summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
0 files changed, 0 insertions, 0 deletions
roundedbox.h \ @@ -21,7 +20,6 @@ HEADERS += 3rdparty/fbm.h \ SOURCES += 3rdparty/fbm.c \ glbuffers.cpp \ glextensions.cpp \ - glshaders.cpp \ main.cpp \ qtbox.cpp \ roundedbox.cpp \ diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp index 59256a8..5f168b6 100644 --- a/demos/boxes/glextensions.cpp +++ b/demos/boxes/glextensions.cpp @@ -47,23 +47,6 @@ bool GLExtensionFunctions::resolve(const QGLContext *context) { bool ok = true; - RESOLVE_GL_FUNC(CreateShaderObjectARB) - RESOLVE_GL_FUNC(ShaderSourceARB) - RESOLVE_GL_FUNC(CompileShaderARB) - RESOLVE_GL_FUNC(GetObjectParameterivARB) - RESOLVE_GL_FUNC(DeleteObjectARB) - RESOLVE_GL_FUNC(GetInfoLogARB) - RESOLVE_GL_FUNC(CreateProgramObjectARB) - RESOLVE_GL_FUNC(AttachObjectARB) - RESOLVE_GL_FUNC(DetachObjectARB) - RESOLVE_GL_FUNC(LinkProgramARB) - RESOLVE_GL_FUNC(UseProgramObjectARB) - RESOLVE_GL_FUNC(GetUniformLocationARB) - RESOLVE_GL_FUNC(Uniform1iARB) - RESOLVE_GL_FUNC(Uniform1fARB) - RESOLVE_GL_FUNC(Uniform4fARB) - RESOLVE_GL_FUNC(UniformMatrix4fvARB) - RESOLVE_GL_FUNC(GenFramebuffersEXT) RESOLVE_GL_FUNC(GenRenderbuffersEXT) RESOLVE_GL_FUNC(BindRenderbufferEXT) @@ -88,26 +71,6 @@ bool GLExtensionFunctions::resolve(const QGLContext *context) return ok; } -bool GLExtensionFunctions::glslSupported() { - return CreateShaderObjectARB - && CreateShaderObjectARB - && ShaderSourceARB - && CompileShaderARB - && GetObjectParameterivARB - && DeleteObjectARB - && GetInfoLogARB - && CreateProgramObjectARB - && AttachObjectARB - && DetachObjectARB - && LinkProgramARB - && UseProgramObjectARB - && GetUniformLocationARB - && Uniform1iARB - && Uniform1fARB - && Uniform4fARB - && UniformMatrix4fvARB; -} - bool GLExtensionFunctions::fboSupported() { return GenFramebuffersEXT && GenRenderbuffersEXT diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h index 74617d6..4755532 100644 --- a/demos/boxes/glextensions.h +++ b/demos/boxes/glextensions.h @@ -47,23 +47,6 @@ /* Functions resolved: -glCreateShaderObjectARB -glShaderSourceARB -glCompileShaderARB -glGetObjectParameterivARB -glDeleteObjectARB -glGetInfoLogARB -glCreateProgramObjectARB -glAttachObjectARB -glDetachObjectARB -glLinkProgramARB -glUseProgramObjectARB -glGetUniformLocationARB -glUniform1iARB -glUniform1fARB -glUniform4fARB -glUniformMatrix4fvARB - glGenFramebuffersEXT glGenRenderbuffersEXT glBindRenderbufferEXT @@ -136,39 +119,6 @@ typedef ptrdiff_t GLsizeiptr; #define GL_DEPTH_ATTACHMENT_EXT 0x8D00 #endif -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#endif - -#ifndef GL_ARB_shader_objects -typedef char GLcharARB; -typedef unsigned int GLhandleARB; -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#endif - -typedef GLhandleARB (APIENTRY *_glCreateShaderObjectARB) (GLenum); -typedef void (APIENTRY *_glShaderSourceARB) (GLhandleARB, GLuint, const GLcharARB**, GLint *); -typedef void (APIENTRY *_glCompileShaderARB) (GLhandleARB); -typedef void (APIENTRY *_glGetObjectParameterivARB) (GLhandleARB, GLenum, int *); -typedef void (APIENTRY *_glDeleteObjectARB) (GLhandleARB); -typedef void (APIENTRY *_glGetInfoLogARB) (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -typedef GLhandleARB (APIENTRY *_glCreateProgramObjectARB) (); -typedef void (APIENTRY *_glAttachObjectARB) (GLhandleARB, GLhandleARB); -typedef void (APIENTRY *_glDetachObjectARB) (GLhandleARB, GLhandleARB); -typedef void (APIENTRY *_glLinkProgramARB) (GLhandleARB); -typedef void (APIENTRY *_glUseProgramObjectARB) (GLhandleARB); -typedef GLint (APIENTRY *_glGetUniformLocationARB) (GLhandleARB, const GLcharARB *); -typedef void (APIENTRY *_glUniform1iARB) (GLint, GLint); -typedef void (APIENTRY *_glUniform1fARB) (GLint, GLfloat); -typedef void (APIENTRY *_glUniform4fARB) (GLint, GLfloat, GLfloat, GLfloat, GLfloat); -typedef void (APIENTRY *_glUniformMatrix4fvARB) (GLint, GLuint, GLboolean, const GLfloat *); - typedef void (APIENTRY *_glGenFramebuffersEXT) (GLsizei, GLuint *); typedef void (APIENTRY *_glGenRenderbuffersEXT) (GLsizei, GLuint *); typedef void (APIENTRY *_glBindRenderbufferEXT) (GLenum, GLuint); @@ -194,27 +144,9 @@ struct GLExtensionFunctions { bool resolve(const QGLContext *context); - bool glslSupported(); bool fboSupported(); bool openGL15Supported(); // the rest: multi-texture, 3D-texture, vertex buffer objects - _glCreateShaderObjectARB CreateShaderObjectARB; - _glShaderSourceARB ShaderSourceARB; - _glCompileShaderARB CompileShaderARB; - _glGetObjectParameterivARB GetObjectParameterivARB; - _glDeleteObjectARB DeleteObjectARB; - _glGetInfoLogARB GetInfoLogARB; - _glCreateProgramObjectARB CreateProgramObjectARB; - _glAttachObjectARB AttachObjectARB; - _glDetachObjectARB DetachObjectARB; - _glLinkProgramARB LinkProgramARB; - _glUseProgramObjectARB UseProgramObjectARB; - _glGetUniformLocationARB GetUniformLocationARB; - _glUniform1iARB Uniform1iARB; - _glUniform1fARB Uniform1fARB; - _glUniform4fARB Uniform4fARB; - _glUniformMatrix4fvARB UniformMatrix4fvARB; - _glGenFramebuffersEXT GenFramebuffersEXT; _glGenRenderbuffersEXT GenRenderbuffersEXT; _glBindRenderbufferEXT BindRenderbufferEXT; @@ -243,23 +175,6 @@ inline GLExtensionFunctions &getGLExtensionFunctions() return funcs; } -#define glCreateShaderObjectARB getGLExtensionFunctions().CreateShaderObjectARB -#define glShaderSourceARB getGLExtensionFunctions().ShaderSourceARB -#define glCompileShaderARB getGLExtensionFunctions().CompileShaderARB -#define glGetObjectParameterivARB getGLExtensionFunctions().GetObjectParameterivARB -#define glDeleteObjectARB getGLExtensionFunctions().DeleteObjectARB -#define glGetInfoLogARB getGLExtensionFunctions().GetInfoLogARB -#define glCreateProgramObjectARB getGLExtensionFunctions().CreateProgramObjectARB -#define glAttachObjectARB getGLExtensionFunctions().AttachObjectARB -#define glDetachObjectARB getGLExtensionFunctions().DetachObjectARB -#define glLinkProgramARB getGLExtensionFunctions().LinkProgramARB -#define glUseProgramObjectARB getGLExtensionFunctions().UseProgramObjectARB -#define glGetUniformLocationARB getGLExtensionFunctions().GetUniformLocationARB -#define glUniform1iARB getGLExtensionFunctions().Uniform1iARB -#define glUniform1fARB getGLExtensionFunctions().Uniform1fARB -#define glUniform4fARB getGLExtensionFunctions().Uniform4fARB -#define glUniformMatrix4fvARB getGLExtensionFunctions().UniformMatrix4fvARB - #define glGenFramebuffersEXT getGLExtensionFunctions().GenFramebuffersEXT #define glGenRenderbuffersEXT getGLExtensionFunctions().GenRenderbuffersEXT #define glBindRenderbufferEXT getGLExtensionFunctions().BindRenderbufferEXT diff --git a/demos/boxes/glshaders.cpp b/demos/boxes/glshaders.cpp deleted file mode 100644 index b6999a8..0000000 --- a/demos/boxes/glshaders.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "glshaders.h" - -#define GLSHADERS_ASSERT_OPENGL(prefix, assertion, returnStatement) \ -if (m_failed || !(assertion)) { \ - if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \ - m_failed = true; \ - returnStatement; \ -} - - -GLShader::GLShader(const char *data, int size, GLenum shaderType) -: m_compileError(false), m_failed(false) -{ - GLSHADERS_ASSERT_OPENGL("GLShader::GLShader", - glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return) - - m_shader = glCreateShaderObjectARB(shaderType); - - GLint glSize = size; - glShaderSourceARB(m_shader, 1, &data, &glSize); - glCompileShaderARB(m_shader); - int status; - glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status); - m_compileError = (status != 1); -} - -GLShader::GLShader(const QString& fileName, GLenum shaderType) - : m_compileError(false), m_failed(false) -{ - GLSHADERS_ASSERT_OPENGL("GLShader::GLShader", - glCreateShaderObjectARB && glShaderSourceARB && glCompileShaderARB && glGetObjectParameterivARB, return) - - m_shader = glCreateShaderObjectARB(shaderType); - - QFile file(fileName); - if (file.open(QIODevice::ReadOnly)) { - QByteArray bytes = file.readAll(); - GLint size = file.size(); - const char *p = bytes.data(); - file.close(); - glShaderSourceARB(m_shader, 1, &p, &size); - glCompileShaderARB(m_shader); - int status; - glGetObjectParameterivARB(m_shader, GL_OBJECT_COMPILE_STATUS_ARB, &status); - m_compileError = (status != 1); - } else { - m_compileError = true; - } -} - -GLShader::~GLShader() -{ - GLSHADERS_ASSERT_OPENGL("GLShader::~GLShader", glDeleteObjectARB, return) - - glDeleteObjectARB(m_shader); -} - -QString GLShader::log() -{ - GLSHADERS_ASSERT_OPENGL("GLShader::log", glGetObjectParameterivARB - && glGetInfoLogARB, return QLatin1String("GLSL not supported.")) - - int length; - glGetObjectParameterivARB(m_shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length); - char *log = new char[length + 1]; - GLsizei glLength = length; - glGetInfoLogARB(m_shader, glLength, &glLength, log); - log[glLength] = '\0'; - QString result(log); - delete log; - return result; -} - -GLVertexShader::GLVertexShader(const char *data, int size) : GLShader(data, size, GL_VERTEX_SHADER_ARB) -{ -} - -GLVertexShader::GLVertexShader(const QString& fileName) : GLShader(fileName, GL_VERTEX_SHADER_ARB) -{ -} - -GLFragmentShader::GLFragmentShader(const char *data, int size) : GLShader(data, size, GL_FRAGMENT_SHADER_ARB) -{ -} - -GLFragmentShader::GLFragmentShader(const QString& fileName) : GLShader(fileName, GL_FRAGMENT_SHADER_ARB) -{ -} - -GLProgram::GLProgram() : m_linked(false), m_linkError(false), m_failed(false) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::GLProgram", glCreateProgramObjectARB, return) - - m_program = glCreateProgramObjectARB(); -} - -GLProgram::~GLProgram() -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::~GLProgram", glDeleteObjectARB, return) - - glDeleteObjectARB(m_program); -} - -void GLProgram::attach(const GLShader &shader) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::attach", glAttachObjectARB, return) - - glAttachObjectARB(m_program, shader.m_shader); - m_linked = m_linkError = false; -} - -void GLProgram::detach(const GLShader &shader) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::detach", glDetachObjectARB, return) - - glDetachObjectARB(m_program, shader.m_shader); - m_linked = m_linkError = false; -} - -bool GLProgram::failed() -{ - if (m_failed || m_linkError) - return true; - - if (m_linked) - return false; - - GLSHADERS_ASSERT_OPENGL("GLProgram::failed", glLinkProgramARB && glGetObjectParameterivARB, return true) - - glLinkProgramARB(m_program); - int status; - glGetObjectParameterivARB(m_program, GL_OBJECT_LINK_STATUS_ARB, &status); - m_linkError = !(m_linked = (status == 1)); - return m_linkError; -} - -QString GLProgram::log() -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::log", glGetObjectParameterivARB && glGetInfoLogARB, - return QLatin1String("Failed.")) - - int length; - glGetObjectParameterivARB(m_program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length); - char *log = new char[length + 1]; - GLsizei glLength = length; - glGetInfoLogARB(m_program, glLength, &glLength, log); - log[glLength] = '\0'; - QString result(log); - delete log; - return result; -} - -void GLProgram::bind() -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return) - - if (!failed()) - glUseProgramObjectARB(m_program); -} - -void GLProgram::unbind() -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::bind", glUseProgramObjectARB, return) - - glUseProgramObjectARB(0); -} - -bool GLProgram::hasParameter(const QString& name) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::hasParameter", glGetUniformLocationARB, return false) - - if (!failed()) { - QByteArray asciiName = name.toAscii(); - return -1 != glGetUniformLocationARB(m_program, asciiName.data()); - } - return false; -} - -void GLProgram::setInt(const QString& name, int value) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::setInt", glGetUniformLocationARB && glUniform1iARB, return) - - if (!failed()) { - QByteArray asciiName = name.toAscii(); - int loc = glGetUniformLocationARB(m_program, asciiName.data()); - glUniform1iARB(loc, value); - } -} - -void GLProgram::setFloat(const QString& name, float value) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::setFloat", glGetUniformLocationARB && glUniform1fARB, return) - - if (!failed()) { - QByteArray asciiName = name.toAscii(); - int loc = glGetUniformLocationARB(m_program, asciiName.data()); - glUniform1fARB(loc, value); - } -} - -void GLProgram::setColor(const QString& name, QRgb value) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::setColor", glGetUniformLocationARB && glUniform4fARB, return) - - //qDebug() << "Setting color" << name; - if (!failed()) { - QByteArray asciiName = name.toAscii(); - int loc = glGetUniformLocationARB(m_program, asciiName.data()); - //qDebug() << "Location of" << name << "is" << loc; - QColor color(value); - glUniform4fARB(loc, color.redF(), color.greenF(), color.blueF(), color.alphaF()); - } -} - -void GLProgram::setMatrix(const QString& name, const gfx::Matrix4x4f &mat) -{ - GLSHADERS_ASSERT_OPENGL("GLProgram::setMatrix", glGetUniformLocationARB && glUniformMatrix4fvARB, return) - - if (!failed()) { - QByteArray asciiName = name.toAscii(); - int loc = glGetUniformLocationARB(m_program, asciiName.data()); - //qDebug() << "Location of" << name << "is" << loc; - glUniformMatrix4fvARB(loc, 1, GL_FALSE, mat.bits()); - } -} \ No newline at end of file diff --git a/demos/boxes/glshaders.h b/demos/boxes/glshaders.h deleted file mode 100644 index 2b6209a..0000000 --- a/demos/boxes/glshaders.h +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GLSHADERS_H -#define GLSHADERS_H - -//#include -#include "glextensions.h" - -#include -#include - -#include "vector.h" - -class GLShader -{ -public: - friend class GLProgram; - virtual ~GLShader(); - bool failed() const {return m_failed;} - QString log(); -protected: - GLShader(const char *data, int size, GLenum shaderType); - GLShader(const QString& fileName, GLenum shaderType); - - GLhandleARB m_shader; - bool m_compileError; - bool m_failed; -}; - -class GLVertexShader : public GLShader -{ -public: - GLVertexShader(const char *data, int size); - GLVertexShader(const QString& fileName); -}; - -class GLFragmentShader : public GLShader -{ -public: - GLFragmentShader(const char *data, int size); - GLFragmentShader(const QString& fileName); -}; - -class GLProgram -{ -public: - GLProgram(); - ~GLProgram(); - void attach(const GLShader &shader); - void detach(const GLShader &shader); - void bind(); - void unbind(); - bool failed(); - QString log(); - bool hasParameter(const QString& name); - // use program before setting values - void setInt(const QString& name, int value); - void setFloat(const QString& name, float value); - void setColor(const QString& name, QRgb value); - void setMatrix(const QString& name, const gfx::Matrix4x4f &mat); - // TODO: add a bunch of set-functions for different types. -private: - GLhandleARB m_program; - bool m_linked; - bool m_linkError; - bool m_failed; -}; - -#endif diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp index 1040e17..e5aab75 100644 --- a/demos/boxes/scene.cpp +++ b/demos/boxes/scene.cpp @@ -531,11 +531,11 @@ Scene::~Scene() if (texture) delete texture; if (m_mainCubemap) delete m_mainCubemap; - foreach (GLProgram *program, m_programs) + foreach (QGLShaderProgram *program, m_programs) if (program) delete program; if (m_vertexShader) delete m_vertexShader; - foreach (GLFragmentShader *shader, m_fragmentShaders) + foreach (QGLShader *shader, m_fragmentShaders) if (shader) delete shader; foreach (GLRenderTargetCube *rt, m_cubemaps) if (rt) delete rt; @@ -549,16 +549,18 @@ void Scene::initGL() { m_box = new GLRoundedBox(0.25f, 1.0f, 10); - m_vertexShader = new GLVertexShader(":/res/boxes/basic.vsh"); + m_vertexShader = new QGLShader(":/res/boxes/basic.vsh", QGLShader::VertexShader); QStringList list; list << ":/res/boxes/cubemap_posx.jpg" << ":/res/boxes/cubemap_negx.jpg" << ":/res/boxes/cubemap_posy.jpg" << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg"; m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize)); - m_environmentShader = new GLFragmentShader(environmentShaderText, strlen(environmentShaderText)); - m_environmentProgram = new GLProgram; - m_environmentProgram->attach(*m_vertexShader); - m_environmentProgram->attach(*m_environmentShader); + m_environmentShader = new QGLShader(QGLShader::FragmentShader); + m_environmentShader->setSourceCode(environmentShaderText); + m_environmentProgram = new QGLShaderProgram; + m_environmentProgram->addShader(m_vertexShader); + m_environmentProgram->addShader(m_environmentShader); + m_environmentProgram->link(); const int NOISE_SIZE = 128; // for a different size, B and BM in fbm.c must also be changed m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE); @@ -610,19 +612,19 @@ void Scene::initGL() filter = QStringList("*.fsh"); files = QDir(":/res/boxes/").entryInfoList(filter, QDir::Files | QDir::Readable); foreach (QFileInfo file, files) { - GLProgram *program = new GLProgram; - GLFragmentShader* shader = new GLFragmentShader(file.absoluteFilePath()); + QGLShaderProgram *program = new QGLShaderProgram; + QGLShader* shader = new QGLShader(file.absoluteFilePath(), QGLShader::FragmentShader); // The program does not take ownership over the shaders, so store them in a vector so they can be deleted afterwards. - program->attach(*m_vertexShader); - program->attach(*shader); - if (program->failed()) { + program->addShader(m_vertexShader); + program->addShader(shader); + if (!program->link()) { qWarning("Failed to compile and link shader program"); qWarning("Vertex shader log:"); - qWarning() << m_vertexShader->log(); + qWarning() << m_vertexShader->errors(); qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):"; - qWarning() << shader->log(); + qWarning() << shader->errors(); qWarning("Shader program log:"); - qWarning() << program->log(); + qWarning() << program->errors(); delete shader; delete program; @@ -633,13 +635,13 @@ void Scene::initGL() m_programs << program; m_renderOptions->addShader(file.baseName()); - program->bind(); - m_cubemaps << (program->hasParameter("env") ? new GLRenderTargetCube(qMin(256, m_maxTextureSize)) : 0); - program->unbind(); + program->enable(); + m_cubemaps << ((program->uniformLocation("env") != -1) ? new GLRenderTargetCube(qMin(256, m_maxTextureSize)) : 0); + program->disable(); } if (m_programs.size() == 0) - m_programs << new GLProgram; + m_programs << new QGLShaderProgram; m_renderOptions->emitParameterChanged(); } @@ -674,12 +676,12 @@ void Scene::renderBoxes(const gfx::Matrix4x4f &view, int excludeBox) // Don't render the environment if the environment texture can't be set for the correct sampler. if (glActiveTexture) { m_environment->bind(); - m_environmentProgram->bind(); - m_environmentProgram->setInt("tex", 0); - m_environmentProgram->setInt("env", 1); - m_environmentProgram->setInt("noise", 2); + m_environmentProgram->enable(); + m_environmentProgram->setUniformValue("tex", 0); + m_environmentProgram->setUniformValue("env", 1); + m_environmentProgram->setUniformValue("noise", 2); m_box->draw(); - m_environmentProgram->unbind(); + m_environmentProgram->disable(); m_environment->unbind(); } @@ -707,14 +709,18 @@ void Scene::renderBoxes(const gfx::Matrix4x4f &view, int excludeBox) else m_environment->bind(); } - m_programs[i]->bind(); - m_programs[i]->setInt("tex", 0); - m_programs[i]->setInt("env", 1); - m_programs[i]->setInt("noise", 2); - m_programs[i]->setMatrix("view", view); - m_programs[i]->setMatrix("invView", invView); + m_programs[i]->enable(); + m_programs[i]->setUniformValue("tex", 0); + m_programs[i]->setUniformValue("env", 1); + m_programs[i]->setUniformValue("noise", 2); + QMatrix4x4 mview; + QMatrix4x4 minvview; + memcpy(mview.data(), view.bits(), sizeof(float) * 16); + memcpy(minvview.data(), invView.bits(), sizeof(float) * 16); + m_programs[i]->setUniformValue("view", mview); + m_programs[i]->setUniformValue("invView", minvview); m_box->draw(); - m_programs[i]->unbind(); + m_programs[i]->disable(); if (glActiveTexture) { if (m_dynamicCubemap && m_cubemaps[i]) @@ -737,14 +743,18 @@ void Scene::renderBoxes(const gfx::Matrix4x4f &view, int excludeBox) m_environment->bind(); } - m_programs[m_currentShader]->bind(); - m_programs[m_currentShader]->setInt("tex", 0); - m_programs[m_currentShader]->setInt("env", 1); - m_programs[m_currentShader]->setInt("noise", 2); - m_programs[m_currentShader]->setMatrix("view", view); - m_programs[m_currentShader]->setMatrix("invView", invView); + m_programs[m_currentShader]->enable(); + m_programs[m_currentShader]->setUniformValue("tex", 0); + m_programs[m_currentShader]->setUniformValue("env", 1); + m_programs[m_currentShader]->setUniformValue("noise", 2); + QMatrix4x4 mview; + QMatrix4x4 minvview; + memcpy(mview.data(), view.bits(), sizeof(float) * 16); + memcpy(minvview.data(), invView.bits(), sizeof(float) * 16); + m_programs[m_currentShader]->setUniformValue("view", mview); + m_programs[m_currentShader]->setUniformValue("invView", minvview); m_box->draw(); - m_programs[m_currentShader]->unbind(); + m_programs[m_currentShader]->disable(); if (glActiveTexture) { if (m_dynamicCubemap) @@ -1021,20 +1031,20 @@ void Scene::toggleDynamicCubemap(int state) void Scene::setColorParameter(const QString &name, QRgb color) { // set the color in all programs - foreach (GLProgram *program, m_programs) { - program->bind(); - program->setColor(name, color); - program->unbind(); + foreach (QGLShaderProgram *program, m_programs) { + program->enable(); + program->setUniformValue(program->uniformLocation(name), QColor(color)); + program->disable(); } } void Scene::setFloatParameter(const QString &name, float value) { // set the color in all programs - foreach (GLProgram *program, m_programs) { - program->bind(); - program->setFloat(name, value); - program->unbind(); + foreach (QGLShaderProgram *program, m_programs) { + program->enable(); + program->setUniformValue(program->uniformLocation(name), value); + program->disable(); } } diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index 2db9317..c056739 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -53,7 +53,6 @@ #include "vector.h" #include "trackball.h" #include "glbuffers.h" -#include "glshaders.h" #include "qtbox.h" #define PI 3.14159265358979 @@ -231,11 +230,11 @@ private: GLTexture3D *m_noise; GLRenderTargetCube *m_mainCubemap; QVector m_cubemaps; - QVector m_programs; - GLVertexShader *m_vertexShader; - QVector m_fragmentShaders; - GLFragmentShader *m_environmentShader; - GLProgram *m_environmentProgram; + QVector m_programs; + QGLShader *m_vertexShader; + QVector m_fragmentShaders; + QGLShader *m_environmentShader; + QGLShaderProgram *m_environmentProgram; }; diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp index 213c5b2..ee50670 100644 --- a/examples/opengl/hellogl_es2/glwidget.cpp +++ b/examples/opengl/hellogl_es2/glwidget.cpp @@ -48,124 +48,10 @@ const int bubbleNum = 8; -inline void CrossProduct(qreal &xOut, qreal &yOut, qreal &zOut, qreal x1, qreal y1, qreal z1, qreal x2, qreal y2, qreal z2) -{ - xOut = y1 * z2 - z1 * y2; - yOut = z1 * x2 - x1 * z2; - zOut = x1 * y2 - y1 * x2; -} - -inline void Normalize(qreal &x, qreal &y, qreal &z) -{ - qreal l = sqrt(x*x + y*y + z*z); - x = x / l; - y = y / l; - z = z / l; -} - -inline void IdentityMatrix(GLfloat *m) -{ - m[0 * 4 + 0] = 1.0f; - m[1 * 4 + 0] = 0.0f; - m[2 * 4 + 0] = 0.0f; - m[3 * 4 + 0] = 0.0f; - m[0 * 4 + 1] = 0.0f; - m[1 * 4 + 1] = 1.0f; - m[2 * 4 + 1] = 0.0f; - m[3 * 4 + 1] = 0.0f; - m[0 * 4 + 2] = 0.0f; - m[1 * 4 + 2] = 0.0f; - m[2 * 4 + 2] = 1.0f; - m[3 * 4 + 2] = 0.0f; - m[0 * 4 + 3] = 0.0f; - m[1 * 4 + 3] = 0.0f; - m[2 * 4 + 3] = 0.0f; - m[3 * 4 + 3] = 1.0f; -} - -// Adjust a 4x4 matrix to apply a scale. -inline void ScaleMatrix(GLfloat *m, GLfloat scalex, GLfloat scaley, GLfloat scalez) -{ - m[0 * 4 + 0] *= scalex; - m[0 * 4 + 1] *= scalex; - m[0 * 4 + 2] *= scalex; - m[0 * 4 + 3] *= scalex; - m[1 * 4 + 0] *= scaley; - m[1 * 4 + 1] *= scaley; - m[1 * 4 + 2] *= scaley; - m[1 * 4 + 3] *= scaley; - m[2 * 4 + 0] *= scalez; - m[2 * 4 + 1] *= scalez; - m[2 * 4 + 2] *= scalez; - m[2 * 4 + 3] *= scalez; -} - -// Adjust a 4x4 matrix to apply a translation. -inline void TranslateMatrix(GLfloat *m, GLfloat translatex, GLfloat translatey, GLfloat translatez) -{ - m[3 * 4 + 0] += m[0 * 4 + 0] * translatex + m[1 * 4 + 0] * translatey + m[2 * 4 + 0] * translatez; - m[3 * 4 + 1] += m[0 * 4 + 1] * translatex + m[1 * 4 + 1] * translatey + m[2 * 4 + 1] * translatez; - m[3 * 4 + 2] += m[0 * 4 + 2] * translatex + m[1 * 4 + 2] * translatey + m[2 * 4 + 2] * translatez; - m[3 * 4 + 3] += m[0 * 4 + 3] * translatex + m[1 * 4 + 3] * translatey + m[2 * 4 + 3] * translatez; -} - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -// Adjust a 4x4 matrix to apply a rotation. -inline void RotateMatrix(GLfloat *m, GLfloat angle, GLfloat vx, GLfloat vy, GLfloat vz) -{ - GLfloat len = sqrt(vx * vx + vy * vy + vz * vz); - if (len != 0) { - vx /= len; - vy /= len; - vz /= len; - } - - GLfloat c, s, ic; - c = cos(angle * M_PI / 180.0); - s = sin(angle * M_PI / 180.0); - ic = 1.0f - c; - - GLfloat rot[16]; - rot[0 * 4 + 0] = vx * vx * ic + c; - rot[1 * 4 + 0] = vx * vy * ic - vz * s; - rot[2 * 4 + 0] = vx * vz * ic + vy * s; - rot[3 * 4 + 0] = 0.0f; - rot[0 * 4 + 1] = vy * vx * ic + vz * s; - rot[1 * 4 + 1] = vy * vy * ic + c; - rot[2 * 4 + 1] = vy * vz * ic - vx * s; - rot[3 * 4 + 1] = 0.0f; - rot[0 * 4 + 2] = vx * vz * ic - vy * s; - rot[1 * 4 + 2] = vy * vz * ic + vx * s; - rot[2 * 4 + 2] = vz * vz * ic + c; - rot[3 * 4 + 2] = 0.0f; - rot[0 * 4 + 3] = 0.0f; - rot[1 * 4 + 3] = 0.0f; - rot[2 * 4 + 3] = 0.0f; - rot[3 * 4 + 3] = 1.0f; - - GLfloat temp[16]; - for (int i = 0; i < 4; ++i) { - for (int j = 0; j < 4; ++j) { - temp[j * 4 + i] = 0.0f; - for (int k = 0; k < 4; ++k) { - temp[j * 4 + i] += m[k * 4 + i] * rot[j * 4 + k]; - } - } - } - - qMemCopy(m, temp, sizeof(temp)); -} - GLWidget::GLWidget(QWidget *parent) : QGLWidget(parent) { qtLogo = true; - createdVertices = 0; - createdNormals = 0; - m_vertexNumber = 0; frames = 0; setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_NoSystemBackground); @@ -178,10 +64,6 @@ GLWidget::GLWidget(QWidget *parent) GLWidget::~GLWidget() { - if (createdVertices) - delete[] createdVertices; - if (createdNormals) - delete[] createdNormals; } void GLWidget::setScaling(int scale) { @@ -210,13 +92,11 @@ void GLWidget::showBubbles(bool bubbles) void GLWidget::paintQtLogo() { glDisable(GL_TEXTURE_2D); - glVertexAttribPointer(vertexAttr1, 3, GL_FLOAT, GL_FALSE, 0, createdVertices); - glEnableVertexAttribArray(vertexAttr1); - glVertexAttribPointer(normalAttr1, 3, GL_FLOAT, GL_FALSE, 0, createdNormals); - glEnableVertexAttribArray(normalAttr1); - glDrawArrays(GL_TRIANGLES, 0, m_vertexNumber / 3); - glDisableVertexAttribArray(normalAttr1); - glDisableVertexAttribArray(vertexAttr1); + program1.setAttributeArray(vertexAttr1, vertices.constData()); + program1.setAttributeArray(normalAttr1, normals.constData()); + glDrawArrays(GL_TRIANGLES, 0, vertices.size()); + program1.disableAttributeArray(normalAttr1); + program1.disableAttributeArray(vertexAttr1); } void GLWidget::paintTexturedCube() @@ -239,8 +119,7 @@ void GLWidget::paintTexturedCube() -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5 }; - glVertexAttribPointer(vertexAttr2, 3, GL_FLOAT, GL_FALSE, 0, afVertices); - glEnableVertexAttribArray(vertexAttr2); + program2.setAttributeArray(vertexAttr2, afVertices, 3); GLfloat afTexCoord[] = { 0.0f,0.0f, 1.0f,1.0f, 1.0f,0.0f, @@ -258,8 +137,7 @@ void GLWidget::paintTexturedCube() 1.0f,0.0f, 1.0f,1.0f, 0.0f,0.0f, 0.0f,1.0f, 0.0f,0.0f, 1.0f,1.0f }; - glVertexAttribPointer(texCoordAttr2, 2, GL_FLOAT, GL_FALSE, 0, afTexCoord); - glEnableVertexAttribArray(texCoordAttr2); + program2.setAttributeArray(texCoordAttr2, afTexCoord, 2); GLfloat afNormals[] = { @@ -278,50 +156,15 @@ void GLWidget::paintTexturedCube() 0,1,0, 0,1,0, 0,1,0, 0,1,0, 0,1,0, 0,1,0 }; - glVertexAttribPointer(normalAttr2, 3, GL_FLOAT, GL_FALSE, 0, afNormals); - glEnableVertexAttribArray(normalAttr2); + program2.setAttributeArray(normalAttr2, afNormals, 3); - glUniform1i(textureUniform2, 0); // use texture unit 0 + program2.setUniformValue(textureUniform2, 0); // use texture unit 0 glDrawArrays(GL_TRIANGLES, 0, 36); - glDisableVertexAttribArray(vertexAttr2); - glDisableVertexAttribArray(normalAttr2); - glDisableVertexAttribArray(texCoordAttr2); -} - -static void reportCompileErrors(GLuint shader, const char *src) -{ - GLint value = 0; - glGetShaderiv(shader, GL_COMPILE_STATUS, &value); - bool compiled = (value != 0); - value = 0; - glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value); - if (!compiled && value > 1) { - char *log = new char [value]; - GLint len; - glGetShaderInfoLog(shader, value, &len, log); - qWarning("%s\n", log); - qWarning("when compiling:\n%s\n", src); - delete [] log; - } -} - -static void reportLinkErrors(GLuint program, const char *vsrc, const char *fsrc) -{ - GLint value = 0; - glGetProgramiv(program, GL_LINK_STATUS, &value); - bool linked = (value != 0); - value = 0; - glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value); - if (!linked && value > 1) { - char *log = new char [value]; - GLint len; - glGetProgramInfoLog(program, value, &len, log); - qWarning("%s\n", log); - qWarning("when linking:\n%s\nwith:\n%s\n", vsrc, fsrc); - delete [] log; - } + program2.disableAttributeArray(vertexAttr2); + program2.disableAttributeArray(normalAttr2); + program2.disableAttributeArray(texCoordAttr2); } void GLWidget::initializeGL () @@ -332,8 +175,8 @@ void GLWidget::initializeGL () glGenTextures(1, &m_uiTexture); m_uiTexture = bindTexture(QImage(":/qt.png")); - GLuint vshader1 = glCreateShader(GL_VERTEX_SHADER); - const char *vsrc1[1] = { + QGLShader *vshader1 = new QGLShader(QGLShader::VertexShader, this); + const char *vsrc1 = "attribute highp vec4 vertex;\n" "attribute mediump vec3 normal;\n" "uniform mediump mat4 matrix;\n" @@ -346,36 +189,28 @@ void GLWidget::initializeGL () " color = vec4(col * 0.2 + col * 0.8 * angle, 1.0);\n" " color = clamp(color, 0.0, 1.0);\n" " gl_Position = matrix * vertex;\n" - "}\n" - }; - glShaderSource(vshader1, 1, vsrc1, 0); - glCompileShader(vshader1); - reportCompileErrors(vshader1, vsrc1[0]); + "}\n"; + vshader1->setSourceCode(vsrc1); - GLuint fshader1 = glCreateShader(GL_FRAGMENT_SHADER); - const char *fsrc1[1] = { + QGLShader *fshader1 = new QGLShader(QGLShader::FragmentShader, this); + const char *fsrc1 = "varying mediump vec4 color;\n" "void main(void)\n" "{\n" " gl_FragColor = color;\n" - "}\n" - }; - glShaderSource(fshader1, 1, fsrc1, 0); - glCompileShader(fshader1); - reportCompileErrors(fshader1, fsrc1[0]); - - program1 = glCreateProgram(); - glAttachShader(program1, vshader1); - glAttachShader(program1, fshader1); - glLinkProgram(program1); - reportLinkErrors(program1, vsrc1[0], fsrc1[0]); - - vertexAttr1 = glGetAttribLocation(program1, "vertex"); - normalAttr1 = glGetAttribLocation(program1, "normal"); - matrixUniform1 = glGetUniformLocation(program1, "matrix"); - - GLuint vshader2 = glCreateShader(GL_VERTEX_SHADER); - const char *vsrc2[1] = { + "}\n"; + fshader1->setSourceCode(fsrc1); + + program1.addShader(vshader1); + program1.addShader(fshader1); + program1.link(); + + vertexAttr1 = program1.attributeLocation("vertex"); + normalAttr1 = program1.attributeLocation("normal"); + matrixUniform1 = program1.uniformLocation("matrix"); + + QGLShader *vshader2 = new QGLShader(QGLShader::VertexShader); + const char *vsrc2 = "attribute highp vec4 vertex;\n" "attribute highp vec4 texCoord;\n" "attribute mediump vec3 normal;\n" @@ -388,14 +223,11 @@ void GLWidget::initializeGL () " angle = max(dot(normal, toLight), 0.0);\n" " gl_Position = matrix * vertex;\n" " texc = texCoord;\n" - "}\n" - }; - glShaderSource(vshader2, 1, vsrc2, 0); - glCompileShader(vshader2); - reportCompileErrors(vshader2, vsrc2[0]); + "}\n"; + vshader2->setSourceCode(vsrc2); - GLuint fshader2 = glCreateShader(GL_FRAGMENT_SHADER); - const char *fsrc2[1] = { + QGLShader *fshader2 = new QGLShader(QGLShader::FragmentShader); + const char *fsrc2 = "varying highp vec4 texc;\n" "uniform sampler2D tex;\n" "varying mediump float angle;\n" @@ -404,23 +236,18 @@ void GLWidget::initializeGL () " highp vec3 color = texture2D(tex, texc.st).rgb;\n" " color = color * 0.2 + color * 0.8 * angle;\n" " gl_FragColor = vec4(clamp(color, 0.0, 1.0), 1.0);\n" - "}\n" - }; - glShaderSource(fshader2, 1, fsrc2, 0); - glCompileShader(fshader2); - reportCompileErrors(fshader2, fsrc2[0]); - - program2 = glCreateProgram(); - glAttachShader(program2, vshader2); - glAttachShader(program2, fshader2); - glLinkProgram(program2); - reportLinkErrors(program2, vsrc2[0], fsrc2[0]); - - vertexAttr2 = glGetAttribLocation(program2, "vertex"); - normalAttr2 = glGetAttribLocation(program2, "normal"); - texCoordAttr2 = glGetAttribLocation(program2, "texCoord"); - matrixUniform2 = glGetUniformLocation(program2, "matrix"); - textureUniform2 = glGetUniformLocation(program2, "tex"); + "}\n"; + fshader2->setSourceCode(fsrc2); + + program2.addShader(vshader2); + program2.addShader(fshader2); + program2.link(); + + vertexAttr2 = program2.attributeLocation("vertex"); + normalAttr2 = program2.attributeLocation("normal"); + texCoordAttr2 = program2.attributeLocation("texCoord"); + matrixUniform2 = program2.uniformLocation("matrix"); + textureUniform2 = program2.uniformLocation("tex"); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); @@ -450,24 +277,23 @@ void GLWidget::paintGL() glEnable(GL_CULL_FACE); glEnable(GL_DEPTH_TEST); - GLfloat modelview[16]; - IdentityMatrix(modelview); - RotateMatrix(modelview, m_fAngle, 0.0, 1.0, 0.0); - RotateMatrix(modelview, m_fAngle, 1.0, 0.0, 0.0); - RotateMatrix(modelview, m_fAngle, 0.0, 0.0, 1.0); - ScaleMatrix(modelview, m_fScale, m_fScale, m_fScale); - TranslateMatrix(modelview, 0, -0.2, 0); + QMatrix4x4 modelview; + modelview.rotate(m_fAngle, 0.0f, 1.0f, 0.0f); + modelview.rotate(m_fAngle, 1.0f, 0.0f, 0.0f); + modelview.rotate(m_fAngle, 0.0f, 0.0f, 1.0f); + modelview.scale(m_fScale); + modelview.translate(0.0f, -0.2f, 0.0f); if (qtLogo) { - glUseProgram(program1); - glUniformMatrix4fv(matrixUniform1, 1, GL_FALSE, modelview); + program1.enable(); + program1.setUniformValue(matrixUniform1, modelview); paintQtLogo(); - glUseProgram(0); + program1.disable(); } else { - glUseProgram(program2); - glUniformMatrix4fv(matrixUniform2, 1, GL_FALSE, modelview); + program2.enable(); + program1.setUniformValue(matrixUniform2, modelview); paintTexturedCube(); - glUseProgram(0); + program2.disable(); } glDisable(GL_DEPTH_TEST); @@ -563,80 +389,69 @@ void GLWidget::createGeometry() extrude(x8, y8, x5, y5); } - m_vertexNumber = vertices.size(); - createdVertices = new GLfloat[m_vertexNumber]; - createdNormals = new GLfloat[m_vertexNumber]; - for (int i = 0;i < m_vertexNumber;i++) { - createdVertices[i] = vertices.at(i) * 2; - createdNormals[i] = normals.at(i); - } - vertices.clear(); - normals.clear(); + for (int i = 0;i < vertices.size();i++) + vertices[i] *= 2.0f; } void GLWidget::quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4) { - qreal nx, ny, nz; + vertices << QVector3D(x1, y1, -0.05f); + vertices << QVector3D(x2, y2, -0.05f); + vertices << QVector3D(x4, y4, -0.05f); - vertices << x1 << y1 << -0.05f; - vertices << x2 << y2 << -0.05f; - vertices << x4 << y4 << -0.05f; + vertices << QVector3D(x3, y3, -0.05f); + vertices << QVector3D(x4, y4, -0.05f); + vertices << QVector3D(x2, y2, -0.05f); - vertices << x3 << y3 << -0.05f; - vertices << x4 << y4 << -0.05f; - vertices << x2 << y2 << -0.05f; + QVector3D n = QVector3D::normal + (QVector3D(x2 - x1, y2 - y1, 0.0f), QVector3D(x4 - x1, y4 - y1, 0.0f)); - CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0, x4 - x1, y4 - y1, 0); - Normalize(nx, ny, nz); + normals << n; + normals << n; + normals << n; - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; + normals << n; + normals << n; + normals << n; - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; + vertices << QVector3D(x4, y4, 0.05f); + vertices << QVector3D(x2, y2, 0.05f); + vertices << QVector3D(x1, y1, 0.05f); - vertices << x4 << y4 << 0.05f; - vertices << x2 << y2 << 0.05f; - vertices << x1 << y1 << 0.05f; + vertices << QVector3D(x2, y2, 0.05f); + vertices << QVector3D(x4, y4, 0.05f); + vertices << QVector3D(x3, y3, 0.05f); - vertices << x2 << y2 << 0.05f; - vertices << x4 << y4 << 0.05f; - vertices << x3 << y3 << 0.05f; + n = QVector3D::normal + (QVector3D(x2 - x4, y2 - y4, 0.0f), QVector3D(x1 - x4, y1 - y4, 0.0f)); - CrossProduct(nx, ny, nz, x2 - x4, y2 - y4, 0, x1 - x4, y1 - y4, 0); - Normalize(nx, ny, nz); + normals << n; + normals << n; + normals << n; - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; - - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; + normals << n; + normals << n; + normals << n; } void GLWidget::extrude(qreal x1, qreal y1, qreal x2, qreal y2) { - qreal nx, ny, nz; - - vertices << x1 << y1 << +0.05f; - vertices << x2 << y2 << +0.05f; - vertices << x1 << y1 << -0.05f; + vertices << QVector3D(x1, y1, +0.05f); + vertices << QVector3D(x2, y2, +0.05f); + vertices << QVector3D(x1, y1, -0.05f); - vertices << x2 << y2 << -0.05f; - vertices << x1 << y1 << -0.05f; - vertices << x2 << y2 << +0.05f; + vertices << QVector3D(x2, y2, -0.05f); + vertices << QVector3D(x1, y1, -0.05f); + vertices << QVector3D(x2, y2, +0.05f); - CrossProduct(nx, ny, nz, x2 - x1, y2 - y1, 0.0f, 0.0f, 0.0f, -0.1f); - Normalize(nx, ny, nz); + QVector3D n = QVector3D::normal + (QVector3D(x2 - x1, y2 - y1, 0.0f), QVector3D(0.0f, 0.0f, -0.1f)); - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; + normals << n; + normals << n; + normals << n; - normals << nx << ny << nz; - normals << nx << ny << nz; - normals << nx << ny << nz; + normals << n; + normals << n; + normals << n; } diff --git a/examples/opengl/hellogl_es2/glwidget.h b/examples/opengl/hellogl_es2/glwidget.h index 9a7823a..596e1cc 100644 --- a/examples/opengl/hellogl_es2/glwidget.h +++ b/examples/opengl/hellogl_es2/glwidget.h @@ -43,7 +43,11 @@ #define GLWIDGET_H #include +#include +#include +#include #include +#include class Bubble; class GLWidget : public QGLWidget { @@ -71,24 +75,21 @@ private: void createBubbles(int number); void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4); void extrude(qreal x1, qreal y1, qreal x2, qreal y2); - QList vertices; - QList normals; - GLfloat *createdVertices; - GLfloat *createdNormals; - int m_vertexNumber; + QVector vertices; + QVector normals; bool qtLogo; QList bubbles; int frames; QTime time; - GLuint program1; - GLuint program2; - GLuint vertexAttr1; - GLuint normalAttr1; - GLuint matrixUniform1; - GLuint vertexAttr2; - GLuint normalAttr2; - GLuint texCoordAttr2; - GLuint matrixUniform2; - GLuint textureUniform2; + QGLShaderProgram program1; + QGLShaderProgram program2; + int vertexAttr1; + int normalAttr1; + int matrixUniform1; + int vertexAttr2; + int normalAttr2; + int texCoordAttr2; + int matrixUniform2; + int textureUniform2; }; #endif diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index b9c2bee..2767f6f 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2939,7 +2939,12 @@ bool QInternal::callFunction(InternalFunction func, void **args) \relates \since 4.4 \threadsafe - \overload + + Compares the floating point value \a p1 and \a p2 and + returns \c true if they are considered equal, otherwise \c false. + + The two numbers are compared in a relative way, where the + exactness is stronger the smaller the numbers are. */ /*! diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 210f713..6f886c2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1833,7 +1833,7 @@ enum { /* TYPEINFO flags */ #define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \ template <> \ -class QTypeInfo \ +class QTypeInfo \ { \ public: \ enum { \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f224e67..1aa6558 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -31,6 +31,7 @@ include(itemviews/itemviews.pri) include(inputmethod/inputmethod.pri) include(graphicsview/graphicsview.pri) include(util/util.pri) +include(math3d/math3d.pri) embedded: QT += network diff --git a/src/gui/math3d/math3d.pri b/src/gui/math3d/math3d.pri new file mode 100644 index 0000000..581adbd --- /dev/null +++ b/src/gui/math3d/math3d.pri @@ -0,0 +1,20 @@ +HEADERS += \ + math3d/qfixedpt.h \ + math3d/qgenericmatrix.h \ + math3d/qmath3dglobal.h \ + math3d/qmath3dutil_p.h \ + math3d/qmatrix4x4.h \ + math3d/qquaternion.h \ + math3d/qvector2d.h \ + math3d/qvector3d.h \ + math3d/qvector4d.h + +SOURCES += \ + math3d/qfixedpt.cpp \ + math3d/qgenericmatrix.cpp \ + math3d/qmath3dutil.cpp \ + math3d/qmatrix4x4.cpp \ + math3d/qquaternion.cpp \ + math3d/qvector2d.cpp \ + math3d/qvector3d.cpp \ + math3d/qvector4d.cpp diff --git a/src/gui/math3d/qfixedpt.cpp b/src/gui/math3d/qfixedpt.cpp new file mode 100644 index 0000000..e7e61b6 --- /dev/null +++ b/src/gui/math3d/qfixedpt.cpp @@ -0,0 +1,681 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qfixedpt.h" + +QT_BEGIN_NAMESPACE + +/*! + \internal + Returns the fixed-point square root of \a value. +*/ +qint64 qt_math3d_fixed_sqrt(qint64 value) +{ + qint64 result = 0; + qint64 bit = ((qint64)1) << 62; + while (bit > value) + bit >>= 2; + while (bit != 0) { + if (value >= (result + bit)) { + value -= result + bit; + result += (bit << 1); + } + result >>= 1; + bit >>= 2; + } + return result; +} + +/*! + \class QFixedPt + \brief The QFixedPt class represents fixed-point numbers within a 32-bit integer with a configurable precision. + + The template parameter is the number of bits of precision after + the decimal point. For example, QFixedPt<5> indicates that there + are 27 bits before the decimal point, and 5 bits of precision after + the decimal point. +*/ + +/*! + \fn QFixedPt::QFixedPt() + + Constructs a default fixed-point number. The initial value + is undefined. +*/ + +/*! + \fn QFixedPt::QFixedPt(int value) + + Constructs a fixed-point number from the integer \a value. +*/ + +/*! + \fn QFixedPt::QFixedPt(qreal value) + + Constructs a fixed-point number from the floating-point \a value. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator=(int value) + + Assigns the integer \a value to this fixed-point variable. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator=(qreal value) + + Assigns the floating-point \a value to this fixed-point variable. +*/ + +/*! + \fn int QFixedPt::bits() const + + Returns the raw bits that represent the fixed-point value of this object. + + \sa setBits() +*/ + +/*! + \fn void QFixedPt::setBits(int value) + + Sets the raw bits that represent the fixed-point value of + this object to \a value. + + \sa bits() +*/ + +#if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC) + +/*! + \fn QFixedPt QFixedPt::toPrecision() const + + Returns this fixed-point number, converted to the new fixed-point + precision Prec. + + \sa qFixedPtToPrecision() +*/ + +#endif + +/*! + \fn QFixedPt qFixedPtToPrecision(const QFixedPt& value) + + Returns the fixed-point number \a value, converted to the new fixed-point + precision Prec. + + \sa QFixedPt::toPrecision() +*/ + +/*! + \fn QFixedPt& QFixedPt::operator+=(const QFixedPt& value) + + Adds \a value to this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator+=(int value) + + Adds an integer \a value to this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator+=(qreal value) + + Adds a floating-point \a value to this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator-=(const QFixedPt& value) + + Subtracts \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator-=(int value) + + Subtracts an integer \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator-=(qreal value) + + Subtracts a floating-point \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator*=(const QFixedPt& value) + + Multiplies this fixed-point number by \a value. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator*=(int value) + + Multiplies this fixed-point number by an integer \a value. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator*=(qreal value) + + Multiplies this fixed-point number by a floating-point \a value. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator/=(const QFixedPt& value) + + Divides this fixed-point number by \a value. Division by zero + will result in zero. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator/=(int value) + + Divides this fixed-point number by an integer \a value. Division + by zero will result in zero. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator/=(qreal value) + + Divides this fixed-point number by a floating-point \a value. Division + by zero will result in zero. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator<<=(int value) + + Shifts this fixed-point number left by \a value bits. +*/ + +/*! + \fn QFixedPt& QFixedPt::operator>>=(int value) + + Shifts this fixed-point number right by \a value bits. +*/ + +/*! + \fn QFixedPt QFixedPt::operator<<(int value) const + + Returns the result of shifting this fixed-point number + left by \a value bits. +*/ + +/*! + \fn QFixedPt QFixedPt::operator>>(int value) const + + Returns the result of shifting this fixed-point number + right by \a value bits. +*/ + +/*! + \fn bool QFixedPt::operator==(const QFixedPt& value) const + + Returns true if this fixed-point number is equal to \a value; + false otherwise. +*/ + +/*! + \fn bool operator==(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator==(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator==(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator==(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is equal to \a v2; false otherwise. +*/ + +/*! + \fn bool QFixedPt::operator!=(const QFixedPt& value) const + + Returns true if this fixed-point number is not equal to \a value; + false otherwise. +*/ + +/*! + \fn bool operator!=(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is not equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator!=(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is not equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator!=(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is not equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator!=(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is not equal to \a v2; false otherwise. +*/ + +/*! + \fn bool QFixedPt::operator<=(const QFixedPt& value) const + + Returns true if this fixed-point number is less than or equal to + \a value; false otherwise. +*/ + +/*! + \fn bool operator<=(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is less than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator<=(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is less than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator<=(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is less than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator<=(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is less than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool QFixedPt::operator<(const QFixedPt& value) const + + Returns true if this fixed-point number is less than \a value; + false otherwise. +*/ + +/*! + \fn bool operator<(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is less than \a v2; false otherwise. +*/ + +/*! + \fn bool operator<(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is less than \a v2; false otherwise. +*/ + +/*! + \fn bool operator<(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is less than \a v2; false otherwise. +*/ + +/*! + \fn bool operator<(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is less than \a v2; false otherwise. +*/ + +/*! + \fn bool QFixedPt::operator>=(const QFixedPt& value) const + + Returns true if this fixed-point number is greater than or equal to + \a value; false otherwise. +*/ + +/*! + \fn bool operator>=(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is greater than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator>=(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is greater than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator>=(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is greater than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool operator>=(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is greater than or equal to \a v2; false otherwise. +*/ + +/*! + \fn bool QFixedPt::operator>(const QFixedPt& value) const + + Returns true if this fixed-point number is greater than \a value; + false otherwise. +*/ + +/*! + \fn bool operator>(const QFixedPt& v1, int v2) + \relates QFixedPt + + Returns true if \a v1 is greater than \a v2; false otherwise. +*/ + +/*! + \fn bool operator>(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is greater than \a v2; false otherwise. +*/ + +/*! + \fn bool operator>(const QFixedPt& v1, qreal v2) + \relates QFixedPt + + Returns true if \a v1 is greater than \a v2; false otherwise. +*/ + +/*! + \fn bool operator>(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns true if \a v1 is greater than \a v2; false otherwise. +*/ + +/*! + \fn QFixedPt QFixedPt::operator+(const QFixedPt& value) const + + Returns the result of adding this fixed-point number and \a value. +*/ + +/*! + \fn QFixedPt QFixedPt::operator+(int value) const + + Returns the result of adding this fixed-point number and \a value. +*/ + +/*! + \fn QFixedPt QFixedPt::operator+(qreal value) const + + Returns the result of adding this fixed-point number and \a value. +*/ + +/*! + \fn QFixedPt operator+(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of adding \a v1 and \a v2. +*/ + +/*! + \fn QFixedPt operator+(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of adding \a v1 and \a v2. +*/ + +/*! + \fn QFixedPt QFixedPt::operator-(const QFixedPt& value) const + + Returns the result of subtracting \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt QFixedPt::operator-(int value) const + + Returns the result of subtracting \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt QFixedPt::operator-(qreal value) const + + Returns the result of subtracting \a value from this fixed-point number. +*/ + +/*! + \fn QFixedPt operator-(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of subtracting \a v2 from \a v1. +*/ + +/*! + \fn QFixedPt operator-(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of subtracting \a v2 from \a v1. +*/ + +/*! + \fn QFixedPt QFixedPt::operator*(const QFixedPt& value) const + + Returns the result of multiplying this fixed-point number by \a value. +*/ + +/*! + \fn QFixedPt QFixedPt::operator*(int value) const + + Returns the result of multiplying this fixed-point number by \a value. +*/ + +/*! + \fn QFixedPt QFixedPt::operator*(qreal value) const + + Returns the result of multiplying this fixed-point number by \a value. +*/ + +/*! + \fn QFixedPt operator*(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of multiplying \a v1 by \a v2. +*/ + +/*! + \fn QFixedPt operator*(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of multiplying \a v1 by \a v2. +*/ + +/*! + \fn QFixedPt QFixedPt::operator/(const QFixedPt& value) const + + Returns the result of dividing this fixed-point number by \a value. + Division by zero will result in zero. +*/ + +/*! + \fn QFixedPt QFixedPt::operator/(int value) const + + Returns the result of dividing this fixed-point number by \a value. + Division by zero will result in zero. +*/ + +/*! + \fn QFixedPt QFixedPt::operator/(qreal value) const + + Returns the result of dividing this fixed-point number by \a value. + Division by zero will result in zero. +*/ + +/*! + \fn QFixedPt operator/(int v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of dividing \a v1 by \a v2. Division by zero will + result in zero. +*/ + +/*! + \fn QFixedPt operator/(qreal v1, const QFixedPt& v2) + \relates QFixedPt + + Returns the result of dividing \a v1 by \a v2. Division by zero will + result in zero. +*/ + +/*! + \fn QFixedPt QFixedPt::operator-() const + + Returns the negation of this fixed-point number. +*/ + +/*! + \fn QFixedPt QFixedPt::sqrt() const + + Returns the square root of this fixed-point number. + + \sa sqrtF() +*/ + +/*! + \fn qreal QFixedPt::sqrtF() const + + Return the square root of this fixed-point number as a + floating-point value. + + \sa sqrt() +*/ + +/*! + \fn QFixedPt QFixedPt::round() const + + Returns this fixed-point number, rounded to the nearest integer. + + \sa floor(), ceil(), truncate() +*/ + +/*! + \fn QFixedPt QFixedPt::floor() const; + + Returns the largest integer that is less than or equal to + this fixed-point number. + + \sa round(), ceil(), truncate() +*/ + +/*! + \fn QFixedPt QFixedPt::ceil() const + + Returns the smallest integer that is greater than or equal to + this fixed-point number. + + \sa round(), floor(), truncate() +*/ + +/*! + \fn int QFixedPt::truncate() const + + Returns this fixed-point number with the bits after the + decimal point truncated. + + \sa round(), floor(), ceil() +*/ + +/*! + \fn int QFixedPt::toInt() const + + Returns this fixed-point number, rounded to the nearest integer. + + \sa toReal() +*/ + +/*! + \fn qreal QFixedPt::toReal() const + + Returns this fixed-point number as a floating-point value. + + \sa toInt() +*/ + +/*! + \fn int qCeil(const QFixedPt& value) + \relates QFixedPt + + Returns the smallest integer that is greater than or equal to + \a value. + + \sa qFloor(), qRound(), QFixedPt::ceil() +*/ + +/*! + \fn int qFloor(const QFixedPt& value) + \relates QFixedPt + + Returns the largest integer that is less than or equal to + \a value. + + \sa qCeil(), qRound(), QFixedPt::floor() +*/ + +/*! + \fn int qRound(const QFixedPt& value) + \relates QFixedPt + + Returns \a value, rounded to the nearest integer. + + \sa qCeil(), qFloor(), QFixedPt::round() +*/ + +/*! + \fn bool qFuzzyCompare(const QFixedPt& v1, const QFixedPt& v2, int compareBits) + \relates QFixedPt + + Returns true if \a v1 is almost equal to \a v2; false otherwise. + The \a compareBits parameter specifies the number of bits of precision + that should be considered relevant when performing the comparison. + By default, \a compareBits is PrecBits / 4. +*/ + +/*! + \fn bool qIsNull(const QFixedPt& v) + \relates QFixedPt + + Returns true if \a v is zero; false otherwise. +*/ + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qfixedpt.h b/src/gui/math3d/qfixedpt.h new file mode 100644 index 0000000..ecbcad4 --- /dev/null +++ b/src/gui/math3d/qfixedpt.h @@ -0,0 +1,521 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QFIXEDPT_H +#define QFIXEDPT_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +Q_GUI_EXPORT qint64 qt_math3d_fixed_sqrt(qint64 value); + +// Should be called QFixed or QFixedPoint, but both of those +// are already in use in src/gui/painting/qfixed_p.h. +template +class QFixedPt +{ +public: + inline QFixedPt() {} // Deliberately not initialized - don't change this. + inline QFixedPt(int value) : val(value << PrecBits) {} + inline QFixedPt(qreal value) : val(int(value * (1 << PrecBits))) {} + + inline QFixedPt& operator=(int value) + { val = value << PrecBits; return *this; } + inline QFixedPt& operator=(qreal value) + { val = int(value * (1 << PrecBits)); return *this; } + + inline int bits() const { return val; } + inline void setBits(int value) { val = value; } + +#if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC) + template + inline QFixedPt toPrecision() const + { + QFixedPt result; + if (Prec < PrecBits) + result.setBits(shiftRight(val, (PrecBits - Prec))); + else + result.setBits(shiftLeft(val, (Prec - PrecBits))); + return result; + } +#endif + + inline QFixedPt& operator+=(const QFixedPt& value) + { val += value.val; return *this; } + inline QFixedPt& operator+=(int value) + { val += (value << PrecBits); return *this; } + inline QFixedPt& operator+=(qreal value) + { val += int(value * (1 << PrecBits)); return *this; } + + inline QFixedPt& operator-=(const QFixedPt& value) + { val -= value.val; return *this; } + inline QFixedPt& operator-=(int value) + { val -= (value << PrecBits); return *this; } + inline QFixedPt& operator-=(qreal value) + { val -= int(value * (1 << PrecBits)); return *this; } + + inline QFixedPt& operator*=(const QFixedPt& value) + { val = mul(val, value.val); return *this; } + inline QFixedPt& operator*=(int value) + { val = mul(val, (value << PrecBits)); return *this; } + inline QFixedPt& operator*=(qreal value) + { val = mul(val, int(value * (1 << PrecBits))); return *this; } + + inline QFixedPt& operator/=(const QFixedPt& value) + { val = div(val, value.val); return *this; } + inline QFixedPt& operator/=(int value) + { val = div(val, (value << PrecBits)); return *this; } + inline QFixedPt& operator/=(qreal value) + { val = div(val, int(value * (1 << PrecBits))); return *this; } + + inline QFixedPt& operator<<=(int value) + { val <<= value; return *this; } + inline QFixedPt& operator>>=(int value) + { val >>= value; return *this; } + + inline QFixedPt operator<<(int value) const + { QFixedPt result; result.val = val << value; return result; } + inline QFixedPt operator>>(int value) const + { QFixedPt result; result.val = val >> value; return result; } + + inline bool operator==(const QFixedPt& value) const + { return val == value.val; } + inline bool operator!=(const QFixedPt& value) const + { return val != value.val; } + inline bool operator<=(const QFixedPt& value) const + { return val <= value.val; } + inline bool operator<(const QFixedPt& value) const + { return val < value.val; } + inline bool operator>=(const QFixedPt& value) const + { return val >= value.val; } + inline bool operator>(const QFixedPt& value) const + { return val > value.val; } + + inline QFixedPt operator+(const QFixedPt& value) const + { QFixedPt result; + result.val = val + value.val; return result; } + inline QFixedPt operator+(int value) const + { QFixedPt result; + result.val = val + (value << PrecBits); return result; } + inline QFixedPt operator+(qreal value) const + { QFixedPt result; + result.val = val + int(value * (1 << PrecBits)); return result; } + + inline QFixedPt operator-(const QFixedPt& value) const + { QFixedPt result; + result.val = val - value.val; return result; } + inline QFixedPt operator-(int value) const + { QFixedPt result; + result.val = val - (value << PrecBits); return result; } + inline QFixedPt operator-(qreal value) const + { QFixedPt result; + result.val = val - int(value * (1 << PrecBits)); return result; } + + inline QFixedPt operator*(const QFixedPt& value) const + { QFixedPt result; + result.val = mul(val, value.val); return result; } + inline QFixedPt operator*(int value) const + { QFixedPt result; + result.val = mul(val, (value << PrecBits)); return result; } + inline QFixedPt operator*(qreal value) const + { QFixedPt result; + result.val = mul(val, int(value * (1 << PrecBits))); return result; } + + inline QFixedPt operator/(const QFixedPt& value) const + { QFixedPt result; + result.val = div(val, value.val); return result; } + inline QFixedPt operator/(int value) const + { QFixedPt result; + result.val = div(val, (value << PrecBits)); return result; } + inline QFixedPt operator/(qreal value) const + { QFixedPt result; + result.val = div(val, int(value * (1 << PrecBits))); return result; } + + inline QFixedPt operator-() const + { QFixedPt result; result.val = -val; return result; } + + inline QFixedPt sqrt() const; + inline qreal sqrtF() const; + inline QFixedPt round() const; + inline QFixedPt floor() const; + inline QFixedPt ceil() const; + inline int truncate() const { return val >> PrecBits; } + + inline int toInt() const { return (val + (1 << (PrecBits - 1))) >> PrecBits; } + inline qreal toReal() const { return qreal(val) / qreal(1 << PrecBits); } + +#if !defined(Q_NO_TEMPLATE_FRIENDS) + template + friend QFixedPt operator/(int v1, const QFixedPt& v2); + template + friend QFixedPt operator/(qreal v1, const QFixedPt& v2); + +private: +#endif + int val; + + inline static int mul(int v1, int v2) + { + return int((qint64(v1) * qint64(v2)) >> PrecBits); + } + + inline static int div(int v1, int v2) + { + if (v2) + return int((qint64(v1) << PrecBits) / qint64(v2)); + else + return 0; + } + + // These are used by toPrecision() to avoid a silly gcc compiler warning + // related to negative shift values that will never actually be used. + inline static int shiftRight(int val, int shift) + { + return val >> shift; + } + inline static int shiftLeft(int val, int shift) + { + return val << shift; + } + +#if !defined(Q_NO_TEMPLATE_FRIENDS) + template + friend QFixedPt qFixedPtToPrecision(const QFixedPt& value); +#endif +}; + +template +inline bool operator==(const QFixedPt& v1, int v2) +{ + return v1.bits() == (v2 << PrecBits); +} + +template +inline bool operator==(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) == v2.bits(); +} + +template +inline bool operator==(const QFixedPt& v1, qreal v2) +{ + return v1.bits() == int(v2 * (1 << PrecBits)); +} + +template +inline bool operator==(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) == v2.bits(); +} + +template +inline bool operator!=(const QFixedPt& v1, int v2) +{ + return v1.bits() != (v2 << PrecBits); +} + +template +inline bool operator!=(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) != v2.bits(); +} + +template +inline bool operator!=(const QFixedPt& v1, qreal v2) +{ + return v1.bits() != int(v2 * (1 << PrecBits)); +} + +template +inline bool operator!=(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) != v2.bits(); +} + +template +inline bool operator<=(const QFixedPt& v1, int v2) +{ + return v1.bits() <= (v2 << PrecBits); +} + +template +inline bool operator<=(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) <= v2.bits(); +} + +template +inline bool operator<=(const QFixedPt& v1, qreal v2) +{ + return v1.bits() <= int(v2 * (1 << PrecBits)); +} + +template +inline bool operator<=(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) <= v2.bits(); +} + +template +inline bool operator<(const QFixedPt& v1, int v2) +{ + return v1.bits() < (v2 << PrecBits); +} + +template +inline bool operator<(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) < v2.bits(); +} + +template +inline bool operator<(const QFixedPt& v1, qreal v2) +{ + return v1.bits() < int(v2 * (1 << PrecBits)); +} + +template +inline bool operator<(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) < v2.bits(); +} + +template +inline bool operator>=(const QFixedPt& v1, int v2) +{ + return v1.bits() >= (v2 << PrecBits); +} + +template +inline bool operator>=(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) >= v2.bits(); +} + +template +inline bool operator>=(const QFixedPt& v1, qreal v2) +{ + return v1.bits() >= int(v2 * (1 << PrecBits)); +} + +template +inline bool operator>=(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) >= v2.bits(); +} + +template +inline bool operator>(const QFixedPt& v1, int v2) +{ + return v1.bits() > (v2 << PrecBits); +} + +template +inline bool operator>(int v1, const QFixedPt& v2) +{ + return (v1 << PrecBits) > v2.bits(); +} + +template +inline bool operator>(const QFixedPt& v1, qreal v2) +{ + return v1.bits() > int(v2 * (1 << PrecBits)); +} + +template +inline bool operator>(qreal v1, const QFixedPt& v2) +{ + return int(v1 * (1 << PrecBits)) > v2.bits(); +} + +template +inline QFixedPt operator+(int v1, const QFixedPt& v2) +{ + return v2 + v1; +} + +template +inline QFixedPt operator+(qreal v1, const QFixedPt& v2) +{ + return v2 + v1; +} + +template +inline QFixedPt operator-(int v1, const QFixedPt& v2) +{ + return -(v2 - v1); +} + +template +inline QFixedPt operator-(qreal v1, const QFixedPt& v2) +{ + return -(v2 - v1); +} + +template +inline QFixedPt operator*(int v1, const QFixedPt& v2) +{ + return v2 * v1; +} + +template +inline QFixedPt operator*(qreal v1, const QFixedPt& v2) +{ + return v2 * v1; +} + +template +inline QFixedPt operator/(int v1, const QFixedPt& v2) +{ + QFixedPt result; + result.val = QFixedPt::div(v1 << PrecBits, v2.val); + return result; +} + +template +inline QFixedPt operator/(qreal v1, const QFixedPt& v2) +{ + QFixedPt result; + result.val = QFixedPt::div(int(v1 * (1 << PrecBits)), v2.val); + return result; +} + +template +inline QFixedPt QFixedPt::sqrt() const +{ + QFixedPt result; + result.val = int(qt_math3d_fixed_sqrt + (qint64(val) << (PrecBits * 2)) >> (PrecBits / 2)); + return result; +} + +template +inline qreal QFixedPt::sqrtF() const +{ + return qt_math3d_fixed_sqrt + (qint64(val) << (PrecBits * 2)) / (qreal)(1 << (PrecBits + (PrecBits / 2))); +} + +template +inline QFixedPt QFixedPt::round() const +{ + QFixedPt result; + result.val = (val + (1 << (PrecBits - 1))) & ~((1 << PrecBits) - 1); + return result; +} + +template +inline QFixedPt QFixedPt::floor() const +{ + QFixedPt result; + result.val = val & ~((1 << PrecBits) - 1); + return result; +} + +template +inline QFixedPt QFixedPt::ceil() const +{ + QFixedPt result; + result.val = (val + (1 << PrecBits) - 1) & ~((1 << PrecBits) - 1); + return result; +} + +template +inline int qCeil(const QFixedPt& value) +{ + return value.ceil().bits() >> PrecBits; +} + +template +inline int qFloor(const QFixedPt& value) +{ + return value.floor().bits() >> PrecBits; +} + +template +inline int qRound(const QFixedPt& value) +{ + return value.round().bits() >> PrecBits; +} + +template +inline bool qFuzzyCompare(const QFixedPt& v1, const QFixedPt& v2, int compareBits = (PrecBits / 4)) +{ + return ((v1.bits() ^ v2.bits()) & ~((1 << compareBits) - 1)) == 0; +} + +template +inline bool qIsNull(const QFixedPt& v) +{ + return v.bits() == 0; +} + +template +QFixedPt qFixedPtToPrecision(const QFixedPt& value) +{ + QFixedPt result; + if (Prec < PrecBits) + result.setBits(QFixedPt::shiftRight(value.bits(), (PrecBits - Prec))); + else + result.setBits(QFixedPt::shiftLeft(value.bits(), (Prec - PrecBits))); + return result; +} + +template +inline QDebug &operator<<(QDebug &dbg, const QFixedPt &f) +{ + return dbg << f.toReal(); +} + +Q_DECLARE_TYPEINFO(QFixedPt<0>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<1>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<2>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<3>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<4>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<5>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<6>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<7>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<8>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<9>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<10>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<11>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<12>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<13>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<14>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<15>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<16>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<17>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<18>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<19>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<20>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<21>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<22>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<23>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<24>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<25>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<26>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<27>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<28>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<29>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<30>, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QFixedPt<31>, Q_PRIMITIVE_TYPE); + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp new file mode 100644 index 0000000..cb48909 --- /dev/null +++ b/src/gui/math3d/qgenericmatrix.cpp @@ -0,0 +1,221 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qgenericmatrix.h" + +QT_BEGIN_NAMESPACE + +/*! + \class QGenericMatrix + \brief The QGenericMatrix class is a template class that represents a NxM transformation matrix with N columns and M rows. + \since 4.6 + + The QGenericMatrix template has four parameters: + + \table + \row \i N \i Number of columns. + \row \i M \i Number of rows. + \row \i T \i Element type that is visible to users of the class. + \row \i InnerT \i Element type that is used inside the class. + \endtable + + Normally T and InnerT are the same type; e.g. float or double. + But they can be different if the user wants to store elements + internally in a fixed-point format for the underlying hardware. + + \sa QMatrix4x4, QFixedPt +*/ + +/*! + \fn QGenericMatrix::QGenericMatrix() + + Constructs a NxM identity matrix. +*/ + +/*! + \fn QGenericMatrix::QGenericMatrix(const QGenericMatrix& other) + + Constructs a copy of \a other. +*/ + +/*! + \fn QGenericMatrix::QGenericMatrix(const T *values) + + Constructs a matrix from the given N * M floating-point \a values. + The contents of the array \a values is assumed to be in + row-major order. + + \sa toValueArray() +*/ + +/*! + \fn T QGenericMatrix::operator()(int row, int column) const + + Returns the element at position (\a row, \a column) in this matrix. +*/ + +/*! + \fn InnerT& QGenericMatrix::operator()(int row, int column) + + Returns a reference to the element at position (\a row, \a column) + in this matrix so that the element can be assigned to. +*/ + +/*! + \fn bool QGenericMatrix::isIdentity() const + + Returns true if this matrix is the identity; false otherwise. + + \sa setIdentity() +*/ + +/*! + \fn void QGenericMatrix::setIdentity() + + Sets this matrix to the identity. + + \sa isIdentity() +*/ + +/*! + \fn void QGenericMatrix::fill(qreal value) + + Fills all elements of this matrix with \a value. +*/ + +/*! + \fn QGenericMatrix QGenericMatrix::transposed() const + + Returns this matrix, transposed about its diagonal. +*/ + +/*! + \fn QGenericMatrix& QGenericMatrix::operator+=(const QGenericMatrix& other) + + Adds the contents of \a other to this matrix. +*/ + +/*! + \fn QGenericMatrix& QGenericMatrix::operator-=(const QGenericMatrix& other) + + Subtracts the contents of \a other from this matrix. +*/ + +/*! + \fn QGenericMatrix& QGenericMatrix::operator*=(T factor) + + Multiplies all elements of this matrix by \a factor. +*/ + +/*! + \fn QGenericMatrix& QGenericMatrix::operator/=(T divisor) + + Divides all elements of this matrix by \a divisor. +*/ + +/*! + \fn bool QGenericMatrix::operator==(const QGenericMatrix& other) const + + Returns true if this matrix is identical to \a other; false otherwise. +*/ + +/*! + \fn bool QGenericMatrix::operator!=(const QGenericMatrix& other) const + + Returns true if this matrix is not identical to \a other; false otherwise. +*/ + +/*! + \fn QGenericMatrix operator+(const QGenericMatrix& m1, const QGenericMatrix& m2) + \relates QGenericMatrix + + Returns the sum of \a m1 and \a m2. +*/ + +/*! + \fn QGenericMatrix operator-(const QGenericMatrix& m1, const QGenericMatrix& m2) + \relates QGenericMatrix + + Returns the difference of \a m1 and \a m2. +*/ + +/*! + \fn QGenericMatrix operator*(const QGenericMatrix& m1, const QGenericMatrix& m2) + \relates QGenericMatrix + + Returns the product of the NxM2 matrix \a m1 and the M1xN matrix \a m2 + to produce a M1xM2 matrix result. +*/ + +/*! + \fn QGenericMatrix operator-(const QGenericMatrix& matrix) + \overload + \relates QGenericMatrix + + Returns the negation of \a matrix. +*/ + +/*! + \fn QGenericMatrix operator*(T factor, const QGenericMatrix& matrix) + \relates QGenericMatrix + + Returns the result of multiplying all elements of \a matrix by \a factor. +*/ + +/*! + \fn QGenericMatrix operator*(const QGenericMatrix& matrix, T factor) + \relates QGenericMatrix + + Returns the result of multiplying all elements of \a matrix by \a factor. +*/ + +/*! + \fn QGenericMatrix operator/(const QGenericMatrix& matrix, T divisor) + \relates QGenericMatrix + + Returns the result of dividing all elements of \a matrix by \a divisor. +*/ + +/*! + \fn void QGenericMatrix::toValueArray(T *values) + + Retrieves the N * M items in this matrix and writes them to \a values + in row-major order. +*/ + +/*! + \fn InnerT *QGenericMatrix::data() + + Returns a pointer to the raw data of this matrix. This is indended + for use with raw GL functions. + + \sa constData() +*/ + +/*! + \fn const InnerT *QGenericMatrix::data() const + + Returns a constant pointer to the raw data of this matrix. + This is indended for use with raw GL functions. + + \sa constData() +*/ + +/*! + \fn const InnerT *QGenericMatrix::constData() const + + Returns a constant pointer to the raw data of this matrix. + This is indended for use with raw GL functions. + + \sa data() +*/ + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h new file mode 100644 index 0000000..26a0e48 --- /dev/null +++ b/src/gui/math3d/qgenericmatrix.h @@ -0,0 +1,341 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QGENERICMATRIX_H +#define QGENERICMATRIX_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +template +class QGenericMatrix +{ +public: + QGenericMatrix(); + QGenericMatrix(const QGenericMatrix& other); + explicit QGenericMatrix(const T *values); + + T operator()(int row, int column) const; + InnerT& operator()(int row, int column); + + bool isIdentity() const; + void setIdentity(); + + void fill(qreal value); + + QGenericMatrix transposed() const; + + QGenericMatrix& operator+=(const QGenericMatrix& other); + QGenericMatrix& operator-=(const QGenericMatrix& other); + QGenericMatrix& operator*=(T factor); + QGenericMatrix& operator/=(T divisor); + bool operator==(const QGenericMatrix& other) const; + bool operator!=(const QGenericMatrix& other) const; + + void toValueArray(T *values); + + InnerT *data() { return m[0]; } + const InnerT *data() const { return m[0]; } + const InnerT *constData() const { return m[0]; } + +#if !defined(Q_NO_TEMPLATE_FRIENDS) + template + friend QGenericMatrix operator+(const QGenericMatrix& m1, const QGenericMatrix& m2); + template + friend QGenericMatrix operator-(const QGenericMatrix& m1, const QGenericMatrix& m2); + template + friend QGenericMatrix operator*(const QGenericMatrix& m1, const QGenericMatrix& m2); + template + friend QGenericMatrix operator-(const QGenericMatrix& matrix); + template + friend QGenericMatrix operator*(TT factor, const QGenericMatrix& matrix); + template + friend QGenericMatrix operator*(const QGenericMatrix& matrix, TT factor); + template + friend QGenericMatrix operator/(const QGenericMatrix& matrix, TT divisor); + +private: +#endif + InnerT m[N][M]; // Column-major order to match OpenGL. + + QGenericMatrix(int) {} // Construct without initializing identity matrix. + +#if !defined(Q_NO_TEMPLATE_FRIENDS) + template + friend class QGenericMatrix; +#endif +}; + +template +Q_INLINE_TEMPLATE QGenericMatrix::QGenericMatrix() +{ + setIdentity(); +} + +template +Q_INLINE_TEMPLATE QGenericMatrix::QGenericMatrix(const QGenericMatrix& other) +{ + qMemCopy(m, other.m, sizeof(m)); +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix::QGenericMatrix(const T *values) +{ + for (int col = 0; col < N; ++col) + for (int row = 0; row < M; ++row) + m[col][row] = values[row * N + col]; +} + +template +Q_INLINE_TEMPLATE T QGenericMatrix::operator()(int row, int column) const +{ + Q_ASSERT(row >= 0 && row < M && column >= 0 && column < N); + return qt_math3d_convert(m[column][row]); +} + +template +Q_INLINE_TEMPLATE InnerT& QGenericMatrix::operator()(int row, int column) +{ + Q_ASSERT(row >= 0 && row < M && column >= 0 && column < N); + return m[column][row]; +} + +template +Q_OUTOFLINE_TEMPLATE bool QGenericMatrix::isIdentity() const +{ + for (int col = 0; col < N; ++col) { + for (int row = 0; row < M; ++row) { + if (row == col) { + if (m[col][row] != 1.0f) + return false; + } else { + if (m[col][row] != 0.0f) + return false; + } + } + } + return true; +} + +template +Q_OUTOFLINE_TEMPLATE void QGenericMatrix::setIdentity() +{ + for (int col = 0; col < N; ++col) { + for (int row = 0; row < M; ++row) { + if (row == col) + m[col][row] = 1.0f; + else + m[col][row] = 0.0f; + } + } +} + +template +Q_OUTOFLINE_TEMPLATE void QGenericMatrix::fill(qreal value) +{ + for (int col = 0; col < N; ++col) + for (int row = 0; row < M; ++row) + m[col][row] = value; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix QGenericMatrix::transposed() const +{ + QGenericMatrix result(1); + for (int row = 0; row < M; ++row) + for (int col = 0; col < N; ++col) + result.m[row][col] = m[col][row]; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix& QGenericMatrix::operator+=(const QGenericMatrix& other) +{ + for (int index = 0; index < N * M; ++index) + m[0][index] += other.m[0][index]; + return *this; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix& QGenericMatrix::operator-=(const QGenericMatrix& other) +{ + for (int index = 0; index < N * M; ++index) + m[0][index] -= other.m[0][index]; + return *this; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix& QGenericMatrix::operator*=(T factor) +{ + InnerT f(factor); + for (int index = 0; index < N * M; ++index) + m[0][index] *= f; + return *this; +} + +template +Q_OUTOFLINE_TEMPLATE bool QGenericMatrix::operator==(const QGenericMatrix& other) const +{ + for (int index = 0; index < N * M; ++index) { + if (m[0][index] != other.m[0][index]) + return false; + } + return true; +} + +template +Q_OUTOFLINE_TEMPLATE bool QGenericMatrix::operator!=(const QGenericMatrix& other) const +{ + for (int index = 0; index < N * M; ++index) { + if (m[0][index] != other.m[0][index]) + return true; + } + return false; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix& QGenericMatrix::operator/=(T divisor) +{ + InnerT d(divisor); + for (int index = 0; index < N * M; ++index) + m[0][index] /= d; + return *this; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator+(const QGenericMatrix& m1, const QGenericMatrix& m2) +{ + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = m1.m[0][index] + m2.m[0][index]; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator-(const QGenericMatrix& m1, const QGenericMatrix& m2) +{ + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = m1.m[0][index] - m2.m[0][index]; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator*(const QGenericMatrix& m1, const QGenericMatrix& m2) +{ + QGenericMatrix result(1); + for (int row = 0; row < M2; ++row) { + for (int col = 0; col < M1; ++col) { + InnerT sum(0.0f); + for (int j = 0; j < N; ++j) + sum += m1.m[j][row] * m2.m[col][j]; + result.m[col][row] = sum; + } + } + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator-(const QGenericMatrix& matrix) +{ + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = -matrix.m[0][index]; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator*(T factor, const QGenericMatrix& matrix) +{ + InnerT f(factor); + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = matrix.m[0][index] * f; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator*(const QGenericMatrix& matrix, T factor) +{ + InnerT f(factor); + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = matrix.m[0][index] * f; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE QGenericMatrix operator/(const QGenericMatrix& matrix, T divisor) +{ + InnerT d(divisor); + QGenericMatrix result(1); + for (int index = 0; index < N * M; ++index) + result.m[0][index] = matrix.m[0][index] / d; + return result; +} + +template +Q_OUTOFLINE_TEMPLATE void QGenericMatrix::toValueArray(T *values) +{ + for (int col = 0; col < N; ++col) + for (int row = 0; row < M; ++row) + values[row * N + col] = qt_math3d_convert(m[col][row]); +} + +// Define aliases for the useful variants of QGenericMatrix. +typedef QGenericMatrix<2, 2, qreal, qrealinner> QMatrix2x2; +typedef QGenericMatrix<2, 3, qreal, qrealinner> QMatrix2x3; +typedef QGenericMatrix<2, 4, qreal, qrealinner> QMatrix2x4; +typedef QGenericMatrix<3, 2, qreal, qrealinner> QMatrix3x2; +typedef QGenericMatrix<3, 3, qreal, qrealinner> QMatrix3x3; +typedef QGenericMatrix<3, 4, qreal, qrealinner> QMatrix3x4; +typedef QGenericMatrix<4, 2, qreal, qrealinner> QMatrix4x2; +typedef QGenericMatrix<4, 3, qreal, qrealinner> QMatrix4x3; + +#ifndef QT_NO_DEBUG_STREAM + +template +QDebug operator<<(QDebug dbg, const QGenericMatrix &m) +{ + dbg.nospace() << "QGenericMatrix<" << N << ", " << M + << ", " << QTypeInfo::name() << ", " << QTypeInfo::name() + << ">(" << endl << qSetFieldWidth(10); + for (int row = 0; row < M; ++row) { + for (int col = 0; col < N; ++col) + dbg << m(row, col); + dbg << endl; + } + dbg << qSetFieldWidth(0) << ')'; + return dbg.space(); +} + +#endif + +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QMatrix2x2) +Q_DECLARE_METATYPE(QMatrix2x3) +Q_DECLARE_METATYPE(QMatrix2x4) +Q_DECLARE_METATYPE(QMatrix3x2) +Q_DECLARE_METATYPE(QMatrix3x3) +Q_DECLARE_METATYPE(QMatrix3x4) +Q_DECLARE_METATYPE(QMatrix4x2) +Q_DECLARE_METATYPE(QMatrix4x3) + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qmath3dglobal.h b/src/gui/math3d/qmath3dglobal.h new file mode 100644 index 0000000..ee5e734 --- /dev/null +++ b/src/gui/math3d/qmath3dglobal.h @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QMATH3DGLOBAL_H +#define QMATH3DGLOBAL_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +// Detect the presence of a fixed-point OpenGL implementation. +#if defined(QT_OPENGL_ES_1_CL) || defined(QT_NO_GL_FLOAT) +#ifndef QT_GL_FIXED_PREFERRED +#define QT_GL_FIXED_PREFERRED 1 +#endif +#endif + +// QT_GL_FIXED_PREFERRED indicates that fixed-point should be +// preferred over floating-point for operations requiring high performance. +// +// qreal is the floating-point type that should be used in +// user-visible functions. qrealinner is used internally where +// values may be stored as either floating-point or fixed-point. +// qrealinner will typically be the same size as GLfloat or GLfixed. +#if defined(QT_GL_FIXED_PREFERRED) +typedef QFixedPt<16> qrealinner; +#else +typedef float qrealinner; +#endif + +// Explicit conversion operator, primarily for converting from +// fixed point back to floating-point. This is safer than +// declaring conversion operators in the QFixedPt class. +template +T1 qt_math3d_convert(T2 v) +{ + return T1(v); +} +template <> +inline float qt_math3d_convert< float, QFixedPt<16> >(QFixedPt<16> v) +{ + return float(v.toReal()); +} +template <> +inline double qt_math3d_convert< double, QFixedPt<16> >(QFixedPt<16> v) +{ + return double(v.toReal()); +} +template <> +inline int qt_math3d_convert< int, QFixedPt<16> >(QFixedPt<16> v) +{ + return v.toInt(); +} + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qmath3dutil.cpp b/src/gui/math3d/qmath3dutil.cpp new file mode 100644 index 0000000..91d4b15 --- /dev/null +++ b/src/gui/math3d/qmath3dutil.cpp @@ -0,0 +1,164 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qmath3dutil_p.h" + +QT_BEGIN_NAMESPACE + +#ifdef QT_GL_FIXED_PREFERRED + +// The table that follows was automatically generated by the following code: +// +//#include +//#include +// +//int main() +//{ +// double angle; +// int count = 0; +// for (angle = 0.0; angle < 360.0; angle += 1.0) { +// if ((count % 4) == 0) +// printf(" "); +// printf(" qf2vt(%f)", sin(angle * M_PI / 180.0)); +// ++count; +// if (count != 360) +// printf(","); +// if ((count % 4) == 0) +// printf("\n"); +// } +// return 0; +//} + +#define qf2vt(x) (int((x) * 65536.0)) + +static int const sinTable[360] = { + qf2vt(0.000000), qf2vt(0.017452), qf2vt(0.034899), qf2vt(0.052336), + qf2vt(0.069756), qf2vt(0.087156), qf2vt(0.104528), qf2vt(0.121869), + qf2vt(0.139173), qf2vt(0.156434), qf2vt(0.173648), qf2vt(0.190809), + qf2vt(0.207912), qf2vt(0.224951), qf2vt(0.241922), qf2vt(0.258819), + qf2vt(0.275637), qf2vt(0.292372), qf2vt(0.309017), qf2vt(0.325568), + qf2vt(0.342020), qf2vt(0.358368), qf2vt(0.374607), qf2vt(0.390731), + qf2vt(0.406737), qf2vt(0.422618), qf2vt(0.438371), qf2vt(0.453990), + qf2vt(0.469472), qf2vt(0.484810), qf2vt(0.500000), qf2vt(0.515038), + qf2vt(0.529919), qf2vt(0.544639), qf2vt(0.559193), qf2vt(0.573576), + qf2vt(0.587785), qf2vt(0.601815), qf2vt(0.615661), qf2vt(0.629320), + qf2vt(0.642788), qf2vt(0.656059), qf2vt(0.669131), qf2vt(0.681998), + qf2vt(0.694658), qf2vt(0.707107), qf2vt(0.719340), qf2vt(0.731354), + qf2vt(0.743145), qf2vt(0.754710), qf2vt(0.766044), qf2vt(0.777146), + qf2vt(0.788011), qf2vt(0.798636), qf2vt(0.809017), qf2vt(0.819152), + qf2vt(0.829038), qf2vt(0.838671), qf2vt(0.848048), qf2vt(0.857167), + qf2vt(0.866025), qf2vt(0.874620), qf2vt(0.882948), qf2vt(0.891007), + qf2vt(0.898794), qf2vt(0.906308), qf2vt(0.913545), qf2vt(0.920505), + qf2vt(0.927184), qf2vt(0.933580), qf2vt(0.939693), qf2vt(0.945519), + qf2vt(0.951057), qf2vt(0.956305), qf2vt(0.961262), qf2vt(0.965926), + qf2vt(0.970296), qf2vt(0.974370), qf2vt(0.978148), qf2vt(0.981627), + qf2vt(0.984808), qf2vt(0.987688), qf2vt(0.990268), qf2vt(0.992546), + qf2vt(0.994522), qf2vt(0.996195), qf2vt(0.997564), qf2vt(0.998630), + qf2vt(0.999391), qf2vt(0.999848), qf2vt(1.000000), qf2vt(0.999848), + qf2vt(0.999391), qf2vt(0.998630), qf2vt(0.997564), qf2vt(0.996195), + qf2vt(0.994522), qf2vt(0.992546), qf2vt(0.990268), qf2vt(0.987688), + qf2vt(0.984808), qf2vt(0.981627), qf2vt(0.978148), qf2vt(0.974370), + qf2vt(0.970296), qf2vt(0.965926), qf2vt(0.961262), qf2vt(0.956305), + qf2vt(0.951057), qf2vt(0.945519), qf2vt(0.939693), qf2vt(0.933580), + qf2vt(0.927184), qf2vt(0.920505), qf2vt(0.913545), qf2vt(0.906308), + qf2vt(0.898794), qf2vt(0.891007), qf2vt(0.882948), qf2vt(0.874620), + qf2vt(0.866025), qf2vt(0.857167), qf2vt(0.848048), qf2vt(0.838671), + qf2vt(0.829038), qf2vt(0.819152), qf2vt(0.809017), qf2vt(0.798636), + qf2vt(0.788011), qf2vt(0.777146), qf2vt(0.766044), qf2vt(0.754710), + qf2vt(0.743145), qf2vt(0.731354), qf2vt(0.719340), qf2vt(0.707107), + qf2vt(0.694658), qf2vt(0.681998), qf2vt(0.669131), qf2vt(0.656059), + qf2vt(0.642788), qf2vt(0.629320), qf2vt(0.615661), qf2vt(0.601815), + qf2vt(0.587785), qf2vt(0.573576), qf2vt(0.559193), qf2vt(0.544639), + qf2vt(0.529919), qf2vt(0.515038), qf2vt(0.500000), qf2vt(0.484810), + qf2vt(0.469472), qf2vt(0.453990), qf2vt(0.438371), qf2vt(0.422618), + qf2vt(0.406737), qf2vt(0.390731), qf2vt(0.374607), qf2vt(0.358368), + qf2vt(0.342020), qf2vt(0.325568), qf2vt(0.309017), qf2vt(0.292372), + qf2vt(0.275637), qf2vt(0.258819), qf2vt(0.241922), qf2vt(0.224951), + qf2vt(0.207912), qf2vt(0.190809), qf2vt(0.173648), qf2vt(0.156434), + qf2vt(0.139173), qf2vt(0.121869), qf2vt(0.104528), qf2vt(0.087156), + qf2vt(0.069756), qf2vt(0.052336), qf2vt(0.034899), qf2vt(0.017452), + qf2vt(0.000000), qf2vt(-0.017452), qf2vt(-0.034899), qf2vt(-0.052336), + qf2vt(-0.069756), qf2vt(-0.087156), qf2vt(-0.104528), qf2vt(-0.121869), + qf2vt(-0.139173), qf2vt(-0.156434), qf2vt(-0.173648), qf2vt(-0.190809), + qf2vt(-0.207912), qf2vt(-0.224951), qf2vt(-0.241922), qf2vt(-0.258819), + qf2vt(-0.275637), qf2vt(-0.292372), qf2vt(-0.309017), qf2vt(-0.325568), + qf2vt(-0.342020), qf2vt(-0.358368), qf2vt(-0.374607), qf2vt(-0.390731), + qf2vt(-0.406737), qf2vt(-0.422618), qf2vt(-0.438371), qf2vt(-0.453990), + qf2vt(-0.469472), qf2vt(-0.484810), qf2vt(-0.500000), qf2vt(-0.515038), + qf2vt(-0.529919), qf2vt(-0.544639), qf2vt(-0.559193), qf2vt(-0.573576), + qf2vt(-0.587785), qf2vt(-0.601815), qf2vt(-0.615661), qf2vt(-0.629320), + qf2vt(-0.642788), qf2vt(-0.656059), qf2vt(-0.669131), qf2vt(-0.681998), + qf2vt(-0.694658), qf2vt(-0.707107), qf2vt(-0.719340), qf2vt(-0.731354), + qf2vt(-0.743145), qf2vt(-0.754710), qf2vt(-0.766044), qf2vt(-0.777146), + qf2vt(-0.788011), qf2vt(-0.798636), qf2vt(-0.809017), qf2vt(-0.819152), + qf2vt(-0.829038), qf2vt(-0.838671), qf2vt(-0.848048), qf2vt(-0.857167), + qf2vt(-0.866025), qf2vt(-0.874620), qf2vt(-0.882948), qf2vt(-0.891007), + qf2vt(-0.898794), qf2vt(-0.906308), qf2vt(-0.913545), qf2vt(-0.920505), + qf2vt(-0.927184), qf2vt(-0.933580), qf2vt(-0.939693), qf2vt(-0.945519), + qf2vt(-0.951057), qf2vt(-0.956305), qf2vt(-0.961262), qf2vt(-0.965926), + qf2vt(-0.970296), qf2vt(-0.974370), qf2vt(-0.978148), qf2vt(-0.981627), + qf2vt(-0.984808), qf2vt(-0.987688), qf2vt(-0.990268), qf2vt(-0.992546), + qf2vt(-0.994522), qf2vt(-0.996195), qf2vt(-0.997564), qf2vt(-0.998630), + qf2vt(-0.999391), qf2vt(-0.999848), qf2vt(-1.000000), qf2vt(-0.999848), + qf2vt(-0.999391), qf2vt(-0.998630), qf2vt(-0.997564), qf2vt(-0.996195), + qf2vt(-0.994522), qf2vt(-0.992546), qf2vt(-0.990268), qf2vt(-0.987688), + qf2vt(-0.984808), qf2vt(-0.981627), qf2vt(-0.978148), qf2vt(-0.974370), + qf2vt(-0.970296), qf2vt(-0.965926), qf2vt(-0.961262), qf2vt(-0.956305), + qf2vt(-0.951057), qf2vt(-0.945519), qf2vt(-0.939693), qf2vt(-0.933580), + qf2vt(-0.927184), qf2vt(-0.920505), qf2vt(-0.913545), qf2vt(-0.906308), + qf2vt(-0.898794), qf2vt(-0.891007), qf2vt(-0.882948), qf2vt(-0.874620), + qf2vt(-0.866025), qf2vt(-0.857167), qf2vt(-0.848048), qf2vt(-0.838671), + qf2vt(-0.829038), qf2vt(-0.819152), qf2vt(-0.809017), qf2vt(-0.798636), + qf2vt(-0.788011), qf2vt(-0.777146), qf2vt(-0.766044), qf2vt(-0.754710), + qf2vt(-0.743145), qf2vt(-0.731354), qf2vt(-0.719340), qf2vt(-0.707107), + qf2vt(-0.694658), qf2vt(-0.681998), qf2vt(-0.669131), qf2vt(-0.656059), + qf2vt(-0.642788), qf2vt(-0.629320), qf2vt(-0.615661), qf2vt(-0.601815), + qf2vt(-0.587785), qf2vt(-0.573576), qf2vt(-0.559193), qf2vt(-0.544639), + qf2vt(-0.529919), qf2vt(-0.515038), qf2vt(-0.500000), qf2vt(-0.484810), + qf2vt(-0.469472), qf2vt(-0.453990), qf2vt(-0.438371), qf2vt(-0.422618), + qf2vt(-0.406737), qf2vt(-0.390731), qf2vt(-0.374607), qf2vt(-0.358368), + qf2vt(-0.342020), qf2vt(-0.325568), qf2vt(-0.309017), qf2vt(-0.292372), + qf2vt(-0.275637), qf2vt(-0.258819), qf2vt(-0.241922), qf2vt(-0.224951), + qf2vt(-0.207912), qf2vt(-0.190809), qf2vt(-0.173648), qf2vt(-0.156434), + qf2vt(-0.139173), qf2vt(-0.121869), qf2vt(-0.104528), qf2vt(-0.087156), + qf2vt(-0.069756), qf2vt(-0.052336), qf2vt(-0.034899), qf2vt(-0.017452) +}; + +void qt_math3d_sincos(qreal angle, qrealinner *s, qrealinner *c) +{ + if (angle == qFloor(angle)) { + // The angle is an integer number of degrees, so look up the results. + int a = (int)angle; + if (a >= 0) + a = (a % 360); + else + a = 360 - (-a % 360); + s->setBits(sinTable[a]); + c->setBits(sinTable[(a + 90) % 360]); + } else { + qreal a = angle * M_PI / 180.0f; + *s = qSin(a); + *c = qCos(a); + } +} + +#else + +void qt_math3d_sincos(qreal angle, qrealinner *s, qrealinner *c) +{ + qreal a = angle * M_PI / 180.0f; + *s = qSin(a); + *c = qCos(a); +} + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qmath3dutil_p.h b/src/gui/math3d/qmath3dutil_p.h new file mode 100644 index 0000000..1cb0bb9 --- /dev/null +++ b/src/gui/math3d/qmath3dutil_p.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QMATH3DUTIL_P_H +#define QMATH3DUTIL_P_H + +#include +#include + +QT_BEGIN_NAMESPACE + +#ifdef QT_GL_FIXED_PREFERRED +#define qvtsqrt(x) ((x).sqrtF()) +#else +#define qvtsqrt(x) qSqrt((x)) +#endif + +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + +void qt_math3d_sincos(qreal degrees, qrealinner *s, qrealinner *c); + +#ifdef QT_GL_FIXED_PREFERRED + +inline qrealinner qf2vt_round(qreal x) +{ + QFixedPt<16> result; + if (x >= 0.0f) + result.setBits(int(x * 65536.0f + 0.5f)); + else + result.setBits(int(x * 65536.0f - 0.5f)); + return result; +} + +// Helper macros for computing dot products without losing precision. +// In fixed-point mode, a 64-bit intermediate result is used. +#define qvtmul64(x,y) ((qint64((x).bits())) * (qint64((y).bits()))) +#define qvtsqrt64(x) \ + (qt_math3d_fixed_sqrt((x) << 16) / (qreal)(1 << 24)) +#define qvtdot64(x) ((x) / (qreal)(((qint64)1) << 32)) + +#else + +inline qrealinner qf2vt_round(qreal x) +{ + return x; +} + +#define qvtmul64(x,y) ((x) * (y)) +#define qvtsqrt64(x) (qvtsqrt((x))) +#define qvtdot64(x) ((x)) + +#endif + +QT_END_NAMESPACE + +#endif diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp new file mode 100644 index 0000000..9941ca8 --- /dev/null +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -0,0 +1,1649 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qmatrix4x4.h" +#include "qmath3dutil_p.h" +#include +#include +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_MATRIX4X4 + +/*! + \class QMatrix4x4 + \brief The QMatrix4x4 class represents a 4x4 transformation matrix in 3D space. + \since 4.6 + + The matrix elements are stored internally using the most efficient + numeric representation for the underlying hardware: floating-point + or fixed-point. + + \sa QVector3D, QGenericMatrix +*/ + +/*! + \fn QMatrix4x4::QMatrix4x4() + + Constructs an identity matrix. +*/ + +/*! + Constructs a matrix from the given 16 floating-point \a values. + The contents of the array \a values is assumed to be in + row-major order. + + If the matrix has a special type (identity, translate, scale, etc), + the programmer should follow this constructor with a call to + inferSpecialType() if they wish QMatrix4x4 to optimize further + calls to translate(), scale(), etc. + + \sa toValueArray(), inferSpecialType() +*/ +QMatrix4x4::QMatrix4x4(const qreal *values) +{ + for (int row = 0; row < 4; ++row) + for (int col = 0; col < 4; ++col) + m[col][row] = values[row * 4 + col]; + flagBits = General; +} + +/*! + \fn QMatrix4x4::QMatrix4x4(qreal m11, qreal m12, qreal m13, qreal m14, qreal m21, qreal m22, qreal m23, qreal m24, qreal m31, qreal m32, qreal m33, qreal m34, qreal m41, qreal m42, qreal m43, qreal m44) + + Constructs a matrix from the 16 elements \a m11, \a m12, \a m13, \a m14, + \a m21, \a m22, \a m23, \a m24, \a m31, \a m32, \a m33, \a m34, + \a m41, \a m42, \a m43, and \a m44. The elements are specified in + row-major order. + + If the matrix has a special type (identity, translate, scale, etc), + the programmer should follow this constructor with a call to + inferSpecialType() if they wish QMatrix4x4 to optimize further + calls to translate(), scale(), etc. + + \sa inferSpecialType() +*/ + +#if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC) + +/*! + \fn QMatrix4x4::QMatrix4x4(const QGenericMatrix& matrix) + + Constructs a 4x4 matrix from the left-most 4 columns and top-most + 4 rows of \a matrix. If \a matrix has less than 4 columns or rows, + the remaining elements are filled with elements from the identity + matrix. + + \sa toGenericMatrix(), qGenericMatrixToMatrix4x4() +*/ + +/*! + \fn QGenericMatrix QMatrix4x4::toGenericMatrix() const + + Constructs a NxM generic matrix from the left-most N columns and + top-most M rows of this 4x4 matrix. If N or M is greater than 4, + then the remaining elements are filled with elements from the + identity matrix. + + \sa qGenericMatrixFromMatrix4x4() +*/ + +#endif + +/*! + \fn QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix& matrix) + \relates QMatrix4x4 + + Returns a 4x4 matrix constructed from the left-most 4 columns and + top-most 4 rows of \a matrix. If \a matrix has less than 4 columns + or rows, the remaining elements are filled with elements from the + identity matrix. + + \sa qGenericMatrixFromMatrix4x4() +*/ + +/*! + \fn QGenericMatrix qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns a NxM generic matrix constructed from the left-most N columns + and top-most M rows of \a matrix. If N or M is greater than 4, + then the remaining elements are filled with elements from the + identity matrix. + + \sa qGenericMatrixToMatrix4x4(), QMatrix4x4::toGenericMatrix() +*/ + +/*! + \internal +*/ +QMatrix4x4::QMatrix4x4(const qrealinner *values, int cols, int rows) +{ + for (int col = 0; col < 4; ++col) { + for (int row = 0; row < 4; ++row) { + if (col < cols && row < rows) + m[col][row] = values[col * rows + row]; + else if (col == row) + m[col][row] = 1.0f; + else + m[col][row] = 0.0f; + } + } + flagBits = General; +} + +/*! + Constructs a 4x4 matrix from a conventional Qt 2D affine + transformation \a matrix. + + If \a matrix has a special type (identity, translate, scale, etc), + the programmer should follow this constructor with a call to + inferSpecialType() if they wish QMatrix4x4 to optimize further + calls to translate(), scale(), etc. + + \sa toAffine(), inferSpecialType() +*/ +QMatrix4x4::QMatrix4x4(const QMatrix& matrix) +{ + m[0][0] = matrix.m11(); + m[0][1] = matrix.m12(); + m[0][2] = 0.0f; + m[0][3] = 0.0f; + m[1][0] = matrix.m21(); + m[1][1] = matrix.m22(); + m[1][2] = 0.0f; + m[1][3] = 0.0f; + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = 1.0f; + m[2][3] = 0.0f; + m[3][0] = matrix.dx(); + m[3][1] = matrix.dy(); + m[3][2] = 0.0f; + m[3][3] = 1.0f; + flagBits = General; +} + +/*! + Constructs a 4x4 matrix from the conventional Qt 2D + transformation matrix \a transform. + + If \a transform has a special type (identity, translate, scale, etc), + the programmer should follow this constructor with a call to + inferSpecialType() if they wish QMatrix4x4 to optimize further + calls to translate(), scale(), etc. + + \sa toTransform(), inferSpecialType() +*/ +QMatrix4x4::QMatrix4x4(const QTransform& transform) +{ + m[0][0] = transform.m11(); + m[0][1] = transform.m12(); + m[0][2] = 0.0f; + m[0][3] = transform.m13(); + m[1][0] = transform.m21(); + m[1][1] = transform.m22(); + m[1][2] = 0.0f; + m[1][3] = transform.m23(); + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = 1.0f; + m[2][3] = 0.0f; + m[3][0] = transform.dx(); + m[3][1] = transform.dy(); + m[3][2] = 0.0f; + m[3][3] = transform.m33(); + flagBits = General; +} + +/*! + \fn qreal QMatrix4x4::operator()(int row, int column) const + + Returns the element at position (\a row, \a column) in this matrix. + + \sa column(), row() +*/ + +/*! + \fn qrealinner& QMatrix4x4::operator()(int row, int column) + + Returns a reference to the element at position (\a row, \a column) + in this matrix so that the element can be assigned to. + + \sa inferSpecialType(), setColumn(), setRow() +*/ + +/*! + \fn QVector4D QMatrix4x4::column(int index) const + + Returns the elements of column \a index as a 4D vector. + + \sa setColumn(), row() +*/ + +/*! + \fn void QMatrix4x4::setColumn(int index, const QVector4D& value) + + Sets the elements of column \a index to the components of \a value. + + \sa column(), setRow() +*/ + +/*! + \fn QVector4D QMatrix4x4::row(int index) const + + Returns the elements of row \a index as a 4D vector. + + \sa setRow(), column() +*/ + +/*! + \fn void QMatrix4x4::setRow(int index, const QVector4D& value) + + Sets the elements of row \a index to the components of \a value. + + \sa row(), setColumn() +*/ + +/*! + \fn bool QMatrix4x4::isIdentity() const + + Returns true if this matrix is the identity; false otherwise. + + \sa setIdentity() +*/ + +/*! + \fn void QMatrix4x4::setIdentity() + + Sets this matrix to the identity. + + \sa isIdentity() +*/ + +/*! + \fn void QMatrix4x4::fill(qreal value) + + Fills all elements of this matrx with \a value. +*/ + +// The 4x4 matrix inverse algorithm is based on that described at: +// http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q24 +// Some optimization has been done to avoid making copies of 3x3 +// sub-matrices, to do calculations in fixed-point where required, +// and to unroll the loops. + +// Calculate the determinant of a 3x3 sub-matrix. +// | A B C | +// M = | D E F | det(M) = A * (EI - HF) - B * (DI - GF) + C * (DH - GE) +// | G H I | +static inline qrealinner matrixDet3 + (const qrealinner m[4][4], int col0, int col1, int col2, + int row0, int row1, int row2) +{ + return m[col0][row0] * + (m[col1][row1] * m[col2][row2] - + m[col1][row2] * m[col2][row1]) - + m[col1][row0] * + (m[col0][row1] * m[col2][row2] - + m[col0][row2] * m[col2][row1]) + + m[col2][row0] * + (m[col0][row1] * m[col1][row2] - + m[col0][row2] * m[col1][row1]); +} + +// Calculate the determinant of a 4x4 matrix. +static inline qrealinner matrixDet4(const qrealinner m[4][4]) +{ + qrealinner det; + det = m[0][0] * matrixDet3(m, 1, 2, 3, 1, 2, 3); + det -= m[1][0] * matrixDet3(m, 0, 2, 3, 1, 2, 3); + det += m[2][0] * matrixDet3(m, 0, 1, 3, 1, 2, 3); + det -= m[3][0] * matrixDet3(m, 0, 1, 2, 1, 2, 3); + return det; +} + +/*! + Returns the determinant of this matrix. +*/ +qreal QMatrix4x4::determinant() const +{ + return qt_math3d_convert(matrixDet4(m)); +} + +/*! + Returns the inverse of this matrix. Returns the identity if + this matrix cannot be inverted; i.e. determinant() is zero. + If \a invertible is not null, then true will be written to + that location if the matrix can be inverted; false otherwise. + + If the matrix is recognized as the identity or an orthonormal + matrix, then this function will quickly invert the matrix + using optimized routines. + + \sa determinant(), normalMatrix() +*/ +QMatrix4x4 QMatrix4x4::inverted(bool *invertible) const +{ + // Handle some of the easy cases first. + if (flagBits == Identity) { + if (invertible) + *invertible = true; + return QMatrix4x4(); + } else if (flagBits == Translation) { + QMatrix4x4 inv; + inv.m[3][0] = -m[3][0]; + inv.m[3][1] = -m[3][1]; + inv.m[3][2] = -m[3][2]; + inv.flagBits = Translation; + if (invertible) + *invertible = true; + return inv; + } else if (flagBits == Rotation || flagBits == (Rotation | Translation)) { + if (invertible) + *invertible = true; + return orthonormalInverse(); + } + + QMatrix4x4 inv(1); // The "1" says to not load the identity. + + qrealinner det = matrixDet4(m); + if (det == 0.0f) { + if (invertible) + *invertible = false; + return QMatrix4x4(); + } + det = qrealinner(1.0f) / det; + + inv.m[0][0] = matrixDet3(m, 1, 2, 3, 1, 2, 3) * det; + inv.m[0][1] = -matrixDet3(m, 0, 2, 3, 1, 2, 3) * det; + inv.m[0][2] = matrixDet3(m, 0, 1, 3, 1, 2, 3) * det; + inv.m[0][3] = -matrixDet3(m, 0, 1, 2, 1, 2, 3) * det; + inv.m[1][0] = -matrixDet3(m, 1, 2, 3, 0, 2, 3) * det; + inv.m[1][1] = matrixDet3(m, 0, 2, 3, 0, 2, 3) * det; + inv.m[1][2] = -matrixDet3(m, 0, 1, 3, 0, 2, 3) * det; + inv.m[1][3] = matrixDet3(m, 0, 1, 2, 0, 2, 3) * det; + inv.m[2][0] = matrixDet3(m, 1, 2, 3, 0, 1, 3) * det; + inv.m[2][1] = -matrixDet3(m, 0, 2, 3, 0, 1, 3) * det; + inv.m[2][2] = matrixDet3(m, 0, 1, 3, 0, 1, 3) * det; + inv.m[2][3] = -matrixDet3(m, 0, 1, 2, 0, 1, 3) * det; + inv.m[3][0] = -matrixDet3(m, 1, 2, 3, 0, 1, 2) * det; + inv.m[3][1] = matrixDet3(m, 0, 2, 3, 0, 1, 2) * det; + inv.m[3][2] = -matrixDet3(m, 0, 1, 3, 0, 1, 2) * det; + inv.m[3][3] = matrixDet3(m, 0, 1, 2, 0, 1, 2) * det; + + if (invertible) + *invertible = true; + return inv; +} + +/*! + Returns the normal matrix corresponding to this 4x4 transformation. + The normal matrix is the transpose of the inverse of the top-left + 3x3 part of this 4x4 matrix. If the 3x3 sub-matrix is not invertible, + this function returns the identity. + + \sa inverted() +*/ +QMatrix3x3 QMatrix4x4::normalMatrix() const +{ + QMatrix3x3 inv; + + // Handle the simple cases first. + if (flagBits == Identity || flagBits == Translation) { + return inv; + } else if (flagBits == Scale || flagBits == (Translation | Scale)) { + if (m[0][0] == 0.0f || m[1][1] == 0.0f || m[2][2] == 0.0f) + return inv; + inv.data()[0] = qrealinner(1.0f) / m[0][0]; + inv.data()[4] = qrealinner(1.0f) / m[1][1]; + inv.data()[8] = qrealinner(1.0f) / m[2][2]; + return inv; + } + + qrealinner det = matrixDet3(m, 0, 1, 2, 0, 1, 2); + if (det == 0.0f) + return inv; + det = qrealinner(1.0f) / det; + + qrealinner *invm = inv.data(); + + // Invert and transpose in a single step. + invm[0 + 0 * 3] = (m[1][1] * m[2][2] - m[2][1] * m[1][2]) * det; + invm[1 + 0 * 3] = -(m[1][0] * m[2][2] - m[1][2] * m[2][0]) * det; + invm[2 + 0 * 3] = (m[1][0] * m[2][1] - m[1][1] * m[2][0]) * det; + invm[0 + 1 * 3] = -(m[0][1] * m[2][2] - m[2][1] * m[0][2]) * det; + invm[1 + 1 * 3] = (m[0][0] * m[2][2] - m[0][2] * m[2][0]) * det; + invm[2 + 1 * 3] = -(m[0][0] * m[2][1] - m[0][1] * m[2][0]) * det; + invm[0 + 2 * 3] = (m[0][1] * m[1][2] - m[0][2] * m[1][1]) * det; + invm[1 + 2 * 3] = -(m[0][0] * m[1][2] - m[0][2] * m[1][0]) * det; + invm[2 + 2 * 3] = (m[0][0] * m[1][1] - m[1][0] * m[0][1]) * det; + + return inv; +} + +/*! + Returns this matrix, transposed about its diagonal. +*/ +QMatrix4x4 QMatrix4x4::transposed() const +{ + QMatrix4x4 result(1); // The "1" says to not load the identity. + for (int row = 0; row < 4; ++row) { + for (int col = 0; col < 4; ++col) { + result.m[col][row] = m[row][col]; + } + } + return result; +} + +/*! + \fn QMatrix4x4& QMatrix4x4::operator+=(const QMatrix4x4& other) + + Adds the contents of \a other to this matrix. +*/ + +/*! + \fn QMatrix4x4& QMatrix4x4::operator-=(const QMatrix4x4& other) + + Subtracts the contents of \a other from this matrix. +*/ + +/*! + \fn QMatrix4x4& QMatrix4x4::operator*=(const QMatrix4x4& other) + + Multiplies the contents of \a other by this matrix. +*/ + +/*! + \fn QMatrix4x4& QMatrix4x4::operator*=(qreal factor) + \overload + + Multiplies all elements of this matrix by \a factor. +*/ + +/*! + \overload + + Divides all elements of this matrix by \a divisor. +*/ +QMatrix4x4& QMatrix4x4::operator/=(qreal divisor) +{ + qrealinner d(divisor); + m[0][0] /= d; + m[0][1] /= d; + m[0][2] /= d; + m[0][3] /= d; + m[1][0] /= d; + m[1][1] /= d; + m[1][2] /= d; + m[1][3] /= d; + m[2][0] /= d; + m[2][1] /= d; + m[2][2] /= d; + m[2][3] /= d; + m[3][0] /= d; + m[3][1] /= d; + m[3][2] /= d; + m[3][3] /= d; + flagBits = General; + return *this; +} + +/*! + \fn bool QMatrix4x4::operator==(const QMatrix4x4& other) const + + Returns true if this matrix is identical to \a other; false otherwise. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn bool QMatrix4x4::operator!=(const QMatrix4x4& other) const + + Returns true if this matrix is not identical to \a other; false otherwise. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn QMatrix4x4 operator+(const QMatrix4x4& m1, const QMatrix4x4& m2) + \relates QMatrix4x4 + + Returns the sum of \a m1 and \a m2. +*/ + +/*! + \fn QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2) + \relates QMatrix4x4 + + Returns the difference of \a m1 and \a m2. +*/ + +/*! + \fn QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2) + \relates QMatrix4x4 + + Returns the product of \a m1 and \a m2. +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + \fn QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns the result of transforming \a vector according to \a matrix, + with the matrix applied post-vector. +*/ + +/*! + \fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) + \relates QMatrix4x4 + + Returns the result of transforming \a vector according to \a matrix, + with the matrix applied pre-vector. +*/ + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + \fn QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns the result of transforming \a vector according to \a matrix, + with the matrix applied post-vector. +*/ + +/*! + \fn QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector) + \relates QMatrix4x4 + + Returns the result of transforming \a vector according to \a matrix, + with the matrix applied pre-vector. +*/ + +#endif + +/*! + \fn QPoint operator*(const QPoint& point, const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns the result of transforming \a point according to \a matrix, + with the matrix applied post-point. +*/ + +/*! + \fn QPointF operator*(const QPointF& point, const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns the result of transforming \a point according to \a matrix, + with the matrix applied post-point. +*/ + +/*! + \fn QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) + \relates QMatrix4x4 + + Returns the result of transforming \a point according to \a matrix, + with the matrix applied pre-point. +*/ + +/*! + \fn QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) + \relates QMatrix4x4 + + Returns the result of transforming \a point according to \a matrix, + with the matrix applied pre-point. +*/ + +/*! + \fn QMatrix4x4 operator-(const QMatrix4x4& matrix) + \overload + \relates QMatrix4x4 + + Returns the negation of \a matrix. +*/ + +/*! + \fn QMatrix4x4 operator*(qreal factor, const QMatrix4x4& matrix) + \relates QMatrix4x4 + + Returns the result of multiplying all elements of \a matrix by \a factor. +*/ + +/*! + \fn QMatrix4x4 operator*(const QMatrix4x4& matrix, qreal factor) + \relates QMatrix4x4 + + Returns the result of multiplying all elements of \a matrix by \a factor. +*/ + +/*! + \relates QMatrix4x4 + + Returns the result of dividing all elements of \a matrix by \a divisor. +*/ +QMatrix4x4 operator/(const QMatrix4x4& matrix, qreal divisor) +{ + QMatrix4x4 m(1); // The "1" says to not load the identity. + qrealinner d(divisor); + m.m[0][0] = matrix.m[0][0] / d; + m.m[0][1] = matrix.m[0][1] / d; + m.m[0][2] = matrix.m[0][2] / d; + m.m[0][3] = matrix.m[0][3] / d; + m.m[1][0] = matrix.m[1][0] / d; + m.m[1][1] = matrix.m[1][1] / d; + m.m[1][2] = matrix.m[1][2] / d; + m.m[1][3] = matrix.m[1][3] / d; + m.m[2][0] = matrix.m[2][0] / d; + m.m[2][1] = matrix.m[2][1] / d; + m.m[2][2] = matrix.m[2][2] / d; + m.m[2][3] = matrix.m[2][3] / d; + m.m[3][0] = matrix.m[3][0] / d; + m.m[3][1] = matrix.m[3][1] / d; + m.m[3][2] = matrix.m[3][2] / d; + m.m[3][3] = matrix.m[3][3] / d; + return m; +} + +/*! + \fn bool qFuzzyCompare(const QMatrix4x4& m1, const QMatrix4x4& m2) + \relates QMatrix4x4 + + Returns true if \a m1 and \a m2 are equal, allowing for a small + fuzziness factor for floating-point comparisons; false otherwise. +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + Multiplies this matrix by another that scales coordinates by + the components of \a vector. Returns this matrix. + + \sa translate(), rotate() +*/ +QMatrix4x4& QMatrix4x4::scale(const QVector3D& vector) +{ + qrealinner vx = vector.xp; + qrealinner vy = vector.yp; + qrealinner vz = vector.zp; + if (flagBits == Identity) { + m[0][0] = vx; + m[1][1] = vy; + m[2][2] = vz; + flagBits = Scale; + } else if (flagBits == Scale || flagBits == (Scale | Translation)) { + m[0][0] *= vx; + m[1][1] *= vy; + m[2][2] *= vz; + } else if (flagBits == Translation) { + m[0][0] = vx; + m[1][1] = vy; + m[2][2] = vz; + flagBits |= Scale; + } else { + m[0][0] *= vx; + m[0][1] *= vx; + m[0][2] *= vx; + m[0][3] *= vx; + m[1][0] *= vy; + m[1][1] *= vy; + m[1][2] *= vy; + m[1][3] *= vy; + m[2][0] *= vz; + m[2][1] *= vz; + m[2][2] *= vz; + m[2][3] *= vz; + flagBits = General; + } + return *this; +} +#endif + +/*! + \overload + + Multiplies this matrix by another that scales coordinates by the + components \a x, \a y, and \a z. Returns this matrix. + + \sa translate(), rotate() +*/ +QMatrix4x4& QMatrix4x4::scale(qreal x, qreal y, qreal z) +{ + qrealinner vx(x); + qrealinner vy(y); + qrealinner vz(z); + if (flagBits == Identity) { + m[0][0] = vx; + m[1][1] = vy; + m[2][2] = vz; + flagBits = Scale; + } else if (flagBits == Scale || flagBits == (Scale | Translation)) { + m[0][0] *= vx; + m[1][1] *= vy; + m[2][2] *= vz; + } else if (flagBits == Translation) { + m[0][0] = vx; + m[1][1] = vy; + m[2][2] = vz; + flagBits |= Scale; + } else { + m[0][0] *= vx; + m[0][1] *= vx; + m[0][2] *= vx; + m[0][3] *= vx; + m[1][0] *= vy; + m[1][1] *= vy; + m[1][2] *= vy; + m[1][3] *= vy; + m[2][0] *= vz; + m[2][1] *= vz; + m[2][2] *= vz; + m[2][3] *= vz; + flagBits = General; + } + return *this; +} + +/*! + \overload + + Multiplies this matrix by another that scales coordinates by the + given \a factor. Returns this matrix. + + \sa translate(), rotate() +*/ +QMatrix4x4& QMatrix4x4::scale(qreal factor) +{ + qrealinner f(factor); + if (flagBits == Identity) { + m[0][0] = f; + m[1][1] = f; + m[2][2] = f; + flagBits = Scale; + } else if (flagBits == Scale || flagBits == (Scale | Translation)) { + m[0][0] *= f; + m[1][1] *= f; + m[2][2] *= f; + } else if (flagBits == Translation) { + m[0][0] = f; + m[1][1] = f; + m[2][2] = f; + flagBits |= Scale; + } else { + m[0][0] *= f; + m[0][1] *= f; + m[0][2] *= f; + m[0][3] *= f; + m[1][0] *= f; + m[1][1] *= f; + m[1][2] *= f; + m[1][3] *= f; + m[2][0] *= f; + m[2][1] *= f; + m[2][2] *= f; + m[2][3] *= f; + flagBits = General; + } + return *this; +} + +#ifndef QT_NO_VECTOR3D +/*! + Multiplies this matrix by another that translates coordinates by + the components of \a vector. Returns this matrix. + + \sa scale(), rotate() +*/ +QMatrix4x4& QMatrix4x4::translate(const QVector3D& vector) +{ + qrealinner vx = vector.xp; + qrealinner vy = vector.yp; + qrealinner vz = vector.zp; + if (flagBits == Identity) { + m[3][0] = vx; + m[3][1] = vy; + m[3][2] = vz; + flagBits = Translation; + } else if (flagBits == Translation) { + m[3][0] += vx; + m[3][1] += vy; + m[3][2] += vz; + } else if (flagBits == Scale) { + m[3][0] = m[0][0] * vx; + m[3][1] = m[1][1] * vy; + m[3][2] = m[2][2] * vz; + flagBits |= Translation; + } else if (flagBits == (Scale | Translation)) { + m[3][0] += m[0][0] * vx; + m[3][1] += m[1][1] * vy; + m[3][2] += m[2][2] * vz; + } else { + m[3][0] += m[0][0] * vx + m[1][0] * vy + m[2][0] * vz; + m[3][1] += m[0][1] * vx + m[1][1] * vy + m[2][1] * vz; + m[3][2] += m[0][2] * vx + m[1][2] * vy + m[2][2] * vz; + m[3][3] += m[0][3] * vx + m[1][3] * vy + m[2][3] * vz; + if (flagBits == Rotation) + flagBits |= Translation; + else if (flagBits != (Rotation | Translation)) + flagBits = General; + } + return *this; +} + +#endif + +/*! + \overload + + Multiplies this matrix by another that translates coordinates + by the components \a x, \a y, and \a z. Returns this matrix. + + \sa scale(), rotate() +*/ +QMatrix4x4& QMatrix4x4::translate(qreal x, qreal y, qreal z) +{ + qrealinner vx(x); + qrealinner vy(y); + qrealinner vz(z); + if (flagBits == Identity) { + m[3][0] = vx; + m[3][1] = vy; + m[3][2] = vz; + flagBits = Translation; + } else if (flagBits == Translation) { + m[3][0] += vx; + m[3][1] += vy; + m[3][2] += vz; + } else if (flagBits == Scale) { + m[3][0] = m[0][0] * vx; + m[3][1] = m[1][1] * vy; + m[3][2] = m[2][2] * vz; + flagBits |= Translation; + } else if (flagBits == (Scale | Translation)) { + m[3][0] += m[0][0] * vx; + m[3][1] += m[1][1] * vy; + m[3][2] += m[2][2] * vz; + } else { + m[3][0] += m[0][0] * vx + m[1][0] * vy + m[2][0] * vz; + m[3][1] += m[0][1] * vx + m[1][1] * vy + m[2][1] * vz; + m[3][2] += m[0][2] * vx + m[1][2] * vy + m[2][2] * vz; + m[3][3] += m[0][3] * vx + m[1][3] * vy + m[2][3] * vz; + if (flagBits == Rotation) + flagBits |= Translation; + else if (flagBits != (Rotation | Translation)) + flagBits = General; + } + return *this; +} + +#ifndef QT_NO_VECTOR3D + +/*! + Multiples this matrix by another that rotates coordinates through + \a angle degrees about \a vector. Returns this matrix. + + \sa scale(), translate() +*/ +QMatrix4x4& QMatrix4x4::rotate(qreal angle, const QVector3D& vector) +{ + return rotate(angle, vector.x(), vector.y(), vector.z()); +} + +#endif + +/*! + \overload + + Multiplies this matrix by another that rotates coordinates through + \a angle degrees about the vector (\a x, \a y, \a z). Returns this matrix. + + \sa scale(), translate() +*/ +QMatrix4x4& QMatrix4x4::rotate(qreal angle, qreal x, qreal y, qreal z) +{ + QMatrix4x4 m(1); // The "1" says to not load the identity. + qrealinner c, s, ic; + qt_math3d_sincos(angle, &s, &c); + bool quick = false; + if (x == 0.0f) { + if (y == 0.0f) { + if (z != 0.0f) { + // Rotate around the Z axis. + m.setIdentity(); + m.m[0][0] = c; + m.m[1][1] = c; + if (z < 0.0f) { + m.m[1][0] = s; + m.m[0][1] = -s; + } else { + m.m[1][0] = -s; + m.m[0][1] = s; + } + m.flagBits = General; + quick = true; + } + } else if (z == 0.0f) { + // Rotate around the Y axis. + m.setIdentity(); + m.m[0][0] = c; + m.m[2][2] = c; + if (y < 0.0f) { + m.m[2][0] = -s; + m.m[0][2] = s; + } else { + m.m[2][0] = s; + m.m[0][2] = -s; + } + m.flagBits = General; + quick = true; + } + } else if (y == 0.0f && z == 0.0f) { + // Rotate around the X axis. + m.setIdentity(); + m.m[1][1] = c; + m.m[2][2] = c; + if (x < 0.0f) { + m.m[2][1] = s; + m.m[1][2] = -s; + } else { + m.m[2][1] = -s; + m.m[1][2] = s; + } + m.flagBits = General; + quick = true; + } + if (!quick) { + qrealinner vx(x); + qrealinner vy(y); + qrealinner vz(z); + qrealinner len(qvtsqrt(vx * vx + vy * vy + vz * vz)); + if (len != 0) { + vx /= len; + vy /= len; + vz /= len; + } + ic = 1.0f - c; + m.m[0][0] = vx * vx * ic + c; + m.m[1][0] = vx * vy * ic - vz * s; + m.m[2][0] = vx * vz * ic + vy * s; + m.m[3][0] = 0.0f; + m.m[0][1] = vy * vx * ic + vz * s; + m.m[1][1] = vy * vy * ic + c; + m.m[2][1] = vy * vz * ic - vx * s; + m.m[3][1] = 0.0f; + m.m[0][2] = vx * vz * ic - vy * s; + m.m[1][2] = vy * vz * ic + vx * s; + m.m[2][2] = vz * vz * ic + c; + m.m[3][2] = 0.0f; + m.m[0][3] = 0.0f; + m.m[1][3] = 0.0f; + m.m[2][3] = 0.0f; + m.m[3][3] = 1.0f; + } + int flags = flagBits; + *this *= m; + if (flags != Identity) + flagBits = flags | Rotation; + else + flagBits = Rotation; + return *this; +} + +#ifndef QT_NO_VECTOR4D + +/*! + Multiples this matrix by another that rotates coordinates according + to a specified \a quaternion. The \a quaternion is assumed to have + been normalized. Returns this matrix. + + \sa scale(), translate(), QQuaternion +*/ +QMatrix4x4& QMatrix4x4::rotate(const QQuaternion& quaternion) +{ + // Algorithm from: + // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q54 + QMatrix4x4 m(1); + qrealinner xx = quaternion.xp * quaternion.xp; + qrealinner xy = quaternion.xp * quaternion.yp; + qrealinner xz = quaternion.xp * quaternion.zp; + qrealinner xw = quaternion.xp * quaternion.wp; + qrealinner yy = quaternion.yp * quaternion.yp; + qrealinner yz = quaternion.yp * quaternion.zp; + qrealinner yw = quaternion.yp * quaternion.wp; + qrealinner zz = quaternion.zp * quaternion.zp; + qrealinner zw = quaternion.zp * quaternion.wp; + m.m[0][0] = 1.0f - 2 * (yy + zz); + m.m[1][0] = 2 * (xy - zw); + m.m[2][0] = 2 * (xz + yw); + m.m[3][0] = 0.0f; + m.m[0][1] = 2 * (xy + zw); + m.m[1][1] = 1.0f - 2 * (xx + zz); + m.m[2][1] = 2 * (yz - xw); + m.m[3][1] = 0.0f; + m.m[0][2] = 2 * (xz - yw); + m.m[1][2] = 2 * (yz + xw); + m.m[2][2] = 1.0f - 2 * (xx + yy); + m.m[3][2] = 0.0f; + m.m[0][3] = 0.0f; + m.m[1][3] = 0.0f; + m.m[2][3] = 0.0f; + m.m[3][3] = 1.0f; + int flags = flagBits; + *this *= m; + if (flags != Identity) + flagBits = flags | Rotation; + else + flagBits = Rotation; + return *this; +} + +#endif + +/*! + \overload + + Multiplies this matrix by another that applies an orthographic + projection for a window with boundaries specified by \a rect. + The near and far clipping planes will be -1 and 1 respectively. + Returns this matrix. + + \sa frustum(), perspective() +*/ +QMatrix4x4& QMatrix4x4::ortho(const QRect& rect) +{ + // Note: rect.right() and rect.bottom() subtract 1 in QRect, + // which gives the location of a pixel within the rectangle, + // instead of the extent of the rectangle. We want the extent. + // QRectF expresses the extent properly. + return ortho(rect.x(), rect.x() + rect.width(), rect.y() + rect.height(), rect.y(), -1.0f, 1.0f); +} + +/*! + \overload + + Multiplies this matrix by another that applies an orthographic + projection for a window with boundaries specified by \a rect. + The near and far clipping planes will be -1 and 1 respectively. + Returns this matrix. + + \sa frustum(), perspective() +*/ +QMatrix4x4& QMatrix4x4::ortho(const QRectF& rect) +{ + return ortho(rect.left(), rect.right(), rect.bottom(), rect.top(), -1.0f, 1.0f); +} + +/*! + Multiplies this matrix by another that applies an orthographic + projection for a window with lower-left corner (\a left, \a bottom), + upper-right corner (\a right, \a top), and the specified \a nearPlane + and \a farPlane clipping planes. Returns this matrix. + + \sa frustum(), perspective() +*/ +QMatrix4x4& QMatrix4x4::ortho(qreal left, qreal right, qreal bottom, qreal top, qreal nearPlane, qreal farPlane) +{ + // Bail out if the projection volume is zero-sized. + if (left == right || bottom == top || nearPlane == farPlane) + return *this; + + // Construct the projection. + qreal width = right - left; + qreal invheight = top - bottom; + qreal clip = farPlane - nearPlane; +#ifndef QT_NO_VECTOR3D + if (clip == 2.0f && (nearPlane + farPlane) == 0.0f) { + // We can express this projection as a translate and scale + // which will be more efficient to modify with further + // transformations than producing a "General" matrix. + translate(QVector3D + (qf2vt_round(-(left + right) / width), + qf2vt_round(-(top + bottom) / invheight), + 0.0f, 1)); + scale(QVector3D + (qf2vt_round(2.0f / width), + qf2vt_round(2.0f / invheight), + -1.0f, 1)); + return *this; + } +#endif + QMatrix4x4 m(1); + m.m[0][0] = qf2vt_round(2.0f / width); + m.m[1][0] = qf2vt_round(0.0f); + m.m[2][0] = qf2vt_round(0.0f); + m.m[3][0] = qf2vt_round(-(left + right) / width); + m.m[0][1] = qf2vt_round(0.0f); + m.m[1][1] = qf2vt_round(2.0f / invheight); + m.m[2][1] = qf2vt_round(0.0f); + m.m[3][1] = qf2vt_round(-(top + bottom) / invheight); + m.m[0][2] = qf2vt_round(0.0f); + m.m[1][2] = qf2vt_round(0.0f); + m.m[2][2] = qf2vt_round(-2.0f / clip); + m.m[3][2] = qf2vt_round(-(nearPlane + farPlane) / clip); + m.m[0][3] = qf2vt_round(0.0f); + m.m[1][3] = qf2vt_round(0.0f); + m.m[2][3] = qf2vt_round(0.0f); + m.m[3][3] = qf2vt_round(1.0f); + + // Apply the projection. + *this *= m; + return *this; +} + +/*! + Multiplies this matrix by another that applies a perspective + frustum projection for a window with lower-left corner (\a left, \a bottom), + upper-right corner (\a right, \a top), and the specified \a nearPlane + and \a farPlane clipping planes. Returns this matrix. + + \sa ortho(), perspective() +*/ +QMatrix4x4& QMatrix4x4::frustum(qreal left, qreal right, qreal bottom, qreal top, qreal nearPlane, qreal farPlane) +{ + // Bail out if the projection volume is zero-sized. + if (left == right || bottom == top || nearPlane == farPlane) + return *this; + + // Construct the projection. + QMatrix4x4 m(1); + qreal width = right - left; + qreal invheight = top - bottom; + qreal clip = farPlane - nearPlane; + m.m[0][0] = qf2vt_round(2.0f * nearPlane / width); + m.m[1][0] = qf2vt_round(0.0f); + m.m[2][0] = qf2vt_round((left + right) / width); + m.m[3][0] = qf2vt_round(0.0f); + m.m[0][1] = qf2vt_round(0.0f); + m.m[1][1] = qf2vt_round(2.0f * nearPlane / invheight); + m.m[2][1] = qf2vt_round((top + bottom) / invheight); + m.m[3][1] = qf2vt_round(0.0f); + m.m[0][2] = qf2vt_round(0.0f); + m.m[1][2] = qf2vt_round(0.0f); + m.m[2][2] = qf2vt_round(-(nearPlane + farPlane) / clip); + m.m[3][2] = qf2vt_round(-(2.0f * nearPlane * farPlane) / clip); + m.m[0][3] = qf2vt_round(0.0f); + m.m[1][3] = qf2vt_round(0.0f); + m.m[2][3] = qf2vt_round(-1.0f); + m.m[3][3] = qf2vt_round(0.0f); + + // Apply the projection. + *this *= m; + return *this; +} + +/*! + Multiplies this matrix by another that applies a perspective + projection. The field of view will be \a angle degrees within + a window with a given \a aspect ratio. The projection will + have the specified \a nearPlane and \a farPlane clipping planes. + Returns this matrix. + + \sa ortho(), frustum() +*/ +QMatrix4x4& QMatrix4x4::perspective(qreal angle, qreal aspect, qreal nearPlane, qreal farPlane) +{ + // Bail out if the projection volume is zero-sized. + if (nearPlane == farPlane || aspect == 0.0f) + return *this; + + // Construct the projection. + QMatrix4x4 m(1); + qreal radians = (angle / 2.0f) * M_PI / 180.0f; + qreal sine = qSin(radians); + if (sine == 0.0f) + return *this; + qreal cotan = qCos(radians) / sine; + qreal clip = farPlane - nearPlane; + m.m[0][0] = qf2vt_round(cotan / aspect); + m.m[1][0] = qf2vt_round(0.0f); + m.m[2][0] = qf2vt_round(0.0f); + m.m[3][0] = qf2vt_round(0.0f); + m.m[0][1] = qf2vt_round(0.0f); + m.m[1][1] = qf2vt_round(cotan); + m.m[2][1] = qf2vt_round(0.0f); + m.m[3][1] = qf2vt_round(0.0f); + m.m[0][2] = qf2vt_round(0.0f); + m.m[1][2] = qf2vt_round(0.0f); + m.m[2][2] = qf2vt_round(-(nearPlane + farPlane) / clip); + m.m[3][2] = qf2vt_round(-(2.0f * nearPlane * farPlane) / clip); + m.m[0][3] = qf2vt_round(0.0f); + m.m[1][3] = qf2vt_round(0.0f); + m.m[2][3] = qf2vt_round(-1.0f); + m.m[3][3] = qf2vt_round(0.0f); + + // Apply the projection. + *this *= m; + return *this; +} + +#ifndef QT_NO_VECTOR3D + +/*! + Multiplies this matrix by another that applies an \a eye position + transformation. The \a center value indicates the center of the + view that the \a eye is looking at. The \a up value indicates + which direction should be considered up with respect to the \a eye. + Returns this matrix. +*/ +QMatrix4x4& QMatrix4x4::lookAt(const QVector3D& eye, const QVector3D& center, const QVector3D& up) +{ + QVector3D forward = (center - eye).normalized(); + QVector3D side = QVector3D::crossProduct(forward, up).normalized(); + QVector3D upVector = QVector3D::crossProduct(side, forward); + + QMatrix4x4 m(1); + + m.m[0][0] = side.xp; + m.m[1][0] = side.yp; + m.m[2][0] = side.zp; + m.m[3][0] = 0.0f; + m.m[0][1] = upVector.xp; + m.m[1][1] = upVector.yp; + m.m[2][1] = upVector.zp; + m.m[3][1] = 0.0f; + m.m[0][2] = -forward.xp; + m.m[1][2] = -forward.yp; + m.m[2][2] = -forward.zp; + m.m[3][2] = 0.0f; + m.m[0][3] = 0.0f; + m.m[1][3] = 0.0f; + m.m[2][3] = 0.0f; + m.m[3][3] = 1.0f; + + *this *= m; + return translate(-eye); +} + +#endif + +/*! + Flips between right-handed and left-handed coordinate systems + by multiplying the y and z co-ordinates by -1. This is normally + used to create a left-handed orthographic view without scaling + the viewport as ortho() does. Returns this matrix. + + \sa ortho() +*/ +QMatrix4x4& QMatrix4x4::flipCoordinates() +{ + if (flagBits == Scale || flagBits == (Scale | Translation)) { + m[1][1] = -m[1][1]; + m[2][2] = -m[2][2]; + } else if (flagBits == Translation) { + m[1][1] = -m[1][1]; + m[2][2] = -m[2][2]; + flagBits |= Scale; + } else if (flagBits == Identity) { + m[1][1] = -1.0f; + m[2][2] = -1.0f; + flagBits = Scale; + } else { + m[1][0] = -m[1][0]; + m[1][1] = -m[1][1]; + m[1][2] = -m[1][2]; + m[1][3] = -m[1][3]; + m[2][0] = -m[2][0]; + m[2][1] = -m[2][1]; + m[2][2] = -m[2][2]; + m[2][3] = -m[2][3]; + flagBits = General; + } + return *this; +} + +/*! + Retrieves the 16 items in this matrix and writes them to \a values + in row-major order. +*/ +void QMatrix4x4::toValueArray(qreal *values) const +{ + for (int row = 0; row < 4; ++row) + for (int col = 0; col < 4; ++col) + values[row * 4 + col] = qt_math3d_convert(m[col][row]); +} + +/*! + Returns the conventional Qt 2D affine transformation matrix that + corresponds to this matrix. It is assumed that this matrix + only contains 2D affine transformation elements. + + \sa toTransform() +*/ +QMatrix QMatrix4x4::toAffine() const +{ + return QMatrix(qt_math3d_convert(m[0][0]), + qt_math3d_convert(m[0][1]), + qt_math3d_convert(m[1][0]), + qt_math3d_convert(m[1][1]), + qt_math3d_convert(m[3][0]), + qt_math3d_convert(m[3][1])); +} + +/*! + Returns the conventional Qt 2D transformation matrix that + corresponds to this matrix. It is assumed that this matrix + only contains 2D transformation elements. + + \sa toAffine() +*/ +QTransform QMatrix4x4::toTransform() const +{ + return QTransform(qt_math3d_convert(m[0][0]), + qt_math3d_convert(m[0][1]), + qt_math3d_convert(m[0][3]), + qt_math3d_convert(m[1][0]), + qt_math3d_convert(m[1][1]), + qt_math3d_convert(m[1][3]), + qt_math3d_convert(m[3][0]), + qt_math3d_convert(m[3][1]), + qt_math3d_convert(m[3][3])); +} + +/*! + \fn QPoint QMatrix4x4::map(const QPoint& point) const + + Maps \a point by multiplying this matrix by \a point. + + \sa mapRect() +*/ + +/*! + \fn QPointF QMatrix4x4::map(const QPointF& point) const + + Maps \a point by multiplying this matrix by \a point. + + \sa mapRect() +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + \fn QVector3D QMatrix4x4::map(const QVector3D& point) const + + Maps \a point by multiplying this matrix by \a point. + + \sa mapRect() +*/ + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + \fn QVector4D QMatrix4x4::map(const QVector4D& point) const; + + Maps \a point by multiplying this matrix by \a point. + + \sa mapRect() +*/ + +#endif + +/*! + \fn QRect QMatrix4x4::mapRect(const QRect& rect) const + + Maps \a rect by multiplying this matrix by the corners + of \a rect and then forming a new rectangle from the results. + The returned rectangle will be an ordinary 2D rectangle + with sides parallel to the horizontal and vertical axes. + + \sa map() +*/ + +/*! + \fn QRectF QMatrix4x4::mapRect(const QRectF& rect) const + + Maps \a rect by multiplying this matrix by the corners + of \a rect and then forming a new rectangle from the results. + The returned rectangle will be an ordinary 2D rectangle + with sides parallel to the horizontal and vertical axes. + + \sa map() +*/ + +/*! + \fn qrealinner *QMatrix4x4::data() + + Returns a pointer to the raw data of this matrix. This is indended + for use with raw GL functions. + + \sa constData(), inferSpecialType() +*/ + +/*! + \fn const qrealinner *QMatrix4x4::data() const + + Returns a constant pointer to the raw data of this matrix. + This is indended for use with raw GL functions. + + \sa constData() +*/ + +/*! + \fn const qrealinner *QMatrix4x4::constData() const + + Returns a constant pointer to the raw data of this matrix. + This is indended for use with raw GL functions. + + \sa data() +*/ + +// Helper routine for inverting orthonormal matrices that consist +// of just rotations and translations. +QMatrix4x4 QMatrix4x4::orthonormalInverse() const +{ + QMatrix4x4 result(1); // The '1' says not to load identity + + result.m[0][0] = m[0][0]; + result.m[1][0] = m[0][1]; + result.m[2][0] = m[0][2]; + + result.m[0][1] = m[1][0]; + result.m[1][1] = m[1][1]; + result.m[2][1] = m[1][2]; + + result.m[0][2] = m[2][0]; + result.m[1][2] = m[2][1]; + result.m[2][2] = m[2][2]; + + result.m[0][3] = 0.0f; + result.m[1][3] = 0.0f; + result.m[2][3] = 0.0f; + + result.m[3][0] = -(result.m[0][0] * m[3][0] + result.m[1][0] * m[3][1] + result.m[2][0] * m[3][2]); + result.m[3][1] = -(result.m[0][1] * m[3][0] + result.m[1][1] * m[3][1] + result.m[2][1] * m[3][2]); + result.m[3][2] = -(result.m[0][2] * m[3][0] + result.m[1][2] * m[3][1] + result.m[2][2] * m[3][2]); + result.m[3][3] = 1.0f; + + return result; +} + +#ifndef QT_NO_VECTOR3D +/*! + Decomposes the current rotation matrix into an \a axis of rotation plus + an \a angle. The result can be used to construct an equivalent rotation + matrix using glRotate(). It is assumed that the homogenous coordinate + is 1.0. The returned vector is guaranteed to be normalized. + + \code + qreal angle; + QVector3D axis; + + matrix.extractAxisAngle(angle, axis); + glRotate(angle, axis[0], axis[1], axis[2]); + \endcode + + \sa rotate() +*/ +void QMatrix4x4::extractAxisRotation(qreal &angle, QVector3D &axis) const +{ + // Orientation is dependent on the upper 3x3 matrix; subtract the + // homogeneous scaling element from the trace of the 4x4 matrix + qrealinner tr = m[0][0] + m[1][1] + m[2][2]; + qreal cosa = qt_math3d_convert(0.5f * (tr - 1.0f)); + angle = acos(cosa) * 180.0f / M_PI; + + // Any axis will work if r is zero (means no rotation) + if (qFuzzyCompare(angle, (qreal)0.0f)) { + axis.setX(1.0f); + axis.setY(0.0f); + axis.setZ(0.0f); + return; + } + + if (angle < 180.0f) { + axis.xp = m[1][2] - m[2][1]; + axis.yp = m[2][0] - m[0][2]; + axis.zp = m[0][1] - m[1][0]; + axis.normalize(); + return; + } + + // rads == PI + qrealinner tmp; + + // r00 is maximum + if ((m[0][0] >= m[2][2]) && (m[0][0] >= m[1][1])) { + axis.xp = 0.5f * qvtsqrt(m[0][0] - m[1][1] - m[2][2] + 1.0f); + tmp = 0.5f / axis.x(); + axis.yp = m[1][0] * tmp; + axis.zp = m[2][0] * tmp; + } + + // r11 is maximum + if ((m[1][1] >= m[2][2]) && (m[1][1] >= m[0][0])) { + axis.yp = 0.5f * qvtsqrt(m[1][1] - m[0][0] - m[2][2] + 1.0f); + tmp = 0.5f / axis.y(); + axis.xp = tmp * m[1][0]; + axis.zp = tmp * m[2][1]; + } + + // r22 is maximum + if ((m[2][2] >= m[1][1]) && (m[2][2] >= m[0][0])) { + axis.zp = 0.5f * qvtsqrt(m[2][2] - m[0][0] - m[1][1] + 1.0f); + tmp = 0.5f / axis.z(); + axis.xp = m[2][0]*tmp; + axis.yp = m[2][1]*tmp; + } +} + +/*! + If this is an orthonormal transformation matrix (e.g. only rotations and + translations have been applied to the matrix, no scaling, or shearing) + then the world translational component can be obtained by calling this function. + + This is most useful for camera matrices, where the negation of this vector + is effectively the camera world coordinates. +*/ +QVector3D QMatrix4x4::extractTranslation() const +{ + return QVector3D + (m[0][0] * m[3][0] + m[0][1] * m[3][1] + m[0][2] * m[3][2], + m[1][0] * m[3][0] + m[1][1] * m[3][1] + m[1][2] * m[3][2], + m[2][0] * m[3][0] + m[2][1] * m[3][1] + m[2][2] * m[3][2], 1); +} +#endif + +/*! + Infers the special type of this matrix from its current elements. + + Some operations such as translate(), scale(), and rotate() can be + performed more efficiently if the matrix being modified is already + known to be the identity, a previous translate(), a previous + scale(), etc. + + Normally the QMatrix4x4 class keeps track of this special type internally + as operations are performed. However, if the matrix is modified + directly with operator()() or data(), then QMatrix4x4 will lose track of + the special type and will revert to the safest but least efficient + operations thereafter. + + By calling inferSpecialType() after directly modifying the matrix, + the programmer can force QMatrix4x4 to recover the special type if + the elements appear to conform to one of the known optimized types. + + \sa operator()(), data(), translate() +*/ +void QMatrix4x4::inferSpecialType() +{ + // If the last element is not 1, then it can never be special. + if (m[3][3] != 1.0f) { + flagBits = General; + return; + } + + // If the upper three elements m12, m13, and m21 are not all zero, + // or the lower elements below the diagonal are not all zero, then + // the matrix can never be special. + if (m[1][0] != 0.0f || m[2][0] != 0.0f || m[2][1] != 0.0f) { + flagBits = General; + return; + } + if (m[0][1] != 0.0f || m[0][2] != 0.0f || m[0][3] != 0.0f || + m[1][2] != 0.0f || m[1][3] != 0.0f || m[2][3] != 0.0f) { + flagBits = General; + return; + } + + // Determine what we have in the remaining regions of the matrix. + bool identityAlongDiagonal + = (m[0][0] == 1.0f && m[1][1] == 1.0f && m[2][2] == 1.0f); + bool translationPresent + = (m[3][0] != 0.0f || m[3][1] != 0.0f || m[3][2] != 0.0f); + + // Now determine the special matrix type. + if (translationPresent && identityAlongDiagonal) + flagBits = Translation; + else if (translationPresent) + flagBits = (Translation | Scale); + else if (identityAlongDiagonal) + flagBits = Identity; + else + flagBits = Scale; +} + +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug dbg, const QMatrix4x4 &m) +{ + // Create a string that represents the matrix type. + QByteArray bits; + if ((m.flagBits & QMatrix4x4::Identity) != 0) + bits += "Identity,"; + if ((m.flagBits & QMatrix4x4::General) != 0) + bits += "General,"; + if ((m.flagBits & QMatrix4x4::Translation) != 0) + bits += "Translation,"; + if ((m.flagBits & QMatrix4x4::Scale) != 0) + bits += "Scale,"; + if ((m.flagBits & QMatrix4x4::Rotation) != 0) + bits += "Rotation,"; + if (bits.size() > 0) + bits = bits.left(bits.size() - 1); + + // Output in row-major order because it is more human-readable. + dbg.nospace() << "QMatrix4x4(type:" << bits.constData() << endl + << qSetFieldWidth(10) + << m(0, 0) << m(0, 1) << m(0, 2) << m(0, 3) << endl + << m(1, 0) << m(1, 1) << m(1, 2) << m(1, 3) << endl + << m(2, 0) << m(2, 1) << m(2, 2) << m(2, 3) << endl + << m(3, 0) << m(3, 1) << m(3, 2) << m(3, 3) << endl + << qSetFieldWidth(0) << ')'; + return dbg.space(); +} + +#endif + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h new file mode 100644 index 0000000..8ef73bf --- /dev/null +++ b/src/gui/math3d/qmatrix4x4.h @@ -0,0 +1,954 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QMATRIX4X4_H +#define QMATRIX4X4_H + +#include +#include +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +#ifndef QT_NO_MATRIX4X4 + +class QMatrix; +class QTransform; + +class Q_GUI_EXPORT QMatrix4x4 +{ +public: + inline QMatrix4x4() { setIdentity(); } + explicit QMatrix4x4(const qreal *values); + inline QMatrix4x4(qreal m11, qreal m12, qreal m13, qreal m14, + qreal m21, qreal m22, qreal m23, qreal m24, + qreal m31, qreal m32, qreal m33, qreal m34, + qreal m41, qreal m42, qreal m43, qreal m44); +#if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC) + template + explicit QMatrix4x4(const QGenericMatrix& matrix); +#endif + QMatrix4x4(const qrealinner *values, int cols, int rows); + QMatrix4x4(const QTransform& transform); + QMatrix4x4(const QMatrix& matrix); + + inline qreal operator()(int row, int column) const; + inline qrealinner& operator()(int row, int column); + + inline QVector4D column(int index) const; + inline void setColumn(int index, const QVector4D& value); + + inline QVector4D row(int index) const; + inline void setRow(int index, const QVector4D& value); + + inline bool isIdentity() const; + inline void setIdentity(); + + inline void fill(qreal value); + + qreal determinant() const; + QMatrix4x4 inverted(bool *invertible = 0) const; + QMatrix4x4 transposed() const; + QMatrix3x3 normalMatrix() const; + + inline QMatrix4x4& operator+=(const QMatrix4x4& other); + inline QMatrix4x4& operator-=(const QMatrix4x4& other); + inline QMatrix4x4& operator*=(const QMatrix4x4& other); + inline QMatrix4x4& operator*=(qreal factor); + QMatrix4x4& operator/=(qreal divisor); + inline bool operator==(const QMatrix4x4& other) const; + inline bool operator!=(const QMatrix4x4& other) const; + + friend QMatrix4x4 operator+(const QMatrix4x4& m1, const QMatrix4x4& m2); + friend QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2); + friend QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2); +#ifndef QT_NO_VECTOR3D + friend QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector); + friend QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix); +#endif +#ifndef QT_NO_VECTOR4D + friend QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix); + friend QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector); +#endif + friend QPoint operator*(const QPoint& point, const QMatrix4x4& matrix); + friend QPointF operator*(const QPointF& point, const QMatrix4x4& matrix); + friend QMatrix4x4 operator-(const QMatrix4x4& matrix); + friend QPoint operator*(const QMatrix4x4& matrix, const QPoint& point); + friend QPointF operator*(const QMatrix4x4& matrix, const QPointF& point); + friend QMatrix4x4 operator*(qreal factor, const QMatrix4x4& matrix); + friend QMatrix4x4 operator*(const QMatrix4x4& matrix, qreal factor); + friend Q_GUI_EXPORT QMatrix4x4 operator/(const QMatrix4x4& matrix, qreal divisor); + + friend inline bool qFuzzyCompare(const QMatrix4x4& m1, const QMatrix4x4& m2); + +#ifndef QT_NO_VECTOR3D + QMatrix4x4& scale(const QVector3D& vector); + QMatrix4x4& translate(const QVector3D& vector); + QMatrix4x4& rotate(qreal angle, const QVector3D& vector); +#endif + QMatrix4x4& scale(qreal x, qreal y, qreal z = 1.0f); + QMatrix4x4& scale(qreal factor); + QMatrix4x4& translate(qreal x, qreal y, qreal z = 0.0f); + QMatrix4x4& rotate(qreal angle, qreal x, qreal y, qreal z = 0.0f); +#ifndef QT_NO_QUATERNION + QMatrix4x4& rotate(const QQuaternion& quaternion); +#endif + +#ifndef QT_NO_VECTOR3D + void extractAxisRotation(qreal &angle, QVector3D &axis) const; + QVector3D extractTranslation() const; +#endif + + QMatrix4x4& ortho(const QRect& rect); + QMatrix4x4& ortho(const QRectF& rect); + QMatrix4x4& ortho(qreal left, qreal right, qreal bottom, qreal top, qreal nearPlane, qreal farPlane); + QMatrix4x4& frustum(qreal left, qreal right, qreal bottom, qreal top, qreal nearPlane, qreal farPlane); + QMatrix4x4& perspective(qreal angle, qreal aspect, qreal nearPlane, qreal farPlane); +#ifndef QT_NO_VECTOR3D + QMatrix4x4& lookAt(const QVector3D& eye, const QVector3D& center, const QVector3D& up); +#endif + QMatrix4x4& flipCoordinates(); + + void toValueArray(qreal *values) const; + + QMatrix toAffine() const; + QTransform toTransform() const; + + QPoint map(const QPoint& point) const; + QPointF map(const QPointF& point) const; +#ifndef QT_NO_VECTOR3D + QVector3D map(const QVector3D& point) const; +#endif +#ifndef QT_NO_VECTOR4D + QVector4D map(const QVector4D& point) const; +#endif + QRect mapRect(const QRect& rect) const; + QRectF mapRect(const QRectF& rect) const; + +#if !defined(QT_NO_MEMBER_TEMPLATES) || defined(Q_QDOC) + template + QGenericMatrix toGenericMatrix() const; +#endif + + inline qrealinner *data(); + inline const qrealinner *data() const { return m[0]; } + inline const qrealinner *constData() const { return m[0]; } + + void inferSpecialType(); + +#ifndef QT_NO_DEBUG_STREAM + friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m); +#endif + +private: + qrealinner m[4][4]; // Column-major order to match OpenGL. + int flagBits; // Flag bits from the enum below. + + enum { + Identity = 0x0001, // Identity matrix + General = 0x0002, // General matrix, unknown contents + Translation = 0x0004, // Contains a simple translation + Scale = 0x0008, // Contains a simple scale + Rotation = 0x0010 // Contains a simple rotation + }; + + // Construct without initializing identity matrix. + QMatrix4x4(int) { flagBits = General; } + + QMatrix4x4 orthonormalInverse() const; +}; + +inline QMatrix4x4::QMatrix4x4 + (qreal m11, qreal m12, qreal m13, qreal m14, + qreal m21, qreal m22, qreal m23, qreal m24, + qreal m31, qreal m32, qreal m33, qreal m34, + qreal m41, qreal m42, qreal m43, qreal m44) +{ + m[0][0] = m11; m[0][1] = m21; m[0][2] = m31; m[0][3] = m41; + m[1][0] = m12; m[1][1] = m22; m[1][2] = m32; m[1][3] = m42; + m[2][0] = m13; m[2][1] = m23; m[2][2] = m33; m[2][3] = m43; + m[3][0] = m14; m[3][1] = m24; m[3][2] = m34; m[3][3] = m44; + flagBits = General; +} + +#if !defined(QT_NO_MEMBER_TEMPLATES) + +template +Q_INLINE_TEMPLATE QMatrix4x4::QMatrix4x4 + (const QGenericMatrix& matrix) +{ + const qrealinner *values = matrix.constData(); + for (int col = 0; col < 4; ++col) { + for (int row = 0; row < 4; ++row) { + if (col < N && row < M) + m[col][row] = values[col * M + row]; + else if (col == row) + m[col][row] = 1.0f; + else + m[col][row] = 0.0f; + } + } + flagBits = General; +} + +template +QGenericMatrix QMatrix4x4::toGenericMatrix() const +{ + QGenericMatrix result; + qrealinner *values = result.data(); + for (int col = 0; col < N; ++col) { + for (int row = 0; row < M; ++row) { + if (col < 4 && row < 4) + values[col * M + row] = m[col][row]; + else if (col == row) + values[col * M + row] = 1.0f; + else + values[col * M + row] = 0.0f; + } + } + return result; +} + +#endif + +inline qreal QMatrix4x4::operator()(int row, int column) const +{ + Q_ASSERT(row >= 0 && row < 4 && column >= 0 && column < 4); + return qt_math3d_convert(m[column][row]); +} + +inline qrealinner& QMatrix4x4::operator()(int row, int column) +{ + Q_ASSERT(row >= 0 && row < 4 && column >= 0 && column < 4); + flagBits = General; + return m[column][row]; +} + +inline QVector4D QMatrix4x4::column(int index) const +{ + Q_ASSERT(index >= 0 && index < 4); + return QVector4D(m[index][0], m[index][1], m[index][2], m[index][3], 1); +} + +inline void QMatrix4x4::setColumn(int index, const QVector4D& value) +{ + Q_ASSERT(index >= 0 && index < 4); + m[index][0] = value.xp; + m[index][1] = value.yp; + m[index][2] = value.zp; + m[index][3] = value.wp; + flagBits = General; +} + +inline QVector4D QMatrix4x4::row(int index) const +{ + Q_ASSERT(index >= 0 && index < 4); + return QVector4D(m[0][index], m[1][index], m[2][index], m[3][index], 1); +} + +inline void QMatrix4x4::setRow(int index, const QVector4D& value) +{ + Q_ASSERT(index >= 0 && index < 4); + m[0][index] = value.xp; + m[1][index] = value.yp; + m[2][index] = value.zp; + m[3][index] = value.wp; + flagBits = General; +} + +Q_GUI_EXPORT QMatrix4x4 operator/(const QMatrix4x4& matrix, qreal divisor); + +inline bool QMatrix4x4::isIdentity() const +{ + if (flagBits == Identity) + return true; + if (m[0][0] != 1.0f || m[0][1] != 0.0f || m[0][2] != 0.0f) + return false; + if (m[0][3] != 0.0f || m[1][0] != 0.0f || m[1][1] != 1.0f) + return false; + if (m[1][2] != 0.0f || m[1][3] != 0.0f || m[2][0] != 0.0f) + return false; + if (m[2][1] != 0.0f || m[2][2] != 1.0f || m[2][3] != 0.0f) + return false; + if (m[3][0] != 0.0f || m[3][1] != 0.0f || m[3][2] != 0.0f) + return false; + return (m[3][3] == 1.0f); +} + +inline void QMatrix4x4::setIdentity() +{ + m[0][0] = 1.0f; + m[0][1] = 0.0f; + m[0][2] = 0.0f; + m[0][3] = 0.0f; + m[1][0] = 0.0f; + m[1][1] = 1.0f; + m[1][2] = 0.0f; + m[1][3] = 0.0f; + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = 1.0f; + m[2][3] = 0.0f; + m[3][0] = 0.0f; + m[3][1] = 0.0f; + m[3][2] = 0.0f; + m[3][3] = 1.0f; + flagBits = Identity; +} + +inline void QMatrix4x4::fill(qreal value) +{ + m[0][0] = value; + m[0][1] = value; + m[0][2] = value; + m[0][3] = value; + m[1][0] = value; + m[1][1] = value; + m[1][2] = value; + m[1][3] = value; + m[2][0] = value; + m[2][1] = value; + m[2][2] = value; + m[2][3] = value; + m[3][0] = value; + m[3][1] = value; + m[3][2] = value; + m[3][3] = value; + flagBits = General; +} + +inline QMatrix4x4& QMatrix4x4::operator+=(const QMatrix4x4& other) +{ + m[0][0] += other.m[0][0]; + m[0][1] += other.m[0][1]; + m[0][2] += other.m[0][2]; + m[0][3] += other.m[0][3]; + m[1][0] += other.m[1][0]; + m[1][1] += other.m[1][1]; + m[1][2] += other.m[1][2]; + m[1][3] += other.m[1][3]; + m[2][0] += other.m[2][0]; + m[2][1] += other.m[2][1]; + m[2][2] += other.m[2][2]; + m[2][3] += other.m[2][3]; + m[3][0] += other.m[3][0]; + m[3][1] += other.m[3][1]; + m[3][2] += other.m[3][2]; + m[3][3] += other.m[3][3]; + flagBits = General; + return *this; +} + +inline QMatrix4x4& QMatrix4x4::operator-=(const QMatrix4x4& other) +{ + m[0][0] -= other.m[0][0]; + m[0][1] -= other.m[0][1]; + m[0][2] -= other.m[0][2]; + m[0][3] -= other.m[0][3]; + m[1][0] -= other.m[1][0]; + m[1][1] -= other.m[1][1]; + m[1][2] -= other.m[1][2]; + m[1][3] -= other.m[1][3]; + m[2][0] -= other.m[2][0]; + m[2][1] -= other.m[2][1]; + m[2][2] -= other.m[2][2]; + m[2][3] -= other.m[2][3]; + m[3][0] -= other.m[3][0]; + m[3][1] -= other.m[3][1]; + m[3][2] -= other.m[3][2]; + m[3][3] -= other.m[3][3]; + flagBits = General; + return *this; +} + +inline QMatrix4x4& QMatrix4x4::operator*=(const QMatrix4x4& other) +{ + if (flagBits == Identity) { + *this = other; + return *this; + } else if (other.flagBits == Identity) { + return *this; + } else { + *this = *this * other; + return *this; + } +} + +inline QMatrix4x4& QMatrix4x4::operator*=(qreal factor) +{ + qrealinner f(factor); + m[0][0] *= f; + m[0][1] *= f; + m[0][2] *= f; + m[0][3] *= f; + m[1][0] *= f; + m[1][1] *= f; + m[1][2] *= f; + m[1][3] *= f; + m[2][0] *= f; + m[2][1] *= f; + m[2][2] *= f; + m[2][3] *= f; + m[3][0] *= f; + m[3][1] *= f; + m[3][2] *= f; + m[3][3] *= f; + flagBits = General; + return *this; +} + +inline bool QMatrix4x4::operator==(const QMatrix4x4& other) const +{ + return m[0][0] == other.m[0][0] && + m[0][1] == other.m[0][1] && + m[0][2] == other.m[0][2] && + m[0][3] == other.m[0][3] && + m[1][0] == other.m[1][0] && + m[1][1] == other.m[1][1] && + m[1][2] == other.m[1][2] && + m[1][3] == other.m[1][3] && + m[2][0] == other.m[2][0] && + m[2][1] == other.m[2][1] && + m[2][2] == other.m[2][2] && + m[2][3] == other.m[2][3] && + m[3][0] == other.m[3][0] && + m[3][1] == other.m[3][1] && + m[3][2] == other.m[3][2] && + m[3][3] == other.m[3][3]; +} + +inline bool QMatrix4x4::operator!=(const QMatrix4x4& other) const +{ + return m[0][0] != other.m[0][0] || + m[0][1] != other.m[0][1] || + m[0][2] != other.m[0][2] || + m[0][3] != other.m[0][3] || + m[1][0] != other.m[1][0] || + m[1][1] != other.m[1][1] || + m[1][2] != other.m[1][2] || + m[1][3] != other.m[1][3] || + m[2][0] != other.m[2][0] || + m[2][1] != other.m[2][1] || + m[2][2] != other.m[2][2] || + m[2][3] != other.m[2][3] || + m[3][0] != other.m[3][0] || + m[3][1] != other.m[3][1] || + m[3][2] != other.m[3][2] || + m[3][3] != other.m[3][3]; +} + +inline QMatrix4x4 operator+(const QMatrix4x4& m1, const QMatrix4x4& m2) +{ + QMatrix4x4 m(1); + m.m[0][0] = m1.m[0][0] + m2.m[0][0]; + m.m[0][1] = m1.m[0][1] + m2.m[0][1]; + m.m[0][2] = m1.m[0][2] + m2.m[0][2]; + m.m[0][3] = m1.m[0][3] + m2.m[0][3]; + m.m[1][0] = m1.m[1][0] + m2.m[1][0]; + m.m[1][1] = m1.m[1][1] + m2.m[1][1]; + m.m[1][2] = m1.m[1][2] + m2.m[1][2]; + m.m[1][3] = m1.m[1][3] + m2.m[1][3]; + m.m[2][0] = m1.m[2][0] + m2.m[2][0]; + m.m[2][1] = m1.m[2][1] + m2.m[2][1]; + m.m[2][2] = m1.m[2][2] + m2.m[2][2]; + m.m[2][3] = m1.m[2][3] + m2.m[2][3]; + m.m[3][0] = m1.m[3][0] + m2.m[3][0]; + m.m[3][1] = m1.m[3][1] + m2.m[3][1]; + m.m[3][2] = m1.m[3][2] + m2.m[3][2]; + m.m[3][3] = m1.m[3][3] + m2.m[3][3]; + return m; +} + +inline QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2) +{ + QMatrix4x4 m(1); + m.m[0][0] = m1.m[0][0] - m2.m[0][0]; + m.m[0][1] = m1.m[0][1] - m2.m[0][1]; + m.m[0][2] = m1.m[0][2] - m2.m[0][2]; + m.m[0][3] = m1.m[0][3] - m2.m[0][3]; + m.m[1][0] = m1.m[1][0] - m2.m[1][0]; + m.m[1][1] = m1.m[1][1] - m2.m[1][1]; + m.m[1][2] = m1.m[1][2] - m2.m[1][2]; + m.m[1][3] = m1.m[1][3] - m2.m[1][3]; + m.m[2][0] = m1.m[2][0] - m2.m[2][0]; + m.m[2][1] = m1.m[2][1] - m2.m[2][1]; + m.m[2][2] = m1.m[2][2] - m2.m[2][2]; + m.m[2][3] = m1.m[2][3] - m2.m[2][3]; + m.m[3][0] = m1.m[3][0] - m2.m[3][0]; + m.m[3][1] = m1.m[3][1] - m2.m[3][1]; + m.m[3][2] = m1.m[3][2] - m2.m[3][2]; + m.m[3][3] = m1.m[3][3] - m2.m[3][3]; + return m; +} + +inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2) +{ + if (m1.flagBits == QMatrix4x4::Identity) + return m2; + else if (m2.flagBits == QMatrix4x4::Identity) + return m1; + + QMatrix4x4 m(1); + m.m[0][0] = m1.m[0][0] * m2.m[0][0] + + m1.m[1][0] * m2.m[0][1] + + m1.m[2][0] * m2.m[0][2] + + m1.m[3][0] * m2.m[0][3]; + m.m[0][1] = m1.m[0][1] * m2.m[0][0] + + m1.m[1][1] * m2.m[0][1] + + m1.m[2][1] * m2.m[0][2] + + m1.m[3][1] * m2.m[0][3]; + m.m[0][2] = m1.m[0][2] * m2.m[0][0] + + m1.m[1][2] * m2.m[0][1] + + m1.m[2][2] * m2.m[0][2] + + m1.m[3][2] * m2.m[0][3]; + m.m[0][3] = m1.m[0][3] * m2.m[0][0] + + m1.m[1][3] * m2.m[0][1] + + m1.m[2][3] * m2.m[0][2] + + m1.m[3][3] * m2.m[0][3]; + m.m[1][0] = m1.m[0][0] * m2.m[1][0] + + m1.m[1][0] * m2.m[1][1] + + m1.m[2][0] * m2.m[1][2] + + m1.m[3][0] * m2.m[1][3]; + m.m[1][1] = m1.m[0][1] * m2.m[1][0] + + m1.m[1][1] * m2.m[1][1] + + m1.m[2][1] * m2.m[1][2] + + m1.m[3][1] * m2.m[1][3]; + m.m[1][2] = m1.m[0][2] * m2.m[1][0] + + m1.m[1][2] * m2.m[1][1] + + m1.m[2][2] * m2.m[1][2] + + m1.m[3][2] * m2.m[1][3]; + m.m[1][3] = m1.m[0][3] * m2.m[1][0] + + m1.m[1][3] * m2.m[1][1] + + m1.m[2][3] * m2.m[1][2] + + m1.m[3][3] * m2.m[1][3]; + m.m[2][0] = m1.m[0][0] * m2.m[2][0] + + m1.m[1][0] * m2.m[2][1] + + m1.m[2][0] * m2.m[2][2] + + m1.m[3][0] * m2.m[2][3]; + m.m[2][1] = m1.m[0][1] * m2.m[2][0] + + m1.m[1][1] * m2.m[2][1] + + m1.m[2][1] * m2.m[2][2] + + m1.m[3][1] * m2.m[2][3]; + m.m[2][2] = m1.m[0][2] * m2.m[2][0] + + m1.m[1][2] * m2.m[2][1] + + m1.m[2][2] * m2.m[2][2] + + m1.m[3][2] * m2.m[2][3]; + m.m[2][3] = m1.m[0][3] * m2.m[2][0] + + m1.m[1][3] * m2.m[2][1] + + m1.m[2][3] * m2.m[2][2] + + m1.m[3][3] * m2.m[2][3]; + m.m[3][0] = m1.m[0][0] * m2.m[3][0] + + m1.m[1][0] * m2.m[3][1] + + m1.m[2][0] * m2.m[3][2] + + m1.m[3][0] * m2.m[3][3]; + m.m[3][1] = m1.m[0][1] * m2.m[3][0] + + m1.m[1][1] * m2.m[3][1] + + m1.m[2][1] * m2.m[3][2] + + m1.m[3][1] * m2.m[3][3]; + m.m[3][2] = m1.m[0][2] * m2.m[3][0] + + m1.m[1][2] * m2.m[3][1] + + m1.m[2][2] * m2.m[3][2] + + m1.m[3][2] * m2.m[3][3]; + m.m[3][3] = m1.m[0][3] * m2.m[3][0] + + m1.m[1][3] * m2.m[3][1] + + m1.m[2][3] * m2.m[3][2] + + m1.m[3][3] * m2.m[3][3]; + return m; +} + +#ifndef QT_NO_VECTOR3D + +inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) +{ + qrealinner x, y, z, w; + x = vector.xp * matrix.m[0][0] + + vector.yp * matrix.m[0][1] + + vector.zp * matrix.m[0][2] + + matrix.m[0][3]; + y = vector.xp * matrix.m[1][0] + + vector.yp * matrix.m[1][1] + + vector.zp * matrix.m[1][2] + + matrix.m[1][3]; + z = vector.xp * matrix.m[2][0] + + vector.yp * matrix.m[2][1] + + vector.zp * matrix.m[2][2] + + matrix.m[2][3]; + w = vector.xp * matrix.m[3][0] + + vector.yp * matrix.m[3][1] + + vector.zp * matrix.m[3][2] + + matrix.m[3][3]; + if (w == 1.0f) + return QVector3D(x, y, z, 1); + else + return QVector3D(x / w, y / w, z / w, 1); +} + +inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) +{ + qrealinner x, y, z, w; + x = vector.xp * matrix.m[0][0] + + vector.yp * matrix.m[1][0] + + vector.zp * matrix.m[2][0] + + matrix.m[3][0]; + y = vector.xp * matrix.m[0][1] + + vector.yp * matrix.m[1][1] + + vector.zp * matrix.m[2][1] + + matrix.m[3][1]; + z = vector.xp * matrix.m[0][2] + + vector.yp * matrix.m[1][2] + + vector.zp * matrix.m[2][2] + + matrix.m[3][2]; + w = vector.xp * matrix.m[0][3] + + vector.yp * matrix.m[1][3] + + vector.zp * matrix.m[2][3] + + matrix.m[3][3]; + if (w == 1.0f) + return QVector3D(x, y, z, 1); + else + return QVector3D(x / w, y / w, z / w, 1); +} + +#endif + +#ifndef QT_NO_VECTOR4D + +inline QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix) +{ + qrealinner x, y, z, w; + x = vector.xp * matrix.m[0][0] + + vector.yp * matrix.m[0][1] + + vector.zp * matrix.m[0][2] + + vector.wp * matrix.m[0][3]; + y = vector.xp * matrix.m[1][0] + + vector.yp * matrix.m[1][1] + + vector.zp * matrix.m[1][2] + + vector.wp * matrix.m[1][3]; + z = vector.xp * matrix.m[2][0] + + vector.yp * matrix.m[2][1] + + vector.zp * matrix.m[2][2] + + vector.wp * matrix.m[2][3]; + w = vector.xp * matrix.m[3][0] + + vector.yp * matrix.m[3][1] + + vector.zp * matrix.m[3][2] + + vector.wp * matrix.m[3][3]; + return QVector4D(x, y, z, w, 1); +} + +inline QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector) +{ + qrealinner x, y, z, w; + x = vector.xp * matrix.m[0][0] + + vector.yp * matrix.m[1][0] + + vector.zp * matrix.m[2][0] + + vector.wp * matrix.m[3][0]; + y = vector.xp * matrix.m[0][1] + + vector.yp * matrix.m[1][1] + + vector.zp * matrix.m[2][1] + + vector.wp * matrix.m[3][1]; + z = vector.xp * matrix.m[0][2] + + vector.yp * matrix.m[1][2] + + vector.zp * matrix.m[2][2] + + vector.wp * matrix.m[3][2]; + w = vector.xp * matrix.m[0][3] + + vector.yp * matrix.m[1][3] + + vector.zp * matrix.m[2][3] + + vector.wp * matrix.m[3][3]; + return QVector4D(x, y, z, w, 1); +} + +#endif + +inline QPoint operator*(const QPoint& point, const QMatrix4x4& matrix) +{ + qrealinner xin, yin; + qrealinner x, y, w; + xin = point.x(); + yin = point.y(); + x = xin * matrix.m[0][0] + + yin * matrix.m[0][1] + + matrix.m[0][3]; + y = xin * matrix.m[1][0] + + yin * matrix.m[1][1] + + matrix.m[1][3]; + w = xin * matrix.m[3][0] + + yin * matrix.m[3][1] + + matrix.m[3][3]; + if (w == 1.0f) + return QPoint(qRound(x), qRound(y)); + else + return QPoint(qRound(x / w), qRound(y / w)); +} + +inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix) +{ + qrealinner xin, yin; + qrealinner x, y, w; + xin = point.x(); + yin = point.y(); + x = xin * matrix.m[0][0] + + yin * matrix.m[0][1] + + matrix.m[0][3]; + y = xin * matrix.m[1][0] + + yin * matrix.m[1][1] + + matrix.m[1][3]; + w = xin * matrix.m[3][0] + + yin * matrix.m[3][1] + + matrix.m[3][3]; + if (w == 1.0f) { + return QPointF(qt_math3d_convert(x), + qt_math3d_convert(y)); + } else { + return QPointF(qt_math3d_convert(x / w), + qt_math3d_convert(y / w)); + } +} + +inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) +{ + qrealinner xin, yin; + qrealinner x, y, w; + xin = point.x(); + yin = point.y(); + x = xin * matrix.m[0][0] + + yin * matrix.m[1][0] + + matrix.m[3][0]; + y = xin * matrix.m[0][1] + + yin * matrix.m[1][1] + + matrix.m[3][1]; + w = xin * matrix.m[0][3] + + yin * matrix.m[1][3] + + matrix.m[3][3]; + if (w == 1.0f) + return QPoint(qRound(x), qRound(y)); + else + return QPoint(qRound(x / w), qRound(y / w)); +} + +inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) +{ + qrealinner xin, yin; + qrealinner x, y, w; + xin = point.x(); + yin = point.y(); + x = xin * matrix.m[0][0] + + yin * matrix.m[1][0] + + matrix.m[3][0]; + y = xin * matrix.m[0][1] + + yin * matrix.m[1][1] + + matrix.m[3][1]; + w = xin * matrix.m[0][3] + + yin * matrix.m[1][3] + + matrix.m[3][3]; + if (w == 1.0f) { + return QPointF(qt_math3d_convert(x), + qt_math3d_convert(y)); + } else { + return QPointF(qt_math3d_convert(x / w), + qt_math3d_convert(y / w)); + } +} + +inline QMatrix4x4 operator-(const QMatrix4x4& matrix) +{ + QMatrix4x4 m(1); + m.m[0][0] = -matrix.m[0][0]; + m.m[0][1] = -matrix.m[0][1]; + m.m[0][2] = -matrix.m[0][2]; + m.m[0][3] = -matrix.m[0][3]; + m.m[1][0] = -matrix.m[1][0]; + m.m[1][1] = -matrix.m[1][1]; + m.m[1][2] = -matrix.m[1][2]; + m.m[1][3] = -matrix.m[1][3]; + m.m[2][0] = -matrix.m[2][0]; + m.m[2][1] = -matrix.m[2][1]; + m.m[2][2] = -matrix.m[2][2]; + m.m[2][3] = -matrix.m[2][3]; + m.m[3][0] = -matrix.m[3][0]; + m.m[3][1] = -matrix.m[3][1]; + m.m[3][2] = -matrix.m[3][2]; + m.m[3][3] = -matrix.m[3][3]; + return m; +} + +inline QMatrix4x4 operator*(qreal factor, const QMatrix4x4& matrix) +{ + QMatrix4x4 m(1); + qrealinner f(factor); + m.m[0][0] = matrix.m[0][0] * f; + m.m[0][1] = matrix.m[0][1] * f; + m.m[0][2] = matrix.m[0][2] * f; + m.m[0][3] = matrix.m[0][3] * f; + m.m[1][0] = matrix.m[1][0] * f; + m.m[1][1] = matrix.m[1][1] * f; + m.m[1][2] = matrix.m[1][2] * f; + m.m[1][3] = matrix.m[1][3] * f; + m.m[2][0] = matrix.m[2][0] * f; + m.m[2][1] = matrix.m[2][1] * f; + m.m[2][2] = matrix.m[2][2] * f; + m.m[2][3] = matrix.m[2][3] * f; + m.m[3][0] = matrix.m[3][0] * f; + m.m[3][1] = matrix.m[3][1] * f; + m.m[3][2] = matrix.m[3][2] * f; + m.m[3][3] = matrix.m[3][3] * f; + return m; +} + +inline QMatrix4x4 operator*(const QMatrix4x4& matrix, qreal factor) +{ + QMatrix4x4 m(1); + qrealinner f(factor); + m.m[0][0] = matrix.m[0][0] * f; + m.m[0][1] = matrix.m[0][1] * f; + m.m[0][2] = matrix.m[0][2] * f; + m.m[0][3] = matrix.m[0][3] * f; + m.m[1][0] = matrix.m[1][0] * f; + m.m[1][1] = matrix.m[1][1] * f; + m.m[1][2] = matrix.m[1][2] * f; + m.m[1][3] = matrix.m[1][3] * f; + m.m[2][0] = matrix.m[2][0] * f; + m.m[2][1] = matrix.m[2][1] * f; + m.m[2][2] = matrix.m[2][2] * f; + m.m[2][3] = matrix.m[2][3] * f; + m.m[3][0] = matrix.m[3][0] * f; + m.m[3][1] = matrix.m[3][1] * f; + m.m[3][2] = matrix.m[3][2] * f; + m.m[3][3] = matrix.m[3][3] * f; + return m; +} + +inline bool qFuzzyCompare(const QMatrix4x4& m1, const QMatrix4x4& m2) +{ + return qFuzzyCompare(m1.m[0][0], m2.m[0][0]) && + qFuzzyCompare(m1.m[0][1], m2.m[0][1]) && + qFuzzyCompare(m1.m[0][2], m2.m[0][2]) && + qFuzzyCompare(m1.m[0][3], m2.m[0][3]) && + qFuzzyCompare(m1.m[1][0], m2.m[1][0]) && + qFuzzyCompare(m1.m[1][1], m2.m[1][1]) && + qFuzzyCompare(m1.m[1][2], m2.m[1][2]) && + qFuzzyCompare(m1.m[1][3], m2.m[1][3]) && + qFuzzyCompare(m1.m[2][0], m2.m[2][0]) && + qFuzzyCompare(m1.m[2][1], m2.m[2][1]) && + qFuzzyCompare(m1.m[2][2], m2.m[2][2]) && + qFuzzyCompare(m1.m[2][3], m2.m[2][3]) && + qFuzzyCompare(m1.m[3][0], m2.m[3][0]) && + qFuzzyCompare(m1.m[3][1], m2.m[3][1]) && + qFuzzyCompare(m1.m[3][2], m2.m[3][2]) && + qFuzzyCompare(m1.m[3][3], m2.m[3][3]); +} + +inline QPoint QMatrix4x4::map(const QPoint& point) const +{ + return *this * point; +} + +inline QPointF QMatrix4x4::map(const QPointF& point) const +{ + return *this * point; +} + +#ifndef QT_NO_VECTOR3D + +inline QVector3D QMatrix4x4::map(const QVector3D& point) const +{ + return *this * point; +} + +#endif + +#ifndef QT_NO_VECTOR4D + +inline QVector4D QMatrix4x4::map(const QVector4D& point) const +{ + return *this * point; +} + +#endif + +inline QRect QMatrix4x4::mapRect(const QRect& rect) const +{ + QPoint tl = map(rect.topLeft()); QPoint tr = map(rect.topRight()); + QPoint bl = map(rect.bottomLeft()); QPoint br = map(rect.bottomRight()); + + int xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x())); + int xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x())); + int ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y())); + int ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y())); + + return QRect(QPoint(xmin, ymin), QPoint(xmax, ymax)); +} + +inline QRectF QMatrix4x4::mapRect(const QRectF& rect) const +{ + QPointF tl = map(rect.topLeft()); QPointF tr = map(rect.topRight()); + QPointF bl = map(rect.bottomLeft()); QPointF br = map(rect.bottomRight()); + + qreal xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x())); + qreal xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x())); + qreal ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y())); + qreal ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y())); + + return QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax)); +} + +inline qrealinner *QMatrix4x4::data() +{ + // We have to assume that the caller will modify the matrix elements, + // so we flip it over to "General" mode. + flagBits = General; + return m[0]; +} + +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m); +#endif + +template +QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix& matrix) +{ + return QMatrix4x4(matrix.constData(), N, M); +} + +template +QGenericMatrix qGenericMatrixFromMatrix4x4(const QMatrix4x4& matrix) +{ + QGenericMatrix result; + const qrealinner *m = matrix.constData(); + qrealinner *values = result.data(); + for (int col = 0; col < N; ++col) { + for (int row = 0; row < M; ++row) { + if (col < 4 && row < 4) + values[col * M + row] = m[col * 4 + row]; + else if (col == row) + values[col * M + row] = 1.0f; + else + values[col * M + row] = 0.0f; + } + } + return result; +} + +#endif + +QT_END_NAMESPACE + +#ifndef QT_NO_MATRIX4X4 +Q_DECLARE_METATYPE(QMatrix4x4) +#endif + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp new file mode 100644 index 0000000..730844f --- /dev/null +++ b/src/gui/math3d/qquaternion.cpp @@ -0,0 +1,513 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qquaternion.h" +#include "qmath3dutil_p.h" +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_QUATERNION + +/*! + \class QQuaternion + \brief The QQuaternion class represents a quaternion consisting of a vector and scalar. + \since 4.6 + + Quaternions are used to represent rotations in 3D space, and + consist of a 3D rotation axis specified by the x, y, and z + coordinates, and a scalar representing the rotation angle. + + The components of a quaternion are stored internally using the most + efficient representation for the GL rendering engine, which will be + either floating-point or fixed-point. +*/ + +/*! + \fn QQuaternion::QQuaternion() + + Constructs an identity quaternion, i.e. with coordinates (1, 0, 0, 0). +*/ + +/*! + \fn QQuaternion::QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos) + + Constructs a quaternion with the vector (\a xpos, \a ypos, \a zpos) + and \a scalar. +*/ + +/*! + \fn QQuaternion::QQuaternion(int scalar, int xpos, int ypos, int zpos) + + Constructs a quaternion with the vector (\a xpos, \a ypos, \a zpos) + and \a scalar. +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + \fn QQuaternion::QQuaternion(qreal scalar, const QVector3D& vector) + + Constructs a quaternion vector from the specified \a vector and + \a scalar. + + \sa vector(), scalar() +*/ + +/*! + \fn QVector3D QQuaternion::vector() const + + Returns the vector component of this quaternion. + + \sa setVector(), scalar() +*/ + +/*! + \fn void QQuaternion::setVector(const QVector3D& vector) + + Sets the vector component of this quaternion to \a vector. + + \sa vector(), setScalar() +*/ + +#endif + +/*! + \fn void QQuaternion::setVector(qreal x, qreal y, qreal z) + + Sets the vector component of this quaternion to (\a x, \a y, \a z). + + \sa vector(), setScalar() +*/ + +#ifndef QT_NO_VECTOR4D + +/*! + \fn QQuaternion::QQuaternion(const QVector4D& vector) + + Constructs a quaternion from the components of \a vector. +*/ + +/*! + \fn QVector4D QQuaternion::toVector4D() const + + Returns this quaternion as a 4D vector. +*/ + +#endif + +/*! + \fn bool QQuaternion::isNull() const + + Returns true if the x, y, z, and scalar components of this + quaternion are set to 0.0; otherwise returns false. +*/ + +/*! + \fn bool QQuaternion::isIdentity() const + + Returns true if the x, y, and z components of this + quaternion are set to 0.0, and the scalar component is set + to 1.0; otherwise returns false. +*/ + +/*! + \fn qreal QQuaternion::x() const + + Returns the x coordinate of this quaternion's vector. + + \sa setX(), y(), z(), scalar() +*/ + +/*! + \fn qreal QQuaternion::y() const + + Returns the y coordinate of this quaternion's vector. + + \sa setY(), x(), z(), scalar() +*/ + +/*! + \fn qreal QQuaternion::z() const + + Returns the z coordinate of this quaternion's vector. + + \sa setZ(), x(), y(), scalar() +*/ + +/*! + \fn qreal QQuaternion::scalar() const + + Returns the scalar component of this quaternion. + + \sa setScalar(), x(), y(), z() +*/ + +/*! + \fn void QQuaternion::setX(qreal x) + + Sets the x coordinate of this quaternion's vector to the given + \a x coordinate. + + \sa x(), setY(), setZ(), setScalar() +*/ + +/*! + \fn void QQuaternion::setY(qreal y) + + Sets the y coordinate of this quaternion's vector to the given + \a y coordinate. + + \sa y(), setX(), setZ(), setScalar() +*/ + +/*! + \fn void QQuaternion::setZ(qreal z) + + Sets the z coordinate of this quaternion's vector to the given + \a z coordinate. + + \sa z(), setX(), setY(), setScalar() +*/ + +/*! + \fn void QQuaternion::setScalar(qreal scalar) + + Sets the scalar component of this quaternion to \a scalar. + + \sa scalar(), setX(), setY(), setZ() +*/ + +/*! + Returns the length of the quaternion. This is also called the "norm". + + \sa lengthSquared(), normalized() +*/ +qreal QQuaternion::length() const +{ + return qvtsqrt64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + + qvtmul64(zp, zp) + qvtmul64(wp, wp)); +} + +/*! + Returns the squared length of the quaternion. + + \sa length() +*/ +qreal QQuaternion::lengthSquared() const +{ + return qvtdot64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + + qvtmul64(zp, zp) + qvtmul64(wp, wp)); +} + +/*! + Returns the normalized unit form of this quaternion. If this quaternion + is not null, the returned quaternion is guaranteed to be 1.0 in length. + If this quaternion is null, then a null quaternion is returned. + + \sa length(), normalize() +*/ +QQuaternion QQuaternion::normalized() const +{ + qreal len = length(); + if (!qIsNull(len)) + return *this / len; + else + return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f); +} + +/*! + Normalizes the currect quaternion in place. Nothing happens if this + is a null quaternion. + + \sa length(), normalized() +*/ +void QQuaternion::normalize() +{ + qreal len = length(); + if (qIsNull(len)) + return; + + xp /= len; + yp /= len; + zp /= len; + wp /= len; +} + + +/*! + \fn QQuaternion QQuaternion::conjugate() const + + Returns the conjugate of this quaternion, which is + (-x, -y, -z, scalar). +*/ + +/*! + Rotates \a vector with this quaternion to produce a new vector + in 3D space. The following code: + + \code + QVector3D result = q.rotateVector(vector); + \endcode + + is equivalent to the following: + + \code + QVector3D result = (q * QQuaternion(0, vector) * q.conjugate()).vector(); + \endcode +*/ +QVector3D QQuaternion::rotateVector(const QVector3D& vector) const +{ + return (*this * QQuaternion(0, vector) * conjugate()).vector(); +} + +/*! + \fn QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) + + Adds the given \a quaternion to this quaternion and returns a reference to + this quaternion. + + \sa operator-=() +*/ + +/*! + \fn QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) + + Subtracts the given \a quaternion from this quaternion and returns a + reference to this quaternion. + + \sa operator+=() +*/ + +/*! + \fn QQuaternion &QQuaternion::operator*=(qreal factor) + + Multiplies this quaternion's components by the given \a factor, and + returns a reference to this quaternion. + + \sa operator/=() +*/ + +/*! + \fn QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) + + Multiplies this quaternion by \a quaternion and returns a reference + to this quaternion. +*/ + +/*! + \fn QQuaternion &QQuaternion::operator/=(qreal divisor) + + Divides this quaternion's components by the given \a divisor, and + returns a reference to this quaternion. + + \sa operator*=() +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + Creates a normalized quaternion that corresponds to rotating through + \a angle degrees about the specified 3D \a axis. +*/ +QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D& axis, qreal angle) +{ + // Algorithm from: + // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56 + // We normalize the result just in case the values are close + // to zero, as suggested in the above FAQ. + qrealinner s, c; + QVector3D ax = axis.normalized(); + qt_math3d_sincos(angle / 2.0f, &s, &c); + return QQuaternion(c, ax.xp * s, ax.yp * s, ax.zp * s, 1).normalized(); +} + +#endif + +/*! + Creates a normalized quaternion that corresponds to rotating through + \a angle degrees about the 3D axis (\a x, \a y, \a z). +*/ +QQuaternion QQuaternion::fromAxisAndAngle + (qreal x, qreal y, qreal z, qreal angle) +{ + qrealinner xp = x; + qrealinner yp = y; + qrealinner zp = z; + qrealinner s, c; + qreal length = qvtsqrt(xp * xp + yp * yp + zp * zp); + if (!qIsNull(length)) { + xp /= length; + yp /= length; + zp /= length; + } + qt_math3d_sincos(angle / 2.0f, &s, &c); + return QQuaternion(c, xp * s, yp * s, zp * s, 1).normalized(); +} + +/*! + \fn bool operator==(const QQuaternion &q1, const QQuaternion &q2) + \relates QQuaternion + + Returns true if \a q1 is equal to \a q2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn bool operator!=(const QQuaternion &q1, const QQuaternion &q2) + \relates QQuaternion + + Returns true if \a q1 is not equal to \a q2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) + \relates QQuaternion + + Returns a QQuaternion object that is the sum of the given quaternions, + \a q1 and \a q2; each component is added separately. + + \sa QQuaternion::operator+=() +*/ + +/*! + \fn const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) + \relates QQuaternion + + Returns a QQuaternion object that is formed by subtracting + \a q2 from \a q1; each component is subtracted separately. + + \sa QQuaternion::operator-=() +*/ + +/*! + \fn const QQuaternion operator*(qreal factor, const QQuaternion &quaternion) + \relates QQuaternion + + Returns a copy of the given \a quaternion, multiplied by the + given \a factor. + + \sa QQuaternion::operator*=() +*/ + +/*! + \fn const QQuaternion operator*(const QQuaternion &quaternion, qreal factor) + \relates QQuaternion + + Returns a copy of the given \a quaternion, multiplied by the + given \a factor. + + \sa QQuaternion::operator*=() +*/ + +/*! + \fn const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2) + \relates QQuaternion + + Multiplies \a q1 and \a q2 using quaternion multiplication. + The result corresponds to applying both of the rotations specified + by \a q1 and \a q2. + + \sa QQuaternion::operator*=() +*/ + +/*! + \fn const QQuaternion operator-(const QQuaternion &quaternion) + \relates QQuaternion + \overload + + Returns a QQuaternion object that is formed by changing the sign of + all three components of the given \a quaternion. + + Equivalent to \c {QQuaternion(0,0,0,0) - quaternion}. +*/ + +/*! + \fn const QQuaternion operator/(const QQuaternion &quaternion, qreal divisor) + \relates QQuaternion + + Returns the QQuaternion object formed by dividing all components of + the given \a quaternion by the given \a divisor. + + \sa QQuaternion::operator/=() +*/ + +/*! + \fn bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2) + \relates QQuaternion + + Returns true if \a q1 and \a q2 are equal, allowing for a small + fuzziness factor for floating-point comparisons; false otherwise. +*/ + +/*! + Interpolates along the shortest spherical path between the + rotational positions \a q1 and \a q2. The value \a t should + be between 0 and 1, indicating the spherical distance to travel + between \a q1 and \a q2. + + If \a t is less than or equal to 0, then \a q1 will be returned. + If \a t is greater than or equal to 1, then \a q2 will be returned. +*/ +QQuaternion QQuaternion::interpolate + (const QQuaternion& q1, const QQuaternion& q2, qreal t) +{ + // Handle the easy cases first. + if (t <= 0.0f) + return q1; + else if (t >= 1.0f) + return q2; + + // Determine the angle between the two quaternions. + QQuaternion q2b; + qreal dot; + dot = qvtdot64(qvtmul64(q1.xp, q2.xp) + qvtmul64(q1.yp, q2.yp) + + qvtmul64(q1.zp, q2.zp) + qvtmul64(q1.wp, q2.wp)); + if (dot >= 0.0f) { + q2b = q2; + } else { + q2b = -q2; + dot = -dot; + } + + // Get the scale factors. If they are too small, + // then revert to simple linear interpolation. + qreal factor1 = 1.0f - t; + qreal factor2 = t; + if ((1.0f - dot) > 0.0000001) { + qreal angle = qreal(qAcos(dot)); + qreal sinOfAngle = qreal(qSin(angle)); + if (sinOfAngle > 0.0000001) { + factor1 = qreal(qSin((1.0f - t) * angle)) / sinOfAngle; + factor2 = qreal(qSin(t * angle)) / sinOfAngle; + } + } + + // Construct the result quaternion. + return q1 * factor1 + q2b * factor2; +} + +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug dbg, const QQuaternion &q) +{ + dbg.nospace() << "QQuaternion(scalar:" << q.scalar() + << ", vector:(" << q.x() << ", " + << q.y() << ", " << q.z() << "))"; + return dbg.space(); +} + +#endif + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h new file mode 100644 index 0000000..cc71b7d --- /dev/null +++ b/src/gui/math3d/qquaternion.h @@ -0,0 +1,313 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUATERNION_H +#define QQUATERNION_H + +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +#ifndef QT_NO_QUATERNION + +class QMatrix4x4; + +class Q_GUI_EXPORT QQuaternion +{ +public: + QQuaternion(); + QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos); + QQuaternion(int scalar, int xpos, int ypos, int zpos); +#ifndef QT_NO_VECTOR3D + QQuaternion(qreal scalar, const QVector3D& vector); +#endif +#ifndef QT_NO_VECTOR4D + explicit QQuaternion(const QVector4D& vector); +#endif + + bool isNull() const; + bool isIdentity() const; + +#ifndef QT_NO_VECTOR3D + QVector3D vector() const; + void setVector(const QVector3D& vector); +#endif + void setVector(qreal x, qreal y, qreal z); + + qreal x() const; + qreal y() const; + qreal z() const; + qreal scalar() const; + + void setX(qreal x); + void setY(qreal y); + void setZ(qreal z); + void setScalar(qreal scalar); + + qreal length() const; + qreal lengthSquared() const; + + QQuaternion normalized() const; + void normalize(); + + QQuaternion conjugate() const; + + QVector3D rotateVector(const QVector3D& vector) const; + + QQuaternion &operator+=(const QQuaternion &quaternion); + QQuaternion &operator-=(const QQuaternion &quaternion); + QQuaternion &operator*=(qreal factor); + QQuaternion &operator*=(const QQuaternion &quaternion); + QQuaternion &operator/=(qreal divisor); + + friend inline bool operator==(const QQuaternion &q1, const QQuaternion &q2); + friend inline bool operator!=(const QQuaternion &q1, const QQuaternion &q2); + friend inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2); + friend inline const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2); + friend inline const QQuaternion operator*(qreal factor, const QQuaternion &quaternion); + friend inline const QQuaternion operator*(const QQuaternion &quaternion, qreal factor); + friend inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2); + friend inline const QQuaternion operator-(const QQuaternion &quaternion); + friend inline const QQuaternion operator/(const QQuaternion &quaternion, qreal divisor); + + friend inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2); + +#ifndef QT_NO_VECTOR4D + QVector4D toVector4D() const; +#endif + +#ifndef QT_NO_VECTOR3D + static QQuaternion fromAxisAndAngle(const QVector3D& axis, qreal angle); +#endif + static QQuaternion fromAxisAndAngle + (qreal x, qreal y, qreal z, qreal angle); + + static QQuaternion interpolate + (const QQuaternion& q1, const QQuaternion& q2, qreal t); + +private: + qrealinner wp, xp, yp, zp; + + friend class QMatrix4x4; + + QQuaternion(qrealinner scalar, qrealinner xpos, qrealinner ypos, qrealinner zpos, int dummy); +}; + +inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {} + +inline QQuaternion::QQuaternion(qreal scalar, qreal xpos, qreal ypos, qreal zpos) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {} + + +inline QQuaternion::QQuaternion(qrealinner scalar, qrealinner xpos, qrealinner ypos, qrealinner zpos, int) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {} + +inline QQuaternion::QQuaternion(int scalar, int xpos, int ypos, int zpos) : wp(scalar), xp(xpos), yp(ypos), zp(zpos) {} + +inline bool QQuaternion::isNull() const +{ + return qIsNull(xp) && qIsNull(yp) && qIsNull(zp) && qIsNull(wp); +} + +inline bool QQuaternion::isIdentity() const +{ + return qIsNull(xp) && qIsNull(yp) && qIsNull(zp) && wp == 1.0f; +} + +inline qreal QQuaternion::x() const { return qt_math3d_convert(xp); } +inline qreal QQuaternion::y() const { return qt_math3d_convert(yp); } +inline qreal QQuaternion::z() const { return qt_math3d_convert(zp); } +inline qreal QQuaternion::scalar() const { return qt_math3d_convert(wp); } + +inline void QQuaternion::setX(qreal x) { xp = x; } +inline void QQuaternion::setY(qreal y) { yp = y; } +inline void QQuaternion::setZ(qreal z) { zp = z; } +inline void QQuaternion::setScalar(qreal scalar) { wp = scalar; } + +inline QQuaternion QQuaternion::conjugate() const +{ + return QQuaternion(wp, -xp, -yp, -zp, 1); +} + +inline QQuaternion &QQuaternion::operator+=(const QQuaternion &quaternion) +{ + xp += quaternion.xp; + yp += quaternion.yp; + zp += quaternion.zp; + wp += quaternion.wp; + return *this; +} + +inline QQuaternion &QQuaternion::operator-=(const QQuaternion &quaternion) +{ + xp -= quaternion.xp; + yp -= quaternion.yp; + zp -= quaternion.zp; + wp -= quaternion.wp; + return *this; +} + +inline QQuaternion &QQuaternion::operator*=(qreal factor) +{ + qrealinner f(factor); + xp *= f; + yp *= f; + zp *= f; + wp *= f; + return *this; +} + +inline const QQuaternion operator*(const QQuaternion &q1, const QQuaternion& q2) +{ + // Algorithm from: + // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q53 + qrealinner x = q1.wp * q2.xp + + q1.xp * q2.wp + + q1.yp * q2.zp - + q1.zp * q2.yp; + qrealinner y = q1.wp * q2.yp + + q1.yp * q2.wp + + q1.zp * q2.xp - + q1.xp * q2.zp; + qrealinner z = q1.wp * q2.zp + + q1.zp * q2.wp + + q1.xp * q2.yp - + q1.yp * q2.xp; + qrealinner w = q1.wp * q2.wp - + q1.xp * q2.xp - + q1.yp * q2.yp - + q1.zp * q2.zp; + return QQuaternion(w, x, y, z, 1); +} + +inline QQuaternion &QQuaternion::operator*=(const QQuaternion &quaternion) +{ + *this = *this * quaternion; + return *this; +} + +inline QQuaternion &QQuaternion::operator/=(qreal divisor) +{ + qrealinner d(divisor); + xp /= d; + yp /= d; + zp /= d; + wp /= d; + return *this; +} + +inline bool operator==(const QQuaternion &q1, const QQuaternion &q2) +{ + return q1.xp == q2.xp && q1.yp == q2.yp && q1.zp == q2.zp && q1.wp == q2.wp; +} + +inline bool operator!=(const QQuaternion &q1, const QQuaternion &q2) +{ + return q1.xp != q2.xp || q1.yp != q2.yp || q1.zp != q2.zp || q1.wp != q2.wp; +} + +inline const QQuaternion operator+(const QQuaternion &q1, const QQuaternion &q2) +{ + return QQuaternion(q1.wp + q2.wp, q1.xp + q2.xp, q1.yp + q2.yp, q1.zp + q2.zp, 1); +} + +inline const QQuaternion operator-(const QQuaternion &q1, const QQuaternion &q2) +{ + return QQuaternion(q1.wp - q2.wp, q1.xp - q2.xp, q1.yp - q2.yp, q1.zp - q2.zp, 1); +} + +inline const QQuaternion operator*(qreal factor, const QQuaternion &quaternion) +{ + qrealinner f(factor); + return QQuaternion(quaternion.wp * f, quaternion.xp * f, quaternion.yp * f, quaternion.zp * f, 1); +} + +inline const QQuaternion operator*(const QQuaternion &quaternion, qreal factor) +{ + qrealinner f(factor); + return QQuaternion(quaternion.wp * f, quaternion.xp * f, quaternion.yp * f, quaternion.zp * f, 1); +} + +inline const QQuaternion operator-(const QQuaternion &quaternion) +{ + return QQuaternion(-quaternion.wp, -quaternion.xp, -quaternion.yp, -quaternion.zp, 1); +} + +inline const QQuaternion operator/(const QQuaternion &quaternion, qreal divisor) +{ + qrealinner d(divisor); + return QQuaternion(quaternion.wp / d, quaternion.xp / d, quaternion.yp / d, quaternion.zp / d, 1); +} + +inline bool qFuzzyCompare(const QQuaternion& q1, const QQuaternion& q2) +{ + return qFuzzyCompare(q1.xp, q2.xp) && + qFuzzyCompare(q1.yp, q2.yp) && + qFuzzyCompare(q1.zp, q2.zp) && + qFuzzyCompare(q1.wp, q2.wp); +} + +#ifndef QT_NO_VECTOR3D + +inline QQuaternion::QQuaternion(qreal scalar, const QVector3D& vector) + : wp(scalar), xp(vector.xp), yp(vector.yp), zp(vector.zp) {} + +inline void QQuaternion::setVector(const QVector3D& vector) +{ + xp = vector.xp; + yp = vector.yp; + zp = vector.zp; +} + +inline QVector3D QQuaternion::vector() const +{ + return QVector3D(xp, yp, zp, 1); +} + +#endif + +inline void QQuaternion::setVector(qreal x, qreal y, qreal z) +{ + xp = x; + yp = y; + zp = z; +} + +#ifndef QT_NO_VECTOR4D + +inline QQuaternion::QQuaternion(const QVector4D& vector) + : wp(vector.wp), xp(vector.xp), yp(vector.yp), zp(vector.zp) {} + +inline QVector4D QQuaternion::toVector4D() const +{ + return QVector4D(xp, yp, zp, wp, 1); +} + +#endif + +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QQuaternion &q); +#endif + +#endif + +QT_END_NAMESPACE + +#ifndef QT_NO_QUATERNION +Q_DECLARE_METATYPE(QQuaternion) +#endif + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp new file mode 100644 index 0000000..13d6cc9 --- /dev/null +++ b/src/gui/math3d/qvector2d.cpp @@ -0,0 +1,386 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qvector2d.h" +#include "qvector3d.h" +#include "qvector4d.h" +#include "qmath3dutil_p.h" + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_VECTOR2D + +/*! + \class QVector2D + \brief The QVector2D class represents a vector or vertex in 2D space. + \since 4.6 + + The QVector2D class can also be used to represent vertices in 2D space. + We therefore do not need to provide a separate vertex class. + + The coordinates are stored internally using the most efficient + representation for the GL rendering engine, which will be either + floating-point or fixed-point. +*/ + +/*! + \fn QVector2D::QVector2D() + + Constructs a null vector, i.e. with coordinates (0, 0, 0). +*/ + +/*! + \fn QVector2D::QVector2D(qreal xpos, qreal ypos) + + Constructs a vector with coordinates (\a xpos, \a ypos). +*/ + +/*! + \fn QVector2D::QVector2D(int xpos, int ypos) + + Constructs a vector with coordinates (\a xpos, \a ypos). +*/ + +/*! + \fn QVector2D::QVector2D(const QPoint& point) + + Constructs a vector with x and y coordinates from a 2D \a point. +*/ + +/*! + \fn QVector2D::QVector2D(const QPointF& point) + + Constructs a vector with x and y coordinates from a 2D \a point. +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + Constructs a vector with x and y coordinates from a 3D \a vector. + The z coordinate of \a vector is dropped. + + \sa toVector3D() +*/ +QVector2D::QVector2D(const QVector3D& vector) +{ + xp = vector.xp; + yp = vector.yp; +} + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + Constructs a vector with x and y coordinates from a 3D \a vector. + The z and w coordinates of \a vector are dropped. + + \sa toVector4D() +*/ +QVector2D::QVector2D(const QVector4D& vector) +{ + xp = vector.xp; + yp = vector.yp; +} + +#endif + +/*! + \fn bool QVector2D::isNull() const + + Returns true if the x and y coordinates are set to 0.0, + otherwise returns false. +*/ + +/*! + \fn qreal QVector2D::x() const + + Returns the x coordinate of this point. + + \sa setX(), y() +*/ + +/*! + \fn qreal QVector2D::y() const + + Returns the y coordinate of this point. + + \sa setY(), x() +*/ + +/*! + \fn void QVector2D::setX(qreal x) + + Sets the x coordinate of this point to the given \a x coordinate. + + \sa x(), setY() +*/ + +/*! + \fn void QVector2D::setY(qreal y) + + Sets the y coordinate of this point to the given \a y coordinate. + + \sa y(), setX() +*/ + +/*! + Returns the length of the vector from the origin. + + \sa lengthSquared(), normalized() +*/ +qreal QVector2D::length() const +{ + return qvtsqrt64(qvtmul64(xp, xp) + qvtmul64(yp, yp)); +} + +/*! + Returns the squared length of the vector from the origin. + This is equivalent to the dot product of the vector with itself. + + \sa length(), dotProduct() +*/ +qreal QVector2D::lengthSquared() const +{ + return qvtdot64(qvtmul64(xp, xp) + qvtmul64(yp, yp)); +} + +/*! + Returns the normalized unit vector form of this vector. If this vector + is not null, the returned vector is guaranteed to be 1.0 in length. + If this vector is null, then a null vector is returned. + + \sa length(), normalize() +*/ +QVector2D QVector2D::normalized() const +{ + qreal len = length(); + if (!qIsNull(len)) + return *this / len; + else + return QVector2D(); +} + +/*! + Normalizes the currect vector in place. Nothing happens if this + vector is a null vector. + + \sa length(), normalized() +*/ +void QVector2D::normalize() +{ + qreal len = length(); + if (qIsNull(len)) + return; + + xp /= len; + yp /= len; +} + +/*! + \fn QVector2D &QVector2D::operator+=(const QVector2D &vector) + + Adds the given \a vector to this vector and returns a reference to + this vector. + + \sa operator-=() +*/ + +/*! + \fn QVector2D &QVector2D::operator-=(const QVector2D &vector) + + Subtracts the given \a vector from this vector and returns a reference to + this vector. + + \sa operator+=() +*/ + +/*! + \fn QVector2D &QVector2D::operator*=(qreal factor) + + Multiplies this vector's coordinates by the given \a factor, and + returns a reference to this vector. + + \sa operator/=() +*/ + +/*! + \fn QVector2D &QVector2D::operator*=(const QVector2D &vector) + + Multiplies the components of this vector by the corresponding + components in \a vector. +*/ + +/*! + \fn QVector2D &QVector2D::operator/=(qreal divisor) + + Divides this vector's coordinates by the given \a divisor, and + returns a reference to this vector. + + \sa operator*=() +*/ + +/*! + Returns the dot product of \a v1 and \a v2. +*/ +qreal QVector2D::dotProduct(const QVector2D& v1, const QVector2D& v2) +{ + return qvtdot64(qvtmul64(v1.xp, v2.xp) + qvtmul64(v1.yp, v2.yp)); +} + +/*! + \fn bool operator==(const QVector2D &v1, const QVector2D &v2) + \relates QVector2D + + Returns true if \a v1 is equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn bool operator!=(const QVector2D &v1, const QVector2D &v2) + \relates QVector2D + + Returns true if \a v1 is not equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn const QVector2D operator+(const QVector2D &v1, const QVector2D &v2) + \relates QVector2D + + Returns a QVector2D object that is the sum of the given vectors, \a v1 + and \a v2; each component is added separately. + + \sa QVector2D::operator+=() +*/ + +/*! + \fn const QVector2D operator-(const QVector2D &v1, const QVector2D &v2) + \relates QVector2D + + Returns a QVector2D object that is formed by subtracting \a v2 from \a v1; + each component is subtracted separately. + + \sa QVector2D::operator-=() +*/ + +/*! + \fn const QVector2D operator*(qreal factor, const QVector2D &vector) + \relates QVector2D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector2D::operator*=() +*/ + +/*! + \fn const QVector2D operator*(const QVector2D &vector, qreal factor) + \relates QVector2D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector2D::operator*=() +*/ + +/*! + \fn const QVector2D operator*(const QVector2D &v1, const QVector2D &v2) + \relates QVector2D + + Multiplies the components of \a v1 by the corresponding + components in \a v2. +*/ + +/*! + \fn const QVector2D operator-(const QVector2D &vector) + \relates QVector2D + \overload + + Returns a QVector2D object that is formed by changing the sign of + the components of the given \a vector. + + Equivalent to \c {QVector2D(0,0) - vector}. +*/ + +/*! + \fn const QVector2D operator/(const QVector2D &vector, qreal divisor) + \relates QVector2D + + Returns the QVector2D object formed by dividing all three components of + the given \a vector by the given \a divisor. + + \sa QVector2D::operator/=() +*/ + +/*! + \fn bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2) + \relates QVector2D + + Returns true if \a v1 and \a v2 are equal, allowing for a small + fuzziness factor for floating-point comparisons; false otherwise. +*/ + +#ifndef QT_NO_VECTOR3D + +/*! + Returns the 3D form of this 2D vector, with the z coordinate set to zero. + + \sa toVector4D(), toPoint() +*/ +QVector3D QVector2D::toVector3D() const +{ + return QVector3D(xp, yp, 0.0f, 1); +} + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + Returns the 4D form of this 2D vector, with the z and w coordinates set to zero. + + \sa toVector3D(), toPoint() +*/ +QVector4D QVector2D::toVector4D() const +{ + return QVector4D(xp, yp, 0.0f, 0.0f, 1); +} + +#endif + +/*! + \fn QPoint QVector2D::toPoint() const + + Returns the QPoint form of this 2D vector. + + \sa toPointF(), toVector3D() +*/ + +/*! + \fn QPointF QVector2D::toPointF() const + + Returns the QPointF form of this 2D vector. + + \sa toPoint(), toVector3D() +*/ + +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug dbg, const QVector2D &vector) +{ + dbg.nospace() << "QVector2D(" << vector.x() << ", " << vector.y() << ')'; + return dbg.space(); +} + +#endif + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h new file mode 100644 index 0000000..55452b0 --- /dev/null +++ b/src/gui/math3d/qvector2d.h @@ -0,0 +1,237 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QVECTOR2D_H +#define QVECTOR2D_H + +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QVector3D; +class QVector4D; + +#ifndef QT_NO_VECTOR2D + +class Q_GUI_EXPORT QVector2D +{ +public: + QVector2D(); + QVector2D(qreal xpos, qreal ypos); + QVector2D(int xpos, int ypos); + explicit QVector2D(const QPoint& point); + explicit QVector2D(const QPointF& point); +#ifndef QT_NO_VECTOR3D + explicit QVector2D(const QVector3D& vector); +#endif +#ifndef QT_NO_VECTOR4D + explicit QVector2D(const QVector4D& vector); +#endif + + bool isNull() const; + + qreal x() const; + qreal y() const; + + void setX(qreal x); + void setY(qreal y); + + qreal length() const; + qreal lengthSquared() const; + + QVector2D normalized() const; + void normalize(); + + QVector2D &operator+=(const QVector2D &vector); + QVector2D &operator-=(const QVector2D &vector); + QVector2D &operator*=(qreal factor); + QVector2D &operator*=(const QVector2D &vector); + QVector2D &operator/=(qreal divisor); + + static qreal dotProduct(const QVector2D& v1, const QVector2D& v2); + + friend inline bool operator==(const QVector2D &v1, const QVector2D &v2); + friend inline bool operator!=(const QVector2D &v1, const QVector2D &v2); + friend inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2); + friend inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2); + friend inline const QVector2D operator*(qreal factor, const QVector2D &vector); + friend inline const QVector2D operator*(const QVector2D &vector, qreal factor); + friend inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2); + friend inline const QVector2D operator-(const QVector2D &vector); + friend inline const QVector2D operator/(const QVector2D &vector, qreal divisor); + + friend inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2); + +#ifndef QT_NO_VECTOR3D + QVector3D toVector3D() const; +#endif +#ifndef QT_NO_VECTOR4D + QVector4D toVector4D() const; +#endif + + QPoint toPoint() const; + QPointF toPointF() const; + +private: + qrealinner xp, yp; + + QVector2D(qrealinner xpos, qrealinner ypos, int dummy); + + friend class QVector3D; + friend class QVector4D; + friend class QVertexArray; +}; + +inline QVector2D::QVector2D() : xp(0.0f), yp(0.0f) {} + +inline QVector2D::QVector2D(qrealinner xpos, qrealinner ypos, int) : xp(xpos), yp(ypos) {} + +inline QVector2D::QVector2D(qreal xpos, qreal ypos) : xp(xpos), yp(ypos) {} + +inline QVector2D::QVector2D(int xpos, int ypos) : xp(xpos), yp(ypos) {} + +inline QVector2D::QVector2D(const QPoint& point) : xp(point.x()), yp(point.y()) {} + +inline QVector2D::QVector2D(const QPointF& point) : xp(point.x()), yp(point.y()) {} + +inline bool QVector2D::isNull() const +{ + return qIsNull(xp) && qIsNull(yp); +} + +inline qreal QVector2D::x() const { return qt_math3d_convert(xp); } +inline qreal QVector2D::y() const { return qt_math3d_convert(yp); } + +inline void QVector2D::setX(qreal x) { xp = x; } +inline void QVector2D::setY(qreal y) { yp = y; } + +inline QVector2D &QVector2D::operator+=(const QVector2D &vector) +{ + xp += vector.xp; + yp += vector.yp; + return *this; +} + +inline QVector2D &QVector2D::operator-=(const QVector2D &vector) +{ + xp -= vector.xp; + yp -= vector.yp; + return *this; +} + +inline QVector2D &QVector2D::operator*=(qreal factor) +{ + qrealinner f(factor); + xp *= f; + yp *= f; + return *this; +} + +inline QVector2D &QVector2D::operator*=(const QVector2D &vector) +{ + xp *= vector.xp; + yp *= vector.yp; + return *this; +} + +inline QVector2D &QVector2D::operator/=(qreal divisor) +{ + qrealinner d(divisor); + xp /= d; + yp /= d; + return *this; +} + +inline bool operator==(const QVector2D &v1, const QVector2D &v2) +{ + return v1.xp == v2.xp && v1.yp == v2.yp; +} + +inline bool operator!=(const QVector2D &v1, const QVector2D &v2) +{ + return v1.xp != v2.xp || v1.yp != v2.yp; +} + +inline const QVector2D operator+(const QVector2D &v1, const QVector2D &v2) +{ + return QVector2D(v1.xp + v2.xp, v1.yp + v2.yp, 1); +} + +inline const QVector2D operator-(const QVector2D &v1, const QVector2D &v2) +{ + return QVector2D(v1.xp - v2.xp, v1.yp - v2.yp, 1); +} + +inline const QVector2D operator*(qreal factor, const QVector2D &vector) +{ + qrealinner f(factor); + return QVector2D(vector.xp * f, vector.yp * f, 1); +} + +inline const QVector2D operator*(const QVector2D &vector, qreal factor) +{ + qrealinner f(factor); + return QVector2D(vector.xp * f, vector.yp * f, 1); +} + +inline const QVector2D operator*(const QVector2D &v1, const QVector2D &v2) +{ + return QVector2D(v1.xp * v2.xp, v1.yp * v2.yp, 1); +} + +inline const QVector2D operator-(const QVector2D &vector) +{ + return QVector2D(-vector.xp, -vector.yp, 1); +} + +inline const QVector2D operator/(const QVector2D &vector, qreal divisor) +{ + qrealinner d(divisor); + return QVector2D(vector.xp / d, vector.yp / d, 1); +} + +inline bool qFuzzyCompare(const QVector2D& v1, const QVector2D& v2) +{ + return qFuzzyCompare(v1.xp, v2.xp) && qFuzzyCompare(v1.yp, v2.yp); +} + +inline QPoint QVector2D::toPoint() const +{ + return QPoint(qRound(xp), qRound(yp)); +} + +inline QPointF QVector2D::toPointF() const +{ + return QPointF(qt_math3d_convert(xp), + qt_math3d_convert(yp)); +} + +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector2D &vector); +#endif + +#endif + +QT_END_NAMESPACE + +#ifndef QT_NO_VECTOR2D +Q_DECLARE_METATYPE(QVector2D) +#endif + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp new file mode 100644 index 0000000..f0b3aeb --- /dev/null +++ b/src/gui/math3d/qvector3d.cpp @@ -0,0 +1,535 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qvector3d.h" +#include "qvector2d.h" +#include "qvector4d.h" +#include "qmath3dutil_p.h" +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_VECTOR3D + +/*! + \class QVector3D + \brief The QVector3D class represents a vector or vertex in 3D space. + \since 4.6 + + Vectors are one of the main building blocks of 3D representation and + drawing. They consist of three coordinates, traditionally called + x, y, and z. + + The QVector3D class can also be used to represent vertices in 3D space. + We therefore do not need to provide a separate vertex class. + + The coordinates are stored internally using the most efficient + representation for the GL rendering engine, which will be either + floating-point or fixed-point. +*/ + +/*! + \fn QVector3D::QVector3D() + + Constructs a null vector, i.e. with coordinates (0, 0, 0). +*/ + +/*! + \fn QVector3D::QVector3D(qreal xpos, qreal ypos, qreal zpos) + + Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos). +*/ + +/*! + \fn QVector3D::QVector3D(int xpos, int ypos, int zpos) + + Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos). +*/ + +/*! + \fn QVector3D::QVector3D(const QPoint& point) + + Constructs a vector with x and y coordinates from a 2D \a point, and a + z coordinate of 0. +*/ + +/*! + \fn QVector3D::QVector3D(const QPointF& point) + + Constructs a vector with x and y coordinates from a 2D \a point, and a + z coordinate of 0. +*/ + +#ifndef QT_NO_VECTOR2D + +/*! + Constructs a 3D vector from the specified 2D \a vector. The z + coordinate is set to zero. + + \sa toVector2D() +*/ +QVector3D::QVector3D(const QVector2D& vector) +{ + xp = vector.xp; + yp = vector.yp; + zp = 0.0f; +} + +/*! + Constructs a 3D vector from the specified 2D \a vector. The z + coordinate is set to \a zpos. + + \sa toVector2D() +*/ +QVector3D::QVector3D(const QVector2D& vector, qreal zpos) +{ + xp = vector.xp; + yp = vector.yp; + zp = zpos; +} + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + Constructs a 3D vector from the specified 4D \a vector. The w + coordinate is dropped. + + \sa toVector4D() +*/ +QVector3D::QVector3D(const QVector4D& vector) +{ + xp = vector.xp; + yp = vector.yp; + zp = vector.zp; +} + +#endif + +/*! + \fn bool QVector3D::isNull() const + + Returns true if the x, y, and z coordinates are set to 0.0, + otherwise returns false. +*/ + +/*! + \fn qreal QVector3D::x() const + + Returns the x coordinate of this point. + + \sa setX(), y(), z() +*/ + +/*! + \fn qreal QVector3D::y() const + + Returns the y coordinate of this point. + + \sa setY(), x(), z() +*/ + +/*! + \fn qreal QVector3D::z() const + + Returns the z coordinate of this point. + + \sa setZ(), x(), y() +*/ + +/*! + \fn void QVector3D::setX(qreal x) + + Sets the x coordinate of this point to the given \a x coordinate. + + \sa x(), setY(), setZ() +*/ + +/*! + \fn void QVector3D::setY(qreal y) + + Sets the y coordinate of this point to the given \a y coordinate. + + \sa y(), setX(), setZ() +*/ + +/*! + \fn void QVector3D::setZ(qreal z) + + Sets the z coordinate of this point to the given \a z coordinate. + + \sa z(), setX(), setY() +*/ + +/*! + Returns the normalized unit vector form of this vector. If this vector + is not null, the returned vector is guaranteed to be 1.0 in length. + If this vector is null, then a null vector is returned. + + \sa length(), normalize() +*/ +QVector3D QVector3D::normalized() const +{ + qreal len = length(); + if (!qIsNull(len)) + return *this / len; + else + return QVector3D(); +} + +/*! + Normalizes the currect vector in place. Nothing happens if this + vector is a null vector. + + \sa length(), normalized() +*/ +void QVector3D::normalize() +{ + qreal len = length(); + if (qIsNull(len)) + return; + + xp /= len; + yp /= len; + zp /= len; +} + +/*! + \fn QVector3D &QVector3D::operator+=(const QVector3D &vector) + + Adds the given \a vector to this vector and returns a reference to + this vector. + + \sa operator-=() +*/ + +/*! + \fn QVector3D &QVector3D::operator-=(const QVector3D &vector) + + Subtracts the given \a vector from this vector and returns a reference to + this vector. + + \sa operator+=() +*/ + +/*! + \fn QVector3D &QVector3D::operator*=(qreal factor) + + Multiplies this vector's coordinates by the given \a factor, and + returns a reference to this vector. + + \sa operator/=() +*/ + +/*! + \fn QVector3D &QVector3D::operator*=(const QVector3D& vector) + \overload + + Multiplies the components of this vector by the corresponding + components in \a vector. + + Note: this is not the same as the crossProduct() of this + vector and \a vector. + + \sa crossProduct() +*/ + +/*! + \fn QVector3D &QVector3D::operator/=(qreal divisor) + + Divides this vector's coordinates by the given \a divisor, and + returns a reference to this vector. + + \sa operator*=() +*/ + +/*! + Returns the dot product of \a v1 and \a v2. +*/ +qreal QVector3D::dotProduct(const QVector3D& v1, const QVector3D& v2) +{ + return qvtdot64(qvtmul64(v1.xp, v2.xp) + qvtmul64(v1.yp, v2.yp) + qvtmul64(v1.zp, v2.zp)); +} + +/*! + Returns the cross-product of vectors \a v1 and \a v2, which corresponds + to the normal vector of a plane defined by \a v1 and \a v2. + + \sa normal() +*/ +QVector3D QVector3D::crossProduct(const QVector3D& v1, const QVector3D& v2) +{ + return QVector3D(v1.yp * v2.zp - v1.zp * v2.yp, + v1.zp * v2.xp - v1.xp * v2.zp, + v1.xp * v2.yp - v1.yp * v2.xp, 1); +} + +/*! + Returns the normal vector of a plane defined by vectors \a v1 and \a v2, + normalized to be a unit vector. + + Use crossProduct() to compute the cross-product of \a v1 and \a v2 if you + do not need the result to be normalized to a unit vector. + + \sa crossProduct(), distanceToPlane() +*/ +QVector3D QVector3D::normal(const QVector3D& v1, const QVector3D& v2) +{ + return crossProduct(v1, v2).normalized(); +} + +/*! + \overload + + Returns the normal vector of a plane defined by vectors + \a v2 - \a v1 and \a v3 - \a v1, normalized to be a unit vector. + + Use crossProduct() to compute the cross-product of \a v2 - \a v1 and + \a v3 - \a v1 if you do not need the result to be normalized to a + unit vector. + + \sa crossProduct(), distanceToPlane() +*/ +QVector3D QVector3D::normal + (const QVector3D& v1, const QVector3D& v2, const QVector3D& v3) +{ + return crossProduct((v2 - v1), (v3 - v1)).normalized(); +} + +/*! + Returns the distance from this vertex to a plane defined by + the vertex \a plane and a \a normal unit vector. The \a normal + parameter is assumed to have been normalized to a unit vector. + + The return value will be negative if the vertex is below the plane, + or zero if it is on the plane. + + \sa normal(), distanceToLine() +*/ +qreal QVector3D::distanceToPlane + (const QVector3D& plane, const QVector3D& normal) const +{ + return dotProduct(*this - plane, normal); +} + +/*! + \overload + + Returns the distance from this vertex a plane defined by + the vertices \a plane1, \a plane2 and \a plane3. + + The return value will be negative if the vertex is below the plane, + or zero if it is on the plane. + + The two vectors that define the plane are \a plane2 - \a plane1 + and \a plane3 - \a plane1. + + \sa normal(), distanceToLine() +*/ +qreal QVector3D::distanceToPlane + (const QVector3D& plane1, const QVector3D& plane2, const QVector3D& plane3) const +{ + QVector3D n = normal(plane2 - plane1, plane3 - plane1); + return dotProduct(*this - plane1, n); +} + +/*! + Returns the distance that this vertex is from a line defined + by \a point and the unit vector \a direction. + + If \a direction is a null vector, then it does not define a line. + In that case, the distance from \a point to this vertex is returned. + + \sa distanceToPlane() +*/ +qreal QVector3D::distanceToLine + (const QVector3D& point, const QVector3D& direction) const +{ + if (direction.isNull()) + return (*this - point).length(); + QVector3D p = point + dotProduct(*this - point, direction) * direction; + return (*this - p).length(); +} + +/*! + \fn bool operator==(const QVector3D &v1, const QVector3D &v2) + \relates QVector3D + + Returns true if \a v1 is equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn bool operator!=(const QVector3D &v1, const QVector3D &v2) + \relates QVector3D + + Returns true if \a v1 is not equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn const QVector3D operator+(const QVector3D &v1, const QVector3D &v2) + \relates QVector3D + + Returns a QVector3D object that is the sum of the given vectors, \a v1 + and \a v2; each component is added separately. + + \sa QVector3D::operator+=() +*/ + +/*! + \fn const QVector3D operator-(const QVector3D &v1, const QVector3D &v2) + \relates QVector3D + + Returns a QVector3D object that is formed by subtracting \a v2 from \a v1; + each component is subtracted separately. + + \sa QVector3D::operator-=() +*/ + +/*! + \fn const QVector3D operator*(qreal factor, const QVector3D &vector) + \relates QVector3D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector3D::operator*=() +*/ + +/*! + \fn const QVector3D operator*(const QVector3D &vector, qreal factor) + \relates QVector3D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector3D::operator*=() +*/ + +/*! + \fn const QVector3D operator*(const QVector3D &v1, const QVector3D& v2) + \relates QVector3D + + Multiplies the components of \a v1 by the corresponding components in \a v2. + + Note: this is not the same as the crossProduct() of \a v1 and \a v2. + + \sa QVector3D::crossProduct() +*/ + +/*! + \fn const QVector3D operator-(const QVector3D &vector) + \relates QVector3D + \overload + + Returns a QVector3D object that is formed by changing the sign of + all three components of the given \a vector. + + Equivalent to \c {QVector3D(0,0,0) - vector}. +*/ + +/*! + \fn const QVector3D operator/(const QVector3D &vector, qreal divisor) + \relates QVector3D + + Returns the QVector3D object formed by dividing all three components of + the given \a vector by the given \a divisor. + + \sa QVector3D::operator/=() +*/ + +/*! + \fn bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2) + \relates QVector3D + + Returns true if \a v1 and \a v2 are equal, allowing for a small + fuzziness factor for floating-point comparisons; false otherwise. +*/ + +#ifndef QT_NO_VECTOR2D + +/*! + Returns the 2D vector form of this 3D vector, dropping the z coordinate. + + \sa toVector4D(), toPoint() +*/ +QVector2D QVector3D::toVector2D() const +{ + return QVector2D(xp, yp, 1); +} + +#endif + +#ifndef QT_NO_VECTOR4D + +/*! + Returns the 4D form of this 3D vector, with the w coordinate set to zero. + + \sa toVector2D(), toPoint() +*/ +QVector4D QVector3D::toVector4D() const +{ + return QVector4D(xp, yp, zp, 0.0f, 1); +} + +#endif + +/*! + \fn QPoint QVector3D::toPoint() const + + Returns the QPoint form of this 3D vector. + + \sa toPointF(), toVector2D() +*/ + +/*! + \fn QPointF QVector3D::toPointF() const + + Returns the QPointF form of this 3D vector. + + \sa toPoint(), toVector2D() +*/ + +/*! + Returns the length of the vector from the origin. + + \sa lengthSquared(), normalized() +*/ +qreal QVector3D::length() const +{ + return qvtsqrt64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + qvtmul64(zp, zp)); +} + +/*! + Returns the squared length of the vector from the origin. + This is equivalent to the dot product of the vector with itself. + + \sa length(), dotProduct() +*/ +qreal QVector3D::lengthSquared() const +{ + return qvtdot64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + qvtmul64(zp, zp)); +} + +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug dbg, const QVector3D &vector) +{ + dbg.nospace() << "QVector3D(" + << vector.x() << ", " << vector.y() << ", " << vector.z() << ')'; + return dbg.space(); +} + +#endif + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h new file mode 100644 index 0000000..dd1d014 --- /dev/null +++ b/src/gui/math3d/qvector3d.h @@ -0,0 +1,266 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QVECTOR3D_H +#define QVECTOR3D_H + +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QMatrix4x4; +class QVector2D; +class QVector4D; +class QQuaternion; + +#ifndef QT_NO_VECTOR3D + +class Q_GUI_EXPORT QVector3D +{ +public: + QVector3D(); + QVector3D(qreal xpos, qreal ypos, qreal zpos); + QVector3D(int xpos, int ypos, int zpos); + explicit QVector3D(const QPoint& point); + explicit QVector3D(const QPointF& point); +#ifndef QT_NO_VECTOR2D + QVector3D(const QVector2D& vector); + QVector3D(const QVector2D& vector, qreal zpos); +#endif +#ifndef QT_NO_VECTOR4D + explicit QVector3D(const QVector4D& vector); +#endif + + bool isNull() const; + + qreal x() const; + qreal y() const; + qreal z() const; + + void setX(qreal x); + void setY(qreal y); + void setZ(qreal z); + + qreal length() const; + qreal lengthSquared() const; + + QVector3D normalized() const; + void normalize(); + + QVector3D &operator+=(const QVector3D &vector); + QVector3D &operator-=(const QVector3D &vector); + QVector3D &operator*=(qreal factor); + QVector3D &operator*=(const QVector3D& vector); + QVector3D &operator/=(qreal divisor); + + static qreal dotProduct(const QVector3D& v1, const QVector3D& v2); + static QVector3D crossProduct(const QVector3D& v1, const QVector3D& v2); + static QVector3D normal(const QVector3D& v1, const QVector3D& v2); + static QVector3D normal + (const QVector3D& v1, const QVector3D& v2, const QVector3D& v3); + + qreal distanceToPlane(const QVector3D& plane, const QVector3D& normal) const; + qreal distanceToPlane(const QVector3D& plane1, const QVector3D& plane2, const QVector3D& plane3) const; + qreal distanceToLine(const QVector3D& point, const QVector3D& direction) const; + + friend inline bool operator==(const QVector3D &v1, const QVector3D &v2); + friend inline bool operator!=(const QVector3D &v1, const QVector3D &v2); + friend inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2); + friend inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2); + friend inline const QVector3D operator*(qreal factor, const QVector3D &vector); + friend inline const QVector3D operator*(const QVector3D &vector, qreal factor); + friend const QVector3D operator*(const QVector3D &v1, const QVector3D& v2); + friend inline const QVector3D operator-(const QVector3D &vector); + friend inline const QVector3D operator/(const QVector3D &vector, qreal divisor); + + friend inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2); + +#ifndef QT_NO_VECTOR2D + QVector2D toVector2D() const; +#endif +#ifndef QT_NO_VECTOR4D + QVector4D toVector4D() const; +#endif + + QPoint toPoint() const; + QPointF toPointF() const; + +private: + qrealinner xp, yp, zp; + + QVector3D(qrealinner xpos, qrealinner ypos, qrealinner zpos, int dummy); + + friend class QVector2D; + friend class QVector4D; + friend class QQuaternion; + friend class QMatrix4x4; + friend class QVertexArray; + friend class QGLPainter; +#ifndef QT_NO_MATRIX4X4 + friend QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix); + friend QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector); +#endif +}; + +inline QVector3D::QVector3D() : xp(0.0f), yp(0.0f), zp(0.0f) {} + +inline QVector3D::QVector3D(qreal xpos, qreal ypos, qreal zpos) : xp(xpos), yp(ypos), zp(zpos) {} + +inline QVector3D::QVector3D(qrealinner xpos, qrealinner ypos, qrealinner zpos, int) : xp(xpos), yp(ypos), zp(zpos) {} + +inline QVector3D::QVector3D(int xpos, int ypos, int zpos) : xp(xpos), yp(ypos), zp(zpos) {} + +inline QVector3D::QVector3D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} + +inline QVector3D::QVector3D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f) {} + +inline bool QVector3D::isNull() const +{ + return qIsNull(xp) && qIsNull(yp) && qIsNull(zp); +} + +inline qreal QVector3D::x() const { return qt_math3d_convert(xp); } +inline qreal QVector3D::y() const { return qt_math3d_convert(yp); } +inline qreal QVector3D::z() const { return qt_math3d_convert(zp); } + +inline void QVector3D::setX(qreal x) { xp = x; } +inline void QVector3D::setY(qreal y) { yp = y; } +inline void QVector3D::setZ(qreal z) { zp = z; } + +inline QVector3D &QVector3D::operator+=(const QVector3D &vector) +{ + xp += vector.xp; + yp += vector.yp; + zp += vector.zp; + return *this; +} + +inline QVector3D &QVector3D::operator-=(const QVector3D &vector) +{ + xp -= vector.xp; + yp -= vector.yp; + zp -= vector.zp; + return *this; +} + +inline QVector3D &QVector3D::operator*=(qreal factor) +{ + qrealinner f(factor); + xp *= f; + yp *= f; + zp *= f; + return *this; +} + +inline QVector3D &QVector3D::operator*=(const QVector3D& vector) +{ + xp *= vector.xp; + yp *= vector.yp; + zp *= vector.zp; + return *this; +} + +inline QVector3D &QVector3D::operator/=(qreal divisor) +{ + qrealinner d(divisor); + xp /= d; + yp /= d; + zp /= d; + return *this; +} + +inline bool operator==(const QVector3D &v1, const QVector3D &v2) +{ + return v1.xp == v2.xp && v1.yp == v2.yp && v1.zp == v2.zp; +} + +inline bool operator!=(const QVector3D &v1, const QVector3D &v2) +{ + return v1.xp != v2.xp || v1.yp != v2.yp || v1.zp != v2.zp; +} + +inline const QVector3D operator+(const QVector3D &v1, const QVector3D &v2) +{ + return QVector3D(v1.xp + v2.xp, v1.yp + v2.yp, v1.zp + v2.zp, 1); +} + +inline const QVector3D operator-(const QVector3D &v1, const QVector3D &v2) +{ + return QVector3D(v1.xp - v2.xp, v1.yp - v2.yp, v1.zp - v2.zp, 1); +} + +inline const QVector3D operator*(qreal factor, const QVector3D &vector) +{ + qrealinner f(factor); + return QVector3D(vector.xp * f, vector.yp * f, vector.zp * f, 1); +} + +inline const QVector3D operator*(const QVector3D &vector, qreal factor) +{ + qrealinner f(factor); + return QVector3D(vector.xp * f, vector.yp * f, vector.zp * f, 1); +} + +inline const QVector3D operator*(const QVector3D &v1, const QVector3D& v2) +{ + return QVector3D(v1.xp * v2.xp, v1.yp * v2.yp, v1.zp * v2.zp, 1); +} + +inline const QVector3D operator-(const QVector3D &vector) +{ + return QVector3D(-vector.xp, -vector.yp, -vector.zp, 1); +} + +inline const QVector3D operator/(const QVector3D &vector, qreal divisor) +{ + qrealinner d(divisor); + return QVector3D(vector.xp / d, vector.yp / d, vector.zp / d, 1); +} + +inline bool qFuzzyCompare(const QVector3D& v1, const QVector3D& v2) +{ + return qFuzzyCompare(v1.xp, v2.xp) && + qFuzzyCompare(v1.yp, v2.yp) && + qFuzzyCompare(v1.zp, v2.zp); +} + +inline QPoint QVector3D::toPoint() const +{ + return QPoint(qRound(xp), qRound(yp)); +} + +inline QPointF QVector3D::toPointF() const +{ + return QPointF(qt_math3d_convert(xp), + qt_math3d_convert(yp)); +} + +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector3D &vector); +#endif + +#endif + +QT_END_NAMESPACE + +#ifndef QT_NO_VECTOR3D +Q_DECLARE_METATYPE(QVector3D) +#endif + +QT_END_HEADER + +#endif diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp new file mode 100644 index 0000000..1239df0 --- /dev/null +++ b/src/gui/math3d/qvector4d.cpp @@ -0,0 +1,491 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "qvector4d.h" +#include "qvector3d.h" +#include "qvector2d.h" +#include "qmath3dutil_p.h" + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_VECTOR4D + +/*! + \class QVector4D + \brief The QVector4D class represents a vector or vertex in 4D space. + \since 4.6 + + The QVector4D class can also be used to represent vertices in 4D space. + We therefore do not need to provide a separate vertex class. + + The coordinates are stored internally using the most efficient + representation for the GL rendering engine, which will be either + floating-point or fixed-point. + + \sa QQuaternion, QVector2D, QVector3D +*/ + +/*! + \fn QVector4D::QVector4D() + + Constructs a null vector, i.e. with coordinates (0, 0, 0, 0). +*/ + +/*! + \fn QVector4D::QVector4D(qreal xpos, qreal ypos, qreal zpos, qreal wpos) + + Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos, \a wpos). +*/ + +/*! + \fn QVector4D::QVector4D(int xpos, int ypos, int zpos, int wpos) + + Constructs a vector with coordinates (\a xpos, \a ypos, \a zpos, \a wpos). +*/ + +/*! + \fn QVector4D::QVector4D(const QPoint& point) + + Constructs a vector with x and y coordinates from a 2D \a point, and + z and w coordinates of 0. +*/ + +/*! + \fn QVector4D::QVector4D(const QPointF& point) + + Constructs a vector with x and y coordinates from a 2D \a point, and + z and w coordinates of 0. +*/ + +#ifndef QT_NO_VECTOR2D + +/*! + Constructs a 4D vector from the specified 2D \a vector. The z + and w coordinates are set to zero. + + \sa toVector2D() +*/ +QVector4D::QVector4D(const QVector2D& vector) +{ + xp = vector.xp; + yp = vector.yp; + zp = 0.0f; + wp = 0.0f; +} + +/*! + Constructs a 4D vector from the specified 2D \a vector. The z + and w coordinates are set to \a zpos and \a wpos respectively. + + \sa toVector2D() +*/ +QVector4D::QVector4D(const QVector2D& vector, qreal zpos, qreal wpos) +{ + xp = vector.xp; + yp = vector.yp; + zp = zpos; + wp = wpos; +} + +#endif + +#ifndef QT_NO_VECTOR3D + +/*! + Constructs a 4D vector from the specified 3D \a vector. The w + coordinate is set to zero. + + \sa toVector3D() +*/ +QVector4D::QVector4D(const QVector3D& vector) +{ + xp = vector.xp; + yp = vector.yp; + zp = vector.zp; + wp = 0.0f; +} + +/*! + Constructs a 4D vector from the specified 3D \a vector. The w + coordinate is set to \a wpos. + + \sa toVector3D() +*/ +QVector4D::QVector4D(const QVector3D& vector, qreal wpos) +{ + xp = vector.xp; + yp = vector.yp; + zp = vector.zp; + wp = wpos; +} + +#endif + +/*! + \fn bool QVector4D::isNull() const + + Returns true if the x, y, z, and w coordinates are set to 0.0, + otherwise returns false. +*/ + +/*! + \fn qreal QVector4D::x() const + + Returns the x coordinate of this point. + + \sa setX(), y(), z(), w() +*/ + +/*! + \fn qreal QVector4D::y() const + + Returns the y coordinate of this point. + + \sa setY(), x(), z(), w() +*/ + +/*! + \fn qreal QVector4D::z() const + + Returns the z coordinate of this point. + + \sa setZ(), x(), y(), w() +*/ + +/*! + \fn qreal QVector4D::w() const + + Returns the w coordinate of this point. + + \sa setW(), x(), y(), z() +*/ + +/*! + \fn void QVector4D::setX(qreal x) + + Sets the x coordinate of this point to the given \a x coordinate. + + \sa x(), setY(), setZ(), setW() +*/ + +/*! + \fn void QVector4D::setY(qreal y) + + Sets the y coordinate of this point to the given \a y coordinate. + + \sa y(), setX(), setZ(), setW() +*/ + +/*! + \fn void QVector4D::setZ(qreal z) + + Sets the z coordinate of this point to the given \a z coordinate. + + \sa z(), setX(), setY(), setW() +*/ + +/*! + \fn void QVector4D::setW(qreal w) + + Sets the w coordinate of this point to the given \a w coordinate. + + \sa w(), setX(), setY(), setZ() +*/ + +/*! + Returns the length of the vector from the origin. + + \sa lengthSquared(), normalized() +*/ +qreal QVector4D::length() const +{ + return qvtsqrt64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + + qvtmul64(zp, zp) + qvtmul64(wp, wp)); +} + +/*! + Returns the squared length of the vector from the origin. + This is equivalent to the dot product of the vector with itself. + + \sa length(), dotProduct() +*/ +qreal QVector4D::lengthSquared() const +{ + return qvtdot64(qvtmul64(xp, xp) + qvtmul64(yp, yp) + + qvtmul64(zp, zp) + qvtmul64(wp, wp)); +} + +/*! + Returns the normalized unit vector form of this vector. If this vector + is not null, the returned vector is guaranteed to be 1.0 in length. + If this vector is null, then a null vector is returned. + + \sa length(), normalize() +*/ +QVector4D QVector4D::normalized() const +{ + qreal len = length(); + if (!qIsNull(len)) + return *this / len; + else + return QVector4D(); +} + +/*! + Normalizes the currect vector in place. Nothing happens if this + vector is a null vector. + + \sa length(), normalized() +*/ +void QVector4D::normalize() +{ + qreal len = length(); + if (qIsNull(len)) + return; + + xp /= len; + yp /= len; + zp /= len; + wp /= len; +} + + +/*! + \fn QVector4D &QVector4D::operator+=(const QVector4D &vector) + + Adds the given \a vector to this vector and returns a reference to + this vector. + + \sa operator-=() +*/ + +/*! + \fn QVector4D &QVector4D::operator-=(const QVector4D &vector) + + Subtracts the given \a vector from this vector and returns a reference to + this vector. + + \sa operator+=() +*/ + +/*! + \fn QVector4D &QVector4D::operator*=(qreal factor) + + Multiplies this vector's coordinates by the given \a factor, and + returns a reference to this vector. + + \sa operator/=() +*/ + +/*! + \fn QVector4D &QVector4D::operator*=(const QVector4D &vector) + + Multiplies the components of this vector by the corresponding + components in \a vector. +*/ + +/*! + \fn QVector4D &QVector4D::operator/=(qreal divisor) + + Divides this vector's coordinates by the given \a divisor, and + returns a reference to this vector. + + \sa operator*=() +*/ + +/*! + Returns the dot product of \a v1 and \a v2. +*/ +qreal QVector4D::dotProduct(const QVector4D& v1, const QVector4D& v2) +{ + return qvtdot64(qvtmul64(v1.xp, v2.xp) + qvtmul64(v1.yp, v2.yp) + + qvtmul64(v1.zp, v2.zp) + qvtmul64(v1.wp, v2.wp)); +} + +/*! + \fn bool operator==(const QVector4D &v1, const QVector4D &v2) + \relates QVector4D + + Returns true if \a v1 is equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn bool operator!=(const QVector4D &v1, const QVector4D &v2) + \relates QVector4D + + Returns true if \a v1 is not equal to \a v2; otherwise returns false. + This operator uses an exact floating-point comparison. +*/ + +/*! + \fn const QVector4D operator+(const QVector4D &v1, const QVector4D &v2) + \relates QVector4D + + Returns a QVector4D object that is the sum of the given vectors, \a v1 + and \a v2; each component is added separately. + + \sa QVector4D::operator+=() +*/ + +/*! + \fn const QVector4D operator-(const QVector4D &v1, const QVector4D &v2) + \relates QVector4D + + Returns a QVector4D object that is formed by subtracting \a v2 from \a v1; + each component is subtracted separately. + + \sa QVector4D::operator-=() +*/ + +/*! + \fn const QVector4D operator*(qreal factor, const QVector4D &vector) + \relates QVector4D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector4D::operator*=() +*/ + +/*! + \fn const QVector4D operator*(const QVector4D &vector, qreal factor) + \relates QVector4D + + Returns a copy of the given \a vector, multiplied by the given \a factor. + + \sa QVector4D::operator*=() +*/ + +/*! + \fn const QVector4D operator*(const QVector4D &v1, const QVector4D& v2) + \relates QVector4D + + Returns the vector consisting of the multiplication of the + components from \a v1 and \a v2. + + \sa QVector4D::operator*=() +*/ + +/*! + \fn const QVector4D operator-(const QVector4D &vector) + \relates QVector4D + \overload + + Returns a QVector4D object that is formed by changing the sign of + all three components of the given \a vector. + + Equivalent to \c {QVector4D(0,0,0,0) - vector}. +*/ + +/*! + \fn const QVector4D operator/(const QVector4D &vector, qreal divisor) + \relates QVector4D + + Returns the QVector4D object formed by dividing all four components of + the given \a vector by the given \a divisor. + + \sa QVector4D::operator/=() +*/ + +/*! + \fn bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2) + \relates QVector4D + + Returns true if \a v1 and \a v2 are equal, allowing for a small + fuzziness factor for floating-point comparisons; false otherwise. +*/ + +#ifndef QT_NO_VECTOR2D + +/*! + Returns the 2D vector form of this 4D vector, dropping the z and w coordinates. + + \sa toVector2DAffine(), toVector3D(), toPoint() +*/ +QVector2D QVector4D::toVector2D() const +{ + return QVector2D(xp, yp, 1); +} + +/*! + Returns the 2D vector form of this 4D vector, dividing the x and y + coordinates by the w coordinate and dropping the z coordinate. + Returns a null vector if w is zero. + + \sa toVector2D(), toVector3DAffine(), toPoint() +*/ +QVector2D QVector4D::toVector2DAffine() const +{ + if (qIsNull(wp)) + return QVector2D(); + return QVector2D(xp / wp, yp / wp, 1); +} + +#endif + +#ifndef QT_NO_VECTOR3D + +/*! + Returns the 3D vector form of this 4D vector, dropping the w coordinate. + + \sa toVector3DAffine(), toVector2D(), toPoint() +*/ +QVector3D QVector4D::toVector3D() const +{ + return QVector3D(xp, yp, zp, 1); +} + +/*! + Returns the 3D vector form of this 4D vector, dividing the x, y, and + z coordinates by the w coordinate. Returns a null vector if w is zero. + + \sa toVector3D(), toVector2DAffine(), toPoint() +*/ +QVector3D QVector4D::toVector3DAffine() const +{ + if (qIsNull(wp)) + return QVector3D(); + return QVector3D(xp / wp, yp / wp, zp / wp, 1); +} + +#endif + +/*! + \fn QPoint QVector4D::toPoint() const + + Returns the QPoint form of this 4D vector. + + \sa toPointF(), toVector2D() +*/ + +/*! + \fn QPointF QVector4D::toPointF() const + + Returns the QPointF form of this 4D vector. + + \sa toPoint(), toVector2D() +*/ + +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug dbg, const QVector4D &vector) +{ + dbg.nospace() << "QVector4D(" + << vector.x() << ", " << vector.y() << ", " + << vector.z() << ", " << vector.w() << ')'; + return dbg.space(); +} + +#endif + +#endif + +QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h new file mode 100644 index 0000000..078c328 --- /dev/null +++ b/src/gui/math3d/qvector4d.h @@ -0,0 +1,270 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef QVECTOR4D_H +#define QVECTOR4D_H + +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QMatrix4x4; +class QVector2D; +class QVector3D; +class QQuaternion; + +#ifndef QT_NO_VECTOR4D + +class Q_GUI_EXPORT QVector4D +{ +public: + QVector4D(); + QVector4D(qreal xpos, qreal ypos, qreal zpos, qreal wpos); + QVector4D(int xpos, int ypos, int zpos, int wpos); + explicit QVector4D(const QPoint& point); + explicit QVector4D(const QPointF& point); +#ifndef QT_NO_VECTOR2D + QVector4D(const QVector2D& vector); + QVector4D(const QVector2D& vector, qreal zpos, qreal wpos); +#endif +#ifndef QT_NO_VECTOR3D + QVector4D(const QVector3D& vector); + QVector4D(const QVector3D& vector, qreal wpos); +#endif + + bool isNull() const; + + qreal x() const; + qreal y() const; + qreal z() const; + qreal w() const; + + void setX(qreal x); + void setY(qreal y); + void setZ(qreal z); + void setW(qreal w); + + qreal length() const; + qreal lengthSquared() const; + + QVector4D normalized() const; + void normalize(); + + QVector4D &operator+=(const QVector4D &vector); + QVector4D &operator-=(const QVector4D &vector); + QVector4D &operator*=(qreal factor); + QVector4D &operator*=(const QVector4D &vector); + QVector4D &operator/=(qreal divisor); + + static qreal dotProduct(const QVector4D& v1, const QVector4D& v2); + + friend inline bool operator==(const QVector4D &v1, const QVector4D &v2); + friend inline bool operator!=(const QVector4D &v1, const QVector4D &v2); + friend inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2); + friend inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2); + friend inline const QVector4D operator*(qreal factor, const QVector4D &vector); + friend inline const QVector4D operator*(const QVector4D &vector, qreal factor); + friend inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2); + friend inline const QVector4D operator-(const QVector4D &vector); + friend inline const QVector4D operator/(const QVector4D &vector, qreal divisor); + + friend inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2); + +#ifndef QT_NO_VECTOR2D + QVector2D toVector2D() const; + QVector2D toVector2DAffine() const; +#endif +#ifndef QT_NO_VECTOR3D + QVector3D toVector3D() const; + QVector3D toVector3DAffine() const; +#endif + + QPoint toPoint() const; + QPointF toPointF() const; + +private: + qrealinner xp, yp, zp, wp; + + QVector4D(qrealinner xpos, qrealinner ypos, qrealinner zpos, qrealinner wpos, int dummy); + + friend class QVector2D; + friend class QVector3D; + friend class QQuaternion; + friend class QMatrix4x4; + friend class QVertexArray; +#ifndef QT_NO_MATRIX4X4 + friend QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix); + friend QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector); +#endif +}; + +inline QVector4D::QVector4D() : xp(0.0f), yp(0.0f), zp(0.0f), wp(0.0f) {} + +inline QVector4D::QVector4D(qreal xpos, qreal ypos, qreal zpos, qreal wpos) : xp(xpos), yp(ypos), zp(zpos), wp(wpos) {} + +inline QVector4D::QVector4D(qrealinner xpos, qrealinner ypos, qrealinner zpos, qrealinner wpos, int) : xp(xpos), yp(ypos), zp(zpos), wp(wpos) {} + +inline QVector4D::QVector4D(int xpos, int ypos, int zpos, int wpos) : xp(xpos), yp(ypos), zp(zpos), wp(wpos) {} + +inline QVector4D::QVector4D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} + +inline QVector4D::QVector4D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {} + +inline bool QVector4D::isNull() const +{ + return qIsNull(xp) && qIsNull(yp) && qIsNull(zp) && qIsNull(wp); +} + +inline qreal QVector4D::x() const { return qt_math3d_convert(xp); } +inline qreal QVector4D::y() const { return qt_math3d_convert(yp); } +inline qreal QVector4D::z() const { return qt_math3d_convert(zp); } +inline qreal QVector4D::w() const { return qt_math3d_convert(wp); } + +inline void QVector4D::setX(qreal x) { xp = x; } +inline void QVector4D::setY(qreal y) { yp = y; } +inline void QVector4D::setZ(qreal z) { zp = z; } +inline void QVector4D::setW(qreal w) { wp = w; } + +inline QVector4D &QVector4D::operator+=(const QVector4D &vector) +{ + xp += vector.xp; + yp += vector.yp; + zp += vector.zp; + wp += vector.wp; + return *this; +} + +inline QVector4D &QVector4D::operator-=(const QVector4D &vector) +{ + xp -= vector.xp; + yp -= vector.yp; + zp -= vector.zp; + wp -= vector.wp; + return *this; +} + +inline QVector4D &QVector4D::operator*=(qreal factor) +{ + qrealinner f(factor); + xp *= f; + yp *= f; + zp *= f; + wp *= f; + return *this; +} + +inline QVector4D &QVector4D::operator*=(const QVector4D &vector) +{ + xp *= vector.xp; + yp *= vector.yp; + zp *= vector.zp; + wp *= vector.wp; + return *this; +} + +inline QVector4D &QVector4D::operator/=(qreal divisor) +{ + qrealinner d(divisor); + xp /= d; + yp /= d; + zp /= d; + wp /= d; + return *this; +} + +inline bool operator==(const QVector4D &v1, const QVector4D &v2) +{ + return v1.xp == v2.xp && v1.yp == v2.yp && v1.zp == v2.zp && v1.wp == v2.wp; +} + +inline bool operator!=(const QVector4D &v1, const QVector4D &v2) +{ + return v1.xp != v2.xp || v1.yp != v2.yp || v1.zp != v2.zp || v1.wp != v2.wp; +} + +inline const QVector4D operator+(const QVector4D &v1, const QVector4D &v2) +{ + return QVector4D(v1.xp + v2.xp, v1.yp + v2.yp, v1.zp + v2.zp, v1.wp + v2.wp, 1); +} + +inline const QVector4D operator-(const QVector4D &v1, const QVector4D &v2) +{ + return QVector4D(v1.xp - v2.xp, v1.yp - v2.yp, v1.zp - v2.zp, v1.wp - v2.wp, 1); +} + +inline const QVector4D operator*(qreal factor, const QVector4D &vector) +{ + qrealinner f(factor); + return QVector4D(vector.xp * f, vector.yp * f, vector.zp * f, vector.wp * f, 1); +} + +inline const QVector4D operator*(const QVector4D &vector, qreal factor) +{ + qrealinner f(factor); + return QVector4D(vector.xp * f, vector.yp * f, vector.zp * f, vector.wp * f, 1); +} + +inline const QVector4D operator*(const QVector4D &v1, const QVector4D& v2) +{ + return QVector4D(v1.xp * v2.xp, v1.yp * v2.yp, v1.zp * v2.zp, v1.wp * v2.wp, 1); +} + +inline const QVector4D operator-(const QVector4D &vector) +{ + return QVector4D(-vector.xp, -vector.yp, -vector.zp, -vector.wp, 1); +} + +inline const QVector4D operator/(const QVector4D &vector, qreal divisor) +{ + qrealinner d(divisor); + return QVector4D(vector.xp / d, vector.yp / d, vector.zp / d, vector.wp / d, 1); +} + +inline bool qFuzzyCompare(const QVector4D& v1, const QVector4D& v2) +{ + return qFuzzyCompare(v1.xp, v2.xp) && + qFuzzyCompare(v1.yp, v2.yp) && + qFuzzyCompare(v1.zp, v2.zp) && + qFuzzyCompare(v1.wp, v2.wp); +} + +inline QPoint QVector4D::toPoint() const +{ + return QPoint(qRound(xp), qRound(yp)); +} + +inline QPointF QVector4D::toPointF() const +{ + return QPointF(qt_math3d_convert(xp), + qt_math3d_convert(yp)); +} + +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector4D &vector); +#endif + +#endif + +QT_END_NAMESPACE + +#ifndef QT_NO_VECTOR4D +Q_DECLARE_METATYPE(QVector4D) +#endif + +QT_END_HEADER + +#endif diff --git a/src/opengl/gl2paintengineex/qglshader_p.h b/src/opengl/gl2paintengineex/qglshader_p.h index 1625b84..64c9a42 100644 --- a/src/opengl/gl2paintengineex/qglshader_p.h +++ b/src/opengl/gl2paintengineex/qglshader_p.h @@ -81,6 +81,8 @@ SAMPLER_2D_SHADOW. #include +#define QGLShader QGLEngineShader +#define QGLShaderProgram QGLEngineShaderProgram typedef struct { GLfloat a; diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 48d7caf..5be48ba 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -25,14 +25,16 @@ HEADERS += qgl.h \ qglcolormap.h \ qglpixelbuffer.h \ qglframebufferobject.h \ - qglpixmapfilter_p.h + qglpixmapfilter_p.h \ + qglshaderprogram.h SOURCES += qgl.cpp \ qglcolormap.cpp \ qglpixelbuffer.cpp \ qglframebufferobject.cpp \ qglextensions.cpp \ - qglpixmapfilter.cpp + qglpixmapfilter.cpp \ + qglshaderprogram.cpp !contains(QT_CONFIG, opengles2) { HEADERS += qpaintengine_opengl_p.h diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index 8357cf9..5ba669b 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -150,36 +150,158 @@ bool qt_resolve_buffer_extensions(QGLContext *ctx) bool qt_resolve_glsl_extensions(QGLContext *ctx) { +#if defined(QT_OPENGL_ES_2) + // The GLSL shader functions are always present in OpenGL/ES 2.0. + // The only exceptions are glGetProgramBinaryOES and glProgramBinaryOES. + if (!QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glslResolved) { + glGetProgramBinaryOES = (_glGetProgramBinaryOES) ctx->getProcAddress(QLatin1String("glGetProgramBinaryOES")); + glProgramBinaryOES = (_glProgramBinaryOES) ctx->getProcAddress(QLatin1String("glProgramBinaryOES")); + QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glslResolved = true; + } + return true; +#else if (glCreateShader) return true; glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader")); - glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); - glCompileShader = (_glCompileShader) ctx->getProcAddress(QLatin1String("glCompileShader")); - glDeleteShader = (_glDeleteShader) ctx->getProcAddress(QLatin1String("glDeleteShader")); - - glCreateProgram = (_glCreateProgram) ctx->getProcAddress(QLatin1String("glCreateProgram")); - glAttachShader = (_glAttachShader) ctx->getProcAddress(QLatin1String("glAttachShader")); - glDetachShader = (_glDetachShader) ctx->getProcAddress(QLatin1String("glDetachShader")); - glLinkProgram = (_glLinkProgram) ctx->getProcAddress(QLatin1String("glLinkProgram")); - glUseProgram = (_glUseProgram) ctx->getProcAddress(QLatin1String("glUseProgram")); - glDeleteProgram = (_glDeleteProgram) ctx->getProcAddress(QLatin1String("glDeleteProgram")); - - glGetShaderInfoLog = (_glGetShaderInfoLog) ctx->getProcAddress(QLatin1String("glGetShaderInfoLog")); - glGetShaderiv = (_glGetShaderiv) ctx->getProcAddress(QLatin1String("glGetShaderiv")); - glGetProgramiv = (_glGetProgramiv) ctx->getProcAddress(QLatin1String("glGetProgramiv")); - - glGetUniformLocation = (_glGetUniformLocation) ctx->getProcAddress(QLatin1String("glGetUniformLocation")); - glUniform4fv = (_glUniform4fv) ctx->getProcAddress(QLatin1String("glUniform4fv")); - glUniform3fv = (_glUniform3fv) ctx->getProcAddress(QLatin1String("glUniform3fv")); - glUniform2fv = (_glUniform2fv) ctx->getProcAddress(QLatin1String("glUniform2fv")); - glUniform1fv = (_glUniform1fv) ctx->getProcAddress(QLatin1String("glUniform1fv")); - glUniform1i = (_glUniform1i) ctx->getProcAddress(QLatin1String("glUniform1i")); - - return glCreateShader && glShaderSource && glCompileShader && glDeleteProgram && - glCreateProgram && glAttachShader && glDetachShader && glLinkProgram && glUseProgram && - glDeleteProgram && glGetShaderInfoLog && glGetShaderiv && glGetProgramiv && glGetUniformLocation && - glUniform1i && glUniform1fv && glUniform2fv && glUniform3fv && glUniform4fv; + if (glCreateShader) { + glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); + glShaderBinary = (_glShaderBinary) ctx->getProcAddress(QLatin1String("glShaderBinary")); + glCompileShader = (_glCompileShader) ctx->getProcAddress(QLatin1String("glCompileShader")); + glDeleteShader = (_glDeleteShader) ctx->getProcAddress(QLatin1String("glDeleteShader")); + glIsShader = (_glIsShader) ctx->getProcAddress(QLatin1String("glIsShader")); + + glCreateProgram = (_glCreateProgram) ctx->getProcAddress(QLatin1String("glCreateProgram")); + glAttachShader = (_glAttachShader) ctx->getProcAddress(QLatin1String("glAttachShader")); + glDetachShader = (_glDetachShader) ctx->getProcAddress(QLatin1String("glDetachShader")); + glLinkProgram = (_glLinkProgram) ctx->getProcAddress(QLatin1String("glLinkProgram")); + glUseProgram = (_glUseProgram) ctx->getProcAddress(QLatin1String("glUseProgram")); + glDeleteProgram = (_glDeleteProgram) ctx->getProcAddress(QLatin1String("glDeleteProgram")); + glIsProgram = (_glIsProgram) ctx->getProcAddress(QLatin1String("glIsProgram")); + + glGetShaderInfoLog = (_glGetShaderInfoLog) ctx->getProcAddress(QLatin1String("glGetShaderInfoLog")); + glGetShaderiv = (_glGetShaderiv) ctx->getProcAddress(QLatin1String("glGetShaderiv")); + glGetShaderSource = (_glGetShaderSource) ctx->getProcAddress(QLatin1String("glGetShaderSource")); + glGetProgramiv = (_glGetProgramiv) ctx->getProcAddress(QLatin1String("glGetProgramiv")); + glGetProgramInfoLog = (_glGetProgramInfoLog) ctx->getProcAddress(QLatin1String("glGetProgramInfoLog")); + + glGetUniformLocation = (_glGetUniformLocation) ctx->getProcAddress(QLatin1String("glGetUniformLocation")); + glUniform4fv = (_glUniform4fv) ctx->getProcAddress(QLatin1String("glUniform4fv")); + glUniform3fv = (_glUniform3fv) ctx->getProcAddress(QLatin1String("glUniform3fv")); + glUniform2fv = (_glUniform2fv) ctx->getProcAddress(QLatin1String("glUniform2fv")); + glUniform1fv = (_glUniform1fv) ctx->getProcAddress(QLatin1String("glUniform1fv")); + glUniform1i = (_glUniform1i) ctx->getProcAddress(QLatin1String("glUniform1i")); + glUniform1iv = (_glUniform1iv) ctx->getProcAddress(QLatin1String("glUniform1iv")); + glUniformMatrix2fv = (_glUniformMatrix2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2fv")); + glUniformMatrix3fv = (_glUniformMatrix3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3fv")); + glUniformMatrix4fv = (_glUniformMatrix4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4fv")); + glUniformMatrix2x3fv = (_glUniformMatrix2x3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2x3fv")); + glUniformMatrix2x4fv = (_glUniformMatrix2x4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2x4fv")); + glUniformMatrix3x2fv = (_glUniformMatrix3x2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3x2fv")); + glUniformMatrix3x4fv = (_glUniformMatrix3x4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3x4fv")); + glUniformMatrix4x2fv = (_glUniformMatrix4x2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4x2fv")); + glUniformMatrix4x3fv = (_glUniformMatrix4x3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4x3fv")); + + glBindAttribLocation = (_glBindAttribLocation) ctx->getProcAddress(QLatin1String("glBindAttribLocation")); + glGetAttribLocation = (_glGetAttribLocation) ctx->getProcAddress(QLatin1String("glGetAttribLocation")); + glVertexAttrib1fv = (_glVertexAttrib1fv) ctx->getProcAddress(QLatin1String("glVertexAttrib1fv")); + glVertexAttrib2fv = (_glVertexAttrib2fv) ctx->getProcAddress(QLatin1String("glVertexAttrib2fv")); + glVertexAttrib3fv = (_glVertexAttrib3fv) ctx->getProcAddress(QLatin1String("glVertexAttrib3fv")); + glVertexAttrib4fv = (_glVertexAttrib4fv) ctx->getProcAddress(QLatin1String("glVertexAttrib4fv")); + glVertexAttribPointer = (_glVertexAttribPointer) ctx->getProcAddress(QLatin1String("glVertexAttribPointer")); + glDisableVertexAttribArray = (_glDisableVertexAttribArray) ctx->getProcAddress(QLatin1String("glDisableVertexAttribArray")); + glEnableVertexAttribArray = (_glEnableVertexAttribArray) ctx->getProcAddress(QLatin1String("glEnableVertexAttribArray")); + } else { + // We may not have the standard shader functions, but we might + // have the older ARB functions instead. + glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShaderObjectARB")); + glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSourceARB")); + glShaderBinary = (_glShaderBinary) ctx->getProcAddress(QLatin1String("glShaderBinaryARB")); + glCompileShader = (_glCompileShader) ctx->getProcAddress(QLatin1String("glCompileShaderARB")); + glDeleteShader = (_glDeleteShader) ctx->getProcAddress(QLatin1String("glDeleteObjectARB")); + glIsShader = 0; + + glCreateProgram = (_glCreateProgram) ctx->getProcAddress(QLatin1String("glCreateProgramObjectARB")); + glAttachShader = (_glAttachShader) ctx->getProcAddress(QLatin1String("glAttachObjectARB")); + glDetachShader = (_glDetachShader) ctx->getProcAddress(QLatin1String("glDetachObjectARB")); + glLinkProgram = (_glLinkProgram) ctx->getProcAddress(QLatin1String("glLinkProgramARB")); + glUseProgram = (_glUseProgram) ctx->getProcAddress(QLatin1String("glUseProgramObjectARB")); + glDeleteProgram = (_glDeleteProgram) ctx->getProcAddress(QLatin1String("glDeleteObjectARB")); + glIsProgram = 0; + + glGetShaderInfoLog = (_glGetShaderInfoLog) ctx->getProcAddress(QLatin1String("glGetInfoLogARB")); + glGetShaderiv = (_glGetShaderiv) ctx->getProcAddress(QLatin1String("glGetObjectParameterivARB")); + glGetShaderSource = (_glGetShaderSource) ctx->getProcAddress(QLatin1String("glGetShaderSourceARB")); + glGetProgramiv = (_glGetProgramiv) ctx->getProcAddress(QLatin1String("glGetObjectParameterivARB")); + glGetProgramInfoLog = (_glGetProgramInfoLog) ctx->getProcAddress(QLatin1String("glGetInfoLogARB")); + + glGetUniformLocation = (_glGetUniformLocation) ctx->getProcAddress(QLatin1String("glGetUniformLocationARB")); + glUniform4fv = (_glUniform4fv) ctx->getProcAddress(QLatin1String("glUniform4fvARB")); + glUniform3fv = (_glUniform3fv) ctx->getProcAddress(QLatin1String("glUniform3fvARB")); + glUniform2fv = (_glUniform2fv) ctx->getProcAddress(QLatin1String("glUniform2fvARB")); + glUniform1fv = (_glUniform1fv) ctx->getProcAddress(QLatin1String("glUniform1fvARB")); + glUniform1i = (_glUniform1i) ctx->getProcAddress(QLatin1String("glUniform1iARB")); + glUniform1iv = (_glUniform1iv) ctx->getProcAddress(QLatin1String("glUniform1ivARB")); + glUniformMatrix2fv = (_glUniformMatrix2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2fvARB")); + glUniformMatrix3fv = (_glUniformMatrix3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3fvARB")); + glUniformMatrix4fv = (_glUniformMatrix4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4fvARB")); + glUniformMatrix2x3fv = (_glUniformMatrix2x3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2x3fvARB")); + glUniformMatrix2x4fv = (_glUniformMatrix2x4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2x4fvARB")); + glUniformMatrix3x2fv = (_glUniformMatrix3x2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3x2fvARB")); + glUniformMatrix3x4fv = (_glUniformMatrix3x4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3x4fvARB")); + glUniformMatrix4x2fv = (_glUniformMatrix4x2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4x2fvARB")); + glUniformMatrix4x3fv = (_glUniformMatrix4x3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4x3fvARB")); + + glBindAttribLocation = (_glBindAttribLocation) ctx->getProcAddress(QLatin1String("glBindAttribLocationARB")); + glGetAttribLocation = (_glGetAttribLocation) ctx->getProcAddress(QLatin1String("glGetAttribLocationARB")); + glVertexAttrib1fv = (_glVertexAttrib1fv) ctx->getProcAddress(QLatin1String("glVertexAttrib1fvARB")); + glVertexAttrib2fv = (_glVertexAttrib2fv) ctx->getProcAddress(QLatin1String("glVertexAttrib2fvARB")); + glVertexAttrib3fv = (_glVertexAttrib3fv) ctx->getProcAddress(QLatin1String("glVertexAttrib3fvARB")); + glVertexAttrib4fv = (_glVertexAttrib4fv) ctx->getProcAddress(QLatin1String("glVertexAttrib4fvARB")); + glVertexAttribPointer = (_glVertexAttribPointer) ctx->getProcAddress(QLatin1String("glVertexAttribPointerARB")); + glDisableVertexAttribArray = (_glDisableVertexAttribArray) ctx->getProcAddress(QLatin1String("glDisableVertexAttribArrayARB")); + glEnableVertexAttribArray = (_glEnableVertexAttribArray) ctx->getProcAddress(QLatin1String("glEnableVertexAttribArrayARB")); + } + + // Note: glShaderBinary(), glIsShader(), glIsProgram(), and + // glUniformMatrixNxMfv() are optional, but all other functions + // are required. + + return glCreateShader && + glShaderSource && + glCompileShader && + glDeleteProgram && + glCreateProgram && + glAttachShader && + glDetachShader && + glLinkProgram && + glUseProgram && + glDeleteProgram && + glGetShaderInfoLog && + glGetShaderiv && + glGetShaderSource && + glGetProgramiv && + glGetProgramInfoLog && + glGetUniformLocation && + glUniform1fv && + glUniform2fv && + glUniform3fv && + glUniform4fv && + glUniform1i && + glUniform1iv && + glUniformMatrix2fv && + glUniformMatrix3fv && + glUniformMatrix4fv && + glBindAttribLocation && + glGetAttribLocation && + glVertexAttrib1fv && + glVertexAttrib2fv && + glVertexAttrib3fv && + glVertexAttrib4fv && + glVertexAttribPointer && + glDisableVertexAttribArray && + glEnableVertexAttribArray; +#endif } QT_END_NAMESPACE diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index a0517f5..f71ae9d 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -92,8 +92,10 @@ typedef void (APIENTRY *_glProgramLocalParameter4fvARB) (GLenum, GLuint, const G // GLSL typedef GLuint (APIENTRY *_glCreateShader) (GLenum); typedef void (APIENTRY *_glShaderSource) (GLuint, GLsizei, const char **, const GLint *); +typedef void (APIENTRY *_glShaderBinary) (GLint, const GLuint*, GLenum, const void*, GLint); typedef void (APIENTRY *_glCompileShader) (GLuint); typedef void (APIENTRY *_glDeleteShader) (GLuint); +typedef GLboolean (APIENTRY *_glIsShader) (GLuint); typedef GLuint (APIENTRY *_glCreateProgram) (); typedef void (APIENTRY *_glAttachShader) (GLuint, GLuint); @@ -101,17 +103,43 @@ typedef void (APIENTRY *_glDetachShader) (GLuint, GLuint); typedef void (APIENTRY *_glLinkProgram) (GLuint); typedef void (APIENTRY *_glUseProgram) (GLuint); typedef void (APIENTRY *_glDeleteProgram) (GLuint); +typedef GLboolean (APIENTRY *_glIsProgram) (GLuint); typedef void (APIENTRY *_glGetShaderInfoLog) (GLuint, GLsizei, GLsizei *, char *); typedef void (APIENTRY *_glGetShaderiv) (GLuint, GLenum, GLint *); +typedef void (APIENTRY *_glGetShaderSource) (GLuint, GLsizei, GLsizei *, char *); typedef void (APIENTRY *_glGetProgramiv) (GLuint, GLenum, GLint *); +typedef void (APIENTRY *_glGetProgramInfoLog) (GLuint, GLsizei, GLsizei *, char *); typedef GLuint (APIENTRY *_glGetUniformLocation) (GLuint, const char*); -typedef void (APIENTRY *_glUniform4fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform3fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform2fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform1fv) (GLint, GLsizei, GLfloat *); +typedef void (APIENTRY *_glUniform4fv) (GLint, GLsizei, const GLfloat *); +typedef void (APIENTRY *_glUniform3fv) (GLint, GLsizei, const GLfloat *); +typedef void (APIENTRY *_glUniform2fv) (GLint, GLsizei, const GLfloat *); +typedef void (APIENTRY *_glUniform1fv) (GLint, GLsizei, const GLfloat *); typedef void (APIENTRY *_glUniform1i) (GLint, GLint); +typedef void (APIENTRY *_glUniform1iv) (GLint, GLsizei, const GLint *); +typedef void (APIENTRY *_glUniformMatrix2fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix3fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix4fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix2x3fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix2x4fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix3x2fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix3x4fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix4x2fv) (GLint, GLsizei, GLboolean, const GLfloat *); +typedef void (APIENTRY *_glUniformMatrix4x3fv) (GLint, GLsizei, GLboolean, const GLfloat *); + +typedef void (APIENTRY *_glBindAttribLocation) (GLuint, GLuint, const char *); +typedef GLint (APIENTRY *_glGetAttribLocation) (GLuint, const char *); +typedef void (APIENTRY *_glVertexAttrib1fv) (GLuint, const GLfloat *); +typedef void (APIENTRY *_glVertexAttrib2fv) (GLuint, const GLfloat *); +typedef void (APIENTRY *_glVertexAttrib3fv) (GLuint, const GLfloat *); +typedef void (APIENTRY *_glVertexAttrib4fv) (GLuint, const GLfloat *); +typedef void (APIENTRY *_glVertexAttribPointer) (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); +typedef void (APIENTRY *_glDisableVertexAttribArray) (GLuint); +typedef void (APIENTRY *_glEnableVertexAttribArray) (GLuint); + +typedef void (APIENTRY *_glGetProgramBinaryOES) (GLuint, GLsizei, GLsizei *, GLenum *, void *); +typedef void (APIENTRY *_glProgramBinaryOES) (GLuint, GLenum, const void *, GLint); typedef void (APIENTRY *_glActiveStencilFaceEXT) (GLenum ); @@ -153,10 +181,13 @@ struct QGLExtensionFuncs qt_glGenProgramsARB = 0; qt_glProgramLocalParameter4fvARB = 0; +#if !defined(QT_OPENGL_ES_2) qt_glCreateShader = 0; qt_glShaderSource = 0; + qt_glShaderBinary = 0; qt_glCompileShader = 0; qt_glDeleteShader = 0; + qt_glIsShader = 0; qt_glCreateProgram = 0; qt_glAttachShader = 0; @@ -164,10 +195,13 @@ struct QGLExtensionFuncs qt_glLinkProgram = 0; qt_glUseProgram = 0; qt_glDeleteProgram = 0; + qt_glIsProgram = 0; qt_glGetShaderInfoLog = 0; qt_glGetShaderiv = 0; + qt_glGetShaderSource = 0; qt_glGetProgramiv = 0; + qt_glGetProgramInfoLog = 0; qt_glGetUniformLocation = 0; qt_glUniform4fv = 0; @@ -175,6 +209,32 @@ struct QGLExtensionFuncs qt_glUniform2fv = 0; qt_glUniform1fv = 0; qt_glUniform1i = 0; + qt_glUniform1iv = 0; + qt_glUniformMatrix2fv = 0; + qt_glUniformMatrix3fv = 0; + qt_glUniformMatrix4fv = 0; + qt_glUniformMatrix2x3fv = 0; + qt_glUniformMatrix2x4fv = 0; + qt_glUniformMatrix3x2fv = 0; + qt_glUniformMatrix3x4fv = 0; + qt_glUniformMatrix4x2fv = 0; + qt_glUniformMatrix4x3fv = 0; + + qt_glBindAttribLocation = 0; + qt_glGetAttribLocation = 0; + qt_glVertexAttrib1fv = 0; + qt_glVertexAttrib2fv = 0; + qt_glVertexAttrib3fv = 0; + qt_glVertexAttrib4fv = 0; + qt_glVertexAttribPointer = 0; + qt_glDisableVertexAttribArray = 0; + qt_glEnableVertexAttribArray = 0; +#else + qt_glslResolved = false; + + qt_glGetProgramBinaryOES = 0; + qt_glProgramBinaryOES = 0; +#endif qt_glActiveStencilFaceEXT = 0; @@ -215,11 +275,14 @@ struct QGLExtensionFuncs _glGenProgramsARB qt_glGenProgramsARB; _glProgramLocalParameter4fvARB qt_glProgramLocalParameter4fvARB; +#if !defined(QT_OPENGL_ES_2) // GLSL definitions _glCreateShader qt_glCreateShader; _glShaderSource qt_glShaderSource; + _glShaderBinary qt_glShaderBinary; _glCompileShader qt_glCompileShader; _glDeleteShader qt_glDeleteShader; + _glIsShader qt_glIsShader; _glCreateProgram qt_glCreateProgram; _glAttachShader qt_glAttachShader; @@ -227,10 +290,13 @@ struct QGLExtensionFuncs _glLinkProgram qt_glLinkProgram; _glUseProgram qt_glUseProgram; _glDeleteProgram qt_glDeleteProgram; + _glIsProgram qt_glIsProgram; _glGetShaderInfoLog qt_glGetShaderInfoLog; _glGetShaderiv qt_glGetShaderiv; + _glGetShaderSource qt_glGetShaderSource; _glGetProgramiv qt_glGetProgramiv; + _glGetProgramInfoLog qt_glGetProgramInfoLog; _glGetUniformLocation qt_glGetUniformLocation; _glUniform4fv qt_glUniform4fv; @@ -238,6 +304,32 @@ struct QGLExtensionFuncs _glUniform2fv qt_glUniform2fv; _glUniform1fv qt_glUniform1fv; _glUniform1i qt_glUniform1i; + _glUniform1iv qt_glUniform1iv; + _glUniformMatrix2fv qt_glUniformMatrix2fv; + _glUniformMatrix3fv qt_glUniformMatrix3fv; + _glUniformMatrix4fv qt_glUniformMatrix4fv; + _glUniformMatrix2x3fv qt_glUniformMatrix2x3fv; + _glUniformMatrix2x4fv qt_glUniformMatrix2x4fv; + _glUniformMatrix3x2fv qt_glUniformMatrix3x2fv; + _glUniformMatrix3x4fv qt_glUniformMatrix3x4fv; + _glUniformMatrix4x2fv qt_glUniformMatrix4x2fv; + _glUniformMatrix4x3fv qt_glUniformMatrix4x3fv; + + _glBindAttribLocation qt_glBindAttribLocation; + _glGetAttribLocation qt_glGetAttribLocation; + _glVertexAttrib1fv qt_glVertexAttrib1fv; + _glVertexAttrib2fv qt_glVertexAttrib2fv; + _glVertexAttrib3fv qt_glVertexAttrib3fv; + _glVertexAttrib4fv qt_glVertexAttrib4fv; + _glVertexAttribPointer qt_glVertexAttribPointer; + _glDisableVertexAttribArray qt_glDisableVertexAttribArray; + _glEnableVertexAttribArray qt_glEnableVertexAttribArray; +#else + bool qt_glslResolved; + + _glGetProgramBinaryOES qt_glGetProgramBinaryOES; + _glProgramBinaryOES qt_glProgramBinaryOES; +#endif _glActiveStencilFaceEXT qt_glActiveStencilFaceEXT; @@ -479,10 +571,14 @@ struct QGLExtensionFuncs #define glMapBufferARB QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glMapBufferARB #define glUnmapBufferARB QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUnmapBufferARB +#if !defined(QT_OPENGL_ES_2) + #define glCreateShader QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glCreateShader #define glShaderSource QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glShaderSource +#define glShaderBinary QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glShaderBinary #define glCompileShader QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glCompileShader #define glDeleteShader QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glDeleteShader +#define glIsShader QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glIsShader #define glCreateProgram QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glCreateProgram #define glAttachShader QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glAttachShader @@ -490,10 +586,13 @@ struct QGLExtensionFuncs #define glLinkProgram QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glLinkProgram #define glUseProgram QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUseProgram #define glDeleteProgram QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glDeleteProgram +#define glIsProgram QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glIsProgram #define glGetShaderInfoLog QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetShaderInfoLog #define glGetShaderiv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetShaderiv +#define glGetShaderSource QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetShaderSource #define glGetProgramiv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetProgramiv +#define glGetProgramInfoLog QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetProgramInfoLog #define glGetUniformLocation QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetUniformLocation #define glUniform4fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniform4fv @@ -501,6 +600,33 @@ struct QGLExtensionFuncs #define glUniform2fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniform2fv #define glUniform1fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniform1fv #define glUniform1i QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniform1i +#define glUniform1iv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniform1iv +#define glUniformMatrix2fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix2fv +#define glUniformMatrix3fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix3fv +#define glUniformMatrix4fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix4fv +#define glUniformMatrix2x3fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix2x3fv +#define glUniformMatrix2x4fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix2x4fv +#define glUniformMatrix3x2fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix3x2fv +#define glUniformMatrix3x4fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix3x4fv +#define glUniformMatrix4x2fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix4x2fv +#define glUniformMatrix4x3fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glUniformMatrix4x3fv + +#define glBindAttribLocation QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glBindAttribLocation +#define glGetAttribLocation QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetAttribLocation +#define glVertexAttrib1fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glVertexAttrib1fv +#define glVertexAttrib2fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glVertexAttrib2fv +#define glVertexAttrib3fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glVertexAttrib3fv +#define glVertexAttrib4fv QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glVertexAttrib4fv +#define glVertexAttribPointer QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glVertexAttribPointer +#define glDisableVertexAttribArray QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glDisableVertexAttribArray +#define glEnableVertexAttribArray QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glEnableVertexAttribArray + +#else // QT_OPENGL_ES_2 + +#define glGetProgramBinaryOES QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glGetProgramBinaryOES +#define glProgramBinaryOES QGLContextPrivate::qt_get_extension_funcs(ctx).qt_glProgramBinaryOES + +#endif // QT_OPENGL_ES_2 extern bool qt_resolve_framebufferobject_extensions(QGLContext *ctx); bool qt_resolve_buffer_extensions(QGLContext *ctx); diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index ff23948..4b811e5 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -45,27 +45,12 @@ #include "qpaintengine_opengl_p.h" #include "qglpixelbuffer.h" -#include "qglextensions_p.h" +#include "qglshaderprogram.h" #include "qgl_p.h" #include "private/qapplication_p.h" -#ifndef GL_FRAGMENT_SHADER -#define GL_FRAGMENT_SHADER 0x8B30 -#endif - -#ifndef GL_COMPILE_STATUS -#define GL_COMPILE_STATUS 0x8B81 -#endif - -#ifndef GL_LINK_STATUS -#define GL_LINK_STATUS 0x8B82 -#endif - - - - QT_BEGIN_NAMESPACE @@ -79,117 +64,6 @@ void QGLPixmapFilterBase::drawImpl(QPainter *painter, const QPointF &pos, const processGL(painter, pos, src, source); } -QGLSLProgram::QGLSLProgram(const QString &src) - : ctx(QGLContext::currentContext()) -{ - if (!qt_resolve_glsl_extensions(const_cast(ctx))) { - qWarning("Failed to resolve GLSL functions"); - m_valid = false; - return; - } - - m_shader = glCreateShader(GL_FRAGMENT_SHADER); - - const QByteArray src_ba = src.toAscii(); - const char *src_cstr = src_ba.constData(); - - glShaderSource(m_shader, 1, &src_cstr, 0); - glCompileShader(m_shader); - glGetShaderiv(m_shader, GL_COMPILE_STATUS, &m_valid); - if (!m_valid) { - char data[4096]; - GLsizei len; - glGetShaderInfoLog(m_shader, 4096, &len, data); - qWarning("Failed to compile GLSL shader:\n%s\nCODE:\n%s\n", data, src_cstr); - return; - } - - m_program = glCreateProgram(); - glAttachShader(m_program, m_shader); - glLinkProgram(m_program); - glGetProgramiv(m_program, GL_LINK_STATUS, &m_valid); - if (!m_valid) { - char data[4096]; - GLsizei len; - glGetShaderInfoLog(m_shader, 4096, &len, data); - qWarning("Failed to link GLSL program:\n%s\nCODE:\n%s\n", data, src_cstr); - return; - } -} - -QGLSLProgram::~QGLSLProgram() -{ - glDeleteProgram(m_program); - glDeleteShader(m_shader); -} - -bool QGLSLProgram::success() const -{ - return m_valid; -} - -void QGLSLProgram::enable() -{ - glUseProgram(m_program); -} - -void QGLSLProgram::disable() -{ - glUseProgram(0); -} - -typedef GLuint (APIENTRY *_glGetUniformLocation) (GLuint, const char*); -typedef void (APIENTRY *_glUniform4fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform3fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform2fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform1fv) (GLint, GLsizei, GLfloat *); -typedef void (APIENTRY *_glUniform1i) (GLint, GLint); - -int QGLSLProgram::getUniformLocation(const QString &name) -{ - return glGetUniformLocation(m_program, name.toAscii().constData()); -} - -void QGLSLProgram::setUniform(int uniform, int value) -{ - enable(); - glUniform1i(uniform, value); -} - -void QGLSLProgram::setUniform(int uniform, qreal value) -{ - enable(); - GLfloat v[] = { value }; - glUniform1fv(uniform, 1, v); -} - -void QGLSLProgram::setUniform(int uniform, qreal v1, qreal v2) -{ - enable(); - GLfloat v[] = { v1, v2 }; - glUniform2fv(uniform, 1, v); -} - -void QGLSLProgram::setUniform(int uniform, qreal v1, qreal v2, qreal v3) -{ - enable(); - GLfloat v[] = { v1, v2, v3 }; - glUniform3fv(uniform, 1, v); -} - -void QGLSLProgram::setUniform(int uniform, qreal v1, qreal v2, qreal v3, qreal v4) -{ - enable(); - GLfloat v[] = { v1, v2, v3, v4 }; - glUniform4fv(uniform, 1, v); -} - -void QGLSLProgram::setUniform(int uniform, int count, float *v) -{ - enable(); - glUniform1fv(uniform, count, v); -} - class QGLPixmapColorizeFilter: public QGLPixmapFilter { public: @@ -199,8 +73,8 @@ protected: bool processGL(QPainter *painter, const QPointF &pos, const QPixmap &pixmap, const QRectF &srcRect) const; private: - mutable QGLSLProgram m_program; - uint m_colorUniform; + mutable QGLShaderProgram m_program; + int m_colorUniform; }; class QGLPixmapConvolutionFilter: public QGLPixmapFilter @@ -213,11 +87,11 @@ protected: bool processGL(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const; private: - QString generateConvolutionShader() const; + QByteArray generateConvolutionShader() const; - mutable QGLSLProgram *m_program; - mutable uint m_scaleUniform; - mutable uint m_matrixUniform; + mutable QGLShaderProgram *m_program; + mutable int m_scaleUniform; + mutable int m_matrixUniform; mutable int m_kernelWidth; mutable int m_kernelHeight; @@ -294,10 +168,12 @@ static const char *qt_gl_colorize_filter = "}"; QGLPixmapColorizeFilter::QGLPixmapColorizeFilter() - : m_program(QLatin1String(qt_gl_colorize_filter)) { - m_program.setUniform(m_program.getUniformLocation(QLatin1String("texture")), 0); // GL_TEXTURE_0 - m_colorUniform = m_program.getUniformLocation(QLatin1String("color")); + m_program.addShader(QGLShader::FragmentShader, qt_gl_colorize_filter); + m_program.link(); + m_program.enable(); + m_program.setUniformValue(m_program.uniformLocation("texture"), 0); // GL_TEXTURE_0 + m_colorUniform = m_program.uniformLocation("color"); } bool QGLPixmapColorizeFilter::processGL(QPainter *, const QPointF &pos, const QPixmap &src, const QRectF &srcRect) const @@ -305,10 +181,10 @@ bool QGLPixmapColorizeFilter::processGL(QPainter *, const QPointF &pos, const QP bindTexture(src); QColor col = color(); - m_program.setUniform(m_colorUniform, col.redF(), col.greenF(), col.blueF()); + m_program.enable(); + m_program.setUniformValue(m_colorUniform, col.redF(), col.greenF(), col.blueF()); QRectF target = (srcRect.isNull() ? QRectF(src.rect()) : srcRect).translated(pos); - m_program.enable(); qgl_drawTexture(target, src.width(), src.height(), srcRect); m_program.disable(); @@ -316,7 +192,7 @@ bool QGLPixmapColorizeFilter::processGL(QPainter *, const QPointF &pos, const QP } // generates convolution filter code for arbitrary sized kernel -QString QGLPixmapConvolutionFilter::generateConvolutionShader() const { +QByteArray QGLPixmapConvolutionFilter::generateConvolutionShader() const { QByteArray code; code.append("uniform sampler2D texture;\n"); code.append("uniform vec2 inv_texture_size;\n"); @@ -352,7 +228,7 @@ QString QGLPixmapConvolutionFilter::generateConvolutionShader() const { code.append(" }\n"); code.append(" gl_FragColor = sum;\n"); code.append("}"); - return QLatin1String(code); + return code; } QGLPixmapConvolutionFilter::QGLPixmapConvolutionFilter() @@ -384,10 +260,12 @@ bool QGLPixmapConvolutionFilter::processGL(QPainter *, const QPointF &pos, const m_kernelWidth = columns(); m_kernelHeight = rows(); - QString code = generateConvolutionShader(); - m_program = new QGLSLProgram(code); - m_scaleUniform = m_program->getUniformLocation(QLatin1String("inv_texture_size")); - m_matrixUniform = m_program->getUniformLocation(QLatin1String("matrix")); + QByteArray code = generateConvolutionShader(); + m_program = new QGLShaderProgram(); + m_program->addShader(QGLShader::FragmentShader, code); + m_program->link(); + m_scaleUniform = m_program->uniformLocation("inv_texture_size"); + m_matrixUniform = m_program->uniformLocation("matrix"); } const qreal *kernel = convolutionKernel(); @@ -397,10 +275,10 @@ bool QGLPixmapConvolutionFilter::processGL(QPainter *, const QPointF &pos, const const qreal iw = 1.0 / src.width(); const qreal ih = 1.0 / src.height(); - m_program->setUniform(m_scaleUniform, iw, ih); - m_program->setUniform(m_matrixUniform, m_kernelWidth * m_kernelHeight, conv); - m_program->enable(); + m_program->setUniformValue(m_scaleUniform, iw, ih); + m_program->setUniformValueArray(m_matrixUniform, conv, m_kernelWidth * m_kernelHeight, 1); + qgl_drawTexture(target, src.width(), src.height(), boundingRectFor(srcRect)); m_program->disable(); return true; diff --git a/src/opengl/qglpixmapfilter_p.h b/src/opengl/qglpixmapfilter_p.h index dc2eea6..d6742fc 100644 --- a/src/opengl/qglpixmapfilter_p.h +++ b/src/opengl/qglpixmapfilter_p.h @@ -87,35 +87,6 @@ public: } }; -class Q_OPENGL_EXPORT QGLSLProgram -{ -public: - QGLSLProgram(const QString &src); - ~QGLSLProgram(); - - bool success() const; - - void enable(); - void disable(); - - int getUniformLocation(const QString &name); - - void setUniform(int uniform, int value); - void setUniform(int uniform, qreal value); - void setUniform(int uniform, qreal v1, qreal v2); - void setUniform(int uniform, qreal v1, qreal v2, qreal v3); - void setUniform(int uniform, qreal v1, qreal v2, qreal v3, qreal v4); - void setUniform(int uniform, int count, float *v); - -private: - GLuint m_shader; - GLuint m_program; - - GLint m_valid; - - const QGLContext *ctx; -}; - QT_END_NAMESPACE QT_END_HEADER diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp new file mode 100644 index 0000000..934b5a5 --- /dev/null +++ b/src/opengl/qglshaderprogram.cpp @@ -0,0 +1,2828 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qglshaderprogram.h" +#include "qglextensions_p.h" +#include "qgl_p.h" +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +#if !defined(QT_OPENGL_ES_1_CL) + +/*! + \class QGLShaderProgram + \brief The QGLShaderProgram class allows OpenGL shader programs to be linked and used. + \since 4.6 + + \section1 Introduction + + This class supports shader programs written in the OpenGL Shading + Language (GLSL) and in the OpenGL/ES Shading Language (GLSL/ES). + + QGLShader and QGLShaderProgram shelter the programmer from the details of + compiling and linking vertex and fragment shaders. + + The following example creates a vertex shader program using the + supplied source \c{code}. Once compiled and linked, the shader + program is activated in the current QGLContext by calling + QGLShaderProgram::enable(): + + \code + QGLShader shader(QGLShader::VertexShader); + shader.setSourceCode(code); + + QGLShaderProgram program(context); + program.addShader(shader); + program.link(); + + program.enable(); + \endcode + + \section1 Writing portable shaders + + Shader programs can be difficult to reuse across OpenGL implementations + because of varying levels of support for standard vertex attributes and + uniform variables. In particular, GLSL/ES lacks all of the + standard variables that are present on desktop OpenGL systems: + \c{gl_Vertex}, \c{gl_Normal}, \c{gl_Color}, and so on. Desktop OpenGL + lacks the variable qualifiers \c{highp}, \c{mediump}, and \c{lowp}. + + The QGLShaderProgram class makes the process of writing portable shaders + easier by prefixing all shader programs with the following lines on + desktop OpenGL: + + \code + #define highp + #define mediump + #define lowp + \endcode + + This makes it possible to run most GLSL/ES shader programs + on desktop systems. The programmer should restrict themselves + to just features that are present in GLSL/ES, and avoid + standard variable names that only work on the desktop. + + \section1 Simple shader example + + \code + program.addShader(QGLShader::VertexShader, + "attribute highp vec4 vertex;\n" + "attribute mediump mat4 matrix;\n" + "void main(void)\n" + "{\n" + " gl_Position = matrix * vertex;\n" + "}"); + program.addShader(QGLShader::FragmentShader, + "uniform mediump vec4 color;\n" + "void main(void)\n" + "{\n" + " gl_FragColor = color;\n" + "}"); + program.link(); + program.enable(); + + int vertexLocation = program.attributeLocation("vertex"); + int matrixLocation = program.attributeLocation("matrix"); + int colorLocation = program.uniformLocation("color"); + \endcode + + With the above shader program active, we can draw a green triangle + as follows: + + \code + static GLfloat const triangleVertices[] = { + 60.0f, 10.0f, 0.0f, + 110.0f, 110.0f, 0.0f, + 10.0f, 110.0f, 0.0f + }; + + QColor color(0, 255, 0, 255); + + QMatrix4x4 pmvMatrix; + pmvMatrix.ortho(rect()); + + program.setAttributeArray(vertexLocation, triangleVertices, 3); + program.setUniformValue(matrixLocation, pmvMatrix); + program.setUniformValue(colorLocation, color); + + glDrawArrays(GL_TRIANGLES, 0, 3); + \endcode + + \section1 Partial shaders + + Desktop GLSL can attach an arbitrary number of vertex and fragment + shaders to a shader program. Embedded GLSL/ES on the other hand + supports only a single shader of each type on a shader program. + + Multiple shaders of the same type can be useful when large libraries + of shaders are needed. Common functions can be factored out into + library shaders that can be reused in multiple shader programs. + + To support this use of shaders, the application programmer can + create shaders with the QGLShader::PartialVertexShader and + QGLShader::PartialFragmentShader types. These types direct + QGLShader and QGLShaderProgram to delay shader compilation until + link time. + + When link() is called, the sources for the partial shaders are + concatenated, and a single vertex or fragment shader is compiled + and linked into the shader program. + + It is more efficient to use the QGLShader::VertexShader and + QGLShader::FragmentShader when there is only one shader of that + type in the program. + + \sa QGLShader +*/ + +/*! + \class QGLShader + \brief The QGLShader class allows OpenGL shaders to be compiled. + \since 4.6 + + This class supports shaders written in the OpenGL Shading Language (GLSL) + and in the OpenGL/ES Shading Language (GLSL/ES). + + QGLShader and QGLShaderProgram shelter the programmer from the details of + compiling and linking vertex and fragment shaders. + + \sa QGLShaderProgram +*/ + +/*! + \enum QGLShader::ShaderType + This enum specifies the type of QGLShader that is being created. + + \value VertexShader Vertex shader written in the OpenGL Shading Language (GLSL). + \value FragmentShader Fragment shader written in the OpenGL Shading Language (GLSL). + \value PartialVertexShader Partial vertex shader that will be concatenated with all other partial vertex shaders at link time. + \value PartialFragmentShader Partial fragment shader that will be concatenated with all other partial fragment shaders at link time. +*/ + +#ifndef GL_FRAGMENT_SHADER +#define GL_FRAGMENT_SHADER 0x8B30 +#endif +#ifndef GL_VERTEX_SHADER +#define GL_VERTEX_SHADER 0x8B31 +#endif +#ifndef GL_COMPILE_STATUS +#define GL_COMPILE_STATUS 0x8B81 +#endif +#ifndef GL_LINK_STATUS +#define GL_LINK_STATUS 0x8B82 +#endif +#ifndef GL_INFO_LOG_LENGTH +#define GL_INFO_LOG_LENGTH 0x8B84 +#endif +#ifndef GL_ACTIVE_UNIFORMS +#define GL_ACTIVE_UNIFORMS 0x8B86 +#endif +#ifndef GL_ACTIVE_UNIFORM_MAX_LENGTH +#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#endif +#ifndef GL_ACTIVE_ATTRIBUTES +#define GL_ACTIVE_ATTRIBUTES 0x8B89 +#endif +#ifndef GL_ACTIVE_ATTRIBUTE_MAX_LENGTH +#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#endif +#ifndef GL_CURRENT_VERTEX_ATTRIB +#define GL_CURRENT_VERTEX_ATTRIB 0x8626 +#endif +#ifndef GL_SHADER_SOURCE_LENGTH +#define GL_SHADER_SOURCE_LENGTH 0x8B88 +#endif +#ifndef GL_SHADER_BINARY_FORMATS +#define GL_SHADER_BINARY_FORMATS 0x8DF8 +#endif +#ifndef GL_NUM_SHADER_BINARY_FORMATS +#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 +#endif + +class QGLShaderPrivate +{ +public: + QGLShaderPrivate(QGLShader::ShaderType type, const QGLContext *ctx) + { + context = ctx; + shader = 0; + shaderType = type; + compiled = false; + isPartial = (type == QGLShader::PartialVertexShader || + type == QGLShader::PartialFragmentShader); + hasPartialSource = false; + } + + const QGLContext *context; + GLuint shader; + QGLShader::ShaderType shaderType; + bool compiled; + bool isPartial; + bool hasPartialSource; + QString errors; + QByteArray partialSource; + + bool create(); + bool compile(); +}; + +#define ctx context + +bool QGLShaderPrivate::create() +{ + if (isPartial) + return true; + if (!context) + context = QGLContext::currentContext(); + if (!context) + return false; + if (qt_resolve_glsl_extensions(const_cast(context))) { + if (shaderType == QGLShader::VertexShader) + shader = glCreateShader(GL_VERTEX_SHADER); + else + shader = glCreateShader(GL_FRAGMENT_SHADER); + if (!shader) { + qWarning() << "QGLShader: could not create shader"; + return false; + } + return true; + } else { + return false; + } +} + +bool QGLShaderPrivate::compile() +{ + // Partial shaders are compiled during QGLShaderProgram::link(). + if (isPartial && hasPartialSource) { + compiled = true; + return true; + } + if (!shader) + return false; + glCompileShader(shader); + GLint value = 0; + glGetShaderiv(shader, GL_COMPILE_STATUS, &value); + compiled = (value != 0); + value = 0; + glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value); + if (!compiled && value > 1) { + char *log = new char [value]; + GLint len; + glGetShaderInfoLog(shader, value, &len, log); + errors = QString::fromLatin1(log); + qWarning() << "QGLShader::compile:" << errors; + delete [] log; + } + return compiled; +} + +#undef ctx +#define ctx d->context + +/*! + Constructs a new QGLShader object of the specified \a type + and attaches it to \a parent. If shader programs are not supported, + then isValid() will return false. + + This constructor is normally followed by a call to setSourceCode() + or setSourceCodeFile(). + + The shader will be associated with the current QGLContext. + + \sa setSourceCode(), setSourceCodeFile(), isValid() +*/ +QGLShader::QGLShader(QGLShader::ShaderType type, QObject *parent) + : QObject(parent) +{ + d = new QGLShaderPrivate(type, QGLContext::currentContext()); + d->create(); +} + +/*! + Constructs a new QGLShader object from the source code in \a fileName + and attaches it to \a parent. If the filename ends in \c{.fsh}, + it is assumed to be a fragment shader, otherwise it is assumed to + be a vertex shader (normally the extension is \c{.vsh} for vertex shaders). + If the shader could not be loaded, then isValid() will return false. + + The shader will be associated with the current QGLContext. + + \sa isValid() +*/ +QGLShader::QGLShader(const QString& fileName, QObject *parent) + : QObject(parent) +{ + if (fileName.endsWith(QLatin1String(".fsh"), Qt::CaseInsensitive)) + d = new QGLShaderPrivate(QGLShader::FragmentShader, QGLContext::currentContext()); + else + d = new QGLShaderPrivate(QGLShader::VertexShader, QGLContext::currentContext()); + if (d->create() && !setSourceCodeFile(fileName)) { + if (d->shader) + glDeleteShader(d->shader); + d->shader = 0; + } +} + +/*! + Constructs a new QGLShader object of the specified \a type from the + source code in \a fileName and attaches it to \a parent. + If the shader could not be loaded, then isValid() will return false. + + The shader will be associated with the current QGLContext. + + \sa isValid() +*/ +QGLShader::QGLShader + (const QString& fileName, QGLShader::ShaderType type, QObject *parent) + : QObject(parent) +{ + d = new QGLShaderPrivate(type, QGLContext::currentContext()); + if (d->create() && !setSourceCodeFile(fileName)) { + if (d->shader) + glDeleteShader(d->shader); + d->shader = 0; + } +} + +/*! + Constructs a new QGLShader object of the specified \a type + and attaches it to \a parent. If shader programs are not supported, + then isValid() will return false. + + This constructor is normally followed by a call to setSourceCode() + or setSourceCodeFile(). + + The shader will be associated with \a context. + + \sa setSourceCode(), setSourceCodeFile(), isValid() +*/ +QGLShader::QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent) + : QObject(parent) +{ + d = new QGLShaderPrivate(type, context); + d->create(); +} + +/*! + Constructs a new QGLShader object from the source code in \a fileName + and attaches it to \a parent. If the filename ends in \c{.fsh}, + it is assumed to be a fragment shader, otherwise it is assumed to + be a vertex shader (normally the extension is \c{.vsh} for vertex shaders). + If the shader could not be loaded, then isValid() will return false. + + The shader will be associated with \a context. + + \sa isValid() +*/ +QGLShader::QGLShader(const QString& fileName, const QGLContext *context, QObject *parent) + : QObject(parent) +{ + if (fileName.endsWith(QLatin1String(".fsh"), Qt::CaseInsensitive)) + d = new QGLShaderPrivate(QGLShader::FragmentShader, context); + else + d = new QGLShaderPrivate(QGLShader::VertexShader, context); + if (d->create() && !setSourceCodeFile(fileName)) { + if (d->shader) + glDeleteShader(d->shader); + d->shader = 0; + } +} + +/*! + Constructs a new QGLShader object of the specified \a type from the + source code in \a fileName and attaches it to \a parent. + If the shader could not be loaded, then isValid() will return false. + + The shader will be associated with \a context. + + \sa isValid() +*/ +QGLShader::QGLShader + (const QString& fileName, QGLShader::ShaderType type, const QGLContext *context, QObject *parent) + : QObject(parent) +{ + d = new QGLShaderPrivate(type, context); + if (d->create() && !setSourceCodeFile(fileName)) { + if (d->shader) + glDeleteShader(d->shader); + d->shader = 0; + } +} + +/*! + Deletes this shader. If the shader has been attached to a + QGLShaderProgram object, then the actual shader will stay around + until the QGLShaderProgram is destroyed. +*/ +QGLShader::~QGLShader() +{ + if (d->shader) + glDeleteShader(d->shader); + delete d; +} + +/*! + Returns true if this shader is valid. Shaders become invalid + when they are destroyed and no longer attached to a QGLShaderProgram. +*/ +bool QGLShader::isValid() const +{ + if (d->isPartial && d->hasPartialSource) + return true; + if (!d->shader) + return false; +#if defined(QT_OPENGL_ES_2) + return glIsShader(d->shader); +#else + // glIsShader() may not exist on some systems. + return (!glIsShader || glIsShader(d->shader)); +#endif +} + +/*! + Returns the type of this shader. +*/ +QGLShader::ShaderType QGLShader::shaderType() const +{ + return d->shaderType; +} + +// The precision qualifiers are useful on OpenGL/ES systems, +// but usually not present on desktop systems. Define the +// keywords to empty strings on desktop systems. +#ifndef QT_OPENGL_ES +#define QGL_DEFINE_QUALIFIERS 1 +static const char qualifierDefines[] = + "#define lowp\n" + "#define mediump\n" + "#define highp\n"; +#endif + +/*! + Sets the \a source code for this shader and compiles it. + Returns true if the source was successfully compiled, false otherwise. + + If shaderType() is PartialVertexShader or PartialFragmentShader, + then this function will always return true, even if the source code + is invalid. Partial shaders are compiled when QGLShaderProgram::link() + is called. +*/ +bool QGLShader::setSourceCode(const char *source) +{ + if (d->isPartial) { + d->partialSource = QByteArray(source); + d->hasPartialSource = true; + return d->compile(); + } else if (d->shader) { + QVarLengthArray src; +#ifdef QGL_DEFINE_QUALIFIERS + src.append(qualifierDefines); +#endif + src.append(source); + glShaderSource(d->shader, src.size(), src.data(), 0); + return d->compile(); + } else { + return false; + } +} + +/*! + \overload + + Sets the \a source code for this shader and compiles it. + Returns true if the source was successfully compiled, false otherwise. + + If shaderType() is PartialVertexShader or PartialFragmentShader, + then this function will always return true, even if the source code + is invalid. Partial shaders are compiled when QGLShaderProgram::link() + is called. +*/ +bool QGLShader::setSourceCode(const QByteArray& source) +{ + return setSourceCode(source.constData()); +} + +/*! + \overload + + Sets the \a source code for this shader and compiles it. + Returns true if the source was successfully compiled, false otherwise. + + If shaderType() is PartialVertexShader or PartialFragmentShader, + then this function will always return true, even if the source code + is invalid. Partial shaders are compiled when QGLShaderProgram::link() + is called. +*/ +bool QGLShader::setSourceCode(const QString& source) +{ + return setSourceCode(source.toLatin1().constData()); +} + +/*! + Sets the source code for this shader to the contents of \a fileName + and compiles it. Returns true if the file could be opened and the + source compiled, false otherwise. + + If shaderType() is PartialVertexShader or PartialFragmentShader, + then this function will always return true, even if the source code + is invalid. Partial shaders are compiled when QGLShaderProgram::link() + is called. +*/ +bool QGLShader::setSourceCodeFile(const QString& fileName) +{ + if (!d->shader) + return false; + + QFile file(fileName); + if (!file.open(QFile::ReadOnly)) { + qWarning() << "QGLShader: Unable to open file" << fileName; + return false; + } + + QByteArray contents = file.readAll(); + return setSourceCode(contents.constData()); +} + +/*! + Sets the binary code for this shader to the \a length bytes from + the array \a binary. The \a format specifies how the binary data + should be interpreted by the OpenGL engine. Returns true if the + binary was set on the shader; false otherwise. + + This function cannot be used with PartialVertexShader or + PartialFragmentShader. + + \sa shaderBinaryFormats() +*/ +bool QGLShader::setBinaryCode(GLenum format, const void *binary, int length) +{ +#if !defined(QT_OPENGL_ES_2) + if (!glShaderBinary) + return false; +#endif + if (d->isPartial || !d->shader) + return false; + glGetError(); // Clear error state. + glShaderBinary(1, &(d->shader), format, binary, length); + return (glGetError() == GL_NO_ERROR); +} + +/*! + Sets the binary code for this shader to the \a length bytes from + the array \a binary. The \a format specifies how the binary data + should be interpreted by the OpenGL engine. Returns true if the + binary was set on the shader; false otherwise. + + The \a otherShader will also have binary code set on it. This is + for the case where \a binary contains both vertex and fragment + shader code. + + This function cannot be used with PartialVertexShader or + PartialFragmentShader. + + \sa shaderBinaryFormats() +*/ +bool QGLShader::setBinaryCode + (QGLShader& otherShader, GLenum format, const void *binary, int length) +{ +#if !defined(QT_OPENGL_ES_2) + if (!glShaderBinary) + return false; +#endif + if (d->isPartial || !d->shader) + return false; + if (otherShader.d->isPartial || !otherShader.d->shader) + return false; + glGetError(); // Clear error state. + GLuint shaders[2]; + shaders[0] = d->shader; + shaders[1] = otherShader.d->shader; + glShaderBinary(2, shaders, format, binary, length); + return (glGetError() == GL_NO_ERROR); +} + +/*! + Returns a list of all binary formats that are supported by + setBinaryCode() on this system. + + \sa setBinaryCode() +*/ +QList QGLShader::shaderBinaryFormats() +{ + GLint num; + QList list; + glGetError(); // Clear error state. + glGetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &num); + if (glGetError() != GL_NO_ERROR || num <= 0) + return list; + QVarLengthArray formats(num); + glGetIntegerv(GL_SHADER_BINARY_FORMATS, formats.data()); + for (GLint i = 0; i < num; ++i) + list += (GLenum)(formats[i]); + return list; +} + +/*! + Returns the source code for this shader. + + \sa setSourceCode() +*/ +QByteArray QGLShader::sourceCode() const +{ + if (d->isPartial) + return d->partialSource; + if (!d->shader) + return QByteArray(); + GLint size = 0; + glGetShaderiv(d->shader, GL_SHADER_SOURCE_LENGTH, &size); + if (size <= 0) + return QByteArray(); + GLint len = 0; + char *source = new char [size]; + glGetShaderSource(d->shader, size, &len, source); + QByteArray src(source); + delete [] source; + return src; +} + +/*! + Returns true if this shader has been compiled; false otherwise. + + \sa setSourceCode() +*/ +bool QGLShader::isCompiled() const +{ + return d->compiled; +} + +/*! + Returns the errors that occurred during the last compile. + + \sa setSourceCode() +*/ +QString QGLShader::errors() const +{ + return d->errors; +} + +/*! + Returns the OpenGL identifier associated with this shader. + + If shaderType() is PartialVertexShader or PartialFragmentShader, + this function will always return zero. Partial shaders are + created and compiled when QGLShaderProgram::link() is called. + + \sa QGLShaderProgram::programId() +*/ +GLuint QGLShader::shaderId() const +{ + return d->shader; +} + +#undef ctx +#define ctx context + +class QGLShaderProgramPrivate +{ +public: + QGLShaderProgramPrivate(const QGLContext *ctx) + { + context = ctx; + program = 0; + linked = false; + inited = false; + hasPartialShaders = false; + vertexShader = 0; + fragmentShader = 0; + } + ~QGLShaderProgramPrivate() + { + if (program) + glDeleteProgram(program); + } + + const QGLContext *context; + GLuint program; + bool linked; + bool inited; + bool hasPartialShaders; + QString errors; + QList shaders; + QList anonShaders; + QGLShader *vertexShader; + QGLShader *fragmentShader; +}; + +#undef ctx +#define ctx d->context + +/*! + Constructs a new shader program and attaches it to \a parent. + The program will be invalid until addShader() is called. + + The shader program will be associated with the current QGLContext. + + \sa isValid(), addShader() +*/ +QGLShaderProgram::QGLShaderProgram(QObject *parent) + : QObject(parent) +{ + d = new QGLShaderProgramPrivate(QGLContext::currentContext()); +} + +/*! + Constructs a new shader program and attaches it to \a parent. + The program will be invalid until addShader() is called. + + The shader program will be associated with \a context. + + \sa isValid(), addShader() +*/ +QGLShaderProgram::QGLShaderProgram(const QGLContext *context, QObject *parent) + : QObject(parent) +{ + d = new QGLShaderProgramPrivate(context); +} + +/*! + Deletes this shader program. +*/ +QGLShaderProgram::~QGLShaderProgram() +{ + delete d; +} + +bool QGLShaderProgram::init() +{ + if (d->program || d->inited) + return true; + d->inited = true; + if (!d->context) + d->context = QGLContext::currentContext(); + if (!d->context) + return false; + if (qt_resolve_glsl_extensions(const_cast(d->context))) { + d->program = glCreateProgram(); + if (!(d->program)) { + qWarning() << "QGLShaderProgram: could not create shader program"; + return false; + } + return true; + } else { + qWarning() << "QGLShaderProgram: shader programs are not supported"; + return false; + } +} + +/*! + Returns true if this shader program object is valid, false otherwise. +*/ +bool QGLShaderProgram::isValid() const +{ + if (!d->program) + return false; +#if defined(QT_OPENGL_ES_2) + return glIsProgram(d->program); +#else + // glIsProgram() may not exist on some systems. + return (!glIsProgram || glIsProgram(d->program)); +#endif +} + +/*! + Adds a compiled \a shader to this shader program. Returns true + if the shader could be added, or false otherwise. + + Ownership of the \a shader object remains with the caller. + It will not be deleted when this QGLShaderProgram instance + is deleted. This allows the caller to add the same shader + to multiple shader programs. + + \sa removeShader(), link(), removeAllShaders() +*/ +bool QGLShaderProgram::addShader(QGLShader *shader) +{ + if (!init()) + return false; + if (d->shaders.contains(shader)) + return true; // Already added to this shader program. + if (d->program && shader && shader->d->shader) { + if (!shader->d->compiled) + return false; + if (!shader->d->isPartial) + glAttachShader(d->program, shader->d->shader); + else + d->hasPartialShaders = true; + d->linked = false; // Program needs to be relinked. + d->shaders.append(shader); + return true; + } else { + return false; + } +} + +/*! + Compiles \a source as a shader of the specified \a type and + adds it to this shader program. Returns true if compilation + was successful, false otherwise. The compilation errors + will be made available via errors(). + + This function is intended to be a short-cut for quickly + adding vertex and fragment shaders to a shader program without + creating an instance of QGLShader first. + + \sa removeShader(), link(), errors(), removeAllShaders() +*/ +bool QGLShaderProgram::addShader(QGLShader::ShaderType type, const char *source) +{ + if (!init()) + return false; + QGLShader *shader = new QGLShader(type, this); + if (!shader->setSourceCode(source)) { + d->errors = shader->errors(); + delete shader; + return false; + } + d->anonShaders.append(shader); + return addShader(shader); +} + +/*! + \overload + + Compiles \a source as a shader of the specified \a type and + adds it to this shader program. Returns true if compilation + was successful, false otherwise. The compilation errors + will be made available via errors(). + + This function is intended to be a short-cut for quickly + adding vertex and fragment shaders to a shader program without + creating an instance of QGLShader first. + + \sa removeShader(), link(), errors(), removeAllShaders() +*/ +bool QGLShaderProgram::addShader(QGLShader::ShaderType type, const QByteArray& source) +{ + return addShader(type, source.constData()); +} + +/*! + \overload + + Compiles \a source as a shader of the specified \a type and + adds it to this shader program. Returns true if compilation + was successful, false otherwise. The compilation errors + will be made available via errors(). + + This function is intended to be a short-cut for quickly + adding vertex and fragment shaders to a shader program without + creating an instance of QGLShader first. + + \sa removeShader(), link(), errors(), removeAllShaders() +*/ +bool QGLShaderProgram::addShader(QGLShader::ShaderType type, const QString& source) +{ + return addShader(type, source.toLatin1().constData()); +} + +/*! + Removes \a shader from this shader program. The object is not deleted. + + \sa addShader(), link(), removeAllShaders() +*/ +void QGLShaderProgram::removeShader(QGLShader *shader) +{ + if (d->program && shader && shader->d->shader) { + glDetachShader(d->program, shader->d->shader); + d->linked = false; // Program needs to be relinked. + } + d->shaders.removeAll(shader); + d->anonShaders.removeAll(shader); +} + +/*! + Returns a list of all shaders that have been added to this shader + program using addShader(). + + \sa addShader(), removeShader() +*/ +QList QGLShaderProgram::shaders() const +{ + return d->shaders; +} + +/*! + Removes all of the shaders that were added to this program previously. + The QGLShader objects for the shaders will not be deleted if they + were constructed externally. QGLShader objects that are constructed + internally by QGLShaderProgram will be deleted. + + \sa addShader(), removeShader() +*/ +void QGLShaderProgram::removeAllShaders() +{ + foreach (QGLShader *shader, d->shaders) { + if (d->program && shader && shader->d->shader) + glDetachShader(d->program, shader->d->shader); + } + foreach (QGLShader *shader, d->anonShaders) { + // Delete shader objects that were created anonymously. + delete shader; + } + d->shaders.clear(); + d->anonShaders.clear(); + d->linked = false; // Program needs to be relinked. +} + +#if defined(QT_OPENGL_ES_2) + +#ifndef GL_PROGRAM_BINARY_LENGTH_OES +#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 +#endif +#ifndef GL_NUM_PROGRAM_BINARY_FORMATS_OES +#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE +#endif +#ifndef GL_PROGRAM_BINARY_FORMATS_OES +#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF +#endif + +#endif + +/*! + Returns the program binary associated with this shader program. + The numeric identifier of the program binary format is returned + in \a format. The \c OES_get_program_binary extension will need + to be supported by the system for binary retrieval to succeed. + + Returns an empty QByteArray if the program binary cannot be + retrieved on this system, or the shader program has not yet + been linked. + + The returned binary can be supplied to setProgramBinary() on the + same machine at some future point to reload the program. It contains + the compiled code of all of the shaders that were attached to the + program at the time programBinary() is called. + + \sa setProgramBinary(), programBinaryFormats() +*/ +QByteArray QGLShaderProgram::programBinary(int *format) const +{ +#if defined(QT_OPENGL_ES_2) + if (!isLinked()) + return QByteArray(); + + // Get the length of the binary data, bailing out if there is none. + GLint length = 0; + glGetProgramiv(d->program, GL_PROGRAM_BINARY_LENGTH_OES, &length); + if (length <= 0) + return QByteArray(); + + // Retrieve the binary data. + QByteArray binary(length, 0); + GLenum binaryFormat; + glGetProgramBinaryOES(d->program, length, 0, &binaryFormat, binary.data()); + if (format) + *format = (int)binaryFormat; + return binary; +#else + Q_UNUSED(format); + return QByteArray(); +#endif +} + +/*! + Sets the \a binary for this shader program according to \a format. + Returns true if the binary was set, or false if the binary format + is not supported or this system does not support program binaries. + The program will be linked if the load succeeds. + + \sa programBinary(), programBinaryFormats(), isLinked() +*/ +bool QGLShaderProgram::setProgramBinary(int format, const QByteArray& binary) +{ +#if defined(QT_OPENGL_ES_2) + // Load the binary and check that it was linked correctly. + glProgramBinaryOES(d->program, (GLenum)format, + binary.constData(), binary.size()); + GLint value = 0; + glGetProgramiv(d->program, GL_LINK_STATUS, &value); + d->linked = (value != 0); + value = 0; + glGetProgramiv(d->program, GL_INFO_LOG_LENGTH, &value); + d->errors = QString(); + if (value > 1) { + char *log = new char [value]; + GLint len; + glGetProgramInfoLog(d->program, value, &len, log); + d->errors = QString::fromLatin1(log); + qWarning() << "QGLShaderProgram::setProgramBinary:" << d->errors; + delete [] log; + } + return d->linked; +#else + Q_UNUSED(format); + Q_UNUSED(binary); + return false; +#endif +} + +/*! + Returns the list of program binary formats that are accepted by + this system for use with setProgramBinary(). + + \sa programBinary, setProgramBinary() +*/ +QList QGLShaderProgram::programBinaryFormats() +{ +#if defined(QT_OPENGL_ES_2) + GLint count = 0; + glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS_OES, &count); + if (count <= 0) + return QList(); + QVector list; + list.resize(count); + glGetIntegerv(GL_PROGRAM_BINARY_FORMATS_OES, list.data()); + return list.toList(); +#else + return QList(); +#endif +} + +/*! + Links together the shaders that were added to this program with + addShader(). Returns true if the link was successful or + false otherwise. If the link failed, the error messages can + be retrieved with errors(). + + Subclasses can override this function to initialize attributes + and uniform variables for use in specific shader programs. + + If the shader program was already linked, calling this + function again will force it to be re-linked. + + \sa addShader(), errors() +*/ +bool QGLShaderProgram::link() +{ + if (!d->program) + return false; + if (d->hasPartialShaders) { + // Compile the partial vertex and fragment shaders. + QByteArray vertexSource; + QByteArray fragmentSource; + foreach (QGLShader *shader, d->shaders) { + if (shader->shaderType() == QGLShader::PartialVertexShader) + vertexSource += shader->sourceCode(); + else if (shader->shaderType() == QGLShader::PartialFragmentShader) + fragmentSource += shader->sourceCode(); + } + if (vertexSource.isEmpty()) { + if (d->vertexShader) { + glDetachShader(d->program, d->vertexShader->d->shader); + delete d->vertexShader; + d->vertexShader = 0; + } + } else { + if (!d->vertexShader) { + d->vertexShader = + new QGLShader(QGLShader::VertexShader, this); + } + if (!d->vertexShader->setSourceCode(vertexSource)) { + d->errors = d->vertexShader->errors(); + return false; + } + glAttachShader(d->program, d->vertexShader->d->shader); + } + if (fragmentSource.isEmpty()) { + if (d->fragmentShader) { + glDetachShader(d->program, d->fragmentShader->d->shader); + delete d->fragmentShader; + d->fragmentShader = 0; + } + } else { + if (!d->fragmentShader) { + d->fragmentShader = + new QGLShader(QGLShader::FragmentShader, this); + } + if (!d->fragmentShader->setSourceCode(fragmentSource)) { + d->errors = d->fragmentShader->errors(); + return false; + } + glAttachShader(d->program, d->fragmentShader->d->shader); + } + } + glLinkProgram(d->program); + GLint value = 0; + glGetProgramiv(d->program, GL_LINK_STATUS, &value); + d->linked = (value != 0); + value = 0; + glGetProgramiv(d->program, GL_INFO_LOG_LENGTH, &value); + d->errors = QString(); + if (value > 1) { + char *log = new char [value]; + GLint len; + glGetProgramInfoLog(d->program, value, &len, log); + d->errors = QString::fromLatin1(log); + qWarning() << "QGLShaderProgram::link:" << d->errors; + delete [] log; + } + return d->linked; +} + +/*! + Returns true if this shader program has been linked; false otherwise. + + \sa link() +*/ +bool QGLShaderProgram::isLinked() const +{ + return d->linked; +} + +/*! + Returns the errors that occurred during the last link() + or addShader() with explicitly specified source code. + + \sa link() +*/ +QString QGLShaderProgram::errors() const +{ + return d->errors; +} + +/*! + Enable use of this shader program in the currently active QGLContext. + Returns true if the program was successfully enabled; false + otherwise. If the shader program has not yet been linked, + or it needs to be re-linked, this function will call link(). + + \sa link(), disable() +*/ +bool QGLShaderProgram::enable() +{ + if (!d->program) + return false; + if (!d->linked && !link()) + return false; + glUseProgram(d->program); + return true; +} + +/*! + Disables this shader program in the currently active QGLContext. + This is equivalent to calling \c{glUseProgram(0)}. + + \sa enable() +*/ +void QGLShaderProgram::disable() +{ +#if defined(QT_OPENGL_ES_2) + glUseProgram(0); +#else + if (glUseProgram) + glUseProgram(0); +#endif +} + +/*! + Returns the OpenGL identifier associated with this shader program. + + \sa QGLShader::shaderId() +*/ +GLuint QGLShaderProgram::programId() const +{ + return d->program; +} + +/*! + Binds the attribute \a name to the specified \a location. This + function can be called before or after the program has been linked. + Any attributes that have not been explicitly bound when the program + is linked will be assigned locations automatically. + + \sa attributeLocation() +*/ +void QGLShaderProgram::bindAttributeLocation(const char *name, int location) +{ + glBindAttribLocation(d->program, location, name); +} + +/*! + \overload + + Binds the attribute \a name to the specified \a location. This + function can be called before or after the program has been linked. + Any attributes that have not been explicitly bound when the program + is linked will be assigned locations automatically. + + \sa attributeLocation() +*/ +void QGLShaderProgram::bindAttributeLocation(const QByteArray& name, int location) +{ + glBindAttribLocation(d->program, location, name.constData()); +} + +/*! + \overload + + Binds the attribute \a name to the specified \a location. This + function can be called before or after the program has been linked. + Any attributes that have not been explicitly bound when the program + is linked will be assigned locations automatically. + + \sa attributeLocation() +*/ +void QGLShaderProgram::bindAttributeLocation(const QString& name, int location) +{ + glBindAttribLocation(d->program, location, name.toLatin1().constData()); +} + +/*! + Returns the location of the attribute \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + attribute for this shader program. + + \sa uniformLocation(), bindAttributeLocation() +*/ +int QGLShaderProgram::attributeLocation(const char *name) const +{ + if (d->linked) { + return glGetAttribLocation(d->program, name); + } else { + qWarning() << "QGLShaderProgram::attributeLocation(" << name + << "): shader program is not linked"; + return -1; + } +} + +/*! + \overload + + Returns the location of the attribute \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + attribute for this shader program. + + \sa uniformLocation(), bindAttributeLocation() +*/ +int QGLShaderProgram::attributeLocation(const QByteArray& name) const +{ + return attributeLocation(name.constData()); +} + +/*! + \overload + + Returns the location of the attribute \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + attribute for this shader program. + + \sa uniformLocation(), bindAttributeLocation() +*/ +int QGLShaderProgram::attributeLocation(const QString& name) const +{ + return attributeLocation(name.toLatin1().constData()); +} + +/*! + Sets the attribute at \a location in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, GLfloat value) +{ + if (location != -1) + glVertexAttrib1fv(location, &value); +} + +/*! + \overload + + Sets the attribute called \a name in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, GLfloat value) +{ + setAttributeValue(attributeLocation(name), value); +} + +/*! + Sets the attribute at \a location in the current context to + the 2D vector (\a x, \a y). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, GLfloat x, GLfloat y) +{ + if (location != -1) { + GLfloat values[2] = {x, y}; + glVertexAttrib2fv(location, values); + } +} + +/*! + \overload + + Sets the attribute called \a name in the current context to + the 2D vector (\a x, \a y). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, GLfloat x, GLfloat y) +{ + setAttributeValue(attributeLocation(name), x, y); +} + +/*! + Sets the attribute at \a location in the current context to + the 3D vector (\a x, \a y, \a z). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (int location, GLfloat x, GLfloat y, GLfloat z) +{ + if (location != -1) { + GLfloat values[3] = {x, y, z}; + glVertexAttrib3fv(location, values); + } +} + +/*! + \overload + + Sets the attribute called \a name in the current context to + the 3D vector (\a x, \a y, \a z). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (const char *name, GLfloat x, GLfloat y, GLfloat z) +{ + setAttributeValue(attributeLocation(name), x, y, z); +} + +/*! + Sets the attribute at \a location in the current context to + the 4D vector (\a x, \a y, \a z, \a w). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) +{ + if (location != -1) { + GLfloat values[4] = {x, y, z, w}; + glVertexAttrib4fv(location, values); + } +} + +/*! + \overload + + Sets the attribute called \a name in the current context to + the 4D vector (\a x, \a y, \a z, \a w). + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w) +{ + setAttributeValue(attributeLocation(name), x, y, z, w); +} + +/*! + Sets the attribute at \a location in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, const QVector2D& value) +{ + if (location != -1) + glVertexAttrib2fv(location, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the attribute called \a name in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, const QVector2D& value) +{ + setAttributeValue(attributeLocation(name), value); +} + +/*! + Sets the attribute at \a location in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, const QVector3D& value) +{ + if (location != -1) + glVertexAttrib3fv(location, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the attribute called \a name in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, const QVector3D& value) +{ + setAttributeValue(attributeLocation(name), value); +} + +/*! + Sets the attribute at \a location in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, const QVector4D& value) +{ + if (location != -1) + glVertexAttrib4fv(location, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the attribute called \a name in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, const QVector4D& value) +{ + setAttributeValue(attributeLocation(name), value); +} + +/*! + Sets the attribute at \a location in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(int location, const QColor& value) +{ + if (location != -1) { + GLfloat values[4] = {value.redF(), value.greenF(), value.blueF(), value.alphaF()}; + glVertexAttrib4fv(location, values); + } +} + +/*! + \overload + + Sets the attribute called \a name in the current context to \a value. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue(const char *name, const QColor& value) +{ + setAttributeValue(attributeLocation(name), value); +} + +/*! + Sets the attribute at \a location in the current context to the + contents of \a values, which contains \a columns elements, each + consisting of \a rows elements. The \a rows value should be + 1, 2, 3, or 4. This function is typically used to set matrix + values and column vectors. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (int location, const GLfloat *values, int columns, int rows) +{ + if (rows < 1 || rows > 4) { + qWarning() << "QGLShaderProgram::setAttributeValue: rows" << rows << "not supported"; + return; + } + if (location != -1) { + while (columns-- > 0) { + if (rows == 1) + glVertexAttrib1fv(location, values); + else if (rows == 2) + glVertexAttrib2fv(location, values); + else if (rows == 3) + glVertexAttrib3fv(location, values); + else + glVertexAttrib4fv(location, values); + values += rows; + ++location; + } + } +} + +/*! + \overload + + Sets the attribute called \a name in the current context to the + contents of \a values, which contains \a columns elements, each + consisting of \a rows elements. The \a rows value should be + 1, 2, 3, or 4. This function is typically used to set matrix + values and column vectors. + + \sa setUniformValue() +*/ +void QGLShaderProgram::setAttributeValue + (const char *name, const GLfloat *values, int columns, int rows) +{ + setAttributeValue(attributeLocation(name), values, columns, rows); +} + +/*! + Sets an array of vertex \a values on the attribute at \a location + in this shader program. The \a size indicates the number of + components per vertex (1, 2, 3, or 4), and the \a stride indicates + the number of bytes between vertices. A default \a stride value + of zero indicates that the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (int location, const GLfloat *values, int size, int stride) +{ + if (location != -1) { + glVertexAttribPointer(location, size, GL_FLOAT, GL_FALSE, + stride, values); + glEnableVertexAttribArray(location); + } +} + +/*! + Sets an array of 2D vertex \a values on the attribute at \a location + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (int location, const QVector2D *values, int stride) +{ + if (location != -1) { + glVertexAttribPointer(location, 2, GL_FLOAT, GL_FALSE, + stride, values); + glEnableVertexAttribArray(location); + } +} + +/*! + Sets an array of 3D vertex \a values on the attribute at \a location + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (int location, const QVector3D *values, int stride) +{ + if (location != -1) { + glVertexAttribPointer(location, 3, GL_FLOAT, GL_FALSE, + stride, values); + glEnableVertexAttribArray(location); + } +} + +/*! + Sets an array of 4D vertex \a values on the attribute at \a location + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (int location, const QVector4D *values, int stride) +{ + if (location != -1) { + glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE, + stride, values); + glEnableVertexAttribArray(location); + } +} + +/*! + \overload + + Sets an array of vertex \a values on the attribute called \a name + in this shader program. The \a size indicates the number of + components per vertex (1, 2, 3, or 4), and the \a stride indicates + the number of bytes between vertices. A default \a stride value + of zero indicates that the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (const char *name, const GLfloat *values, int size, int stride) +{ + setAttributeArray(attributeLocation(name), values, size, stride); +} + +/*! + \overload + + Sets an array of 2D vertex \a values on the attribute called \a name + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (const char *name, const QVector2D *values, int stride) +{ + setAttributeArray(attributeLocation(name), values, stride); +} + +/*! + \overload + + Sets an array of 3D vertex \a values on the attribute called \a name + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (const char *name, const QVector3D *values, int stride) +{ + setAttributeArray(attributeLocation(name), values, stride); +} + +/*! + \overload + + Sets an array of 4D vertex \a values on the attribute called \a name + in this shader program. The \a stride indicates the number of bytes + between vertices. A default \a stride value of zero indicates that + the vertices are densely packed in \a values. + + \sa setAttributeValue(), setUniformValue(), disableAttributeArray() +*/ +void QGLShaderProgram::setAttributeArray + (const char *name, const QVector4D *values, int stride) +{ + setAttributeArray(attributeLocation(name), values, stride); +} + +/*! + Disables the vertex array at \a location in this shader program + that was enabled by a previous call to setAttributeArray(). + + \sa setAttributeArray(), setAttributeValue(), setUniformValue() +*/ +void QGLShaderProgram::disableAttributeArray(int location) +{ + if (location != -1) + glDisableVertexAttribArray(location); +} + +/*! + \overload + + Disables the vertex array called \a name in this shader program + that was enabled by a previous call to setAttributeArray(). + + \sa setAttributeArray(), setAttributeValue(), setUniformValue() +*/ +void QGLShaderProgram::disableAttributeArray(const char *name) +{ + disableAttributeArray(attributeLocation(name)); +} + +/*! + Returns the location of the uniform variable \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + uniform variable for this shader program. + + \sa attributeLocation() +*/ +int QGLShaderProgram::uniformLocation(const char *name) const +{ + if (d->linked) { + return glGetUniformLocation(d->program, name); + } else { + qWarning() << "QGLShaderProgram::uniformLocation(" << name + << "): shader program is not linked"; + return -1; + } +} + +/*! + \overload + + Returns the location of the uniform variable \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + uniform variable for this shader program. + + \sa attributeLocation() +*/ +int QGLShaderProgram::uniformLocation(const QByteArray& name) const +{ + return uniformLocation(name.constData()); +} + +/*! + \overload + + Returns the location of the uniform variable \a name within this shader + program's parameter list. Returns -1 if \a name is not a valid + uniform variable for this shader program. + + \sa attributeLocation() +*/ +int QGLShaderProgram::uniformLocation(const QString& name) const +{ + return uniformLocation(name.toLatin1().constData()); +} + +/*! + Sets the uniform variable at \a location in the current context to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, GLfloat value) +{ + if (location != -1) + glUniform1fv(location, 1, &value); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, GLfloat value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to \a value. + This function must be used when setting sampler values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, GLint value) +{ + if (location != -1) + glUniform1i(location, value); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to \a value. This function must be used when setting sampler values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, GLint value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to + the 2D vector (\a x, \a y). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, GLfloat x, GLfloat y) +{ + if (location != -1) { + GLfloat values[2] = {x, y}; + glUniform2fv(location, 1, values); + } +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context to + the 2D vector (\a x, \a y). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, GLfloat x, GLfloat y) +{ + setUniformValue(uniformLocation(name), x, y); +} + +/*! + Sets the uniform variable at \a location in the current context to + the 3D vector (\a x, \a y, \a z). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue + (int location, GLfloat x, GLfloat y, GLfloat z) +{ + if (location != -1) { + GLfloat values[3] = {x, y, z}; + glUniform3fv(location, 1, values); + } +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context to + the 3D vector (\a x, \a y, \a z). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue + (const char *name, GLfloat x, GLfloat y, GLfloat z) +{ + setUniformValue(uniformLocation(name), x, y, z); +} + +/*! + Sets the uniform variable at \a location in the current context to + the 4D vector (\a x, \a y, \a z, \a w). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue + (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) +{ + if (location != -1) { + GLfloat values[4] = {x, y, z, w}; + glUniform4fv(location, 1, values); + } +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context to + the 4D vector (\a x, \a y, \a z, \a w). + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue + (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w) +{ + setUniformValue(uniformLocation(name), x, y, z, w); +} + +/*! + Sets the uniform variable at \a location in the current context to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QVector2D& value) +{ + if (location != -1) + glUniform2fv(location, 1, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QVector2D& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QVector3D& value) +{ + if (location != -1) + glUniform3fv(location, 1, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QVector3D& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QVector4D& value) +{ + if (location != -1) + glUniform4fv(location, 1, reinterpret_cast(&value)); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QVector4D& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to + the red, green, blue, and alpha components of \a color. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QColor& color) +{ + if (location != -1) { + GLfloat values[4] = {color.redF(), color.greenF(), color.blueF(), color.alphaF()}; + glUniform4fv(location, 1, values); + } +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context to + the red, green, blue, and alpha components of \a color. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QColor& color) +{ + setUniformValue(uniformLocation(name), color); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 2x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix2x2& value) +{ + if (location != -1) + glUniformMatrix2fv(location, 1, GL_FALSE, value.data()); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 2x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x2& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 2x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix2x3& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix2x3fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix2x3fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform3fv(location, 2, value.data()); + } + } +#else + if (location != -1) + glUniform3fv(location, 2, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 2x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x3& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 2x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix2x4& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix2x4fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix2x4fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform4fv(location, 2, value.data()); + } + } +#else + if (location != -1) + glUniform4fv(location, 2, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 2x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x4& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 3x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix3x2& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix3x2fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix3x2fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform2fv(location, 3, value.data()); + } + } +#else + if (location != -1) + glUniform2fv(location, 3, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 3x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x2& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 3x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix3x3& value) +{ + if (location != -1) + glUniformMatrix3fv(location, 1, GL_FALSE, value.data()); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 3x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x3& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 3x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix3x4& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix3x4fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix3x4fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform4fv(location, 3, value.data()); + } + } +#else + if (location != -1) + glUniform4fv(location, 3, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 3x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x4& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 4x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix4x2& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix4x2fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix4x2fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform2fv(location, 4, value.data()); + } + } +#else + if (location != -1) + glUniform2fv(location, 4, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 4x2 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x2& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 4x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix4x3& value) +{ +#if !defined(QT_OPENGL_ES_2) + if (location != -1) { + if (glUniformMatrix4x3fv) { + // OpenGL 2.1+: pass the matrix directly. + glUniformMatrix4x3fv(location, 1, GL_FALSE, value.data()); + } else { + // OpenGL 2.0: pass the matrix columns as a vector. + glUniform3fv(location, 4, value.data()); + } + } +#else + if (location != -1) + glUniform3fv(location, 4, value.data()); +#endif +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 4x3 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x3& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context + to a 4x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const QMatrix4x4& value) +{ + if (location != -1) + glUniformMatrix4fv(location, 1, GL_FALSE, value.data()); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 4x4 matrix \a value. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + \overload + + Sets the uniform variable at \a location in the current context + to a 4x4 matrix \a value. The matrix elements must be specified + in column-major order. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(int location, const GLfloat value[4][4]) +{ + if (location != -1) + glUniformMatrix4fv(location, 1, GL_FALSE, value[0]); +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context + to a 4x4 matrix \a value. The matrix elements must be specified + in column-major order. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[4][4]) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable at \a location in the current context to a + 3x3 transformation matrix \a value that is specified as a QTransform value. + + To set a QTransform value as a 4x4 matrix in a shader, use + \c{setUniformValue(location, QMatrix4x4(value))}. +*/ +void QGLShaderProgram::setUniformValue(int location, const QTransform& value) +{ + if (location != -1) { + GLfloat mat[3][3] = { + {value.m11(), value.m12(), value.m13()}, + {value.m21(), value.m22(), value.m23()}, + {value.m31(), value.m32(), value.m33()} + }; + glUniformMatrix3fv(location, 1, GL_FALSE, mat[0]); + } +} + +/*! + \overload + + Sets the uniform variable called \a name in the current context to a + 3x3 transformation matrix \a value that is specified as a QTransform value. + + To set a QTransform value as a 4x4 matrix in a shader, use + \c{setUniformValue(name, QMatrix4x4(value))}. +*/ +void QGLShaderProgram::setUniformValue + (const char *name, const QTransform& value) +{ + setUniformValue(uniformLocation(name), value); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count elements of \a values. This overload + must be used when setting an array of sampler values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const GLint *values, int count) +{ + if (location != -1) + glUniform1iv(location, count, values); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count elements of \a values. This overload + must be used when setting an array of sampler values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray + (const char *name, const GLint *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count elements of \a values. Each element + has \a size components. The \a size must be 1, 2, 3, or 4. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const GLfloat *values, int count, int size) +{ + if (location != -1) { + if (size == 1) + glUniform1fv(location, count, values); + else if (size == 2) + glUniform2fv(location, count, values); + else if (size == 3) + glUniform3fv(location, count, values); + else if (size == 4) + glUniform4fv(location, count, values); + else + qWarning() << "QGLShaderProgram::setUniformValue: size" << size << "not supported"; + } +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count elements of \a values. Each element + has \a size components. The \a size must be 1, 2, 3, or 4. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray + (const char *name, const GLfloat *values, int count, int size) +{ + setUniformValueArray(uniformLocation(name), values, count, size); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 2D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QVector2D *values, int count) +{ + if (location != -1) + glUniform2fv(location, count, reinterpret_cast(values)); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 2D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QVector2D *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 3D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QVector3D *values, int count) +{ + if (location != -1) + glUniform3fv(location, count, reinterpret_cast(values)); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 3D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QVector3D *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 4D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QVector4D *values, int count) +{ + if (location != -1) + glUniform4fv(location, count, reinterpret_cast(values)); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 4D vector elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +// We may have to repack matrix arrays if the matrix types +// contain additional flag bits. Especially QMatrix4x4. +#define setUniformMatrixArray(func,location,values,count,type,cols,rows) \ + if (location == -1 || count <= 0) \ + return; \ + if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \ + func(location, count, GL_FALSE, values->constData()); \ + } else { \ + QVarLengthArray temp(cols * rows * count); \ + for (int index = 0; index < count; ++index) { \ + qMemCopy(temp.data() + cols * rows * index, \ + values[index].constData(), cols * rows * sizeof(GLfloat)); \ + } \ + func(location, count, GL_FALSE, temp.constData()); \ + } +#if !defined(QT_OPENGL_ES_2) +#define setUniformGenericMatrixArray(func,colfunc,location,values,count,type,cols,rows) \ + if (location == -1 || count <= 0) \ + return; \ + if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \ + if (func) \ + func(location, count, GL_FALSE, values->constData()); \ + else \ + colfunc(location, cols * count, values->constData()); \ + } else { \ + QVarLengthArray temp(cols * rows * count); \ + for (int index = 0; index < count; ++index) { \ + qMemCopy(temp.data() + cols * rows * index, \ + values[index].constData(), cols * rows * sizeof(GLfloat)); \ + } \ + if (func) \ + func(location, count, GL_FALSE, temp.constData()); \ + else \ + colfunc(location, count * cols, temp.constData()); \ + } +#else +#define setUniformGenericMatrixArray(func,colfunc,location,values,count,type,cols,rows) \ + if (location == -1 || count <= 0) \ + return; \ + if (count == 1 || sizeof(type) == cols * rows * sizeof(GLfloat)) { \ + colfunc(location, cols * count, values->constData()); \ + } else { \ + QVarLengthArray temp(cols * rows * count); \ + for (int index = 0; index < count; ++index) { \ + qMemCopy(temp.data() + cols * rows * index, \ + values[index].constData(), cols * rows * sizeof(GLfloat)); \ + } \ + colfunc(location, count * cols, temp.constData()); \ + } +#endif + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 2x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x2 *values, int count) +{ + setUniformMatrixArray + (glUniformMatrix2fv, location, values, count, QMatrix2x2, 2, 2); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 2x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x2 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 2x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x3 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix2x3fv, glUniform3fv, location, values, count, + QMatrix2x3, 2, 3); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 2x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x3 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 2x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x4 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix2x4fv, glUniform4fv, location, values, count, + QMatrix2x4, 2, 4); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 2x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x4 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 3x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x2 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix3x2fv, glUniform2fv, location, values, count, + QMatrix3x2, 3, 2); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 3x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x2 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 3x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x3 *values, int count) +{ + setUniformMatrixArray + (glUniformMatrix3fv, location, values, count, QMatrix3x3, 3, 3); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 3x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x3 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 3x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x4 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix3x4fv, glUniform4fv, location, values, count, + QMatrix3x4, 3, 4); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 3x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x4 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 4x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x2 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix4x2fv, glUniform2fv, location, values, count, + QMatrix4x2, 4, 2); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 4x2 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x2 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 4x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x3 *values, int count) +{ + setUniformGenericMatrixArray + (glUniformMatrix4x3fv, glUniform3fv, location, values, count, + QMatrix4x3, 4, 3); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 4x3 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x3 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Sets the uniform variable array at \a location in the current + context to the \a count 4x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x4 *values, int count) +{ + setUniformMatrixArray + (glUniformMatrix4fv, location, values, count, QMatrix4x4, 4, 4); +} + +/*! + \overload + + Sets the uniform variable array called \a name in the current + context to the \a count 4x4 matrix elements of \a values. + + \sa setAttributeValue() +*/ +void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *values, int count) +{ + setUniformValueArray(uniformLocation(name), values, count); +} + +/*! + Returns true if shader programs written in the OpenGL Shading + Language (GLSL) are supported on this system; false otherwise. + + The \a context is used to resolve the GLSL extensions. + If \a context is null, then QGLContext::currentContext() is used. +*/ +bool QGLShaderProgram::hasShaderPrograms(const QGLContext *context) +{ +#if !defined(QT_OPENGL_ES_2) + if (!context) + context = QGLContext::currentContext(); + if (!context) + return false; + return qt_resolve_glsl_extensions(const_cast(context)); +#else + Q_UNUSED(context); + return true; +#endif +} + +#endif + +QT_END_NAMESPACE diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h new file mode 100644 index 0000000..ec6faaf --- /dev/null +++ b/src/opengl/qglshaderprogram.h @@ -0,0 +1,285 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGLSHADERPROGRAM_H +#define QGLSHADERPROGRAM_H + +#include +#include +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(OpenGL) + +#if !defined(QT_OPENGL_ES_1_CL) && !defined(QT_GL_FIXED_PREFERRED) + +class QGLShaderProgram; +class QGLShaderPrivate; + +class Q_OPENGL_EXPORT QGLShader : public QObject +{ + Q_OBJECT +public: + enum ShaderType + { + VertexShader, + FragmentShader, + PartialVertexShader, + PartialFragmentShader + }; + + explicit QGLShader(QGLShader::ShaderType type, QObject *parent = 0); + explicit QGLShader(const QString& fileName, QObject *parent = 0); + QGLShader(const QString& fileName, QGLShader::ShaderType type, QObject *parent = 0); + QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = 0); + QGLShader(const QString& fileName, const QGLContext *context, QObject *parent = 0); + QGLShader(const QString& fileName, QGLShader::ShaderType type, const QGLContext *context, QObject *parent = 0); + virtual ~QGLShader(); + + bool isValid() const; + + QGLShader::ShaderType shaderType() const; + + bool setSourceCode(const char *source); + bool setSourceCode(const QByteArray& source); + bool setSourceCode(const QString& source); + bool setSourceCodeFile(const QString& fileName); + + bool setBinaryCode(GLenum format, const void *binary, int length); + bool setBinaryCode(QGLShader& otherShader, GLenum format, const void *binary, int length); + + static QList shaderBinaryFormats(); + + QByteArray sourceCode() const; + + bool isCompiled() const; + QString errors() const; + + GLuint shaderId() const; + +private: + QGLShaderPrivate *d; + + friend class QGLShaderProgram; + + Q_DISABLE_COPY(QGLShader); +}; + +class QGLShaderProgramPrivate; + +class Q_OPENGL_EXPORT QGLShaderProgram : public QObject +{ + Q_OBJECT +public: + explicit QGLShaderProgram(QObject *parent = 0); + explicit QGLShaderProgram(const QGLContext *context, QObject *parent = 0); + virtual ~QGLShaderProgram(); + + bool isValid() const; + + bool addShader(QGLShader *shader); + void removeShader(QGLShader *shader); + QList shaders() const; + + bool addShader(QGLShader::ShaderType type, const char *source); + bool addShader(QGLShader::ShaderType type, const QByteArray& source); + bool addShader(QGLShader::ShaderType type, const QString& source); + + void removeAllShaders(); + + QByteArray programBinary(int *format) const; + bool setProgramBinary(int format, const QByteArray& binary); + static QList programBinaryFormats(); + + virtual bool link(); + bool isLinked() const; + QString errors() const; + + bool enable(); + void disable(); + + GLuint programId() const; + + void bindAttributeLocation(const char *name, int location); + void bindAttributeLocation(const QByteArray& name, int location); + void bindAttributeLocation(const QString& name, int location); + + int attributeLocation(const char *name) const; + int attributeLocation(const QByteArray& name) const; + int attributeLocation(const QString& name) const; + + void setAttributeValue(int location, GLfloat value); + void setAttributeValue(int location, GLfloat x, GLfloat y); + void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z); + void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + void setAttributeValue(int location, const QVector2D& value); + void setAttributeValue(int location, const QVector3D& value); + void setAttributeValue(int location, const QVector4D& value); + void setAttributeValue(int location, const QColor& value); + void setAttributeValue(int location, const GLfloat *values, int columns, int rows); + + void setAttributeValue(const char *name, GLfloat value); + void setAttributeValue(const char *name, GLfloat x, GLfloat y); + void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z); + void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + void setAttributeValue(const char *name, const QVector2D& value); + void setAttributeValue(const char *name, const QVector3D& value); + void setAttributeValue(const char *name, const QVector4D& value); + void setAttributeValue(const char *name, const QColor& value); + void setAttributeValue(const char *name, const GLfloat *values, int columns, int rows); + + void setAttributeArray + (int location, const GLfloat *values, int size, int stride = 0); + void setAttributeArray + (int location, const QVector2D *values, int stride = 0); + void setAttributeArray + (int location, const QVector3D *values, int stride = 0); + void setAttributeArray + (int location, const QVector4D *values, int stride = 0); + void setAttributeArray + (const char *name, const GLfloat *values, int size, int stride = 0); + void setAttributeArray + (const char *name, const QVector2D *values, int stride = 0); + void setAttributeArray + (const char *name, const QVector3D *values, int stride = 0); + void setAttributeArray + (const char *name, const QVector4D *values, int stride = 0); + void disableAttributeArray(int location); + void disableAttributeArray(const char *name); + + int uniformLocation(const char *name) const; + int uniformLocation(const QByteArray& name) const; + int uniformLocation(const QString& name) const; + + void setUniformValue(int location, GLfloat value); + void setUniformValue(int location, GLint value); + void setUniformValue(int location, GLfloat x, GLfloat y); + void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z); + void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + void setUniformValue(int location, const QVector2D& value); + void setUniformValue(int location, const QVector3D& value); + void setUniformValue(int location, const QVector4D& value); + void setUniformValue(int location, const QColor& color); + void setUniformValue(int location, const QMatrix2x2& value); + void setUniformValue(int location, const QMatrix2x3& value); + void setUniformValue(int location, const QMatrix2x4& value); + void setUniformValue(int location, const QMatrix3x2& value); + void setUniformValue(int location, const QMatrix3x3& value); + void setUniformValue(int location, const QMatrix3x4& value); + void setUniformValue(int location, const QMatrix4x2& value); + void setUniformValue(int location, const QMatrix4x3& value); + void setUniformValue(int location, const QMatrix4x4& value); + void setUniformValue(int location, const GLfloat value[4][4]); + void setUniformValue(int location, const QTransform& value); + + void setUniformValue(const char *name, GLfloat value); + void setUniformValue(const char *name, GLint value); + void setUniformValue(const char *name, GLfloat x, GLfloat y); + void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z); + void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + void setUniformValue(const char *name, const QVector2D& value); + void setUniformValue(const char *name, const QVector3D& value); + void setUniformValue(const char *name, const QVector4D& value); + void setUniformValue(const char *name, const QColor& color); + void setUniformValue(const char *name, const QMatrix2x2& value); + void setUniformValue(const char *name, const QMatrix2x3& value); + void setUniformValue(const char *name, const QMatrix2x4& value); + void setUniformValue(const char *name, const QMatrix3x2& value); + void setUniformValue(const char *name, const QMatrix3x3& value); + void setUniformValue(const char *name, const QMatrix3x4& value); + void setUniformValue(const char *name, const QMatrix4x2& value); + void setUniformValue(const char *name, const QMatrix4x3& value); + void setUniformValue(const char *name, const QMatrix4x4& value); + void setUniformValue(const char *name, const GLfloat value[4][4]); + void setUniformValue(const char *name, const QTransform& value); + + void setUniformValueArray(int location, const GLfloat *values, int count, int size); + void setUniformValueArray(int location, const GLint *values, int count); + void setUniformValueArray(int location, const QVector2D *values, int count); + void setUniformValueArray(int location, const QVector3D *values, int count); + void setUniformValueArray(int location, const QVector4D *values, int count); + void setUniformValueArray(int location, const QMatrix2x2 *values, int count); + void setUniformValueArray(int location, const QMatrix2x3 *values, int count); + void setUniformValueArray(int location, const QMatrix2x4 *values, int count); + void setUniformValueArray(int location, const QMatrix3x2 *values, int count); + void setUniformValueArray(int location, const QMatrix3x3 *values, int count); + void setUniformValueArray(int location, const QMatrix3x4 *values, int count); + void setUniformValueArray(int location, const QMatrix4x2 *values, int count); + void setUniformValueArray(int location, const QMatrix4x3 *values, int count); + void setUniformValueArray(int location, const QMatrix4x4 *values, int count); + + void setUniformValueArray(const char *name, const GLfloat *values, int count, int size); + void setUniformValueArray(const char *name, const GLint *values, int count); + void setUniformValueArray(const char *name, const QVector2D *values, int count); + void setUniformValueArray(const char *name, const QVector3D *values, int count); + void setUniformValueArray(const char *name, const QVector4D *values, int count); + void setUniformValueArray(const char *name, const QMatrix2x2 *values, int count); + void setUniformValueArray(const char *name, const QMatrix2x3 *values, int count); + void setUniformValueArray(const char *name, const QMatrix2x4 *values, int count); + void setUniformValueArray(const char *name, const QMatrix3x2 *values, int count); + void setUniformValueArray(const char *name, const QMatrix3x3 *values, int count); + void setUniformValueArray(const char *name, const QMatrix3x4 *values, int count); + void setUniformValueArray(const char *name, const QMatrix4x2 *values, int count); + void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count); + void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count); + + static bool hasShaderPrograms(const QGLContext *context = 0); + +private: + QGLShaderProgramPrivate *d; + + Q_DISABLE_COPY(QGLShaderProgram); + + bool init(); +}; + +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 41c73a3..19f6b43 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -432,3 +432,4 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ qwebpage +SUBDIRS += math3d diff --git a/tests/auto/math3d/math3d.pro b/tests/auto/math3d/math3d.pro new file mode 100644 index 0000000..3977e92 --- /dev/null +++ b/tests/auto/math3d/math3d.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = qfixedpt qmatrixnxn qquaternion qvectornd +SUBDIRS += qmatrixnxn_fixed qquaternion_fixed qvectornd_fixed diff --git a/tests/auto/math3d/qfixedpt/qfixedpt.pro b/tests/auto/math3d/qfixedpt/qfixedpt.pro new file mode 100644 index 0000000..94598b5 --- /dev/null +++ b/tests/auto/math3d/qfixedpt/qfixedpt.pro @@ -0,0 +1,2 @@ +load(qttest_p4) +SOURCES += tst_qfixedpt.cpp diff --git a/tests/auto/math3d/qfixedpt/tst_qfixedpt.cpp b/tests/auto/math3d/qfixedpt/tst_qfixedpt.cpp new file mode 100644 index 0000000..f8c8d09 --- /dev/null +++ b/tests/auto/math3d/qfixedpt/tst_qfixedpt.cpp @@ -0,0 +1,613 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +class tst_QFixedPt : public QObject +{ + Q_OBJECT +public: + tst_QFixedPt() {} + ~tst_QFixedPt() {} + +private slots: + void create_data(); + void create(); + void add_data(); + void add(); + void sub_data(); + void sub(); + void mul_data(); + void mul(); + void div_data(); + void div(); + void neg_data(); + void neg(); + void shift_data(); + void shift(); + void sqrt_data(); + void sqrt(); + void round_data(); + void round(); + void compare_data(); + void compare(); +}; + +// qFuzzyCompare isn't quite "fuzzy" enough to handle conversion +// to fixed-point and back again. So create a "fuzzier" compare. +static bool fuzzyCompare(double x, double y) +{ + double diff = x - y; + if (diff < 0.0f) + diff = -diff; + return (diff < 0.0001); +} + +// Test the creation of QFixedPt values in various ways. +void tst_QFixedPt::create_data() +{ + QTest::addColumn("value"); + QTest::addColumn("intValue"); + QTest::addColumn("realValue"); + + QTest::newRow("zero") << 0x00000000 << 0 << 0.0f; + QTest::newRow("one") << 0x00010000 << 1 << 1.0f; + QTest::newRow("1.5") << 0x00018000 << 2 << 1.5f; // int rounds up + QTest::newRow("-1.5") << (int)0xFFFE8000 << -1 << -1.5f; // int rounds up + QTest::newRow("-7") << (int)0xFFF90000 << -7 << -7.0f; +} +void tst_QFixedPt::create() +{ + QFETCH(int, value); + QFETCH(int, intValue); + QFETCH(float, realValue); + + if (qFloor(realValue) == realValue) { + QFixedPt<16> ivalue(intValue); + QCOMPARE(ivalue.bits(), value); + QCOMPARE(ivalue.toInt(), intValue); + QCOMPARE(ivalue.toReal(), (qreal)realValue); + } + + QFixedPt<16> fvalue(realValue); + QCOMPARE(fvalue.bits(), value); + QCOMPARE(fvalue.toInt(), intValue); + QCOMPARE(fvalue.toReal(), (qreal)realValue); + + QFixedPt<16> fpvalue; + fpvalue.setBits(value); + QCOMPARE(fpvalue.bits(), value); + QCOMPARE(fpvalue.toInt(), intValue); + QCOMPARE(fpvalue.toReal(), (qreal)realValue); + + QFixedPt<16> fpvalue2(fpvalue); + QCOMPARE(fpvalue2.bits(), value); + QCOMPARE(fpvalue2.toInt(), intValue); + QCOMPARE(fpvalue2.toReal(), (qreal)realValue); + + if (qFloor(realValue) == realValue) { + QFixedPt<16> ivalue2(63); // Initialize the something else. + ivalue2 = intValue; // Then change the value. + QCOMPARE(ivalue2.bits(), value); + QCOMPARE(ivalue2.toInt(), intValue); + QCOMPARE(ivalue2.toReal(), (qreal)realValue); + } + + QFixedPt<16> fvalue2(36); + fvalue2 = realValue; + QCOMPARE(fvalue2.bits(), value); + QCOMPARE(fvalue2.toInt(), intValue); + QCOMPARE(fvalue2.toReal(), (qreal)realValue); + + QFixedPt<16> fpvalue3; + fpvalue3 = fpvalue; + QCOMPARE(fpvalue3.bits(), value); + QCOMPARE(fpvalue3.toInt(), intValue); + QCOMPARE(fpvalue3.toReal(), (qreal)realValue); + + // Now do some of the tests again with a different precision value. + + if (qFloor(realValue) == realValue) { + QFixedPt<4> ivalue3(intValue); + QCOMPARE(ivalue3.bits(), value >> 12); + QCOMPARE(ivalue3.toInt(), intValue); + QCOMPARE(ivalue3.toReal(), (qreal)realValue); + } + + QFixedPt<4> fvalue3(realValue); + QCOMPARE(fvalue3.bits(), value >> 12); + QCOMPARE(fvalue3.toInt(), intValue); + QCOMPARE(fvalue3.toReal(), (qreal)realValue); + + QFixedPt<4> fpvalue4; + fpvalue4.setBits(value >> 12); + QCOMPARE(fpvalue4.bits(), value >> 12); + QCOMPARE(fpvalue4.toInt(), intValue); + QCOMPARE(fpvalue4.toReal(), (qreal)realValue); + + // Test conversion between the precision values. + +#if !defined(QT_NO_MEMBER_TEMPLATES) + if (qFloor(realValue) == realValue) { + QFixedPt<16> ivalue(intValue); + QFixedPt<4> ivalue3(intValue); + QVERIFY(ivalue.toPrecision<4>() == ivalue3); + QVERIFY(ivalue3.toPrecision<16>() == ivalue); + } + QVERIFY(fvalue.toPrecision<4>() == fvalue3); + QVERIFY(fvalue3.toPrecision<16>() == fvalue); +#endif + + if (qFloor(realValue) == realValue) { + QFixedPt<16> ivalue(intValue); + QFixedPt<4> ivalue3(intValue); + QVERIFY(qFixedPtToPrecision<4>(ivalue) == ivalue3); + QVERIFY(qFixedPtToPrecision<16>(ivalue3) == ivalue); + } + QVERIFY(qFixedPtToPrecision<4>(fvalue) == fvalue3); + QVERIFY(qFixedPtToPrecision<16>(fvalue3) == fvalue); +} + +// Test fixed point addition. +void tst_QFixedPt::add_data() +{ + QTest::addColumn("a"); + QTest::addColumn("b"); + + QTest::newRow("zero") << 0.0f << 0.0f; + QTest::newRow("test1") << 1.0f << 0.0f; + QTest::newRow("test2") << 0.0f << 1.0f; + QTest::newRow("test3") << 10.0f << -3.0f; + QTest::newRow("test4") << 10.5f << 3.25f; +} +void tst_QFixedPt::add() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + QFixedPt<16> cvalue = avalue + bvalue; + QFixedPt<16> dvalue = a + bvalue; + QFixedPt<16> evalue = avalue + b; + + QCOMPARE(cvalue.toReal(), (qreal)(a + b)); + QCOMPARE(dvalue.toReal(), (qreal)(a + b)); + QCOMPARE(evalue.toReal(), (qreal)(a + b)); + + QFixedPt<16> fvalue(avalue); + fvalue += bvalue; + QCOMPARE(fvalue.toReal(), (qreal)(a + b)); + + QFixedPt<16> gvalue(avalue); + gvalue += b; + QCOMPARE(gvalue.toReal(), (qreal)(a + b)); + + if (qFloor(a) == a && qFloor(b) == b) { + QFixedPt<16> hvalue = int(a) + bvalue; + QFixedPt<16> ivalue = avalue + int(b); + + QCOMPARE(hvalue.toInt(), int(a) + int(b)); + QCOMPARE(ivalue.toInt(), int(a) + int(b)); + QCOMPARE(hvalue.toReal(), (qreal)(a + b)); + QCOMPARE(ivalue.toReal(), (qreal)(a + b)); + + QFixedPt<16> jvalue(avalue); + jvalue += int(b); + QCOMPARE(jvalue.toReal(), (qreal)(a + b)); + } +} + +// Test fixed point subtraction. +void tst_QFixedPt::sub_data() +{ + // Use the same test data as the add() test. + add_data(); +} +void tst_QFixedPt::sub() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + QFixedPt<16> cvalue = avalue - bvalue; + QFixedPt<16> dvalue = a - bvalue; + QFixedPt<16> evalue = avalue - b; + + QCOMPARE(cvalue.toReal(), (qreal)(a - b)); + QCOMPARE(dvalue.toReal(), (qreal)(a - b)); + QCOMPARE(evalue.toReal(), (qreal)(a - b)); + + QFixedPt<16> fvalue(avalue); + fvalue -= bvalue; + QCOMPARE(fvalue.toReal(), (qreal)(a - b)); + + QFixedPt<16> gvalue(avalue); + gvalue -= b; + QCOMPARE(gvalue.toReal(), (qreal)(a - b)); + + if (qFloor(a) == a && qFloor(b) == b) { + QFixedPt<16> hvalue = int(a) - bvalue; + QFixedPt<16> ivalue = avalue - int(b); + + QCOMPARE(hvalue.toInt(), int(a) - int(b)); + QCOMPARE(ivalue.toInt(), int(a) - int(b)); + QCOMPARE(hvalue.toReal(), (qreal)(a - b)); + QCOMPARE(ivalue.toReal(), (qreal)(a - b)); + + QFixedPt<16> jvalue(avalue); + jvalue -= int(b); + QCOMPARE(jvalue.toReal(), (qreal)(a - b)); + } +} + +// Test fixed point multiplication. +void tst_QFixedPt::mul_data() +{ + // Use the same test data as the add() test. + add_data(); +} +void tst_QFixedPt::mul() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + QFixedPt<16> cvalue = avalue * bvalue; + QFixedPt<16> dvalue = a * bvalue; + QFixedPt<16> evalue = avalue * b; + + QCOMPARE(cvalue.toReal(), (qreal)(a * b)); + QCOMPARE(dvalue.toReal(), (qreal)(a * b)); + QCOMPARE(evalue.toReal(), (qreal)(a * b)); + + QFixedPt<16> fvalue(avalue); + fvalue *= bvalue; + QCOMPARE(fvalue.toReal(), (qreal)(a * b)); + + QFixedPt<16> gvalue(avalue); + gvalue *= b; + QCOMPARE(gvalue.toReal(), (qreal)(a * b)); + + if (qFloor(a) == a && qFloor(b) == b) { + QFixedPt<16> hvalue = int(a) * bvalue; + QFixedPt<16> ivalue = avalue * int(b); + + QCOMPARE(hvalue.toInt(), int(a) * int(b)); + QCOMPARE(ivalue.toInt(), int(a) * int(b)); + QCOMPARE(hvalue.toReal(), (qreal)(a * b)); + QCOMPARE(ivalue.toReal(), (qreal)(a * b)); + + QFixedPt<16> jvalue(avalue); + jvalue *= int(b); + QCOMPARE(jvalue.toReal(), (qreal)(a * b)); + } +} + +// Test fixed point division. +void tst_QFixedPt::div_data() +{ + // Use the same test data as the add() test. + add_data(); +} +void tst_QFixedPt::div() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + qreal result; + if (b == 0.0f) + result = 0.0f; // Divide by zero results in zero. + else + result = a / b; + + QFixedPt<16> cvalue = avalue / bvalue; + QFixedPt<16> dvalue = a / bvalue; + QFixedPt<16> evalue = avalue / b; + + QVERIFY(fuzzyCompare(cvalue.toReal(), result)); + QVERIFY(fuzzyCompare(dvalue.toReal(), result)); + QVERIFY(fuzzyCompare(evalue.toReal(), result)); + + QFixedPt<16> fvalue(avalue); + fvalue /= bvalue; + QVERIFY(fuzzyCompare(fvalue.toReal(), result)); + + QFixedPt<16> gvalue(avalue); + gvalue /= b; + QVERIFY(fuzzyCompare(gvalue.toReal(), result)); + + if (qFloor(a) == a && qFloor(b) == b) { + QFixedPt<16> hvalue = int(a) / bvalue; + QFixedPt<16> ivalue = avalue / int(b); + + QCOMPARE(hvalue.toInt(), int(result)); + QCOMPARE(ivalue.toInt(), int(result)); + QVERIFY(fuzzyCompare(hvalue.toReal(), result)); + QVERIFY(fuzzyCompare(ivalue.toReal(), result)); + + QFixedPt<16> jvalue(avalue); + jvalue /= int(b); + QVERIFY(fuzzyCompare(jvalue.toReal(), result)); + } +} + +// Test fixed point negation. +void tst_QFixedPt::neg_data() +{ + // Use the same test data as the add() test. + add_data(); +} +void tst_QFixedPt::neg() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + QFixedPt<16> cvalue = -avalue; + QCOMPARE(cvalue.bits(), -avalue.bits()); + QCOMPARE(cvalue.toInt(), int(-a)); + QCOMPARE(cvalue.toReal(), (qreal)-a); + + QFixedPt<16> dvalue = -bvalue; + QCOMPARE(dvalue.bits(), -bvalue.bits()); + QCOMPARE(dvalue.toInt(), int(-b)); + QCOMPARE(dvalue.toReal(), (qreal)-b); +} + +// Test left and right shift operators on fixed point values. +void tst_QFixedPt::shift_data() +{ + QTest::addColumn("a"); + QTest::addColumn("amount"); + + QTest::newRow("zero") << 0.0f << 5; + QTest::newRow("one") << 1.0f << 4; + QTest::newRow("-1.75") << -1.75f << 4; +} +void tst_QFixedPt::shift() +{ + QFETCH(float, a); + QFETCH(int, amount); + + int lresult = int((a * 65536.0) * (1 << amount)); + int rresult = int((a * 65536.0) / (1 << amount)); + + QFixedPt<16> avalue(a); + avalue <<= amount; + QCOMPARE(avalue.bits(), lresult); + + QFixedPt<16> bvalue(a); + bvalue >>= amount; + QCOMPARE(bvalue.bits(), rresult); + + QFixedPt<16> cvalue(a); + + QFixedPt<16> dvalue; + dvalue = cvalue << amount; + QCOMPARE(dvalue.bits(), lresult); + + QFixedPt<16> evalue; + evalue = cvalue >> amount; + QCOMPARE(evalue.bits(), rresult); +} + +// Test fixed point square root. +void tst_QFixedPt::sqrt_data() +{ + QTest::addColumn("a"); + + QTest::newRow("zero") << 0.0f; + QTest::newRow("one") << 1.0f; + QTest::newRow("two") << 2.0f; + QTest::newRow("sixteen") << 16.0f; + QTest::newRow("1.5") << 1.5f; +} +void tst_QFixedPt::sqrt() +{ + QFETCH(float, a); + + QFixedPt<16> avalue(a); + QVERIFY(fuzzyCompare(avalue.sqrt().toReal(), qSqrt(a))); + QVERIFY(fuzzyCompare(avalue.sqrtF(), qSqrt(a))); +} + +// Test fixed point rounding. +void tst_QFixedPt::round_data() +{ + QTest::addColumn("a"); + QTest::addColumn("rounded"); + QTest::addColumn("ceiling"); + QTest::addColumn("flooring"); + QTest::addColumn("truncated"); + + QTest::newRow("zero") << 0.0f << 0 << 0 << 0 << 0; + QTest::newRow("test1") << 1.0f << 1 << 1 << 1 << 1; + QTest::newRow("test2") << 2.5f << 3 << 3 << 2 << 2; + QTest::newRow("test3") << 2.3f << 2 << 3 << 2 << 2; + QTest::newRow("test4") << -2.5f << -2 << -2 << -3 << -3; + QTest::newRow("test5") << -2.3f << -2 << -2 << -3 << -3; + QTest::newRow("test6") << -2.7f << -3 << -2 << -3 << -3; +} +void tst_QFixedPt::round() +{ + QFETCH(float, a); + QFETCH(int, rounded); + QFETCH(int, ceiling); + QFETCH(int, flooring); + QFETCH(int, truncated); + + QFixedPt<16> avalue(a); + QVERIFY(avalue.round() == rounded); + QVERIFY(avalue.ceil() == ceiling); + QVERIFY(avalue.floor() == flooring); + QVERIFY(avalue.truncate() == truncated); + + QCOMPARE(qRound(avalue), rounded); + QCOMPARE(qCeil(avalue), ceiling); + QCOMPARE(qFloor(avalue), flooring); +} + +// Test comparison operators. +void tst_QFixedPt::compare_data() +{ + QTest::addColumn("a"); + QTest::addColumn("b"); + + QTest::newRow("test1") << 0.0f << 0.0f; + QTest::newRow("test2") << 1.0f << 0.0f; + QTest::newRow("test3") << 2.5f << 2.5f; + QTest::newRow("test4") << 2.5f << -2.5f; + QTest::newRow("test5") << -2.5f << 2.5f; +} +void tst_QFixedPt::compare() +{ + QFETCH(float, a); + QFETCH(float, b); + + QFixedPt<16> avalue(a); + QFixedPt<16> bvalue(b); + + if (a == b) { + QVERIFY(avalue == bvalue); + QVERIFY(avalue == b); + QVERIFY(a == bvalue); + QVERIFY(!(avalue != bvalue)); + QVERIFY(!(avalue != b)); + QVERIFY(!(a != bvalue)); + QVERIFY(!(avalue < bvalue)); + QVERIFY(!(avalue < b)); + QVERIFY(!(a < bvalue)); + QVERIFY(!(avalue > bvalue)); + QVERIFY(!(avalue > b)); + QVERIFY(!(a > bvalue)); + QVERIFY(avalue <= bvalue); + QVERIFY(avalue <= b); + QVERIFY(a <= bvalue); + QVERIFY(avalue >= bvalue); + QVERIFY(avalue >= b); + QVERIFY(a >= bvalue); + if (qFloor(a) == a) { + QVERIFY(int(a) == bvalue); + QVERIFY(!(int(a) != bvalue)); + QVERIFY(!(int(a) < bvalue)); + QVERIFY(!(int(a) > bvalue)); + QVERIFY(int(a) <= bvalue); + QVERIFY(int(a) >= bvalue); + } + if (qFloor(b) == b) { + QVERIFY(avalue == int(b)); + QVERIFY(!(avalue != int(b))); + QVERIFY(!(avalue < int(b))); + QVERIFY(!(avalue > int(b))); + QVERIFY(avalue <= int(b)); + QVERIFY(avalue >= int(b)); + } + } + + if (a != b) { + QVERIFY(avalue != bvalue); + QVERIFY(avalue != b); + QVERIFY(a != bvalue); + QVERIFY(!(avalue == bvalue)); + QVERIFY(!(avalue == b)); + QVERIFY(!(a == bvalue)); + if (qFloor(a) == a) { + QVERIFY(int(a) != bvalue); + QVERIFY(!(int(a) == bvalue)); + } + if (qFloor(b) == b) { + QVERIFY(avalue != int(b)); + QVERIFY(!(avalue == int(b))); + } + } + + if (a < b) { + QVERIFY(avalue < bvalue); + QVERIFY(avalue < b); + QVERIFY(a < bvalue); + QVERIFY(!(avalue >= bvalue)); + QVERIFY(!(avalue >= b)); + QVERIFY(!(a >= bvalue)); + QVERIFY(!(avalue > bvalue)); + QVERIFY(!(avalue > b)); + QVERIFY(!(a > bvalue)); + QVERIFY(avalue <= bvalue); + QVERIFY(avalue <= b); + QVERIFY(a <= bvalue); + QVERIFY(!(avalue >= bvalue)); + QVERIFY(!(avalue >= b)); + QVERIFY(!(a >= bvalue)); + if (qFloor(a) == a) { + QVERIFY(int(a) < bvalue); + QVERIFY(!(int(a) >= bvalue)); + QVERIFY(!(int(a) > bvalue)); + QVERIFY(int(a) <= bvalue); + } + if (qFloor(b) == b) { + QVERIFY(avalue < int(b)); + QVERIFY(!(avalue >= int(b))); + QVERIFY(!(avalue > int(b))); + QVERIFY(avalue <= int(b)); + } + } + + if (a > b) { + QVERIFY(avalue > bvalue); + QVERIFY(avalue > b); + QVERIFY(a > bvalue); + QVERIFY(!(avalue <= bvalue)); + QVERIFY(!(avalue <= b)); + QVERIFY(!(a <= bvalue)); + QVERIFY(!(avalue < bvalue)); + QVERIFY(!(avalue < b)); + QVERIFY(!(a < bvalue)); + QVERIFY(avalue >= bvalue); + QVERIFY(avalue >= b); + QVERIFY(a >= bvalue); + QVERIFY(!(avalue <= bvalue)); + QVERIFY(!(avalue <= b)); + QVERIFY(!(a <= bvalue)); + if (qFloor(a) == a) { + QVERIFY(int(a) > bvalue); + QVERIFY(!(int(a) <= bvalue)); + QVERIFY(!(int(a) < bvalue)); + QVERIFY(int(a) >= bvalue); + } + if (qFloor(b) == b) { + QVERIFY(avalue > int(b)); + QVERIFY(!(avalue <= int(b))); + QVERIFY(!(avalue < int(b))); + QVERIFY(avalue >= int(b)); + } + } + + if (qFuzzyCompare(a, b)) + QVERIFY(qFuzzyCompare(avalue, bvalue)); + else + QVERIFY(!qFuzzyCompare(avalue, bvalue)); +} + +QTEST_APPLESS_MAIN(tst_QFixedPt) + +#include "tst_qfixedpt.moc" diff --git a/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro b/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro new file mode 100644 index 0000000..40c6cc0 --- /dev/null +++ b/tests/auto/math3d/qmatrixnxn/qmatrixnxn.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +VPATH += ../shared +INCLUDEPATH += ../shared +HEADERS += math3dincludes.h +SOURCES += tst_qmatrixnxn.cpp diff --git a/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp new file mode 100644 index 0000000..3d92adf --- /dev/null +++ b/tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp @@ -0,0 +1,3218 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include "math3dincludes.h" + +class tst_QMatrix : public QObject +{ + Q_OBJECT +public: + tst_QMatrix() {} + ~tst_QMatrix() {} + +private slots: + void create2x2(); + void create3x3(); + void create4x4(); + void create4x3(); + + void isIdentity2x2(); + void isIdentity3x3(); + void isIdentity4x4(); + void isIdentity4x3(); + + void compare2x2(); + void compare3x3(); + void compare4x4(); + void compare4x3(); + + void transposed2x2(); + void transposed3x3(); + void transposed4x4(); + void transposed4x3(); + + void add2x2_data(); + void add2x2(); + void add3x3_data(); + void add3x3(); + void add4x4_data(); + void add4x4(); + void add4x3_data(); + void add4x3(); + + void subtract2x2_data(); + void subtract2x2(); + void subtract3x3_data(); + void subtract3x3(); + void subtract4x4_data(); + void subtract4x4(); + void subtract4x3_data(); + void subtract4x3(); + + void multiply2x2_data(); + void multiply2x2(); + void multiply3x3_data(); + void multiply3x3(); + void multiply4x4_data(); + void multiply4x4(); + void multiply4x3_data(); + void multiply4x3(); + + void multiplyFactor2x2_data(); + void multiplyFactor2x2(); + void multiplyFactor3x3_data(); + void multiplyFactor3x3(); + void multiplyFactor4x4_data(); + void multiplyFactor4x4(); + void multiplyFactor4x3_data(); + void multiplyFactor4x3(); + + void divideFactor2x2_data(); + void divideFactor2x2(); + void divideFactor3x3_data(); + void divideFactor3x3(); + void divideFactor4x4_data(); + void divideFactor4x4(); + void divideFactor4x3_data(); + void divideFactor4x3(); + + void negate2x2_data(); + void negate2x2(); + void negate3x3_data(); + void negate3x3(); + void negate4x4_data(); + void negate4x4(); + void negate4x3_data(); + void negate4x3(); + + void inverted4x4_data(); + void inverted4x4(); + + void orthonormalInverse4x4(); + + void scale4x4_data(); + void scale4x4(); + + void translate4x4_data(); + void translate4x4(); + + void rotate4x4_data(); + void rotate4x4(); + + void normalMatrix_data(); + void normalMatrix(); + + void optimizedTransforms(); + + void ortho(); + void frustum(); + void perspective(); + void flipCoordinates(); + + void convertGeneric(); + + void extractAxisRotation_data(); + void extractAxisRotation(); + + void extractTranslation_data(); + void extractTranslation(); + + void inferSpecialType_data(); + void inferSpecialType(); + + void columnsAndRows(); + + void convertQMatrix(); + void convertQTransform(); + + void fill(); + +private: + static void setMatrix(QMatrix2x2& m, const qreal *values); + static void setMatrixFixed(QMatrix2x2& m, const qreal *values); + static bool isSame(const QMatrix2x2& m, const qreal *values); + static bool isIdentity(const QMatrix2x2& m); + + static void setMatrix(QMatrix3x3& m, const qreal *values); + static void setMatrixFixed(QMatrix3x3& m, const qreal *values); + static bool isSame(const QMatrix3x3& m, const qreal *values); + static bool isIdentity(const QMatrix3x3& m); + + static void setMatrix(QMatrix4x4& m, const qreal *values); + static void setMatrixFixed(QMatrix4x4& m, const qreal *values); + static bool isSame(const QMatrix4x4& m, const qreal *values); + static bool isIdentity(const QMatrix4x4& m); + + static void setMatrix(QMatrix4x3& m, const qreal *values); + static void setMatrixFixed(QMatrix4x3& m, const qreal *values); + static bool isSame(const QMatrix4x3& m, const qreal *values); + static bool isIdentity(const QMatrix4x3& m); +}; + +static const qreal nullValues2[] = + {0.0f, 0.0f, + 0.0f, 0.0f}; + +static qreal const identityValues2[16] = + {1.0f, 0.0f, + 0.0f, 1.0f}; + +static const qreal doubleIdentity2[] = + {2.0f, 0.0f, + 0.0f, 2.0f}; + +static qreal const uniqueValues2[16] = + {1.0f, 2.0f, + 5.0f, 6.0f}; + +static qreal const transposedValues2[16] = + {1.0f, 5.0f, + 2.0f, 6.0f}; + +static const qreal nullValues3[] = + {0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f}; + +static qreal const identityValues3[16] = + {1.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 1.0f}; + +static const qreal doubleIdentity3[] = + {2.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 2.0f}; + +static qreal const uniqueValues3[16] = + {1.0f, 2.0f, 3.0f, + 5.0f, 6.0f, 7.0f, + 9.0f, 10.0f, 11.0f}; + +static qreal const transposedValues3[16] = + {1.0f, 5.0f, 9.0f, + 2.0f, 6.0f, 10.0f, + 3.0f, 7.0f, 11.0f}; + +static const qreal nullValues4[] = + {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + +static qreal const identityValues4[16] = + {1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + +static const qreal doubleIdentity4[] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 2.0f}; + +static qreal const uniqueValues4[16] = + {1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f}; + +static qreal const transposedValues4[16] = + {1.0f, 5.0f, 9.0f, 13.0f, + 2.0f, 6.0f, 10.0f, 14.0f, + 3.0f, 7.0f, 11.0f, 15.0f, + 4.0f, 8.0f, 12.0f, 16.0f}; + +static const qreal nullValues4x3[] = + {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + +static qreal const identityValues4x3[12] = + {1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f}; + +static qreal const doubleIdentity4x3[12] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f}; + +static qreal const uniqueValues4x3[12] = + {1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f}; + +static qreal const transposedValues3x4[12] = + {1.0f, 5.0f, 9.0f, + 2.0f, 6.0f, 10.0f, + 3.0f, 7.0f, 11.0f, + 4.0f, 8.0f, 12.0f}; + +// Set a matrix to a specified array of values, which are assumed +// to be in row-major order. This sets the values using floating-point. +void tst_QMatrix::setMatrix(QMatrix2x2& m, const qreal *values) +{ + for (int row = 0; row < 2; ++row) + for (int col = 0; col < 2; ++col) + m(row, col) = values[row * 2 + col]; +} +void tst_QMatrix::setMatrix(QMatrix3x3& m, const qreal *values) +{ + for (int row = 0; row < 3; ++row) + for (int col = 0; col < 3; ++col) + m(row, col) = values[row * 3 + col]; +} +void tst_QMatrix::setMatrix(QMatrix4x4& m, const qreal *values) +{ + for (int row = 0; row < 4; ++row) + for (int col = 0; col < 4; ++col) + m(row, col) = values[row * 4 + col]; +} +void tst_QMatrix::setMatrix(QMatrix4x3& m, const qreal *values) +{ + for (int row = 0; row < 3; ++row) + for (int col = 0; col < 4; ++col) + m(row, col) = values[row * 4 + col]; +} + +// Set a matrix to a specified array of values, which are assumed +// to be in row-major order. This sets the values using fixed-point. +void tst_QMatrix::setMatrixFixed(QMatrix2x2& m, const qreal *values) +{ + qrealinner *data = m.data(); + for (int row = 0; row < 2; ++row) { + for (int col = 0; col < 2; ++col) { + data[row + col * 2] = values[row * 2 + col]; + } + } +} +void tst_QMatrix::setMatrixFixed(QMatrix3x3& m, const qreal *values) +{ + qrealinner *data = m.data(); + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + data[row + col * 3] = values[row * 3 + col]; + } + } +} +void tst_QMatrix::setMatrixFixed(QMatrix4x4& m, const qreal *values) +{ + qrealinner *data = m.data(); + for (int row = 0; row < 4; ++row) { + for (int col = 0; col < 4; ++col) { + data[row + col * 4] = values[row * 4 + col]; + } + } +} +void tst_QMatrix::setMatrixFixed(QMatrix4x3& m, const qreal *values) +{ + qrealinner *data = m.data(); + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 4; ++col) { + data[row + col * 3] = values[row * 4 + col]; + } + } +} + +// qFuzzyCompare isn't quite "fuzzy" enough to handle conversion +// to fixed-point and back again. So create "fuzzier" compares. +static bool fuzzyCompare(float x, float y, qreal epsilon = 0.001) +{ + float diff = x - y; + if (diff < 0.0f) + diff = -diff; + return (diff < epsilon); +} +#ifdef QT_GL_FIXED_PREFERRED +static bool fuzzyCompareFixed(qrealinner x, int y) +{ + int diff = x.bits() - y; + if (diff < 0) + diff = -diff; + return (diff < 50); +} +#endif + +static bool fuzzyCompare(const QVector3D &v1, const QVector3D &v2, qreal epsilon = 0.001) +{ + if (!fuzzyCompare(v1.x(), v2.x(), epsilon)) + return false; + if (!fuzzyCompare(v1.y(), v2.y(), epsilon)) + return false; + if (!fuzzyCompare(v1.z(), v2.z(), epsilon)) + return false; + return true; +} + +static bool matrixFuzzyCompare(const QMatrix4x4 &m1, const QMatrix4x4 &m2) +{ + bool ret = true; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + ret = ret && fuzzyCompare(m1(i, j), m2(i, j)); + } + } + + return ret; +} + +// Determine if a matrix is the same as a specified array of values. +// The values are assumed to be specified in row-major order. +bool tst_QMatrix::isSame(const QMatrix2x2& m, const qreal *values) +{ + const qrealinner *mv = m.constData(); + for (int row = 0; row < 2; ++row) { + for (int col = 0; col < 2; ++col) { + // Check the values using the operator() function. + if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 2 + col]))) { + qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 2 + col]; + return false; + } + + // Check the values using direct access, which verifies that the values + // are stored internally in column-major order. +#ifdef QT_GL_FIXED_PREFERRED + if (!fuzzyCompareFixed(mv[col * 2 + row], (int)(values[row * 2 + col] * 65536.0))) { + qDebug() << "column fixed-point failure at" << row << col << "actual =" << mv[col * 2 + row] << "expected =" << (int)(values[row * 2 + col] * 65536.0); + return false; + } +#else + if (!fuzzyCompare((float)(mv[col * 2 + row]), (float)(values[row * 2 + col]))) { + qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 2 + row] << "expected =" << values[row * 2 + col]; + return false; + } +#endif + } + } + return true; +} +bool tst_QMatrix::isSame(const QMatrix3x3& m, const qreal *values) +{ + const qrealinner *mv = m.constData(); + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + // Check the values using the operator() access function. + if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 3 + col]))) { + qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 3 + col]; + return false; + } + + // Check the values using direct access, which verifies that the values + // are stored internally in column-major order. +#ifdef QT_GL_FIXED_PREFERRED + if (!fuzzyCompareFixed(mv[col * 3 + row], (int)(values[row * 3 + col] * 65536.0))) { + qDebug() << "column fixed-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << (int)(values[row * 3 + col] * 65536.0); + return false; + } +#else + if (!fuzzyCompare((float)(mv[col * 3 + row]), (float)(values[row * 3 + col]))) { + qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << values[row * 3 + col]; + return false; + } +#endif + } + } + return true; +} +bool tst_QMatrix::isSame(const QMatrix4x4& m, const qreal *values) +{ + const qrealinner *mv = m.constData(); + for (int row = 0; row < 4; ++row) { + for (int col = 0; col < 4; ++col) { + // Check the values using the operator() access function. + if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 4 + col]))) { + qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 4 + col]; + return false; + } + + // Check the values using direct access, which verifies that the values + // are stored internally in column-major order. +#ifdef QT_GL_FIXED_PREFERRED + if (!fuzzyCompareFixed(mv[col * 4 + row], (int)(values[row * 4 + col] * 65536.0))) { + qDebug() << "column fixed-point failure at" << row << col << "actual =" << mv[col * 4 + row] << "expected =" << (int)(values[row * 4 + col] * 65536.0); + return false; + } +#else + if (!fuzzyCompare((float)(mv[col * 4 + row]), (float)(values[row * 4 + col]))) { + qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 4 + row] << "expected =" << values[row * 4 + col]; + return false; + } +#endif + } + } + return true; +} +bool tst_QMatrix::isSame(const QMatrix4x3& m, const qreal *values) +{ + const qrealinner *mv = m.constData(); + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 4; ++col) { + // Check the values using the operator() access function. + if (!fuzzyCompare((float)(m(row, col)), (float)(values[row * 4 + col]))) { + qDebug() << "floating-point failure at" << row << col << "actual =" << m(row, col) << "expected =" << values[row * 4 + col]; + return false; + } + + // Check the values using direct access, which verifies that the values + // are stored internally in column-major order. +#ifdef QT_GL_FIXED_PREFERRED + if (!fuzzyCompareFixed(mv[col * 3 + row], (int)(values[row * 4 + col] * 65536.0))) { + qDebug() << "column fixed-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << (int)(values[row * 4 + col] * 65536.0); + return false; + } +#else + if (!fuzzyCompare((float)(mv[col * 3 + row]), (float)(values[row * 4 + col]))) { + qDebug() << "column floating-point failure at" << row << col << "actual =" << mv[col * 3 + row] << "expected =" << values[row * 4 + col]; + return false; + } +#endif + } + } + return true; +} + +// Determine if a matrix is the identity. +bool tst_QMatrix::isIdentity(const QMatrix2x2& m) +{ + return isSame(m, identityValues2); +} +bool tst_QMatrix::isIdentity(const QMatrix3x3& m) +{ + return isSame(m, identityValues3); +} +bool tst_QMatrix::isIdentity(const QMatrix4x4& m) +{ + return isSame(m, identityValues4); +} +bool tst_QMatrix::isIdentity(const QMatrix4x3& m) +{ + return isSame(m, identityValues4x3); +} + +// Test the creation of QMatrix2x2 objects in various ways: +// construct, copy, and modify. +void tst_QMatrix::create2x2() +{ + QMatrix2x2 m1; + QVERIFY(isIdentity(m1)); + QVERIFY(m1.isIdentity()); + + QMatrix2x2 m2; + setMatrix(m2, uniqueValues2); + QVERIFY(isSame(m2, uniqueValues2)); + QVERIFY(!m2.isIdentity()); + + QMatrix2x2 m3; + setMatrixFixed(m3, uniqueValues2); + QVERIFY(isSame(m3, uniqueValues2)); + + QMatrix2x2 m4(m3); + QVERIFY(isSame(m4, uniqueValues2)); + + QMatrix2x2 m5; + m5 = m3; + QVERIFY(isSame(m5, uniqueValues2)); + + m5.setIdentity(); + QVERIFY(isIdentity(m5)); + + QMatrix2x2 m6(uniqueValues2); + QVERIFY(isSame(m6, uniqueValues2)); + qreal vals[4]; + m6.toValueArray(vals); + for (int index = 0; index < 4; ++index) + QCOMPARE((float)(vals[index]), (float)(uniqueValues2[index])); +} + +// Test the creation of QMatrix3x3 objects in various ways: +// construct, copy, and modify. +void tst_QMatrix::create3x3() +{ + QMatrix3x3 m1; + QVERIFY(isIdentity(m1)); + QVERIFY(m1.isIdentity()); + + QMatrix3x3 m2; + setMatrix(m2, uniqueValues3); + QVERIFY(isSame(m2, uniqueValues3)); + QVERIFY(!m2.isIdentity()); + + QMatrix3x3 m3; + setMatrixFixed(m3, uniqueValues3); + QVERIFY(isSame(m3, uniqueValues3)); + + QMatrix3x3 m4(m3); + QVERIFY(isSame(m4, uniqueValues3)); + + QMatrix3x3 m5; + m5 = m3; + QVERIFY(isSame(m5, uniqueValues3)); + + m5.setIdentity(); + QVERIFY(isIdentity(m5)); + + QMatrix3x3 m6(uniqueValues3); + QVERIFY(isSame(m6, uniqueValues3)); + qreal vals[9]; + m6.toValueArray(vals); + for (int index = 0; index < 9; ++index) + QCOMPARE((float)(vals[index]), (float)(uniqueValues3[index])); +} + +// Test the creation of QMatrix4x4 objects in various ways: +// construct, copy, and modify. +void tst_QMatrix::create4x4() +{ + QMatrix4x4 m1; + QVERIFY(isIdentity(m1)); + QVERIFY(m1.isIdentity()); + + QMatrix4x4 m2; + setMatrix(m2, uniqueValues4); + QVERIFY(isSame(m2, uniqueValues4)); + QVERIFY(!m2.isIdentity()); + + QMatrix4x4 m3; + setMatrixFixed(m3, uniqueValues4); + QVERIFY(isSame(m3, uniqueValues4)); + + QMatrix4x4 m4(m3); + QVERIFY(isSame(m4, uniqueValues4)); + + QMatrix4x4 m5; + m5 = m3; + QVERIFY(isSame(m5, uniqueValues4)); + + m5.setIdentity(); + QVERIFY(isIdentity(m5)); + + QMatrix4x4 m6(uniqueValues4); + QVERIFY(isSame(m6, uniqueValues4)); + qreal vals[16]; + m6.toValueArray(vals); + for (int index = 0; index < 16; ++index) + QCOMPARE((float)(vals[index]), (float)(uniqueValues4[index])); + + QMatrix4x4 m8 + (uniqueValues4[0], uniqueValues4[1], uniqueValues4[2], uniqueValues4[3], + uniqueValues4[4], uniqueValues4[5], uniqueValues4[6], uniqueValues4[7], + uniqueValues4[8], uniqueValues4[9], uniqueValues4[10], uniqueValues4[11], + uniqueValues4[12], uniqueValues4[13], uniqueValues4[14], uniqueValues4[15]); + QVERIFY(isSame(m8, uniqueValues4)); +} + +// Test the creation of QMatrix4x3 objects in various ways: +// construct, copy, and modify. +void tst_QMatrix::create4x3() +{ + QMatrix4x3 m1; + QVERIFY(isIdentity(m1)); + QVERIFY(m1.isIdentity()); + + QMatrix4x3 m2; + setMatrix(m2, uniqueValues4x3); + QVERIFY(isSame(m2, uniqueValues4x3)); + QVERIFY(!m2.isIdentity()); + + QMatrix4x3 m3; + setMatrixFixed(m3, uniqueValues4x3); + QVERIFY(isSame(m3, uniqueValues4x3)); + + QMatrix4x3 m4(m3); + QVERIFY(isSame(m4, uniqueValues4x3)); + + QMatrix4x3 m5; + m5 = m3; + QVERIFY(isSame(m5, uniqueValues4x3)); + + m5.setIdentity(); + QVERIFY(isIdentity(m5)); + + QMatrix4x3 m6(uniqueValues4x3); + QVERIFY(isSame(m6, uniqueValues4x3)); + qreal vals[12]; + m6.toValueArray(vals); + for (int index = 0; index < 12; ++index) + QCOMPARE((float)(vals[index]), (float)(uniqueValues4x3[index])); +} + +// Test isIdentity() for 2x2 matrices. +void tst_QMatrix::isIdentity2x2() +{ + for (int i = 0; i < 2 * 2; ++i) { + QMatrix2x2 m; + QVERIFY(m.isIdentity()); + m.data()[i] = 42.0f; + QVERIFY(!m.isIdentity()); + } +} + +// Test isIdentity() for 3x3 matrices. +void tst_QMatrix::isIdentity3x3() +{ + for (int i = 0; i < 3 * 3; ++i) { + QMatrix3x3 m; + QVERIFY(m.isIdentity()); + m.data()[i] = 42.0f; + QVERIFY(!m.isIdentity()); + } +} + +// Test isIdentity() for 4x4 matrices. +void tst_QMatrix::isIdentity4x4() +{ + for (int i = 0; i < 4 * 4; ++i) { + QMatrix4x4 m; + QVERIFY(m.isIdentity()); + m.data()[i] = 42.0f; + QVERIFY(!m.isIdentity()); + } + + // Force the "Identity" flag bit to be lost and check again. + QMatrix4x4 m2; + m2.data()[0] = 1.0f; + QVERIFY(m2.isIdentity()); +} + +// Test isIdentity() for 4x3 matrices. +void tst_QMatrix::isIdentity4x3() +{ + for (int i = 0; i < 4 * 3; ++i) { + QMatrix4x3 m; + QVERIFY(m.isIdentity()); + m.data()[i] = 42.0f; + QVERIFY(!m.isIdentity()); + } +} + +// Test 2x2 matrix comparisons. +void tst_QMatrix::compare2x2() +{ + QMatrix2x2 m1(uniqueValues2); + QMatrix2x2 m2(uniqueValues2); + QMatrix2x2 m3(transposedValues2); + + QVERIFY(m1 == m2); + QVERIFY(!(m1 != m2)); + QVERIFY(m1 != m3); + QVERIFY(!(m1 == m3)); +} + +// Test 3x3 matrix comparisons. +void tst_QMatrix::compare3x3() +{ + QMatrix3x3 m1(uniqueValues3); + QMatrix3x3 m2(uniqueValues3); + QMatrix3x3 m3(transposedValues3); + + QVERIFY(m1 == m2); + QVERIFY(!(m1 != m2)); + QVERIFY(m1 != m3); + QVERIFY(!(m1 == m3)); +} + +// Test 4x4 matrix comparisons. +void tst_QMatrix::compare4x4() +{ + QMatrix4x4 m1(uniqueValues4); + QMatrix4x4 m2(uniqueValues4); + QMatrix4x4 m3(transposedValues4); + + QVERIFY(m1 == m2); + QVERIFY(!(m1 != m2)); + QVERIFY(m1 != m3); + QVERIFY(!(m1 == m3)); +} + +// Test 4x3 matrix comparisons. +void tst_QMatrix::compare4x3() +{ + QMatrix4x3 m1(uniqueValues4x3); + QMatrix4x3 m2(uniqueValues4x3); + QMatrix4x3 m3(transposedValues3x4); + + QVERIFY(m1 == m2); + QVERIFY(!(m1 != m2)); + QVERIFY(m1 != m3); + QVERIFY(!(m1 == m3)); +} + +// Test matrix 2x2 transpose operations. +void tst_QMatrix::transposed2x2() +{ + // Transposing the identity should result in the identity. + QMatrix2x2 m1; + QMatrix2x2 m2 = m1.transposed(); + QVERIFY(isIdentity(m2)); + + // Transpose a more interesting matrix that allows us to track + // exactly where each source element ends up. + QMatrix2x2 m3(uniqueValues2); + QMatrix2x2 m4 = m3.transposed(); + QVERIFY(isSame(m4, transposedValues2)); + + // Transpose in-place, just to check that the compiler is sane. + m3 = m3.transposed(); + QVERIFY(isSame(m3, transposedValues2)); +} + +// Test matrix 3x3 transpose operations. +void tst_QMatrix::transposed3x3() +{ + // Transposing the identity should result in the identity. + QMatrix3x3 m1; + QMatrix3x3 m2 = m1.transposed(); + QVERIFY(isIdentity(m2)); + + // Transpose a more interesting matrix that allows us to track + // exactly where each source element ends up. + QMatrix3x3 m3(uniqueValues3); + QMatrix3x3 m4 = m3.transposed(); + QVERIFY(isSame(m4, transposedValues3)); + + // Transpose in-place, just to check that the compiler is sane. + m3 = m3.transposed(); + QVERIFY(isSame(m3, transposedValues3)); +} + +// Test matrix 4x4 transpose operations. +void tst_QMatrix::transposed4x4() +{ + // Transposing the identity should result in the identity. + QMatrix4x4 m1; + QMatrix4x4 m2 = m1.transposed(); + QVERIFY(isIdentity(m2)); + + // Transpose a more interesting matrix that allows us to track + // exactly where each source element ends up. + QMatrix4x4 m3(uniqueValues4); + QMatrix4x4 m4 = m3.transposed(); + QVERIFY(isSame(m4, transposedValues4)); + + // Transpose in-place, just to check that the compiler is sane. + m3 = m3.transposed(); + QVERIFY(isSame(m3, transposedValues4)); +} + +// Test matrix 4x3 transpose operations. +void tst_QMatrix::transposed4x3() +{ + QMatrix4x3 m3(uniqueValues4x3); + QMatrix3x4 m4 = m3.transposed(); + qreal values[12]; + m4.toValueArray(values); + for (int index = 0; index < 12; ++index) + QCOMPARE(values[index], transposedValues3x4[index]); +} + +// Test matrix addition for 2x2 matrices. +void tst_QMatrix::add2x2_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues2 << (void *)nullValues2 << (void *)nullValues2; + + QTest::newRow("identity/null") + << (void *)identityValues2 << (void *)nullValues2 << (void *)identityValues2; + + QTest::newRow("identity/identity") + << (void *)identityValues2 << (void *)identityValues2 << (void *)doubleIdentity2; + + static qreal const sumValues[16] = + {2.0f, 7.0f, + 7.0f, 12.0f}; + QTest::newRow("unique") + << (void *)uniqueValues2 << (void *)transposedValues2 << (void *)sumValues; +} +void tst_QMatrix::add2x2() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix2x2 m1((const qreal *)m1Values); + QMatrix2x2 m2((const qreal *)m2Values); + + QMatrix2x2 m4(m1); + m4 += m2; + QVERIFY(isSame(m4, (const qreal *)m3Values)); + + QMatrix2x2 m5; + m5 = m1 + m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix addition for 3x3 matrices. +void tst_QMatrix::add3x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues3 << (void *)nullValues3 << (void *)nullValues3; + + QTest::newRow("identity/null") + << (void *)identityValues3 << (void *)nullValues3 << (void *)identityValues3; + + QTest::newRow("identity/identity") + << (void *)identityValues3 << (void *)identityValues3 << (void *)doubleIdentity3; + + static qreal const sumValues[16] = + {2.0f, 7.0f, 12.0f, + 7.0f, 12.0f, 17.0f, + 12.0f, 17.0f, 22.0f}; + QTest::newRow("unique") + << (void *)uniqueValues3 << (void *)transposedValues3 << (void *)sumValues; +} +void tst_QMatrix::add3x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix3x3 m1((const qreal *)m1Values); + QMatrix3x3 m2((const qreal *)m2Values); + + QMatrix3x3 m4(m1); + m4 += m2; + QVERIFY(isSame(m4, (const qreal *)m3Values)); + + QMatrix3x3 m5; + m5 = m1 + m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix addition for 4x4 matrices. +void tst_QMatrix::add4x4_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues4 << (void *)nullValues4 << (void *)nullValues4; + + QTest::newRow("identity/null") + << (void *)identityValues4 << (void *)nullValues4 << (void *)identityValues4; + + QTest::newRow("identity/identity") + << (void *)identityValues4 << (void *)identityValues4 << (void *)doubleIdentity4; + + static qreal const sumValues[16] = + {2.0f, 7.0f, 12.0f, 17.0f, + 7.0f, 12.0f, 17.0f, 22.0f, + 12.0f, 17.0f, 22.0f, 27.0f, + 17.0f, 22.0f, 27.0f, 32.0f}; + QTest::newRow("unique") + << (void *)uniqueValues4 << (void *)transposedValues4 << (void *)sumValues; +} +void tst_QMatrix::add4x4() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x4 m1((const qreal *)m1Values); + QMatrix4x4 m2((const qreal *)m2Values); + + QMatrix4x4 m4(m1); + m4 += m2; + QVERIFY(isSame(m4, (const qreal *)m3Values)); + + QMatrix4x4 m5; + m5 = m1 + m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix addition for 4x3 matrices. +void tst_QMatrix::add4x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues4x3 << (void *)nullValues4x3 << (void *)nullValues4x3; + + QTest::newRow("identity/null") + << (void *)identityValues4x3 << (void *)nullValues4x3 << (void *)identityValues4x3; + + QTest::newRow("identity/identity") + << (void *)identityValues4x3 << (void *)identityValues4x3 << (void *)doubleIdentity4x3; + + static qreal const sumValues[16] = + {2.0f, 7.0f, 12.0f, 6.0f, + 11.0f, 16.0f, 10.0f, 15.0f, + 20.0f, 14.0f, 19.0f, 24.0f}; + QTest::newRow("unique") + << (void *)uniqueValues4x3 << (void *)transposedValues3x4 << (void *)sumValues; +} +void tst_QMatrix::add4x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x3 m1((const qreal *)m1Values); + QMatrix4x3 m2((const qreal *)m2Values); + + QMatrix4x3 m4(m1); + m4 += m2; + QVERIFY(isSame(m4, (const qreal *)m3Values)); + + QMatrix4x3 m5; + m5 = m1 + m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix subtraction for 2x2 matrices. +void tst_QMatrix::subtract2x2_data() +{ + // Use the same test cases as the add test. + add2x2_data(); +} +void tst_QMatrix::subtract2x2() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix2x2 m1((const qreal *)m1Values); + QMatrix2x2 m2((const qreal *)m2Values); + QMatrix2x2 m3((const qreal *)m3Values); + + QMatrix2x2 m4(m3); + m4 -= m1; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix2x2 m5; + m5 = m3 - m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); + + QMatrix2x2 m6(m3); + m6 -= m2; + QVERIFY(isSame(m6, (const qreal *)m1Values)); + + QMatrix2x2 m7; + m7 = m3 - m2; + QVERIFY(isSame(m7, (const qreal *)m1Values)); +} + +// Test matrix subtraction for 3x3 matrices. +void tst_QMatrix::subtract3x3_data() +{ + // Use the same test cases as the add test. + add3x3_data(); +} +void tst_QMatrix::subtract3x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix3x3 m1((const qreal *)m1Values); + QMatrix3x3 m2((const qreal *)m2Values); + QMatrix3x3 m3((const qreal *)m3Values); + + QMatrix3x3 m4(m3); + m4 -= m1; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix3x3 m5; + m5 = m3 - m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); + + QMatrix3x3 m6(m3); + m6 -= m2; + QVERIFY(isSame(m6, (const qreal *)m1Values)); + + QMatrix3x3 m7; + m7 = m3 - m2; + QVERIFY(isSame(m7, (const qreal *)m1Values)); +} + +// Test matrix subtraction for 4x4 matrices. +void tst_QMatrix::subtract4x4_data() +{ + // Use the same test cases as the add test. + add4x4_data(); +} +void tst_QMatrix::subtract4x4() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x4 m1((const qreal *)m1Values); + QMatrix4x4 m2((const qreal *)m2Values); + QMatrix4x4 m3((const qreal *)m3Values); + + QMatrix4x4 m4(m3); + m4 -= m1; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix4x4 m5; + m5 = m3 - m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); + + QMatrix4x4 m6(m3); + m6 -= m2; + QVERIFY(isSame(m6, (const qreal *)m1Values)); + + QMatrix4x4 m7; + m7 = m3 - m2; + QVERIFY(isSame(m7, (const qreal *)m1Values)); +} + +// Test matrix subtraction for 4x3 matrices. +void tst_QMatrix::subtract4x3_data() +{ + // Use the same test cases as the add test. + add4x3_data(); +} +void tst_QMatrix::subtract4x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x3 m1((const qreal *)m1Values); + QMatrix4x3 m2((const qreal *)m2Values); + QMatrix4x3 m3((const qreal *)m3Values); + + QMatrix4x3 m4(m3); + m4 -= m1; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix4x3 m5; + m5 = m3 - m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); + + QMatrix4x3 m6(m3); + m6 -= m2; + QVERIFY(isSame(m6, (const qreal *)m1Values)); + + QMatrix4x3 m7; + m7 = m3 - m2; + QVERIFY(isSame(m7, (const qreal *)m1Values)); +} + +// Test matrix multiplication for 2x2 matrices. +void tst_QMatrix::multiply2x2_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues2 << (void *)nullValues2 << (void *)nullValues2; + + QTest::newRow("null/unique") + << (void *)nullValues2 << (void *)uniqueValues2 << (void *)nullValues2; + + QTest::newRow("unique/null") + << (void *)uniqueValues2 << (void *)nullValues2 << (void *)nullValues2; + + QTest::newRow("unique/identity") + << (void *)uniqueValues2 << (void *)identityValues2 << (void *)uniqueValues2; + + QTest::newRow("identity/unique") + << (void *)identityValues2 << (void *)uniqueValues2 << (void *)uniqueValues2; + + static qreal uniqueResult[4]; + for (int row = 0; row < 2; ++row) { + for (int col = 0; col < 2; ++col) { + qreal sum = 0.0f; + for (int j = 0; j < 2; ++j) + sum += uniqueValues2[row * 2 + j] * transposedValues2[j * 2 + col]; + uniqueResult[row * 2 + col] = sum; + } + } + + QTest::newRow("unique/transposed") + << (void *)uniqueValues2 << (void *)transposedValues2 << (void *)uniqueResult; +} +void tst_QMatrix::multiply2x2() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix2x2 m1((const qreal *)m1Values); + QMatrix2x2 m2((const qreal *)m2Values); + + QMatrix2x2 m5; + m5 = m1 * m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix multiplication for 3x3 matrices. +void tst_QMatrix::multiply3x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues3 << (void *)nullValues3 << (void *)nullValues3; + + QTest::newRow("null/unique") + << (void *)nullValues3 << (void *)uniqueValues3 << (void *)nullValues3; + + QTest::newRow("unique/null") + << (void *)uniqueValues3 << (void *)nullValues3 << (void *)nullValues3; + + QTest::newRow("unique/identity") + << (void *)uniqueValues3 << (void *)identityValues3 << (void *)uniqueValues3; + + QTest::newRow("identity/unique") + << (void *)identityValues3 << (void *)uniqueValues3 << (void *)uniqueValues3; + + static qreal uniqueResult[9]; + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + qreal sum = 0.0f; + for (int j = 0; j < 3; ++j) + sum += uniqueValues3[row * 3 + j] * transposedValues3[j * 3 + col]; + uniqueResult[row * 3 + col] = sum; + } + } + + QTest::newRow("unique/transposed") + << (void *)uniqueValues3 << (void *)transposedValues3 << (void *)uniqueResult; +} +void tst_QMatrix::multiply3x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix3x3 m1((const qreal *)m1Values); + QMatrix3x3 m2((const qreal *)m2Values); + + QMatrix3x3 m5; + m5 = m1 * m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix multiplication for 4x4 matrices. +void tst_QMatrix::multiply4x4_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues4 << (void *)nullValues4 << (void *)nullValues4; + + QTest::newRow("null/unique") + << (void *)nullValues4 << (void *)uniqueValues4 << (void *)nullValues4; + + QTest::newRow("unique/null") + << (void *)uniqueValues4 << (void *)nullValues4 << (void *)nullValues4; + + QTest::newRow("unique/identity") + << (void *)uniqueValues4 << (void *)identityValues4 << (void *)uniqueValues4; + + QTest::newRow("identity/unique") + << (void *)identityValues4 << (void *)uniqueValues4 << (void *)uniqueValues4; + + static qreal uniqueResult[16]; + for (int row = 0; row < 4; ++row) { + for (int col = 0; col < 4; ++col) { + qreal sum = 0.0f; + for (int j = 0; j < 4; ++j) + sum += uniqueValues4[row * 4 + j] * transposedValues4[j * 4 + col]; + uniqueResult[row * 4 + col] = sum; + } + } + + QTest::newRow("unique/transposed") + << (void *)uniqueValues4 << (void *)transposedValues4 << (void *)uniqueResult; +} +void tst_QMatrix::multiply4x4() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x4 m1((const qreal *)m1Values); + QMatrix4x4 m2((const qreal *)m2Values); + + QMatrix4x4 m4; + m4 = m1; + m4 *= m2; + QVERIFY(isSame(m4, (const qreal *)m3Values)); + + QMatrix4x4 m5; + m5 = m1 * m2; + QVERIFY(isSame(m5, (const qreal *)m3Values)); +} + +// Test matrix multiplication for 4x3 matrices. +void tst_QMatrix::multiply4x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("m3Values"); + + QTest::newRow("null") + << (void *)nullValues4x3 << (void *)nullValues4x3 << (void *)nullValues3; + + QTest::newRow("null/unique") + << (void *)nullValues4x3 << (void *)uniqueValues4x3 << (void *)nullValues3; + + QTest::newRow("unique/null") + << (void *)uniqueValues4x3 << (void *)nullValues4x3 << (void *)nullValues3; + + static qreal uniqueResult[9]; + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + qreal sum = 0.0f; + for (int j = 0; j < 4; ++j) + sum += uniqueValues4x3[row * 4 + j] * transposedValues3x4[j * 3 + col]; + uniqueResult[row * 3 + col] = sum; + } + } + + QTest::newRow("unique/transposed") + << (void *)uniqueValues4x3 << (void *)transposedValues3x4 << (void *)uniqueResult; +} +void tst_QMatrix::multiply4x3() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(void *, m3Values); + + QMatrix4x3 m1((const qreal *)m1Values); + QMatrix3x4 m2((const qreal *)m2Values); + + QGenericMatrix<3, 3, qreal, qrealinner> m4; + m4 = m1 * m2; + qreal values[9]; + m4.toValueArray(values); + for (int index = 0; index < 9; ++index) + QCOMPARE(values[index], ((const qreal *)m3Values)[index]); +} + +// Test matrix multiplication by a factor for 2x2 matrices. +void tst_QMatrix::multiplyFactor2x2_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("factor"); + QTest::addColumn("m2Values"); + + QTest::newRow("null") + << (void *)nullValues2 << (qreal)1.0f << (void *)nullValues2; + + QTest::newRow("double identity") + << (void *)identityValues2 << (qreal)2.0f << (void *)doubleIdentity2; + + static qreal const values[16] = + {1.0f, 2.0f, + 5.0f, 6.0f}; + static qreal const doubleValues[16] = + {2.0f, 4.0f, + 10.0f, 12.0f}; + static qreal const negDoubleValues[16] = + {-2.0f, -4.0f, + -10.0f, -12.0f}; + + QTest::newRow("unique") + << (void *)values << (qreal)2.0f << (void *)doubleValues; + + QTest::newRow("neg") + << (void *)values << (qreal)-2.0f << (void *)negDoubleValues; + + QTest::newRow("zero") + << (void *)values << (qreal)0.0f << (void *)nullValues4; +} +void tst_QMatrix::multiplyFactor2x2() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + QMatrix2x2 m1((const qreal *)m1Values); + + QMatrix2x2 m3; + m3 = m1; + m3 *= factor; + QVERIFY(isSame(m3, (const qreal *)m2Values)); + + QMatrix2x2 m4; + m4 = m1 * factor; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix2x2 m5; + m5 = factor * m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); +} + +// Test matrix multiplication by a factor for 3x3 matrices. +void tst_QMatrix::multiplyFactor3x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("factor"); + QTest::addColumn("m2Values"); + + QTest::newRow("null") + << (void *)nullValues3 << (qreal)1.0f << (void *)nullValues3; + + QTest::newRow("double identity") + << (void *)identityValues3 << (qreal)2.0f << (void *)doubleIdentity3; + + static qreal const values[16] = + {1.0f, 2.0f, 3.0f, + 5.0f, 6.0f, 7.0f, + 9.0f, 10.0f, 11.0f}; + static qreal const doubleValues[16] = + {2.0f, 4.0f, 6.0f, + 10.0f, 12.0f, 14.0f, + 18.0f, 20.0f, 22.0f}; + static qreal const negDoubleValues[16] = + {-2.0f, -4.0f, -6.0f, + -10.0f, -12.0f, -14.0f, + -18.0f, -20.0f, -22.0f}; + + QTest::newRow("unique") + << (void *)values << (qreal)2.0f << (void *)doubleValues; + + QTest::newRow("neg") + << (void *)values << (qreal)-2.0f << (void *)negDoubleValues; + + QTest::newRow("zero") + << (void *)values << (qreal)0.0f << (void *)nullValues4; +} +void tst_QMatrix::multiplyFactor3x3() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + QMatrix3x3 m1((const qreal *)m1Values); + + QMatrix3x3 m3; + m3 = m1; + m3 *= factor; + QVERIFY(isSame(m3, (const qreal *)m2Values)); + + QMatrix3x3 m4; + m4 = m1 * factor; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix3x3 m5; + m5 = factor * m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); +} + +// Test matrix multiplication by a factor for 4x4 matrices. +void tst_QMatrix::multiplyFactor4x4_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("factor"); + QTest::addColumn("m2Values"); + + QTest::newRow("null") + << (void *)nullValues4 << (qreal)1.0f << (void *)nullValues4; + + QTest::newRow("double identity") + << (void *)identityValues4 << (qreal)2.0f << (void *)doubleIdentity4; + + static qreal const values[16] = + {1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f}; + static qreal const doubleValues[16] = + {2.0f, 4.0f, 6.0f, 8.0f, + 10.0f, 12.0f, 14.0f, 16.0f, + 18.0f, 20.0f, 22.0f, 24.0f, + 26.0f, 28.0f, 30.0f, 32.0f}; + static qreal const negDoubleValues[16] = + {-2.0f, -4.0f, -6.0f, -8.0f, + -10.0f, -12.0f, -14.0f, -16.0f, + -18.0f, -20.0f, -22.0f, -24.0f, + -26.0f, -28.0f, -30.0f, -32.0f}; + + QTest::newRow("unique") + << (void *)values << (qreal)2.0f << (void *)doubleValues; + + QTest::newRow("neg") + << (void *)values << (qreal)-2.0f << (void *)negDoubleValues; + + QTest::newRow("zero") + << (void *)values << (qreal)0.0f << (void *)nullValues4; +} +void tst_QMatrix::multiplyFactor4x4() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + QMatrix4x4 m1((const qreal *)m1Values); + + QMatrix4x4 m3; + m3 = m1; + m3 *= factor; + QVERIFY(isSame(m3, (const qreal *)m2Values)); + + QMatrix4x4 m4; + m4 = m1 * factor; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix4x4 m5; + m5 = factor * m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); +} + +// Test matrix multiplication by a factor for 4x3 matrices. +void tst_QMatrix::multiplyFactor4x3_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("factor"); + QTest::addColumn("m2Values"); + + QTest::newRow("null") + << (void *)nullValues4x3 << (qreal)1.0f << (void *)nullValues4x3; + + QTest::newRow("double identity") + << (void *)identityValues4x3 << (qreal)2.0f << (void *)doubleIdentity4x3; + + static qreal const values[12] = + {1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f}; + static qreal const doubleValues[12] = + {2.0f, 4.0f, 6.0f, 8.0f, + 10.0f, 12.0f, 14.0f, 16.0f, + 18.0f, 20.0f, 22.0f, 24.0f}; + static qreal const negDoubleValues[12] = + {-2.0f, -4.0f, -6.0f, -8.0f, + -10.0f, -12.0f, -14.0f, -16.0f, + -18.0f, -20.0f, -22.0f, -24.0f}; + + QTest::newRow("unique") + << (void *)values << (qreal)2.0f << (void *)doubleValues; + + QTest::newRow("neg") + << (void *)values << (qreal)-2.0f << (void *)negDoubleValues; + + QTest::newRow("zero") + << (void *)values << (qreal)0.0f << (void *)nullValues4x3; +} +void tst_QMatrix::multiplyFactor4x3() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + QMatrix4x3 m1((const qreal *)m1Values); + + QMatrix4x3 m3; + m3 = m1; + m3 *= factor; + QVERIFY(isSame(m3, (const qreal *)m2Values)); + + QMatrix4x3 m4; + m4 = m1 * factor; + QVERIFY(isSame(m4, (const qreal *)m2Values)); + + QMatrix4x3 m5; + m5 = factor * m1; + QVERIFY(isSame(m5, (const qreal *)m2Values)); +} + +// Test matrix division by a factor for 2x2 matrices. +void tst_QMatrix::divideFactor2x2_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor2x2_data(); +} +void tst_QMatrix::divideFactor2x2() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + if (factor == 0.0f) + return; + + QMatrix2x2 m2((const qreal *)m2Values); + + QMatrix2x2 m3; + m3 = m2; + m3 /= factor; + QVERIFY(isSame(m3, (const qreal *)m1Values)); + + QMatrix2x2 m4; + m4 = m2 / factor; + QVERIFY(isSame(m4, (const qreal *)m1Values)); +} + +// Test matrix division by a factor for 3x3 matrices. +void tst_QMatrix::divideFactor3x3_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor3x3_data(); +} +void tst_QMatrix::divideFactor3x3() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + if (factor == 0.0f) + return; + + QMatrix3x3 m2((const qreal *)m2Values); + + QMatrix3x3 m3; + m3 = m2; + m3 /= factor; + QVERIFY(isSame(m3, (const qreal *)m1Values)); + + QMatrix3x3 m4; + m4 = m2 / factor; + QVERIFY(isSame(m4, (const qreal *)m1Values)); +} + +// Test matrix division by a factor for 4x4 matrices. +void tst_QMatrix::divideFactor4x4_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor4x4_data(); +} +void tst_QMatrix::divideFactor4x4() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + if (factor == 0.0f) + return; + + QMatrix4x4 m2((const qreal *)m2Values); + + QMatrix4x4 m3; + m3 = m2; + m3 /= factor; + QVERIFY(isSame(m3, (const qreal *)m1Values)); + + QMatrix4x4 m4; + m4 = m2 / factor; + QVERIFY(isSame(m4, (const qreal *)m1Values)); +} + +// Test matrix division by a factor for 4x3 matrices. +void tst_QMatrix::divideFactor4x3_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor4x3_data(); +} +void tst_QMatrix::divideFactor4x3() +{ + QFETCH(void *, m1Values); + QFETCH(qreal, factor); + QFETCH(void *, m2Values); + + if (factor == 0.0f) + return; + + QMatrix4x3 m2((const qreal *)m2Values); + + QMatrix4x3 m3; + m3 = m2; + m3 /= factor; + QVERIFY(isSame(m3, (const qreal *)m1Values)); + + QMatrix4x3 m4; + m4 = m2 / factor; + QVERIFY(isSame(m4, (const qreal *)m1Values)); +} + +// Test matrix negation for 2x2 matrices. +void tst_QMatrix::negate2x2_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor2x2_data(); +} +void tst_QMatrix::negate2x2() +{ + QFETCH(void *, m1Values); + + const qreal *values = (const qreal *)m1Values; + + QMatrix2x2 m1(values); + + qreal negated[4]; + for (int index = 0; index < 4; ++index) + negated[index] = -values[index]; + + QMatrix2x2 m2; + m2 = -m1; + QVERIFY(isSame(m2, negated)); +} + +// Test matrix negation for 3x3 matrices. +void tst_QMatrix::negate3x3_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor3x3_data(); +} +void tst_QMatrix::negate3x3() +{ + QFETCH(void *, m1Values); + + const qreal *values = (const qreal *)m1Values; + + QMatrix3x3 m1(values); + + qreal negated[9]; + for (int index = 0; index < 9; ++index) + negated[index] = -values[index]; + + QMatrix3x3 m2; + m2 = -m1; + QVERIFY(isSame(m2, negated)); +} + +// Test matrix negation for 4x4 matrices. +void tst_QMatrix::negate4x4_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor4x4_data(); +} +void tst_QMatrix::negate4x4() +{ + QFETCH(void *, m1Values); + + const qreal *values = (const qreal *)m1Values; + + QMatrix4x4 m1(values); + + qreal negated[16]; + for (int index = 0; index < 16; ++index) + negated[index] = -values[index]; + + QMatrix4x4 m2; + m2 = -m1; + QVERIFY(isSame(m2, negated)); +} + +// Test matrix negation for 4x3 matrices. +void tst_QMatrix::negate4x3_data() +{ + // Use the same test cases as the multiplyFactor test. + multiplyFactor4x3_data(); +} +void tst_QMatrix::negate4x3() +{ + QFETCH(void *, m1Values); + + const qreal *values = (const qreal *)m1Values; + + QMatrix4x3 m1(values); + + qreal negated[12]; + for (int index = 0; index < 12; ++index) + negated[index] = -values[index]; + + QMatrix4x3 m2; + m2 = -m1; + QVERIFY(isSame(m2, negated)); +} + +// Matrix inverted. This is a more straight-forward implementation +// of the algorithm at http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q24 +// than the optimized version in the QMatrix4x4 code. Hopefully it is +// easier to verify that this version is the same as the reference. + +struct Matrix3 +{ + qreal v[9]; +}; +struct Matrix4 +{ + qreal v[16]; +}; + +static qreal m3Determinant(const Matrix3& m) +{ + return m.v[0] * (m.v[4] * m.v[8] - m.v[7] * m.v[5]) - + m.v[1] * (m.v[3] * m.v[8] - m.v[6] * m.v[5]) + + m.v[2] * (m.v[3] * m.v[7] - m.v[6] * m.v[4]); +} + +static bool m3Inverse(const Matrix3& min, Matrix3& mout) +{ + qreal det = m3Determinant(min); + if (det == 0.0f) + return false; + mout.v[0] = (min.v[4] * min.v[8] - min.v[5] * min.v[7]) / det; + mout.v[1] = -(min.v[1] * min.v[8] - min.v[2] * min.v[7]) / det; + mout.v[2] = (min.v[1] * min.v[5] - min.v[4] * min.v[2]) / det; + mout.v[3] = -(min.v[3] * min.v[8] - min.v[5] * min.v[6]) / det; + mout.v[4] = (min.v[0] * min.v[8] - min.v[6] * min.v[2]) / det; + mout.v[5] = -(min.v[0] * min.v[5] - min.v[3] * min.v[2]) / det; + mout.v[6] = (min.v[3] * min.v[7] - min.v[6] * min.v[4]) / det; + mout.v[7] = -(min.v[0] * min.v[7] - min.v[6] * min.v[1]) / det; + mout.v[8] = (min.v[0] * min.v[4] - min.v[1] * min.v[3]) / det; + return true; +} + +static void m3Transpose(Matrix3& m) +{ + qSwap(m.v[1], m.v[3]); + qSwap(m.v[2], m.v[6]); + qSwap(m.v[5], m.v[7]); +} + +static void m4Submatrix(const Matrix4& min, Matrix3& mout, int i, int j) +{ + for (int di = 0; di < 3; ++di) { + for (int dj = 0; dj < 3; ++dj) { + int si = di + ((di >= i) ? 1 : 0); + int sj = dj + ((dj >= j) ? 1 : 0); + mout.v[di * 3 + dj] = min.v[si * 4 + sj]; + } + } +} + +static qreal m4Determinant(const Matrix4& m) +{ + qreal det; + qreal result = 0.0f; + qreal i = 1.0f; + Matrix3 msub; + for (int n = 0; n < 4; ++n, i *= -1.0f) { + m4Submatrix(m, msub, 0, n); + det = m3Determinant(msub); + result += m.v[n] * det * i; + } + return result; +} + +static void m4Inverse(const Matrix4& min, Matrix4& mout) +{ + qreal det = m4Determinant(min); + Matrix3 msub; + for (int i = 0; i < 4; ++i) { + for (int j = 0; j < 4; ++j) { + qreal sign = 1.0f - ((i + j) % 2) * 2.0f; + m4Submatrix(min, msub, i, j); + mout.v[i + j * 4] = (m3Determinant(msub) * sign) / det; + } + } +} + +// Test matrix inverted for 4x4 matrices. +void tst_QMatrix::inverted4x4_data() +{ + QTest::addColumn("m1Values"); + QTest::addColumn("m2Values"); + QTest::addColumn("invertible"); + + QTest::newRow("null") + << (void *)nullValues4 << (void *)identityValues4 << false; + + QTest::newRow("identity") + << (void *)identityValues4 << (void *)identityValues4 << true; + + QTest::newRow("unique") + << (void *)uniqueValues4 << (void *)identityValues4 << false; + + static Matrix4 const invertible = { + {5.0f, 0.0f, 0.0f, 2.0f, + 0.0f, 6.0f, 0.0f, 3.0f, + 0.0f, 0.0f, 7.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 1.0f} + }; + static Matrix4 inverted; + m4Inverse(invertible, inverted); + + QTest::newRow("invertible") + << (void *)invertible.v << (void *)inverted.v << true; + + static Matrix4 const translate = { + {1.0f, 0.0f, 0.0f, 2.0f, + 0.0f, 1.0f, 0.0f, 3.0f, + 0.0f, 0.0f, 1.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 1.0f} + }; + static Matrix4 const inverseTranslate = { + {1.0f, 0.0f, 0.0f, -2.0f, + 0.0f, 1.0f, 0.0f, -3.0f, + 0.0f, 0.0f, 1.0f, -4.0f, + 0.0f, 0.0f, 0.0f, 1.0f} + }; + + QTest::newRow("translate") + << (void *)translate.v << (void *)inverseTranslate.v << true; +} +void tst_QMatrix::inverted4x4() +{ + QFETCH(void *, m1Values); + QFETCH(void *, m2Values); + QFETCH(bool, invertible); + + QMatrix4x4 m1((const qreal *)m1Values); + + if (invertible) + QVERIFY(m1.determinant() != 0.0f); + else + QVERIFY(m1.determinant() == 0.0f); + + Matrix4 m1alt; + memcpy(m1alt.v, (const qreal *)m1Values, sizeof(m1alt.v)); + + QCOMPARE((float)(m1.determinant()), (float)(m4Determinant(m1alt))); + + QMatrix4x4 m2; + bool inv; + m2 = m1.inverted(&inv); + QVERIFY(isSame(m2, (const qreal *)m2Values)); + + if (invertible) { + QVERIFY(inv); + + Matrix4 m2alt; + m4Inverse(m1alt, m2alt); + QVERIFY(isSame(m2, m2alt.v)); + + QMatrix4x4 m3; + m3 = m1 * m2; + QVERIFY(isIdentity(m3)); + + QMatrix4x4 m4; + m4 = m2 * m1; + QVERIFY(isIdentity(m4)); + } else { + QVERIFY(!inv); + } + + // Test again, after inferring the special matrix type. + m1.inferSpecialType(); + m2 = m1.inverted(&inv); + QVERIFY(isSame(m2, (const qreal *)m2Values)); + QCOMPARE(inv, invertible); +} + +void tst_QMatrix::orthonormalInverse4x4() +{ + QMatrix4x4 m1; + QVERIFY(matrixFuzzyCompare(m1.inverted(), m1)); + + QMatrix4x4 m2; + m2.rotate(45.0, 1.0, 0.0, 0.0); + m2.translate(10.0, 0.0, 0.0); + + // Use inferSpecialType() to drop the internal flags that + // mark the matrix as orthonormal. This will force inverted() + // to compute m3.inverted() the long way. We can then compare + // the result to what the faster algorithm produces on m2. + QMatrix4x4 m3 = m2; + m3.inferSpecialType(); + bool invertible; + QVERIFY(matrixFuzzyCompare(m2.inverted(&invertible), m3.inverted())); + QVERIFY(invertible); + + QMatrix4x4 m4; + m4.rotate(45.0, 0.0, 1.0, 0.0); + QMatrix4x4 m5 = m4; + m5.inferSpecialType(); + QVERIFY(matrixFuzzyCompare(m4.inverted(), m5.inverted())); + + QMatrix4x4 m6; + m1.rotate(88, 0.0, 0.0, 1.0); + m1.translate(-20.0, 20.0, 15.0); + m1.rotate(25, 1.0, 0.0, 0.0); + QMatrix4x4 m7 = m6; + m7.inferSpecialType(); + QVERIFY(matrixFuzzyCompare(m6.inverted(), m7.inverted())); +} + +// Test the generation and use of 4x4 scale matrices. +void tst_QMatrix::scale4x4_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("resultValues"); + + static const qreal nullScale[] = + {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (void *)nullScale; + + QTest::newRow("identity") + << (qreal)1.0f << (qreal)1.0f << (qreal)1.0f << (void *)identityValues4; + + static const qreal doubleScale[] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("double") + << (qreal)2.0f << (qreal)2.0f << (qreal)2.0f << (void *)doubleScale; + + static const qreal complexScale[] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 11.0f, 0.0f, 0.0f, + 0.0f, 0.0f, -6.5f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("complex") + << (qreal)2.0f << (qreal)11.0f << (qreal)-6.5f << (void *)complexScale; +} +void tst_QMatrix::scale4x4() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(void *, resultValues); + + QMatrix4x4 result((const qreal *)resultValues); + + QMatrix4x4 m1; + m1.scale(QVector3D(x, y, z)); + QVERIFY(isSame(m1, (const qreal *)resultValues)); + + QMatrix4x4 m2; + m2.scale(x, y, z); + QVERIFY(isSame(m2, (const qreal *)resultValues)); + + QVector3D v1(2.0f, 3.0f, -4.0f); + QVector3D v2 = m1 * v1; + QCOMPARE(v2.x(), (qreal)(2.0f * x)); + QCOMPARE(v2.y(), (qreal)(3.0f * y)); + QCOMPARE(v2.z(), (qreal)(-4.0f * z)); + + v2 = v1 * m1; + QCOMPARE(v2.x(), (qreal)(2.0f * x)); + QCOMPARE(v2.y(), (qreal)(3.0f * y)); + QCOMPARE(v2.z(), (qreal)(-4.0f * z)); + + QVector4D v3(2.0f, 3.0f, -4.0f, 34.0f); + QVector4D v4 = m1 * v3; + QCOMPARE(v4.x(), (qreal)(2.0f * x)); + QCOMPARE(v4.y(), (qreal)(3.0f * y)); + QCOMPARE(v4.z(), (qreal)(-4.0f * z)); + QCOMPARE(v4.w(), (qreal)34.0f); + + v4 = v3 * m1; + QCOMPARE(v4.x(), (qreal)(2.0f * x)); + QCOMPARE(v4.y(), (qreal)(3.0f * y)); + QCOMPARE(v4.z(), (qreal)(-4.0f * z)); + QCOMPARE(v4.w(), (qreal)34.0f); + + QPoint p1(2, 3); + QPoint p2 = m1 * p1; + QCOMPARE(p2.x(), (int)(2.0f * x)); + QCOMPARE(p2.y(), (int)(3.0f * y)); + + p2 = p1 * m1; + QCOMPARE(p2.x(), (int)(2.0f * x)); + QCOMPARE(p2.y(), (int)(3.0f * y)); + + QPointF p3(2.0f, 3.0f); + QPointF p4 = m1 * p3; + QCOMPARE(p4.x(), (qreal)(2.0f * x)); + QCOMPARE(p4.y(), (qreal)(3.0f * y)); + + p4 = p3 * m1; + QCOMPARE(p4.x(), (qreal)(2.0f * x)); + QCOMPARE(p4.y(), (qreal)(3.0f * y)); + + QMatrix4x4 m3(uniqueValues4); + QMatrix4x4 m4(m3); + m4.scale(x, y, z); + QVERIFY(m4 == m3 * m1); + + if (x == y && y == z) { + QMatrix4x4 m5; + m5.scale(x); + QVERIFY(isSame(m5, (const qreal *)resultValues)); + } + + // Test coverage when the special matrix type is unknown. + + QMatrix4x4 m6; + m6(0, 0) = 1.0f; + m6.scale(QVector3D(x, y, z)); + QVERIFY(isSame(m6, (const qreal *)resultValues)); + + QMatrix4x4 m7; + m7(0, 0) = 1.0f; + m7.scale(x, y, z); + QVERIFY(isSame(m7, (const qreal *)resultValues)); + + if (x == y && y == z) { + QMatrix4x4 m8; + m8(0, 0) = 1.0f; + m8.scale(x); + QVERIFY(isSame(m8, (const qreal *)resultValues)); + + m8.inferSpecialType(); + m8.scale(1.0f); + QVERIFY(isSame(m8, (const qreal *)resultValues)); + + QMatrix4x4 m9; + m9.translate(0.0f, 0.0f, 0.0f); + m9.scale(x); + QVERIFY(isSame(m9, (const qreal *)resultValues)); + } +} + +// Test the generation and use of 4x4 translation matrices. +void tst_QMatrix::translate4x4_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("resultValues"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (void *)identityValues4; + + static const qreal identityTranslate[] = + {1.0f, 0.0f, 0.0f, 1.0f, + 0.0f, 1.0f, 0.0f, 1.0f, + 0.0f, 0.0f, 1.0f, 1.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("identity") + << (qreal)1.0f << (qreal)1.0f << (qreal)1.0f << (void *)identityTranslate; + + static const qreal complexTranslate[] = + {1.0f, 0.0f, 0.0f, 2.0f, + 0.0f, 1.0f, 0.0f, 11.0f, + 0.0f, 0.0f, 1.0f, -6.5f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("complex") + << (qreal)2.0f << (qreal)11.0f << (qreal)-6.5f << (void *)complexTranslate; +} +void tst_QMatrix::translate4x4() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(void *, resultValues); + + QMatrix4x4 result((const qreal *)resultValues); + + QMatrix4x4 m1; + m1.translate(QVector3D(x, y, z)); + QVERIFY(isSame(m1, (const qreal *)resultValues)); + + QMatrix4x4 m2; + m2.translate(x, y, z); + QVERIFY(isSame(m2, (const qreal *)resultValues)); + + QVector3D v1(2.0f, 3.0f, -4.0f); + QVector3D v2 = m1 * v1; + QCOMPARE(v2.x(), (qreal)(2.0f + x)); + QCOMPARE(v2.y(), (qreal)(3.0f + y)); + QCOMPARE(v2.z(), (qreal)(-4.0f + z)); + + QVector4D v3(2.0f, 3.0f, -4.0f, 1.0f); + QVector4D v4 = m1 * v3; + QCOMPARE(v4.x(), (qreal)(2.0f + x)); + QCOMPARE(v4.y(), (qreal)(3.0f + y)); + QCOMPARE(v4.z(), (qreal)(-4.0f + z)); + QCOMPARE(v4.w(), (qreal)1.0f); + + QVector4D v5(2.0f, 3.0f, -4.0f, 34.0f); + QVector4D v6 = m1 * v5; + QCOMPARE(v6.x(), (qreal)(2.0f + x * 34.0f)); + QCOMPARE(v6.y(), (qreal)(3.0f + y * 34.0f)); + QCOMPARE(v6.z(), (qreal)(-4.0f + z * 34.0f)); + QCOMPARE(v6.w(), (qreal)34.0f); + + QPoint p1(2, 3); + QPoint p2 = m1 * p1; + QCOMPARE(p2.x(), (int)(2.0f + x)); + QCOMPARE(p2.y(), (int)(3.0f + y)); + + QPointF p3(2.0f, 3.0f); + QPointF p4 = m1 * p3; + QCOMPARE(p4.x(), (qreal)(2.0f + x)); + QCOMPARE(p4.y(), (qreal)(3.0f + y)); + + QMatrix4x4 m3(uniqueValues4); + QMatrix4x4 m4(m3); + m4.translate(x, y, z); + QVERIFY(m4 == m3 * m1); +} + +// Test the generation and use of 4x4 rotation matrices. +void tst_QMatrix::rotate4x4_data() +{ + QTest::addColumn("angle"); + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("resultValues"); + + static const qreal nullRotate[] = + {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("null") + << (qreal)90.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (void *)nullRotate; + + static const qreal noRotate[] = + {1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("zerodegrees") + << (qreal)0.0f + << (qreal)2.0f << (qreal)3.0f << (qreal)-4.0f + << (void *)noRotate; + + static const qreal xRotate[] = + {1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, -1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("xrotate") + << (qreal)90.0f + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (void *)xRotate; + + static const qreal xRotateNeg[] = + {1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("-xrotate") + << (qreal)90.0f + << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f + << (void *)xRotateNeg; + + static const qreal yRotate[] = + {0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("yrotate") + << (qreal)90.0f + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (void *)yRotate; + + static const qreal yRotateNeg[] = + {0.0f, 0.0f, -1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("-yrotate") + << (qreal)90.0f + << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f + << (void *)yRotateNeg; + + static const qreal zRotate[] = + {0.0f, -1.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("zrotate") + << (qreal)90.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (void *)zRotate; + + static const qreal zRotateNeg[] = + {0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + QTest::newRow("-zrotate") + << (qreal)90.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f + << (void *)zRotateNeg; + + // Algorithm from http://en.wikipedia.org/wiki/Rotation_matrix. + // Deliberately different from the one in the code for cross-checking. + static qreal complexRotate[16]; + qreal x = 1.0f; + qreal y = 2.0f; + qreal z = -6.0f; + qreal angle = -45.0f; + qreal c = qCos(angle * M_PI / 180.0f); + qreal s = qSin(angle * M_PI / 180.0f); + qreal len = qSqrt(x * x + y * y + z * z); + qreal xu = x / len; + qreal yu = y / len; + qreal zu = z / len; + complexRotate[0] = (qreal)((1 - xu * xu) * c + xu * xu); + complexRotate[1] = (qreal)(-zu * s - xu * yu * c + xu * yu); + complexRotate[2] = (qreal)(yu * s - xu * zu * c + xu * zu); + complexRotate[3] = 0; + complexRotate[4] = (qreal)(zu * s - xu * yu * c + xu * yu); + complexRotate[5] = (qreal)((1 - yu * yu) * c + yu * yu); + complexRotate[6] = (qreal)(-xu * s - yu * zu * c + yu * zu); + complexRotate[7] = 0; + complexRotate[8] = (qreal)(-yu * s - xu * zu * c + xu * zu); + complexRotate[9] = (qreal)(xu * s - yu * zu * c + yu * zu); + complexRotate[10] = (qreal)((1 - zu * zu) * c + zu * zu); + complexRotate[11] = 0; + complexRotate[12] = 0; + complexRotate[13] = 0; + complexRotate[14] = 0; + complexRotate[15] = 1; + + QTest::newRow("complex") + << (qreal)angle + << (qreal)x << (qreal)y << (qreal)z + << (void *)complexRotate; +} +void tst_QMatrix::rotate4x4() +{ + QFETCH(qreal, angle); + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(void *, resultValues); + + QMatrix4x4 m1; + m1.rotate(angle, QVector3D(x, y, z)); + QVERIFY(isSame(m1, (const qreal *)resultValues)); + + QMatrix4x4 m2; + m2.rotate(angle, x, y, z); + QVERIFY(isSame(m2, (const qreal *)resultValues)); + + QMatrix4x4 m3(uniqueValues4); + QMatrix4x4 m4(m3); + m4.rotate(angle, x, y, z); + QVERIFY(matrixFuzzyCompare(m4, m3 * m1)); + + // Null vectors don't make sense for quaternion rotations. + if (x != 0 || y != 0 || z != 0) { + QMatrix4x4 m5; + m5.rotate(QQuaternion::fromAxisAndAngle(QVector3D(x, y, z), angle)); + QVERIFY(isSame(m5, (const qreal *)resultValues)); + } + +#define ROTATE4(xin,yin,zin,win,xout,yout,zout,wout) \ + do { \ + xout = ((const qreal *)resultValues)[0] * xin + \ + ((const qreal *)resultValues)[1] * yin + \ + ((const qreal *)resultValues)[2] * zin + \ + ((const qreal *)resultValues)[3] * win; \ + yout = ((const qreal *)resultValues)[4] * xin + \ + ((const qreal *)resultValues)[5] * yin + \ + ((const qreal *)resultValues)[6] * zin + \ + ((const qreal *)resultValues)[7] * win; \ + zout = ((const qreal *)resultValues)[8] * xin + \ + ((const qreal *)resultValues)[9] * yin + \ + ((const qreal *)resultValues)[10] * zin + \ + ((const qreal *)resultValues)[11] * win; \ + wout = ((const qreal *)resultValues)[12] * xin + \ + ((const qreal *)resultValues)[13] * yin + \ + ((const qreal *)resultValues)[14] * zin + \ + ((const qreal *)resultValues)[15] * win; \ + } while (0) + + // Rotate various test vectors using the straight-forward approach. + qreal v1x, v1y, v1z, v1w; + ROTATE4(2.0f, 3.0f, -4.0f, 1.0f, v1x, v1y, v1z, v1w); + v1x /= v1w; + v1y /= v1w; + v1z /= v1w; + qreal v3x, v3y, v3z, v3w; + ROTATE4(2.0f, 3.0f, -4.0f, 1.0f, v3x, v3y, v3z, v3w); + qreal v5x, v5y, v5z, v5w; + ROTATE4(2.0f, 3.0f, -4.0f, 34.0f, v5x, v5y, v5z, v5w); + qreal p1x, p1y, p1z, p1w; + ROTATE4(2.0f, 3.0f, 0.0f, 1.0f, p1x, p1y, p1z, p1w); + p1x /= p1w; + p1y /= p1w; + p1z /= p1w; + + QVector3D v1(2.0f, 3.0f, -4.0f); + QVector3D v2 = m1 * v1; + QVERIFY(fuzzyCompare(v2.x(), v1x)); + QVERIFY(fuzzyCompare(v2.y(), v1y)); + QVERIFY(fuzzyCompare(v2.z(), v1z)); + + QVector4D v3(2.0f, 3.0f, -4.0f, 1.0f); + QVector4D v4 = m1 * v3; + QVERIFY(fuzzyCompare(v4.x(), v3x)); + QVERIFY(fuzzyCompare(v4.y(), v3y)); + QVERIFY(fuzzyCompare(v4.z(), v3z)); + QVERIFY(fuzzyCompare(v4.w(), v3w)); + + QVector4D v5(2.0f, 3.0f, -4.0f, 34.0f); + QVector4D v6 = m1 * v5; + QVERIFY(fuzzyCompare(v6.x(), v5x)); + QVERIFY(fuzzyCompare(v6.y(), v5y)); + QVERIFY(fuzzyCompare(v6.z(), v5z)); + QVERIFY(fuzzyCompare(v6.w(), v5w)); + + QPoint p1(2, 3); + QPoint p2 = m1 * p1; + QCOMPARE(p2.x(), qRound(p1x)); + QCOMPARE(p2.y(), qRound(p1y)); + + QPointF p3(2.0f, 3.0f); + QPointF p4 = m1 * p3; + QVERIFY(fuzzyCompare((float)(p4.x()), p1x)); + QVERIFY(fuzzyCompare((float)(p4.y()), p1y)); + + if (x != 0 || y != 0 || z != 0) { + QQuaternion q = QQuaternion::fromAxisAndAngle(QVector3D(x, y, z), angle); + QVector3D vq = q.rotateVector(v1); + QVERIFY(fuzzyCompare(vq.x(), v1x)); + QVERIFY(fuzzyCompare(vq.y(), v1y)); + QVERIFY(fuzzyCompare(vq.z(), v1z)); + } +} + +static bool isSame(const QMatrix3x3& m1, const Matrix3& m2) +{ + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + if (!fuzzyCompare(m1(row, col), m2.v[row * 3 + col])) + return false; + } + } + return true; +} + +// Test the computation of normal matrices from 4x4 transformation matrices. +void tst_QMatrix::normalMatrix_data() +{ + QTest::addColumn("mValues"); + + QTest::newRow("identity") + << (void *)identityValues4; + QTest::newRow("unique") + << (void *)uniqueValues4; // Not invertible because determinant == 0. + + static qreal const translateValues[16] = + {1.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 1.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 1.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const scaleValues[16] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 7.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 9.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const bothValues[16] = + {2.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 7.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 9.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const nullScaleValues1[16] = + {0.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 7.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 9.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const nullScaleValues2[16] = + {2.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 9.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const nullScaleValues3[16] = + {2.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 7.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 0.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + + QTest::newRow("translate") << (void *)translateValues; + QTest::newRow("scale") << (void *)scaleValues; + QTest::newRow("both") << (void *)bothValues; + QTest::newRow("null scale 1") << (void *)nullScaleValues1; + QTest::newRow("null scale 2") << (void *)nullScaleValues2; + QTest::newRow("null scale 3") << (void *)nullScaleValues3; +} +void tst_QMatrix::normalMatrix() +{ + QFETCH(void *, mValues); + const qreal *values = (const qreal *)mValues; + + // Compute the expected answer the long way. + Matrix3 min; + Matrix3 answer; + min.v[0] = values[0]; + min.v[1] = values[1]; + min.v[2] = values[2]; + min.v[3] = values[4]; + min.v[4] = values[5]; + min.v[5] = values[6]; + min.v[6] = values[8]; + min.v[7] = values[9]; + min.v[8] = values[10]; + bool invertible = m3Inverse(min, answer); + m3Transpose(answer); + + // Perform the test. + QMatrix4x4 m1(values); + QMatrix3x3 n1 = m1.normalMatrix(); + + if (invertible) + QVERIFY(::isSame(n1, answer)); + else + QVERIFY(isIdentity(n1)); + + // Perform the test again, after inferring special matrix types. + // This tests the optimized paths in the normalMatrix() function. + m1.inferSpecialType(); + n1 = m1.normalMatrix(); + + if (invertible) + QVERIFY(::isSame(n1, answer)); + else + QVERIFY(isIdentity(n1)); +} + +// Test optimized transformations on 4x4 matrices. +void tst_QMatrix::optimizedTransforms() +{ + static qreal const translateValues[16] = + {1.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 1.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 1.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const translateDoubleValues[16] = + {1.0f, 0.0f, 0.0f, 8.0f, + 0.0f, 1.0f, 0.0f, 10.0f, + 0.0f, 0.0f, 1.0f, -6.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const scaleValues[16] = + {2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 7.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 9.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const scaleDoubleValues[16] = + {4.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 49.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 81.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const bothValues[16] = + {2.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 7.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 9.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const bothReverseValues[16] = + {2.0f, 0.0f, 0.0f, 4.0f * 2.0f, + 0.0f, 7.0f, 0.0f, 5.0f * 7.0f, + 0.0f, 0.0f, 9.0f, -3.0f * 9.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const bothThenTranslateValues[16] = + {2.0f, 0.0f, 0.0f, 4.0f + 2.0f * 4.0f, + 0.0f, 7.0f, 0.0f, 5.0f + 7.0f * 5.0f, + 0.0f, 0.0f, 9.0f, -3.0f + 9.0f * -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + static qreal const bothThenScaleValues[16] = + {4.0f, 0.0f, 0.0f, 4.0f, + 0.0f, 49.0f, 0.0f, 5.0f, + 0.0f, 0.0f, 81.0f, -3.0f, + 0.0f, 0.0f, 0.0f, 1.0f}; + + QMatrix4x4 translate(translateValues); + QMatrix4x4 scale(scaleValues); + QMatrix4x4 both(bothValues); + + QMatrix4x4 m1; + m1.translate(4.0f, 5.0f, -3.0f); + QVERIFY(isSame(m1, translateValues)); + m1.translate(4.0f, 5.0f, -3.0f); + QVERIFY(isSame(m1, translateDoubleValues)); + + QMatrix4x4 m2; + m2.translate(QVector3D(4.0f, 5.0f, -3.0f)); + QVERIFY(isSame(m2, translateValues)); + m2.translate(QVector3D(4.0f, 5.0f, -3.0f)); + QVERIFY(isSame(m2, translateDoubleValues)); + + QMatrix4x4 m3; + m3.scale(2.0f, 7.0f, 9.0f); + QVERIFY(isSame(m3, scaleValues)); + m3.scale(2.0f, 7.0f, 9.0f); + QVERIFY(isSame(m3, scaleDoubleValues)); + + QMatrix4x4 m4; + m4.scale(QVector3D(2.0f, 7.0f, 9.0f)); + QVERIFY(isSame(m4, scaleValues)); + m4.scale(QVector3D(2.0f, 7.0f, 9.0f)); + QVERIFY(isSame(m4, scaleDoubleValues)); + + QMatrix4x4 m5; + m5.translate(4.0f, 5.0f, -3.0f); + m5.scale(2.0f, 7.0f, 9.0f); + QVERIFY(isSame(m5, bothValues)); + m5.translate(4.0f, 5.0f, -3.0f); + QVERIFY(isSame(m5, bothThenTranslateValues)); + + QMatrix4x4 m6; + m6.translate(QVector3D(4.0f, 5.0f, -3.0f)); + m6.scale(QVector3D(2.0f, 7.0f, 9.0f)); + QVERIFY(isSame(m6, bothValues)); + m6.translate(QVector3D(4.0f, 5.0f, -3.0f)); + QVERIFY(isSame(m6, bothThenTranslateValues)); + + QMatrix4x4 m7; + m7.scale(2.0f, 7.0f, 9.0f); + m7.translate(4.0f, 5.0f, -3.0f); + QVERIFY(isSame(m7, bothReverseValues)); + + QMatrix4x4 m8; + m8.scale(QVector3D(2.0f, 7.0f, 9.0f)); + m8.translate(QVector3D(4.0f, 5.0f, -3.0f)); + QVERIFY(isSame(m8, bothReverseValues)); + + QMatrix4x4 m9; + m9.translate(4.0f, 5.0f, -3.0f); + m9.scale(2.0f, 7.0f, 9.0f); + QVERIFY(isSame(m9, bothValues)); + m9.scale(2.0f, 7.0f, 9.0f); + QVERIFY(isSame(m9, bothThenScaleValues)); + + QMatrix4x4 m10; + m10.translate(QVector3D(4.0f, 5.0f, -3.0f)); + m10.scale(QVector3D(2.0f, 7.0f, 9.0f)); + QVERIFY(isSame(m10, bothValues)); + m10.scale(QVector3D(2.0f, 7.0f, 9.0f)); + QVERIFY(isSame(m10, bothThenScaleValues)); +} + +// Test orthographic projections. +void tst_QMatrix::ortho() +{ + QMatrix4x4 m1; + m1.ortho(QRect(0, 0, 300, 150)); + QPointF p1 = m1 * QPointF(0, 0); + QPointF p2 = m1 * QPointF(300, 0); + QPointF p3 = m1 * QPointF(0, 150); + QPointF p4 = m1 * QPointF(300, 150); + QVector3D p5 = m1 * QVector3D(300, 150, 1); + QVERIFY(fuzzyCompare(p1.x(), -1.0)); + QVERIFY(fuzzyCompare(p1.y(), 1.0)); + QVERIFY(fuzzyCompare(p2.x(), 1.0)); + QVERIFY(fuzzyCompare(p2.y(), 1.0)); + QVERIFY(fuzzyCompare(p3.x(), -1.0)); + QVERIFY(fuzzyCompare(p3.y(), -1.0)); + QVERIFY(fuzzyCompare(p4.x(), 1.0)); + QVERIFY(fuzzyCompare(p4.y(), -1.0)); + QVERIFY(fuzzyCompare(p5.x(), (qreal)1.0)); + QVERIFY(fuzzyCompare(p5.y(), (qreal)-1.0)); + QVERIFY(fuzzyCompare(p5.z(), (qreal)-1.0)); + + QMatrix4x4 m2; + m2.ortho(QRectF(0, 0, 300, 150)); + p1 = m2 * QPointF(0, 0); + p2 = m2 * QPointF(300, 0); + p3 = m2 * QPointF(0, 150); + p4 = m2 * QPointF(300, 150); + p5 = m2 * QVector3D(300, 150, 1); + QVERIFY(fuzzyCompare(p1.x(), -1.0)); + QVERIFY(fuzzyCompare(p1.y(), 1.0)); + QVERIFY(fuzzyCompare(p2.x(), 1.0)); + QVERIFY(fuzzyCompare(p2.y(), 1.0)); + QVERIFY(fuzzyCompare(p3.x(), -1.0)); + QVERIFY(fuzzyCompare(p3.y(), -1.0)); + QVERIFY(fuzzyCompare(p4.x(), 1.0)); + QVERIFY(fuzzyCompare(p4.y(), -1.0)); + QVERIFY(fuzzyCompare(p5.x(), (qreal)1.0)); + QVERIFY(fuzzyCompare(p5.y(), (qreal)-1.0)); + QVERIFY(fuzzyCompare(p5.z(), (qreal)-1.0)); + + QMatrix4x4 m3; + m3.ortho(0, 300, 150, 0, -1, 1); + p1 = m3 * QPointF(0, 0); + p2 = m3 * QPointF(300, 0); + p3 = m3 * QPointF(0, 150); + p4 = m3 * QPointF(300, 150); + p5 = m3 * QVector3D(300, 150, 1); + QVERIFY(fuzzyCompare(p1.x(), -1.0)); + QVERIFY(fuzzyCompare(p1.y(), 1.0)); + QVERIFY(fuzzyCompare(p2.x(), 1.0)); + QVERIFY(fuzzyCompare(p2.y(), 1.0)); + QVERIFY(fuzzyCompare(p3.x(), -1.0)); + QVERIFY(fuzzyCompare(p3.y(), -1.0)); + QVERIFY(fuzzyCompare(p4.x(), 1.0)); + QVERIFY(fuzzyCompare(p4.y(), -1.0)); + QVERIFY(fuzzyCompare(p5.x(), (qreal)1.0)); + QVERIFY(fuzzyCompare(p5.y(), (qreal)-1.0)); + QVERIFY(fuzzyCompare(p5.z(), (qreal)-1.0)); + + QMatrix4x4 m4; + m4.ortho(0, 300, 150, 0, -2, 3); + p1 = m4 * QPointF(0, 0); + p2 = m4 * QPointF(300, 0); + p3 = m4 * QPointF(0, 150); + p4 = m4 * QPointF(300, 150); + p5 = m4 * QVector3D(300, 150, 1); + QVERIFY(fuzzyCompare(p1.x(), -1.0)); + QVERIFY(fuzzyCompare(p1.y(), 1.0)); + QVERIFY(fuzzyCompare(p2.x(), 1.0)); + QVERIFY(fuzzyCompare(p2.y(), 1.0)); + QVERIFY(fuzzyCompare(p3.x(), -1.0)); + QVERIFY(fuzzyCompare(p3.y(), -1.0)); + QVERIFY(fuzzyCompare(p4.x(), 1.0)); + QVERIFY(fuzzyCompare(p4.y(), -1.0)); + QVERIFY(fuzzyCompare(p5.x(), (qreal)1.0)); + QVERIFY(fuzzyCompare(p5.y(), (qreal)-1.0)); + QVERIFY(fuzzyCompare(p5.z(), (qreal)-0.6)); + + // An empty view volume should leave the matrix alone. + QMatrix4x4 m5; + m5.ortho(0, 0, 150, 0, -2, 3); + QVERIFY(m5.isIdentity()); + m5.ortho(0, 300, 150, 150, -2, 3); + QVERIFY(m5.isIdentity()); + m5.ortho(0, 300, 150, 0, 2, 2); + QVERIFY(m5.isIdentity()); +} + +// Test perspective frustum projections. +void tst_QMatrix::frustum() +{ + QMatrix4x4 m1; + m1.frustum(-1.0f, 1.0f, -1.0f, 1.0f, -1.0f, 1.0f); + QVector3D p1 = m1 * QVector3D(-1.0f, -1.0f, 1.0f); + QVector3D p2 = m1 * QVector3D(1.0f, -1.0f, 1.0f); + QVector3D p3 = m1 * QVector3D(-1.0f, 1.0f, 1.0f); + QVector3D p4 = m1 * QVector3D(1.0f, 1.0f, 1.0f); + QVector3D p5 = m1 * QVector3D(0.0f, 0.0f, 2.0f); + QVERIFY(fuzzyCompare(p1.x(), -1.0f)); + QVERIFY(fuzzyCompare(p1.y(), -1.0f)); + QVERIFY(fuzzyCompare(p1.z(), -1.0f)); + QVERIFY(fuzzyCompare(p2.x(), 1.0f)); + QVERIFY(fuzzyCompare(p2.y(), -1.0f)); + QVERIFY(fuzzyCompare(p2.z(), -1.0f)); + QVERIFY(fuzzyCompare(p3.x(), -1.0f)); + QVERIFY(fuzzyCompare(p3.y(), 1.0f)); + QVERIFY(fuzzyCompare(p3.z(), -1.0f)); + QVERIFY(fuzzyCompare(p4.x(), 1.0f)); + QVERIFY(fuzzyCompare(p4.y(), 1.0f)); + QVERIFY(fuzzyCompare(p4.z(), -1.0f)); + QVERIFY(fuzzyCompare(p5.x(), 0.0f)); + QVERIFY(fuzzyCompare(p5.y(), 0.0f)); + QVERIFY(fuzzyCompare(p5.z(), -0.5f)); + + // An empty view volume should leave the matrix alone. + QMatrix4x4 m5; + m5.frustum(0, 0, 150, 0, -2, 3); + QVERIFY(m5.isIdentity()); + m5.frustum(0, 300, 150, 150, -2, 3); + QVERIFY(m5.isIdentity()); + m5.frustum(0, 300, 150, 0, 2, 2); + QVERIFY(m5.isIdentity()); +} + +// Test perspective field-of-view projections. +void tst_QMatrix::perspective() +{ + QMatrix4x4 m1; + m1.perspective(45.0f, 1.0f, -1.0f, 1.0f); + QVector3D p1 = m1 * QVector3D(-1.0f, -1.0f, 1.0f); + QVector3D p2 = m1 * QVector3D(1.0f, -1.0f, 1.0f); + QVector3D p3 = m1 * QVector3D(-1.0f, 1.0f, 1.0f); + QVector3D p4 = m1 * QVector3D(1.0f, 1.0f, 1.0f); + QVector3D p5 = m1 * QVector3D(0.0f, 0.0f, 2.0f); + QVERIFY(fuzzyCompare(p1.x(), 2.41421)); + QVERIFY(fuzzyCompare(p1.y(), 2.41421)); + QVERIFY(fuzzyCompare(p1.z(), -1)); + QVERIFY(fuzzyCompare(p2.x(), -2.41421)); + QVERIFY(fuzzyCompare(p2.y(), 2.41421)); + QVERIFY(fuzzyCompare(p2.z(), -1.0f)); + QVERIFY(fuzzyCompare(p3.x(), 2.41421)); + QVERIFY(fuzzyCompare(p3.y(), -2.41421)); + QVERIFY(fuzzyCompare(p3.z(), -1.0f)); + QVERIFY(fuzzyCompare(p4.x(), -2.41421)); + QVERIFY(fuzzyCompare(p4.y(), -2.41421)); + QVERIFY(fuzzyCompare(p4.z(), -1.0f)); + QVERIFY(fuzzyCompare(p5.x(), 0.0f)); + QVERIFY(fuzzyCompare(p5.y(), 0.0f)); + QVERIFY(fuzzyCompare(p5.z(), -0.5f)); + + // An empty view volume should leave the matrix alone. + QMatrix4x4 m5; + m5.perspective(45.0f, 1.0f, 0.0f, 0.0f); + QVERIFY(m5.isIdentity()); + m5.perspective(45.0f, 0.0f, -1.0f, 1.0f); + QVERIFY(m5.isIdentity()); + m5.perspective(0.0f, 1.0f, -1.0f, 1.0f); + QVERIFY(m5.isIdentity()); +} + +// Test left-handed vs right-handed coordinate flipping. +void tst_QMatrix::flipCoordinates() +{ + QMatrix4x4 m1; + m1.flipCoordinates(); + QVector3D p1 = m1 * QVector3D(2, 3, 4); + QVERIFY(p1 == QVector3D(2, -3, -4)); + + QMatrix4x4 m2; + m2.scale(2.0f, 3.0f, 1.0f); + m2.flipCoordinates(); + QVector3D p2 = m2 * QVector3D(2, 3, 4); + QVERIFY(p2 == QVector3D(4, -9, -4)); + + QMatrix4x4 m3; + m3.translate(2.0f, 3.0f, 1.0f); + m3.flipCoordinates(); + QVector3D p3 = m3 * QVector3D(2, 3, 4); + QVERIFY(p3 == QVector3D(4, 0, -3)); + + QMatrix4x4 m4; + m4.rotate(90.0f, 0.0f, 0.0f, 1.0f); + m4.flipCoordinates(); + QVector3D p4 = m4 * QVector3D(2, 3, 4); + QVERIFY(p4 == QVector3D(3, 2, -4)); +} + +// Test conversion of generic matrices to and from the non-generic types. +void tst_QMatrix::convertGeneric() +{ + QMatrix4x3 m1(uniqueValues4x3); + + static qreal const unique4x4[16] = { + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; +#if !defined(QT_NO_MEMBER_TEMPLATES) + QMatrix4x4 m4(m1); + QVERIFY(isSame(m4, unique4x4)); +#endif + QMatrix4x4 m5 = qGenericMatrixToMatrix4x4(m1); + QVERIFY(isSame(m5, unique4x4)); + + static qreal const conv4x4[12] = { + 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f + }; + QMatrix4x4 m9(uniqueValues4); +#if !defined(QT_NO_MEMBER_TEMPLATES) + QMatrix4x3 m10 = m9.toGenericMatrix<4, 3>(); + QVERIFY(isSame(m10, conv4x4)); +#endif + + QMatrix4x3 m11 = qGenericMatrixFromMatrix4x4<4, 3>(m9); + QVERIFY(isSame(m11, conv4x4)); +} + +void tst_QMatrix::extractAxisRotation_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("angle"); + + QTest::newRow("1, 0, 0, 0 deg") << 1.0f << 0.0f << 0.0f << 0.0f; + QTest::newRow("1, 0, 0, 90 deg") << 1.0f << 0.0f << 0.0f << 90.0f; + QTest::newRow("1, 0, 0, 270 deg") << 1.0f << 0.0f << 0.0f << 270.0f; + QTest::newRow("1, 0, 0, 45 deg") << 1.0f << 0.0f << 0.0f << 45.0f; + QTest::newRow("1, 0, 0, 120 deg") << 1.0f << 0.0f << 0.0f << 120.0f; + QTest::newRow("1, 0, 0, 300 deg") << 1.0f << 0.0f << 0.0f << 300.0f; + + QTest::newRow("0, 1, 0, 90 deg") << 0.0f << 1.0f << 0.0f << 90.0f; + QTest::newRow("0, 1, 0, 270 deg") << 0.0f << 1.0f << 0.0f << 270.0f; + QTest::newRow("0, 1, 0, 45 deg") << 0.0f << 1.0f << 0.0f << 45.0f; + QTest::newRow("0, 1, 0, 120 deg") << 0.0f << 1.0f << 0.0f << 120.0f; + QTest::newRow("0, 1, 0, 300 deg") << 0.0f << 1.0f << 0.0f << 300.0f; + + QTest::newRow("0, 0, 1, 90 deg") << 0.0f << 0.0f << 1.0f << 90.0f; + QTest::newRow("0, 0, 1, 270 deg") << 0.0f << 0.0f << 1.0f << 270.0f; + QTest::newRow("0, 0, 1, 45 deg") << 0.0f << 0.0f << 1.0f << 45.0f; + QTest::newRow("0, 0, 1, 120 deg") << 0.0f << 0.0f << 1.0f << 120.0f; + QTest::newRow("0, 0, 1, 300 deg") << 0.0f << 0.0f << 1.0f << 300.0f; + + QTest::newRow("1, 1, 1, 90 deg") << 1.0f << 1.0f << 1.0f << 90.0f; + QTest::newRow("1, 1, 1, 270 deg") << 1.0f << 1.0f << 1.0f << 270.0f; + QTest::newRow("1, 1, 1, 45 deg") << 1.0f << 1.0f << 1.0f << 45.0f; + QTest::newRow("1, 1, 1, 120 deg") << 1.0f << 1.0f << 1.0f << 120.0f; + QTest::newRow("1, 1, 1, 300 deg") << 1.0f << 1.0f << 1.0f << 300.0f; +} + +void tst_QMatrix::extractAxisRotation() +{ + QFETCH(float, x); + QFETCH(float, y); + QFETCH(float, z); + QFETCH(float, angle); + + QMatrix4x4 m; + QVector3D origAxis(x, y, z); + + m.rotate(angle, x, y, z); + + origAxis.normalize(); + QVector3D extractedAxis; + qreal extractedAngle; + + m.extractAxisRotation(extractedAngle, extractedAxis); + +#ifdef QT_GL_FIXED_PREFERRED + qreal epsilon = 0.003; +#else + qreal epsilon = 0.001; +#endif + + if (angle > 180) { + QVERIFY(fuzzyCompare(360.0f - angle, extractedAngle, epsilon)); + QVERIFY(fuzzyCompare(extractedAxis, -origAxis, epsilon)); + } else { + QVERIFY(fuzzyCompare(angle, extractedAngle, epsilon)); + QVERIFY(fuzzyCompare(extractedAxis, origAxis, epsilon)); + } +} + +void tst_QMatrix::extractTranslation_data() +{ + QTest::addColumn("rotation"); + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + + static QMatrix4x4 m1; + + QTest::newRow("identity, 100, 50, 25") + << m1 << 100.0f << 50.0f << 250.0f; + + m1.rotate(45.0, 1.0, 0.0, 0.0); + QTest::newRow("rotX 45 + 100, 50, 25") << m1 << 100.0f << 50.0f << 25.0f; + + m1.setIdentity(); + m1.rotate(45.0, 0.0, 1.0, 0.0); + QTest::newRow("rotY 45 + 100, 50, 25") << m1 << 100.0f << 50.0f << 25.0f; + + m1.setIdentity(); + m1.rotate(75, 0.0, 0.0, 1.0); + m1.rotate(25, 1.0, 0.0, 0.0); + m1.rotate(45, 0.0, 1.0, 0.0); + QTest::newRow("rotZ 75, rotX 25, rotY 45, 100, 50, 25") << m1 << 100.0f << 50.0f << 25.0f; +} + +void tst_QMatrix::extractTranslation() +{ + QFETCH(QMatrix4x4, rotation); + QFETCH(float, x); + QFETCH(float, y); + QFETCH(float, z); + + rotation.translate(x, y, z); + + QVector3D vec = rotation.extractTranslation(); + +#ifdef QT_GL_FIXED_PREFERRED + qreal epsilon = 0.01; +#else + qreal epsilon = 0.001; +#endif + + QVERIFY(fuzzyCompare(vec.x(), x, epsilon)); + QVERIFY(fuzzyCompare(vec.y(), y, epsilon)); + QVERIFY(fuzzyCompare(vec.z(), z, epsilon)); + + // Have to be careful with numbers here, it is really easy to blow away + // the precision of a fixed pointer number, especially when doing distance + // formula for vector normalization + + QMatrix4x4 lookAt; + QVector3D eye(1.5f, -2.5f, 2.5f); + lookAt.lookAt(eye, + QVector3D(10.0f, 10.0f, 10.0f), + QVector3D(0.0f, 1.0f, 0.0f)); + + QVector3D extEye = lookAt.extractTranslation(); + + QVERIFY(fuzzyCompare(eye.x(), -extEye.x(), epsilon)); + QVERIFY(fuzzyCompare(eye.y(), -extEye.y(), epsilon)); + QVERIFY(fuzzyCompare(eye.z(), -extEye.z(), epsilon)); +} + +// Copy of "flagBits" in qmatrix4x4.h. +enum { + Identity = 0x0001, // Identity matrix + General = 0x0002, // General matrix, unknown contents + Translation = 0x0004, // Contains a simple translation + Scale = 0x0008, // Contains a simple scale + Rotation = 0x0010 // Contains a simple rotation +}; + +// Structure that allows direct access to "flagBits" for testing. +struct Matrix4x4 +{ + qrealinner m[4][4]; + int flagBits; +}; + +// Test the inferring of special matrix types. +void tst_QMatrix::inferSpecialType_data() +{ + QTest::addColumn("mValues"); + QTest::addColumn("flagBits"); + + QTest::newRow("null") + << (void *)nullValues4 << (int)General; + QTest::newRow("identity") + << (void *)identityValues4 << (int)Identity; + QTest::newRow("unique") + << (void *)uniqueValues4 << (int)General; + + static qreal scaleValues[16] = { + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 3.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 4.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + QTest::newRow("scale") + << (void *)scaleValues << (int)Scale; + + static qreal translateValues[16] = { + 1.0f, 0.0f, 0.0f, 2.0f, + 0.0f, 1.0f, 0.0f, 3.0f, + 0.0f, 0.0f, 1.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + QTest::newRow("scale") + << (void *)translateValues << (int)Translation; + + static qreal bothValues[16] = { + 1.0f, 0.0f, 0.0f, 2.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 4.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + QTest::newRow("both") + << (void *)bothValues << (int)(Scale | Translation); + + static qreal belowValues[16] = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 4.0f, 0.0f, 0.0f, 1.0f + }; + QTest::newRow("below") + << (void *)belowValues << (int)General; +} +void tst_QMatrix::inferSpecialType() +{ + QFETCH(void *, mValues); + QFETCH(int, flagBits); + + QMatrix4x4 m((const qreal *)mValues); + m.inferSpecialType(); + + QCOMPARE(reinterpret_cast(&m)->flagBits, flagBits); +} + +void tst_QMatrix::columnsAndRows() +{ + QMatrix4x4 m1(uniqueValues4); + + QVERIFY(m1.column(0) == QVector4D(1, 5, 9, 13)); + QVERIFY(m1.column(1) == QVector4D(2, 6, 10, 14)); + QVERIFY(m1.column(2) == QVector4D(3, 7, 11, 15)); + QVERIFY(m1.column(3) == QVector4D(4, 8, 12, 16)); + + QVERIFY(m1.row(0) == QVector4D(1, 2, 3, 4)); + QVERIFY(m1.row(1) == QVector4D(5, 6, 7, 8)); + QVERIFY(m1.row(2) == QVector4D(9, 10, 11, 12)); + QVERIFY(m1.row(3) == QVector4D(13, 14, 15, 16)); + + m1.setColumn(0, QVector4D(-1, -5, -9, -13)); + m1.setColumn(1, QVector4D(-2, -6, -10, -14)); + m1.setColumn(2, QVector4D(-3, -7, -11, -15)); + m1.setColumn(3, QVector4D(-4, -8, -12, -16)); + + QVERIFY(m1.column(0) == QVector4D(-1, -5, -9, -13)); + QVERIFY(m1.column(1) == QVector4D(-2, -6, -10, -14)); + QVERIFY(m1.column(2) == QVector4D(-3, -7, -11, -15)); + QVERIFY(m1.column(3) == QVector4D(-4, -8, -12, -16)); + + QVERIFY(m1.row(0) == QVector4D(-1, -2, -3, -4)); + QVERIFY(m1.row(1) == QVector4D(-5, -6, -7, -8)); + QVERIFY(m1.row(2) == QVector4D(-9, -10, -11, -12)); + QVERIFY(m1.row(3) == QVector4D(-13, -14, -15, -16)); + + m1.setRow(0, QVector4D(1, 5, 9, 13)); + m1.setRow(1, QVector4D(2, 6, 10, 14)); + m1.setRow(2, QVector4D(3, 7, 11, 15)); + m1.setRow(3, QVector4D(4, 8, 12, 16)); + + QVERIFY(m1.column(0) == QVector4D(1, 2, 3, 4)); + QVERIFY(m1.column(1) == QVector4D(5, 6, 7, 8)); + QVERIFY(m1.column(2) == QVector4D(9, 10, 11, 12)); + QVERIFY(m1.column(3) == QVector4D(13, 14, 15, 16)); + + QVERIFY(m1.row(0) == QVector4D(1, 5, 9, 13)); + QVERIFY(m1.row(1) == QVector4D(2, 6, 10, 14)); + QVERIFY(m1.row(2) == QVector4D(3, 7, 11, 15)); + QVERIFY(m1.row(3) == QVector4D(4, 8, 12, 16)); +} + +// Test converting QMatrix objects into QMatrix4x4 and then +// checking that transformations in the original perform the +// equivalent transformations in the new matrix. +void tst_QMatrix::convertQMatrix() +{ + QMatrix m1; + m1.translate(-3.5, 2.0); + QPointF p1 = m1.map(QPointF(100.0, 150.0)); + QCOMPARE(p1.x(), 100.0 - 3.5); + QCOMPARE(p1.y(), 150.0 + 2.0); + + QMatrix4x4 m2(m1); + QPointF p2 = m2 * QPointF(100.0, 150.0); + QCOMPARE((double)p2.x(), 100.0 - 3.5); + QCOMPARE((double)p2.y(), 150.0 + 2.0); + QVERIFY(m1 == m2.toAffine()); + + QMatrix m3; + m3.scale(1.5, -2.0); + QPointF p3 = m3.map(QPointF(100.0, 150.0)); + QCOMPARE(p3.x(), 1.5 * 100.0); + QCOMPARE(p3.y(), -2.0 * 150.0); + + QMatrix4x4 m4(m3); + QPointF p4 = m4 * QPointF(100.0, 150.0); + QCOMPARE((double)p4.x(), 1.5 * 100.0); + QCOMPARE((double)p4.y(), -2.0 * 150.0); + QVERIFY(m3 == m4.toAffine()); + + QMatrix m5; + m5.rotate(45.0); + QPointF p5 = m5.map(QPointF(100.0, 150.0)); + + QMatrix4x4 m6(m5); + QPointF p6 = m6 * QPointF(100.0, 150.0); + QVERIFY(fuzzyCompare(p5.x(), p6.x(), 0.005)); + QVERIFY(fuzzyCompare(p5.y(), p6.y(), 0.005)); + + QMatrix m7 = m6.toAffine(); + QVERIFY(fuzzyCompare(m5.m11(), m7.m11())); + QVERIFY(fuzzyCompare(m5.m12(), m7.m12())); + QVERIFY(fuzzyCompare(m5.m21(), m7.m21())); + QVERIFY(fuzzyCompare(m5.m22(), m7.m22())); + QVERIFY(fuzzyCompare(m5.dx(), m7.dx())); + QVERIFY(fuzzyCompare(m5.dy(), m7.dy())); +} + +// Test converting QTransform objects into QMatrix4x4 and then +// checking that transformations in the original perform the +// equivalent transformations in the new matrix. +void tst_QMatrix::convertQTransform() +{ + QTransform m1; + m1.translate(-3.5, 2.0); + QPointF p1 = m1.map(QPointF(100.0, 150.0)); + QCOMPARE(p1.x(), 100.0 - 3.5); + QCOMPARE(p1.y(), 150.0 + 2.0); + + QMatrix4x4 m2(m1); + QPointF p2 = m2 * QPointF(100.0, 150.0); + QCOMPARE((double)p2.x(), 100.0 - 3.5); + QCOMPARE((double)p2.y(), 150.0 + 2.0); + QVERIFY(m1 == m2.toTransform()); + + QTransform m3; + m3.scale(1.5, -2.0); + QPointF p3 = m3.map(QPointF(100.0, 150.0)); + QCOMPARE(p3.x(), 1.5 * 100.0); + QCOMPARE(p3.y(), -2.0 * 150.0); + + QMatrix4x4 m4(m3); + QPointF p4 = m4 * QPointF(100.0, 150.0); + QCOMPARE((double)p4.x(), 1.5 * 100.0); + QCOMPARE((double)p4.y(), -2.0 * 150.0); + QVERIFY(m3 == m4.toTransform()); + + QTransform m5; + m5.rotate(45.0); + QPointF p5 = m5.map(QPointF(100.0, 150.0)); + + QMatrix4x4 m6(m5); + QPointF p6 = m6 * QPointF(100.0, 150.0); + QVERIFY(fuzzyCompare(p5.x(), p6.x(), 0.005)); + QVERIFY(fuzzyCompare(p5.y(), p6.y(), 0.005)); + + QTransform m7 = m6.toTransform(); + QVERIFY(fuzzyCompare(m5.m11(), m7.m11())); + QVERIFY(fuzzyCompare(m5.m12(), m7.m12())); + QVERIFY(fuzzyCompare(m5.m21(), m7.m21())); + QVERIFY(fuzzyCompare(m5.m22(), m7.m22())); + QVERIFY(fuzzyCompare(m5.dx(), m7.dx())); + QVERIFY(fuzzyCompare(m5.dy(), m7.dy())); + QVERIFY(fuzzyCompare(m5.m13(), m7.m13())); + QVERIFY(fuzzyCompare(m5.m23(), m7.m23())); + QVERIFY(fuzzyCompare(m5.m33(), m7.m33())); +} + +// Test filling matrices with specific values. +void tst_QMatrix::fill() +{ + QMatrix4x4 m1; + m1.fill(0.0f); + QVERIFY(isSame(m1, nullValues4)); + + static const qreal fillValues4[] = + {2.5f, 2.5f, 2.5f, 2.5f, + 2.5f, 2.5f, 2.5f, 2.5f, + 2.5f, 2.5f, 2.5f, 2.5f, + 2.5f, 2.5f, 2.5f, 2.5f}; + m1.fill(2.5f); + QVERIFY(isSame(m1, fillValues4)); + + QMatrix4x3 m2; + m2.fill(0.0f); + QVERIFY(isSame(m2, nullValues4x3)); + + static const qreal fillValues4x3[] = + {2.5f, 2.5f, 2.5f, 2.5f, + 2.5f, 2.5f, 2.5f, 2.5f, + 2.5f, 2.5f, 2.5f, 2.5f}; + m2.fill(2.5f); + QVERIFY(isSame(m2, fillValues4x3)); +} + +// Force the fixed-point version of the test case to put a +// different test name on the front of failure reports. +class tst_QMatrixFixed : public tst_QMatrix +{ + Q_OBJECT +public: + tst_QMatrixFixed() {} + ~tst_QMatrixFixed() {} +}; + +#ifdef QT_GL_FIXED_PREFERRED + +QTEST_APPLESS_MAIN(tst_QMatrixFixed) + +#else + +QTEST_APPLESS_MAIN(tst_QMatrix) + +#endif + +#include "tst_qmatrixnxn.moc" diff --git a/tests/auto/math3d/qmatrixnxn_fixed/qmatrixnxn_fixed.pro b/tests/auto/math3d/qmatrixnxn_fixed/qmatrixnxn_fixed.pro new file mode 100644 index 0000000..cd1c8fa --- /dev/null +++ b/tests/auto/math3d/qmatrixnxn_fixed/qmatrixnxn_fixed.pro @@ -0,0 +1,8 @@ +load(qttest_p4) +VPATH += ../shared +VPATH += ../qmatrixnxn +INCLUDEPATH += ../shared +INCLUDEPATH += ../../../../src/gui/math3d +DEFINES += FIXED_POINT_TESTS +HEADERS += math3dincludes.h +SOURCES += tst_qmatrixnxn.cpp math3dincludes.cpp diff --git a/tests/auto/math3d/qquaternion/qquaternion.pro b/tests/auto/math3d/qquaternion/qquaternion.pro new file mode 100644 index 0000000..eea84f0 --- /dev/null +++ b/tests/auto/math3d/qquaternion/qquaternion.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +VPATH += ../shared +INCLUDEPATH += ../shared +HEADERS += math3dincludes.h +SOURCES += tst_qquaternion.cpp diff --git a/tests/auto/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/math3d/qquaternion/tst_qquaternion.cpp new file mode 100644 index 0000000..252bdc7 --- /dev/null +++ b/tests/auto/math3d/qquaternion/tst_qquaternion.cpp @@ -0,0 +1,761 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include "math3dincludes.h" + +class tst_QQuaternion : public QObject +{ + Q_OBJECT +public: + tst_QQuaternion() {} + ~tst_QQuaternion() {} + +private slots: + void create(); + + void length_data(); + void length(); + + void normalized_data(); + void normalized(); + + void normalize_data(); + void normalize(); + + void compare(); + + void add_data(); + void add(); + + void subtract_data(); + void subtract(); + + void multiply_data(); + void multiply(); + + void multiplyFactor_data(); + void multiplyFactor(); + + void divide_data(); + void divide(); + + void negate_data(); + void negate(); + + void conjugate_data(); + void conjugate(); + + void fromAxisAndAngle_data(); + void fromAxisAndAngle(); + + void interpolate_data(); + void interpolate(); +}; + +// qFuzzyCompare isn't quite "fuzzy" enough to handle conversion +// to fixed-point and back again. So create "fuzzier" compares. +static bool fuzzyCompare(float x, float y) +{ + float diff = x - y; + if (diff < 0.0f) + diff = -diff; + return (diff < 0.001); +} + +// Test the creation of QQuaternion objects in various ways: +// construct, copy, and modify. +void tst_QQuaternion::create() +{ + QQuaternion identity; + QCOMPARE(identity.x(), (qreal)0.0f); + QCOMPARE(identity.y(), (qreal)0.0f); + QCOMPARE(identity.z(), (qreal)0.0f); + QCOMPARE(identity.scalar(), (qreal)1.0f); + QVERIFY(identity.isIdentity()); + + QQuaternion v1(34.0f, 1.0f, 2.5f, -89.25f); + QCOMPARE(v1.x(), (qreal)1.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.scalar(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + QQuaternion v1i(34, 1, 2, -89); + QCOMPARE(v1i.x(), (qreal)1.0f); + QCOMPARE(v1i.y(), (qreal)2.0f); + QCOMPARE(v1i.z(), (qreal)-89.0f); + QCOMPARE(v1i.scalar(), (qreal)34.0f); + QVERIFY(!v1i.isNull()); + + QQuaternion v2(v1); + QCOMPARE(v2.x(), (qreal)1.0f); + QCOMPARE(v2.y(), (qreal)2.5f); + QCOMPARE(v2.z(), (qreal)-89.25f); + QCOMPARE(v2.scalar(), (qreal)34.0f); + QVERIFY(!v2.isNull()); + + QQuaternion v4; + QCOMPARE(v4.x(), (qreal)0.0f); + QCOMPARE(v4.y(), (qreal)0.0f); + QCOMPARE(v4.z(), (qreal)0.0f); + QCOMPARE(v4.scalar(), (qreal)1.0f); + QVERIFY(v4.isIdentity()); + v4 = v1; + QCOMPARE(v4.x(), (qreal)1.0f); + QCOMPARE(v4.y(), (qreal)2.5f); + QCOMPARE(v4.z(), (qreal)-89.25f); + QCOMPARE(v4.scalar(), (qreal)34.0f); + QVERIFY(!v4.isNull()); + + QQuaternion v9(34, QVector3D(1.0f, 2.5f, -89.25f)); + QCOMPARE(v9.x(), (qreal)1.0f); + QCOMPARE(v9.y(), (qreal)2.5f); + QCOMPARE(v9.z(), (qreal)-89.25f); + QCOMPARE(v9.scalar(), (qreal)34.0f); + QVERIFY(!v9.isNull()); + + v1.setX(3.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.scalar(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setY(10.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.scalar(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setZ(15.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)15.5f); + QCOMPARE(v1.scalar(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setScalar(6.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)15.5f); + QCOMPARE(v1.scalar(), (qreal)6.0f); + QVERIFY(!v1.isNull()); + + v1.setVector(2.0f, 6.5f, -1.25f); + QCOMPARE(v1.x(), (qreal)2.0f); + QCOMPARE(v1.y(), (qreal)6.5f); + QCOMPARE(v1.z(), (qreal)-1.25f); + QCOMPARE(v1.scalar(), (qreal)6.0f); + QVERIFY(!v1.isNull()); + QVERIFY(v1.vector() == QVector3D(2.0f, 6.5f, -1.25f)); + + v1.setVector(QVector3D(-2.0f, -6.5f, 1.25f)); + QCOMPARE(v1.x(), (qreal)-2.0f); + QCOMPARE(v1.y(), (qreal)-6.5f); + QCOMPARE(v1.z(), (qreal)1.25f); + QCOMPARE(v1.scalar(), (qreal)6.0f); + QVERIFY(!v1.isNull()); + QVERIFY(v1.vector() == QVector3D(-2.0f, -6.5f, 1.25f)); + + v1.setX(0.0f); + v1.setY(0.0f); + v1.setZ(0.0f); + v1.setScalar(0.0f); + QCOMPARE(v1.x(), (qreal)0.0f); + QCOMPARE(v1.y(), (qreal)0.0f); + QCOMPARE(v1.z(), (qreal)0.0f); + QCOMPARE(v1.scalar(), (qreal)0.0f); + QVERIFY(v1.isNull()); + + QVector4D v10 = v9.toVector4D(); + QCOMPARE(v10.x(), (qreal)1.0f); + QCOMPARE(v10.y(), (qreal)2.5f); + QCOMPARE(v10.z(), (qreal)-89.25f); + QCOMPARE(v10.w(), (qreal)34.0f); +} + +// Test length computation for quaternions. +void tst_QQuaternion::length_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("w"); + QTest::addColumn("len"); + + QTest::newRow("null") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + QTest::newRow("1x") << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1y") << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1z") << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1w") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)1.0f; + QTest::newRow("-1x") << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1y") << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1z") << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1w") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f << (qreal)1.0f; + QTest::newRow("two") << (qreal)2.0f << (qreal)-2.0f << (qreal)2.0f << (qreal)2.0f << (qreal)qSqrt(16.0f); +} +void tst_QQuaternion::length() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + QFETCH(qreal, len); + + QQuaternion v(w, x, y, z); + QCOMPARE((float)(v.length()), (float)len); + QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z + w * w)); +} + +// Test the unit vector conversion for quaternions. +void tst_QQuaternion::normalized_data() +{ + // Use the same test data as the length test. + length_data(); +} +void tst_QQuaternion::normalized() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + QFETCH(qreal, len); + + QQuaternion v(w, x, y, z); + QQuaternion u = v.normalized(); + if (v.isNull()) + QVERIFY(u.isNull()); + else + QCOMPARE((float)(u.length()), (float)1.0f); + QCOMPARE((float)(u.x() * len), (float)(v.x())); + QCOMPARE((float)(u.y() * len), (float)(v.y())); + QCOMPARE((float)(u.z() * len), (float)(v.z())); + QCOMPARE((float)(u.scalar() * len), (float)(v.scalar())); +} + +// Test the unit vector conversion for quaternions. +void tst_QQuaternion::normalize_data() +{ + // Use the same test data as the length test. + length_data(); +} +void tst_QQuaternion::normalize() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + + QQuaternion v(w, x, y, z); + bool isNull = v.isNull(); + v.normalize(); + if (isNull) + QVERIFY(v.isNull()); + else + QCOMPARE((float)(v.length()), (float)1.0f); +} + +// Test the comparison operators for quaternions. +void tst_QQuaternion::compare() +{ + QQuaternion v1(8, 1, 2, 4); + QQuaternion v2(8, 1, 2, 4); + QQuaternion v3(8, 3, 2, 4); + QQuaternion v4(8, 1, 3, 4); + QQuaternion v5(8, 1, 2, 3); + QQuaternion v6(3, 1, 2, 4); + + QVERIFY(v1 == v2); + QVERIFY(v1 != v3); + QVERIFY(v1 != v4); + QVERIFY(v1 != v5); + QVERIFY(v1 != v6); +} + +// Test addition for quaternions. +void tst_QQuaternion::add_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("w3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)3.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)3.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)3.0f << (qreal)0.0f; + + QTest::newRow("wonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)3.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)8.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)-6.0f << (qreal)9.0f + << (qreal)5.0f << (qreal)7.0f << (qreal)-3.0f << (qreal)17.0f; +} +void tst_QQuaternion::add() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, w3); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(w2, x2, y2, z2); + QQuaternion v3(w3, x3, y3, z3); + + QVERIFY((v1 + v2) == v3); + + QQuaternion v4(v1); + v4 += v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() + v2.x()); + QCOMPARE(v4.y(), v1.y() + v2.y()); + QCOMPARE(v4.z(), v1.z() + v2.z()); + QCOMPARE(v4.scalar(), v1.scalar() + v2.scalar()); +} + +// Test subtraction for quaternions. +void tst_QQuaternion::subtract_data() +{ + // Use the same test data as the add test. + add_data(); +} +void tst_QQuaternion::subtract() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, w3); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(w2, x2, y2, z2); + QQuaternion v3(w3, x3, y3, z3); + + QVERIFY((v3 - v1) == v2); + QVERIFY((v3 - v2) == v1); + + QQuaternion v4(v3); + v4 -= v1; + QVERIFY(v4 == v2); + + QCOMPARE(v4.x(), v3.x() - v1.x()); + QCOMPARE(v4.y(), v3.y() - v1.y()); + QCOMPARE(v4.z(), v3.z() - v1.z()); + QCOMPARE(v4.scalar(), v3.scalar() - v1.scalar()); + + QQuaternion v5(v3); + v5 -= v2; + QVERIFY(v5 == v1); + + QCOMPARE(v5.x(), v3.x() - v2.x()); + QCOMPARE(v5.y(), v3.y() - v2.y()); + QCOMPARE(v5.z(), v3.z() - v2.z()); + QCOMPARE(v5.scalar(), v3.scalar() - v2.scalar()); +} + +// Test quaternion multiplication. +void tst_QQuaternion::multiply_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("unitvec") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)1.0f; + + QTest::newRow("complex") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)7.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)6.0f << (qreal)8.0f; +} +void tst_QQuaternion::multiply() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + + QQuaternion q1(w1, x1, y1, z1); + QQuaternion q2(w2, x2, y2, z2); + + // Use the simple algorithm at: + // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q53 + // to calculate the answer we expect to get. + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + qreal scalar = w1 * w2 - QVector3D::dotProduct(v1, v2); + QVector3D vector = w1 * v2 + w2 * v1 + QVector3D::crossProduct(v1, v2); + QQuaternion result(scalar, vector); + + QVERIFY((q1 * q2) == result); +} + +// Test multiplication by a factor for quaternions. +void tst_QQuaternion::multiplyFactor_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("factor"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)100.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("wonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)4.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)4.0f << (qreal)-6.0f << (qreal)8.0f; + + QTest::newRow("allzero") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)4.0f + << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; +} +void tst_QQuaternion::multiplyFactor() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(w2, x2, y2, z2); + + QVERIFY((v1 * factor) == v2); + QVERIFY((factor * v1) == v2); + + QQuaternion v3(v1); + v3 *= factor; + QVERIFY(v3 == v2); + + QCOMPARE(v3.x(), v1.x() * factor); + QCOMPARE(v3.y(), v1.y() * factor); + QCOMPARE(v3.z(), v1.z() * factor); + QCOMPARE(v3.scalar(), v1.scalar() * factor); +} + +// Test division by a factor for quaternions. +void tst_QQuaternion::divide_data() +{ + // Use the same test data as the multiply test. + multiplyFactor_data(); +} +void tst_QQuaternion::divide() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(w2, x2, y2, z2); + + if (factor == (qreal)0.0f) + return; + + QVERIFY((v2 / factor) == v1); + + QQuaternion v3(v2); + v3 /= factor; + QVERIFY(v3 == v1); + + QCOMPARE(v3.x(), v2.x() / factor); + QCOMPARE(v3.y(), v2.y() / factor); + QCOMPARE(v3.z(), v2.z() / factor); + QCOMPARE(v3.scalar(), v2.scalar() / factor); +} + +// Test negation for quaternions. +void tst_QQuaternion::negate_data() +{ + // Use the same test data as the add test. + add_data(); +} +void tst_QQuaternion::negate() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(-w1, -x1, -y1, -z1); + + QVERIFY(-v1 == v2); +} + +// Test quaternion conjugate calculations. +void tst_QQuaternion::conjugate_data() +{ + // Use the same test data as the add test. + add_data(); +} +void tst_QQuaternion::conjugate() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + + QQuaternion v1(w1, x1, y1, z1); + QQuaternion v2(w1, -x1, -y1, -z1); + + QVERIFY(v1.conjugate() == v2); +} + +// Test quaternion creation from an axis and an angle. +void tst_QQuaternion::fromAxisAndAngle_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("angle"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)90.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)180.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)270.0f; + + QTest::newRow("complex") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)45.0f; +} +void tst_QQuaternion::fromAxisAndAngle() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, angle); + + // Use a straight-forward implementation of the algorithm at: + // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56 + // to calculate the answer we expect to get. + QVector3D vector = QVector3D(x1, y1, z1).normalized(); + qreal sin_a = qSin((angle * M_PI / 180.0) / 2.0); + qreal cos_a = qCos((angle * M_PI / 180.0) / 2.0); + QQuaternion result((qreal)cos_a, + (qreal)(vector.x() * sin_a), + (qreal)(vector.y() * sin_a), + (qreal)(vector.z() * sin_a)); + result = result.normalized(); + + QQuaternion answer = QQuaternion::fromAxisAndAngle(QVector3D(x1, y1, z1), angle); + QVERIFY(fuzzyCompare(answer.x(), result.x())); + QVERIFY(fuzzyCompare(answer.y(), result.y())); + QVERIFY(fuzzyCompare(answer.z(), result.z())); + QVERIFY(fuzzyCompare(answer.scalar(), result.scalar())); + + answer = QQuaternion::fromAxisAndAngle(x1, y1, z1, angle); + QVERIFY(fuzzyCompare(answer.x(), result.x())); + QVERIFY(fuzzyCompare(answer.y(), result.y())); + QVERIFY(fuzzyCompare(answer.z(), result.z())); + QVERIFY(fuzzyCompare(answer.scalar(), result.scalar())); +} + +// Test spherical interpolation of quaternions. +void tst_QQuaternion::interpolate_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("angle1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("angle2"); + QTest::addColumn("t"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("angle3"); + + QTest::newRow("first") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f + << (qreal)0.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f; + QTest::newRow("first2") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f + << (qreal)-0.5f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f; + QTest::newRow("second") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f + << (qreal)1.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f; + QTest::newRow("second2") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f + << (qreal)1.5f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f; + QTest::newRow("middle") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)90.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)180.0f + << (qreal)0.5f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)135.0f; + QTest::newRow("wide angle") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)0.0f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)270.0f + << (qreal)0.5f + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)-45.0f; +} +void tst_QQuaternion::interpolate() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, angle1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, angle2); + QFETCH(qreal, t); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, angle3); + + QQuaternion q1 = QQuaternion::fromAxisAndAngle(x1, y1, z1, angle1); + QQuaternion q2 = QQuaternion::fromAxisAndAngle(x2, y2, z2, angle2); + QQuaternion q3 = QQuaternion::fromAxisAndAngle(x3, y3, z3, angle3); + + QQuaternion result = QQuaternion::interpolate(q1, q2, t); + + QVERIFY(fuzzyCompare(result.x(), q3.x())); + QVERIFY(fuzzyCompare(result.y(), q3.y())); + QVERIFY(fuzzyCompare(result.z(), q3.z())); + QVERIFY(fuzzyCompare(result.scalar(), q3.scalar())); +} + +// Force the fixed-point version of the test case to put a +// different test name on the front of failure reports. +class tst_QQuaternionFixed : public tst_QQuaternion +{ + Q_OBJECT +public: + tst_QQuaternionFixed() {} + ~tst_QQuaternionFixed() {} +}; + +#ifdef QT_GL_FIXED_PREFERRED + +QTEST_APPLESS_MAIN(tst_QQuaternionFixed) + +#else + +QTEST_APPLESS_MAIN(tst_QQuaternion) + +#endif + +#include "tst_qquaternion.moc" diff --git a/tests/auto/math3d/qquaternion_fixed/qquaternion_fixed.pro b/tests/auto/math3d/qquaternion_fixed/qquaternion_fixed.pro new file mode 100644 index 0000000..a0d5401 --- /dev/null +++ b/tests/auto/math3d/qquaternion_fixed/qquaternion_fixed.pro @@ -0,0 +1,8 @@ +load(qttest_p4) +VPATH += ../shared +VPATH += ../qquaternion +INCLUDEPATH += ../shared +INCLUDEPATH += ../../../../src/gui/math3d +DEFINES += FIXED_POINT_TESTS +HEADERS += math3dincludes.h +SOURCES += tst_qquaternion.cpp math3dincludes.cpp diff --git a/tests/auto/math3d/qvectornd/qvectornd.pro b/tests/auto/math3d/qvectornd/qvectornd.pro new file mode 100644 index 0000000..0981637 --- /dev/null +++ b/tests/auto/math3d/qvectornd/qvectornd.pro @@ -0,0 +1,5 @@ +load(qttest_p4) +VPATH += ../shared +INCLUDEPATH += ../shared +HEADERS += math3dincludes.h +SOURCES += tst_qvectornd.cpp diff --git a/tests/auto/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/math3d/qvectornd/tst_qvectornd.cpp new file mode 100644 index 0000000..48a41b9 --- /dev/null +++ b/tests/auto/math3d/qvectornd/tst_qvectornd.cpp @@ -0,0 +1,2033 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include "math3dincludes.h" + +class tst_QVector : public QObject +{ + Q_OBJECT +public: + tst_QVector() {} + ~tst_QVector() {} + +private slots: + void create2(); + void create3(); + void create4(); + + void length2_data(); + void length2(); + void length3_data(); + void length3(); + void length4_data(); + void length4(); + + void normalized2_data(); + void normalized2(); + void normalized3_data(); + void normalized3(); + void normalized4_data(); + void normalized4(); + + void normalize2_data(); + void normalize2(); + void normalize3_data(); + void normalize3(); + void normalize4_data(); + void normalize4(); + + void compare2(); + void compare3(); + void compare4(); + + void add2_data(); + void add2(); + void add3_data(); + void add3(); + void add4_data(); + void add4(); + + void subtract2_data(); + void subtract2(); + void subtract3_data(); + void subtract3(); + void subtract4_data(); + void subtract4(); + + void multiply2_data(); + void multiply2(); + void multiply3_data(); + void multiply3(); + void multiply4_data(); + void multiply4(); + + void multiplyFactor2_data(); + void multiplyFactor2(); + void multiplyFactor3_data(); + void multiplyFactor3(); + void multiplyFactor4_data(); + void multiplyFactor4(); + + void divide2_data(); + void divide2(); + void divide3_data(); + void divide3(); + void divide4_data(); + void divide4(); + + void negate2_data(); + void negate2(); + void negate3_data(); + void negate3(); + void negate4_data(); + void negate4(); + + void crossProduct_data(); + void crossProduct(); + void normal_data(); + void normal(); + void distanceToPlane_data(); + void distanceToPlane(); + void distanceToLine_data(); + void distanceToLine(); + + void dotProduct2_data(); + void dotProduct2(); + void dotProduct3_data(); + void dotProduct3(); + void dotProduct4_data(); + void dotProduct4(); +}; + +// qFuzzyCompare isn't quite "fuzzy" enough to handle conversion +// to fixed-point and back again. So create "fuzzier" compares. +static bool fuzzyCompare(float x, float y) +{ + float diff = x - y; + if (diff < 0.0f) + diff = -diff; + return (diff < 0.001); +} + +// Test the creation of QVector2D objects in various ways: +// construct, copy, and modify. +void tst_QVector::create2() +{ + QVector2D null; + QCOMPARE(null.x(), (qreal)0.0f); + QCOMPARE(null.y(), (qreal)0.0f); + QVERIFY(null.isNull()); + + QVector2D v1(1.0f, 2.5f); + QCOMPARE(v1.x(), (qreal)1.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QVERIFY(!v1.isNull()); + + QVector2D v1i(1, 2); + QCOMPARE(v1i.x(), (qreal)1.0f); + QCOMPARE(v1i.y(), (qreal)2.0f); + QVERIFY(!v1i.isNull()); + + QVector2D v2(v1); + QCOMPARE(v2.x(), (qreal)1.0f); + QCOMPARE(v2.y(), (qreal)2.5f); + QVERIFY(!v2.isNull()); + + QVector2D v4; + QCOMPARE(v4.x(), (qreal)0.0f); + QCOMPARE(v4.y(), (qreal)0.0f); + QVERIFY(v4.isNull()); + v4 = v1; + QCOMPARE(v4.x(), (qreal)1.0f); + QCOMPARE(v4.y(), (qreal)2.5f); + QVERIFY(!v4.isNull()); + + QVector2D v5(QPoint(1, 2)); + QCOMPARE(v5.x(), (qreal)1.0f); + QCOMPARE(v5.y(), (qreal)2.0f); + QVERIFY(!v5.isNull()); + + QVector2D v6(QPointF(1, 2.5)); + QCOMPARE(v6.x(), (qreal)1.0f); + QCOMPARE(v6.y(), (qreal)2.5f); + QVERIFY(!v6.isNull()); + + QVector2D v7(QVector3D(1.0f, 2.5f, 54.25f)); + QCOMPARE(v7.x(), (qreal)1.0f); + QCOMPARE(v7.y(), (qreal)2.5f); + QVERIFY(!v6.isNull()); + + QVector2D v8(QVector4D(1.0f, 2.5f, 54.25f, 34.0f)); + QCOMPARE(v8.x(), (qreal)1.0f); + QCOMPARE(v8.y(), (qreal)2.5f); + QVERIFY(!v6.isNull()); + + v1.setX(3.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QVERIFY(!v1.isNull()); + + v1.setY(10.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QVERIFY(!v1.isNull()); + + v1.setX(0.0f); + v1.setY(0.0f); + QCOMPARE(v1.x(), (qreal)0.0f); + QCOMPARE(v1.y(), (qreal)0.0f); + QVERIFY(v1.isNull()); + + QPoint p1 = v8.toPoint(); + QCOMPARE(p1.x(), 1); + QCOMPARE(p1.y(), 3); + + QPointF p2 = v8.toPointF(); + QCOMPARE((qreal)p2.x(), (qreal)1.0f); + QCOMPARE((qreal)p2.y(), (qreal)2.5f); + + QVector3D v9 = v8.toVector3D(); + QCOMPARE(v9.x(), (qreal)1.0f); + QCOMPARE(v9.y(), (qreal)2.5f); + QCOMPARE(v9.z(), (qreal)0.0f); + + QVector4D v10 = v8.toVector4D(); + QCOMPARE(v10.x(), (qreal)1.0f); + QCOMPARE(v10.y(), (qreal)2.5f); + QCOMPARE(v10.z(), (qreal)0.0f); + QCOMPARE(v10.w(), (qreal)0.0f); +} + +// Test the creation of QVector3D objects in various ways: +// construct, copy, and modify. +void tst_QVector::create3() +{ + QVector3D null; + QCOMPARE(null.x(), (qreal)0.0f); + QCOMPARE(null.y(), (qreal)0.0f); + QCOMPARE(null.z(), (qreal)0.0f); + QVERIFY(null.isNull()); + + QVector3D v1(1.0f, 2.5f, -89.25f); + QCOMPARE(v1.x(), (qreal)1.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QVERIFY(!v1.isNull()); + + QVector3D v1i(1, 2, -89); + QCOMPARE(v1i.x(), (qreal)1.0f); + QCOMPARE(v1i.y(), (qreal)2.0f); + QCOMPARE(v1i.z(), (qreal)-89.0f); + QVERIFY(!v1i.isNull()); + + QVector3D v2(v1); + QCOMPARE(v2.x(), (qreal)1.0f); + QCOMPARE(v2.y(), (qreal)2.5f); + QCOMPARE(v2.z(), (qreal)-89.25f); + QVERIFY(!v2.isNull()); + + QVector3D v3(1.0f, 2.5f, 0.0f); + QCOMPARE(v3.x(), (qreal)1.0f); + QCOMPARE(v3.y(), (qreal)2.5f); + QCOMPARE(v3.z(), (qreal)0.0f); + QVERIFY(!v3.isNull()); + + QVector3D v3i(1, 2, 0); + QCOMPARE(v3i.x(), (qreal)1.0f); + QCOMPARE(v3i.y(), (qreal)2.0f); + QCOMPARE(v3i.z(), (qreal)0.0f); + QVERIFY(!v3i.isNull()); + + QVector3D v4; + QCOMPARE(v4.x(), (qreal)0.0f); + QCOMPARE(v4.y(), (qreal)0.0f); + QCOMPARE(v4.z(), (qreal)0.0f); + QVERIFY(v4.isNull()); + v4 = v1; + QCOMPARE(v4.x(), (qreal)1.0f); + QCOMPARE(v4.y(), (qreal)2.5f); + QCOMPARE(v4.z(), (qreal)-89.25f); + QVERIFY(!v4.isNull()); + + QVector3D v5(QPoint(1, 2)); + QCOMPARE(v5.x(), (qreal)1.0f); + QCOMPARE(v5.y(), (qreal)2.0f); + QCOMPARE(v5.z(), (qreal)0.0f); + QVERIFY(!v5.isNull()); + + QVector3D v6(QPointF(1, 2.5)); + QCOMPARE(v6.x(), (qreal)1.0f); + QCOMPARE(v6.y(), (qreal)2.5f); + QCOMPARE(v6.z(), (qreal)0.0f); + QVERIFY(!v6.isNull()); + + QVector3D v7(QVector2D(1.0f, 2.5f)); + QCOMPARE(v7.x(), (qreal)1.0f); + QCOMPARE(v7.y(), (qreal)2.5f); + QCOMPARE(v7.z(), (qreal)0.0f); + QVERIFY(!v7.isNull()); + + QVector3D v8(QVector2D(1.0f, 2.5f), 54.25f); + QCOMPARE(v8.x(), (qreal)1.0f); + QCOMPARE(v8.y(), (qreal)2.5f); + QCOMPARE(v8.z(), (qreal)54.25f); + QVERIFY(!v8.isNull()); + + QVector3D v9(QVector4D(1.0f, 2.5f, 54.25f, 34.0f)); + QCOMPARE(v9.x(), (qreal)1.0f); + QCOMPARE(v9.y(), (qreal)2.5f); + QCOMPARE(v9.z(), (qreal)54.25f); + QVERIFY(!v9.isNull()); + + v1.setX(3.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QVERIFY(!v1.isNull()); + + v1.setY(10.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QVERIFY(!v1.isNull()); + + v1.setZ(15.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)15.5f); + QVERIFY(!v1.isNull()); + + v1.setX(0.0f); + v1.setY(0.0f); + v1.setZ(0.0f); + QCOMPARE(v1.x(), (qreal)0.0f); + QCOMPARE(v1.y(), (qreal)0.0f); + QCOMPARE(v1.z(), (qreal)0.0f); + QVERIFY(v1.isNull()); + + QPoint p1 = v8.toPoint(); + QCOMPARE(p1.x(), 1); + QCOMPARE(p1.y(), 3); + + QPointF p2 = v8.toPointF(); + QCOMPARE((qreal)p2.x(), (qreal)1.0f); + QCOMPARE((qreal)p2.y(), (qreal)2.5f); + + QVector2D v10 = v8.toVector2D(); + QCOMPARE(v10.x(), (qreal)1.0f); + QCOMPARE(v10.y(), (qreal)2.5f); + + QVector4D v11 = v8.toVector4D(); + QCOMPARE(v11.x(), (qreal)1.0f); + QCOMPARE(v11.y(), (qreal)2.5f); + QCOMPARE(v11.z(), (qreal)54.25f); + QCOMPARE(v11.w(), (qreal)0.0f); +} + +// Test the creation of QVector4D objects in various ways: +// construct, copy, and modify. +void tst_QVector::create4() +{ + QVector4D null; + QCOMPARE(null.x(), (qreal)0.0f); + QCOMPARE(null.y(), (qreal)0.0f); + QCOMPARE(null.z(), (qreal)0.0f); + QCOMPARE(null.w(), (qreal)0.0f); + QVERIFY(null.isNull()); + + QVector4D v1(1.0f, 2.5f, -89.25f, 34.0f); + QCOMPARE(v1.x(), (qreal)1.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.w(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + QVector4D v1i(1, 2, -89, 34); + QCOMPARE(v1i.x(), (qreal)1.0f); + QCOMPARE(v1i.y(), (qreal)2.0f); + QCOMPARE(v1i.z(), (qreal)-89.0f); + QCOMPARE(v1i.w(), (qreal)34.0f); + QVERIFY(!v1i.isNull()); + + QVector4D v2(v1); + QCOMPARE(v2.x(), (qreal)1.0f); + QCOMPARE(v2.y(), (qreal)2.5f); + QCOMPARE(v2.z(), (qreal)-89.25f); + QCOMPARE(v2.w(), (qreal)34.0f); + QVERIFY(!v2.isNull()); + + QVector4D v3(1.0f, 2.5f, 0.0f, 0.0f); + QCOMPARE(v3.x(), (qreal)1.0f); + QCOMPARE(v3.y(), (qreal)2.5f); + QCOMPARE(v3.z(), (qreal)0.0f); + QCOMPARE(v3.w(), (qreal)0.0f); + QVERIFY(!v3.isNull()); + + QVector4D v3i(1, 2, 0, 0); + QCOMPARE(v3i.x(), (qreal)1.0f); + QCOMPARE(v3i.y(), (qreal)2.0f); + QCOMPARE(v3i.z(), (qreal)0.0f); + QCOMPARE(v3i.w(), (qreal)0.0f); + QVERIFY(!v3i.isNull()); + + QVector4D v3b(1.0f, 2.5f, -89.25f, 0.0f); + QCOMPARE(v3b.x(), (qreal)1.0f); + QCOMPARE(v3b.y(), (qreal)2.5f); + QCOMPARE(v3b.z(), (qreal)-89.25f); + QCOMPARE(v3b.w(), (qreal)0.0f); + QVERIFY(!v3b.isNull()); + + QVector4D v3bi(1, 2, -89, 0); + QCOMPARE(v3bi.x(), (qreal)1.0f); + QCOMPARE(v3bi.y(), (qreal)2.0f); + QCOMPARE(v3bi.z(), (qreal)-89.0f); + QCOMPARE(v3bi.w(), (qreal)0.0f); + QVERIFY(!v3bi.isNull()); + + QVector4D v4; + QCOMPARE(v4.x(), (qreal)0.0f); + QCOMPARE(v4.y(), (qreal)0.0f); + QCOMPARE(v4.z(), (qreal)0.0f); + QCOMPARE(v4.w(), (qreal)0.0f); + QVERIFY(v4.isNull()); + v4 = v1; + QCOMPARE(v4.x(), (qreal)1.0f); + QCOMPARE(v4.y(), (qreal)2.5f); + QCOMPARE(v4.z(), (qreal)-89.25f); + QCOMPARE(v4.w(), (qreal)34.0f); + QVERIFY(!v4.isNull()); + + QVector4D v5(QPoint(1, 2)); + QCOMPARE(v5.x(), (qreal)1.0f); + QCOMPARE(v5.y(), (qreal)2.0f); + QCOMPARE(v5.z(), (qreal)0.0f); + QCOMPARE(v5.w(), (qreal)0.0f); + QVERIFY(!v5.isNull()); + + QVector4D v6(QPointF(1, 2.5)); + QCOMPARE(v6.x(), (qreal)1.0f); + QCOMPARE(v6.y(), (qreal)2.5f); + QCOMPARE(v6.z(), (qreal)0.0f); + QCOMPARE(v6.w(), (qreal)0.0f); + QVERIFY(!v6.isNull()); + + QVector4D v7(QVector2D(1.0f, 2.5f)); + QCOMPARE(v7.x(), (qreal)1.0f); + QCOMPARE(v7.y(), (qreal)2.5f); + QCOMPARE(v7.z(), (qreal)0.0f); + QCOMPARE(v7.w(), (qreal)0.0f); + QVERIFY(!v7.isNull()); + + QVector4D v8(QVector3D(1.0f, 2.5f, -89.25f)); + QCOMPARE(v8.x(), (qreal)1.0f); + QCOMPARE(v8.y(), (qreal)2.5f); + QCOMPARE(v8.z(), (qreal)-89.25f); + QCOMPARE(v8.w(), (qreal)0.0f); + QVERIFY(!v8.isNull()); + + QVector4D v9(QVector3D(1.0f, 2.5f, -89.25f), 34); + QCOMPARE(v9.x(), (qreal)1.0f); + QCOMPARE(v9.y(), (qreal)2.5f); + QCOMPARE(v9.z(), (qreal)-89.25f); + QCOMPARE(v9.w(), (qreal)34.0f); + QVERIFY(!v9.isNull()); + + QVector4D v10(QVector2D(1.0f, 2.5f), 23.5f, -8); + QCOMPARE(v10.x(), (qreal)1.0f); + QCOMPARE(v10.y(), (qreal)2.5f); + QCOMPARE(v10.z(), (qreal)23.5f); + QCOMPARE(v10.w(), (qreal)-8.0f); + QVERIFY(!v10.isNull()); + + v1.setX(3.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)2.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.w(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setY(10.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)-89.25f); + QCOMPARE(v1.w(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setZ(15.5f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)15.5f); + QCOMPARE(v1.w(), (qreal)34.0f); + QVERIFY(!v1.isNull()); + + v1.setW(6.0f); + QCOMPARE(v1.x(), (qreal)3.0f); + QCOMPARE(v1.y(), (qreal)10.5f); + QCOMPARE(v1.z(), (qreal)15.5f); + QCOMPARE(v1.w(), (qreal)6.0f); + QVERIFY(!v1.isNull()); + + v1.setX(0.0f); + v1.setY(0.0f); + v1.setZ(0.0f); + v1.setW(0.0f); + QCOMPARE(v1.x(), (qreal)0.0f); + QCOMPARE(v1.y(), (qreal)0.0f); + QCOMPARE(v1.z(), (qreal)0.0f); + QCOMPARE(v1.w(), (qreal)0.0f); + QVERIFY(v1.isNull()); + + QPoint p1 = v8.toPoint(); + QCOMPARE(p1.x(), 1); + QCOMPARE(p1.y(), 3); + + QPointF p2 = v8.toPointF(); + QCOMPARE((qreal)p2.x(), (qreal)1.0f); + QCOMPARE((qreal)p2.y(), (qreal)2.5f); + + QVector2D v11 = v8.toVector2D(); + QCOMPARE(v11.x(), (qreal)1.0f); + QCOMPARE(v11.y(), (qreal)2.5f); + + QVector3D v12 = v8.toVector3D(); + QCOMPARE(v12.x(), (qreal)1.0f); + QCOMPARE(v12.y(), (qreal)2.5f); + QCOMPARE(v12.z(), (qreal)-89.25f); + + QVector2D v13 = v9.toVector2DAffine(); + QVERIFY(fuzzyCompare(v13.x(), (qreal)(1.0f / 34.0f))); + QVERIFY(fuzzyCompare(v13.y(), (qreal)(2.5f / 34.0f))); + + QVector4D zerow(1.0f, 2.0f, 3.0f, 0.0f); + v13 = zerow.toVector2DAffine(); + QVERIFY(v13.isNull()); + + QVector3D v14 = v9.toVector3DAffine(); + QVERIFY(fuzzyCompare(v14.x(), (qreal)(1.0f / 34.0f))); + QVERIFY(fuzzyCompare(v14.y(), (qreal)(2.5f / 34.0f))); + QVERIFY(fuzzyCompare(v14.z(), (qreal)(-89.25f / 34.0f))); + + v14 = zerow.toVector3DAffine(); + QVERIFY(v14.isNull()); +} + +// Test vector length computation for 2D vectors. +void tst_QVector::length2_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("len"); + + QTest::newRow("null") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + QTest::newRow("1x") << (qreal)1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1y") << (qreal)0.0f << (qreal)1.0f << (qreal)1.0f; + QTest::newRow("-1x") << (qreal)-1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1y") << (qreal)0.0f << (qreal)-1.0f << (qreal)1.0f; + QTest::newRow("two") << (qreal)2.0f << (qreal)-2.0f << (qreal)qSqrt(8.0f); +} +void tst_QVector::length2() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, len); + + QVector2D v(x, y); + QCOMPARE((float)(v.length()), (float)len); + QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y)); +} + +// Test vector length computation for 3D vectors. +void tst_QVector::length3_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("len"); + + QTest::newRow("null") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + QTest::newRow("1x") << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1y") << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1z") << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)1.0f; + QTest::newRow("-1x") << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1y") << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1z") << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f << (qreal)1.0f; + QTest::newRow("two") << (qreal)2.0f << (qreal)-2.0f << (qreal)2.0f << (qreal)qSqrt(12.0f); +} +void tst_QVector::length3() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, len); + + QVector3D v(x, y, z); + QCOMPARE((float)(v.length()), (float)len); + QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z)); +} + +// Test vector length computation for 4D vectors. +void tst_QVector::length4_data() +{ + QTest::addColumn("x"); + QTest::addColumn("y"); + QTest::addColumn("z"); + QTest::addColumn("w"); + QTest::addColumn("len"); + + QTest::newRow("null") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + QTest::newRow("1x") << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1y") << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1z") << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("1w") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)1.0f; + QTest::newRow("-1x") << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1y") << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1z") << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f << (qreal)0.0f << (qreal)1.0f; + QTest::newRow("-1w") << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)-1.0f << (qreal)1.0f; + QTest::newRow("two") << (qreal)2.0f << (qreal)-2.0f << (qreal)2.0f << (qreal)2.0f << (qreal)qSqrt(16.0f); +} +void tst_QVector::length4() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + QFETCH(qreal, len); + + QVector4D v(x, y, z, w); + QCOMPARE((float)(v.length()), (float)len); + QCOMPARE((float)(v.lengthSquared()), (float)(x * x + y * y + z * z + w * w)); +} + +// Test the unit vector conversion for 2D vectors. +void tst_QVector::normalized2_data() +{ + // Use the same test data as the length test. + length2_data(); +} +void tst_QVector::normalized2() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, len); + + QVector2D v(x, y); + QVector2D u = v.normalized(); + if (v.isNull()) + QVERIFY(u.isNull()); + else + QCOMPARE((float)(u.length()), (float)1.0f); + QCOMPARE((float)(u.x() * len), (float)(v.x())); + QCOMPARE((float)(u.y() * len), (float)(v.y())); +} + +// Test the unit vector conversion for 3D vectors. +void tst_QVector::normalized3_data() +{ + // Use the same test data as the length test. + length3_data(); +} +void tst_QVector::normalized3() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, len); + + QVector3D v(x, y, z); + QVector3D u = v.normalized(); + if (v.isNull()) + QVERIFY(u.isNull()); + else + QCOMPARE((float)(u.length()), (float)1.0f); + QCOMPARE((float)(u.x() * len), (float)(v.x())); + QCOMPARE((float)(u.y() * len), (float)(v.y())); + QCOMPARE((float)(u.z() * len), (float)(v.z())); +} + +// Test the unit vector conversion for 4D vectors. +void tst_QVector::normalized4_data() +{ + // Use the same test data as the length test. + length4_data(); +} +void tst_QVector::normalized4() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + QFETCH(qreal, len); + + QVector4D v(x, y, z, w); + QVector4D u = v.normalized(); + if (v.isNull()) + QVERIFY(u.isNull()); + else + QCOMPARE((float)(u.length()), (float)1.0f); + QCOMPARE((float)(u.x() * len), (float)(v.x())); + QCOMPARE((float)(u.y() * len), (float)(v.y())); + QCOMPARE((float)(u.z() * len), (float)(v.z())); + QCOMPARE((float)(u.w() * len), (float)(v.w())); +} + +// Test the unit vector conversion for 2D vectors. +void tst_QVector::normalize2_data() +{ + // Use the same test data as the length test. + length2_data(); +} +void tst_QVector::normalize2() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + + QVector2D v(x, y); + bool isNull = v.isNull(); + v.normalize(); + if (isNull) + QVERIFY(v.isNull()); + else + QCOMPARE((float)(v.length()), (float)1.0f); +} + +// Test the unit vector conversion for 3D vectors. +void tst_QVector::normalize3_data() +{ + // Use the same test data as the length test. + length3_data(); +} +void tst_QVector::normalize3() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + + QVector3D v(x, y, z); + bool isNull = v.isNull(); + v.normalize(); + if (isNull) + QVERIFY(v.isNull()); + else + QCOMPARE((float)(v.length()), (float)1.0f); +} + +// Test the unit vector conversion for 4D vectors. +void tst_QVector::normalize4_data() +{ + // Use the same test data as the length test. + length4_data(); +} +void tst_QVector::normalize4() +{ + QFETCH(qreal, x); + QFETCH(qreal, y); + QFETCH(qreal, z); + QFETCH(qreal, w); + + QVector4D v(x, y, z, w); + bool isNull = v.isNull(); + v.normalize(); + if (isNull) + QVERIFY(v.isNull()); + else + QCOMPARE((float)(v.length()), (float)1.0f); +} + +// Test the comparison operators for 2D vectors. +void tst_QVector::compare2() +{ + QVector2D v1(1, 2); + QVector2D v2(1, 2); + QVector2D v3(3, 2); + QVector2D v4(1, 3); + + QVERIFY(v1 == v2); + QVERIFY(v1 != v3); + QVERIFY(v1 != v4); +} + +// Test the comparison operators for 3D vectors. +void tst_QVector::compare3() +{ + QVector3D v1(1, 2, 4); + QVector3D v2(1, 2, 4); + QVector3D v3(3, 2, 4); + QVector3D v4(1, 3, 4); + QVector3D v5(1, 2, 3); + + QVERIFY(v1 == v2); + QVERIFY(v1 != v3); + QVERIFY(v1 != v4); + QVERIFY(v1 != v5); +} + +// Test the comparison operators for 4D vectors. +void tst_QVector::compare4() +{ + QVector4D v1(1, 2, 4, 8); + QVector4D v2(1, 2, 4, 8); + QVector4D v3(3, 2, 4, 8); + QVector4D v4(1, 3, 4, 8); + QVector4D v5(1, 2, 3, 8); + QVector4D v6(1, 2, 4, 3); + + QVERIFY(v1 == v2); + QVERIFY(v1 != v3); + QVERIFY(v1 != v4); + QVERIFY(v1 != v5); + QVERIFY(v1 != v6); +} + +// Test vector addition for 2D vectors. +void tst_QVector::add2_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f + << (qreal)3.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)3.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f + << (qreal)4.0f << (qreal)5.0f + << (qreal)5.0f << (qreal)7.0f; +} +void tst_QVector::add2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + QVector2D v3(x3, y3); + + QVERIFY((v1 + v2) == v3); + + QVector2D v4(v1); + v4 += v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() + v2.x()); + QCOMPARE(v4.y(), v1.y() + v2.y()); +} + +// Test vector addition for 3D vectors. +void tst_QVector::add3_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)3.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)3.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)3.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)-6.0f + << (qreal)5.0f << (qreal)7.0f << (qreal)-3.0f; +} +void tst_QVector::add3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QVERIFY((v1 + v2) == v3); + + QVector3D v4(v1); + v4 += v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() + v2.x()); + QCOMPARE(v4.y(), v1.y() + v2.y()); + QCOMPARE(v4.z(), v1.z() + v2.z()); +} + +// Test vector addition for 4D vectors. +void tst_QVector::add4_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("w3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)3.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)3.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)3.0f << (qreal)0.0f; + + QTest::newRow("wonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)3.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)8.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)-6.0f << (qreal)9.0f + << (qreal)5.0f << (qreal)7.0f << (qreal)-3.0f << (qreal)17.0f; +} +void tst_QVector::add4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, w3); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + QVector4D v3(x3, y3, z3, w3); + + QVERIFY((v1 + v2) == v3); + + QVector4D v4(v1); + v4 += v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() + v2.x()); + QCOMPARE(v4.y(), v1.y() + v2.y()); + QCOMPARE(v4.z(), v1.z() + v2.z()); + QCOMPARE(v4.w(), v1.w() + v2.w()); +} + +// Test vector subtraction for 2D vectors. +void tst_QVector::subtract2_data() +{ + // Use the same test data as the add test. + add2_data(); +} +void tst_QVector::subtract2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + QVector2D v3(x3, y3); + + QVERIFY((v3 - v1) == v2); + QVERIFY((v3 - v2) == v1); + + QVector2D v4(v3); + v4 -= v1; + QVERIFY(v4 == v2); + + QCOMPARE(v4.x(), v3.x() - v1.x()); + QCOMPARE(v4.y(), v3.y() - v1.y()); + + QVector2D v5(v3); + v5 -= v2; + QVERIFY(v5 == v1); + + QCOMPARE(v5.x(), v3.x() - v2.x()); + QCOMPARE(v5.y(), v3.y() - v2.y()); +} + +// Test vector subtraction for 3D vectors. +void tst_QVector::subtract3_data() +{ + // Use the same test data as the add test. + add3_data(); +} +void tst_QVector::subtract3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QVERIFY((v3 - v1) == v2); + QVERIFY((v3 - v2) == v1); + + QVector3D v4(v3); + v4 -= v1; + QVERIFY(v4 == v2); + + QCOMPARE(v4.x(), v3.x() - v1.x()); + QCOMPARE(v4.y(), v3.y() - v1.y()); + QCOMPARE(v4.z(), v3.z() - v1.z()); + + QVector3D v5(v3); + v5 -= v2; + QVERIFY(v5 == v1); + + QCOMPARE(v5.x(), v3.x() - v2.x()); + QCOMPARE(v5.y(), v3.y() - v2.y()); + QCOMPARE(v5.z(), v3.z() - v2.z()); +} + +// Test vector subtraction for 4D vectors. +void tst_QVector::subtract4_data() +{ + // Use the same test data as the add test. + add4_data(); +} +void tst_QVector::subtract4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, w3); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + QVector4D v3(x3, y3, z3, w3); + + QVERIFY((v3 - v1) == v2); + QVERIFY((v3 - v2) == v1); + + QVector4D v4(v3); + v4 -= v1; + QVERIFY(v4 == v2); + + QCOMPARE(v4.x(), v3.x() - v1.x()); + QCOMPARE(v4.y(), v3.y() - v1.y()); + QCOMPARE(v4.z(), v3.z() - v1.z()); + QCOMPARE(v4.w(), v3.w() - v1.w()); + + QVector4D v5(v3); + v5 -= v2; + QVERIFY(v5 == v1); + + QCOMPARE(v5.x(), v3.x() - v2.x()); + QCOMPARE(v5.y(), v3.y() - v2.y()); + QCOMPARE(v5.z(), v3.z() - v2.z()); + QCOMPARE(v5.w(), v3.w() - v2.w()); +} + +// Test component-wise vector multiplication for 2D vectors. +void tst_QVector::multiply2_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f + << (qreal)4.0f << (qreal)5.0f + << (qreal)4.0f << (qreal)10.0f; +} +void tst_QVector::multiply2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + QVector2D v3(x3, y3); + + QVERIFY((v1 * v2) == v3); + + QVector2D v4(v1); + v4 *= v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() * v2.x()); + QCOMPARE(v4.y(), v1.y() * v2.y()); +} + +// Test component-wise vector multiplication for 3D vectors. +void tst_QVector::multiply3_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)-6.0f + << (qreal)4.0f << (qreal)10.0f << (qreal)-18.0f; +} +void tst_QVector::multiply3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QVERIFY((v1 * v2) == v3); + + QVector3D v4(v1); + v4 *= v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() * v2.x()); + QCOMPARE(v4.y(), v1.y() * v2.y()); + QCOMPARE(v4.z(), v1.z() * v2.z()); +} + +// Test component-wise vector multiplication for 4D vectors. +void tst_QVector::multiply4_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("w3"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("wonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)8.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)-6.0f << (qreal)9.0f + << (qreal)4.0f << (qreal)10.0f << (qreal)-18.0f << (qreal)72.0f; +} +void tst_QVector::multiply4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, w3); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + QVector4D v3(x3, y3, z3, w3); + + QVERIFY((v1 * v2) == v3); + + QVector4D v4(v1); + v4 *= v2; + QVERIFY(v4 == v3); + + QCOMPARE(v4.x(), v1.x() * v2.x()); + QCOMPARE(v4.y(), v1.y() * v2.y()); + QCOMPARE(v4.z(), v1.z() * v2.z()); + QCOMPARE(v4.w(), v1.w() * v2.w()); +} + +// Test vector multiplication by a factor for 2D vectors. +void tst_QVector::multiplyFactor2_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("factor"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f + << (qreal)100.0f + << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)4.0f; + + QTest::newRow("allzero") + << (qreal)1.0f << (qreal)2.0f + << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f; +} +void tst_QVector::multiplyFactor2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + + QVERIFY((v1 * factor) == v2); + QVERIFY((factor * v1) == v2); + + QVector2D v3(v1); + v3 *= factor; + QVERIFY(v3 == v2); + + QCOMPARE(v3.x(), v1.x() * factor); + QCOMPARE(v3.y(), v1.y() * factor); +} + +// Test vector multiplication by a factor for 3D vectors. +void tst_QVector::multiplyFactor3_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("factor"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)100.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)4.0f << (qreal)-6.0f; + + QTest::newRow("allzero") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f + << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; +} +void tst_QVector::multiplyFactor3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + + QVERIFY((v1 * factor) == v2); + QVERIFY((factor * v1) == v2); + + QVector3D v3(v1); + v3 *= factor; + QVERIFY(v3 == v2); + + QCOMPARE(v3.x(), v1.x() * factor); + QCOMPARE(v3.y(), v1.y() * factor); + QCOMPARE(v3.z(), v1.z() * factor); +} + +// Test vector multiplication by a factor for 4D vectors. +void tst_QVector::multiplyFactor4_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("factor"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)100.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("xonly") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("yonly") + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f << (qreal)0.0f; + + QTest::newRow("zonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f; + + QTest::newRow("wonly") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)2.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f; + + QTest::newRow("all") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)4.0f + << (qreal)2.0f + << (qreal)2.0f << (qreal)4.0f << (qreal)-6.0f << (qreal)8.0f; + + QTest::newRow("allzero") + << (qreal)1.0f << (qreal)2.0f << (qreal)-3.0f << (qreal)4.0f + << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f; +} +void tst_QVector::multiplyFactor4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + + QVERIFY((v1 * factor) == v2); + QVERIFY((factor * v1) == v2); + + QVector4D v3(v1); + v3 *= factor; + QVERIFY(v3 == v2); + + QCOMPARE(v3.x(), v1.x() * factor); + QCOMPARE(v3.y(), v1.y() * factor); + QCOMPARE(v3.z(), v1.z() * factor); + QCOMPARE(v3.w(), v1.w() * factor); +} + +// Test vector division by a factor for 2D vectors. +void tst_QVector::divide2_data() +{ + // Use the same test data as the multiply test. + multiplyFactor2_data(); +} +void tst_QVector::divide2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + + if (factor == (qreal)0.0f) + return; + + QVERIFY((v2 / factor) == v1); + + QVector2D v3(v2); + v3 /= factor; + QVERIFY(v3 == v1); + + QCOMPARE(v3.x(), v2.x() / factor); + QCOMPARE(v3.y(), v2.y() / factor); +} + +// Test vector division by a factor for 3D vectors. +void tst_QVector::divide3_data() +{ + // Use the same test data as the multiply test. + multiplyFactor3_data(); +} +void tst_QVector::divide3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + + if (factor == (qreal)0.0f) + return; + + QVERIFY((v2 / factor) == v1); + + QVector3D v3(v2); + v3 /= factor; + QVERIFY(v3 == v1); + + QCOMPARE(v3.x(), v2.x() / factor); + QCOMPARE(v3.y(), v2.y() / factor); + QCOMPARE(v3.z(), v2.z() / factor); +} + +// Test vector division by a factor for 4D vectors. +void tst_QVector::divide4_data() +{ + // Use the same test data as the multiply test. + multiplyFactor4_data(); +} +void tst_QVector::divide4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, factor); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + + if (factor == (qreal)0.0f) + return; + + QVERIFY((v2 / factor) == v1); + + QVector4D v3(v2); + v3 /= factor; + QVERIFY(v3 == v1); + + QCOMPARE(v3.x(), v2.x() / factor); + QCOMPARE(v3.y(), v2.y() / factor); + QCOMPARE(v3.z(), v2.z() / factor); + QCOMPARE(v3.w(), v2.w() / factor); +} + +// Test vector negation for 2D vectors. +void tst_QVector::negate2_data() +{ + // Use the same test data as the add test. + add2_data(); +} +void tst_QVector::negate2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + + QVector2D v1(x1, y1); + QVector2D v2(-x1, -y1); + + QVERIFY(-v1 == v2); +} + +// Test vector negation for 3D vectors. +void tst_QVector::negate3_data() +{ + // Use the same test data as the add test. + add3_data(); +} +void tst_QVector::negate3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + + QVector3D v1(x1, y1, z1); + QVector3D v2(-x1, -y1, -z1); + + QVERIFY(-v1 == v2); +} + +// Test vector negation for 4D vectors. +void tst_QVector::negate4_data() +{ + // Use the same test data as the add test. + add4_data(); +} +void tst_QVector::negate4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(-x1, -y1, -z1, -w1); + + QVERIFY(-v1 == v2); +} + +// Test the computation of vector cross-products. +void tst_QVector::crossProduct_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("x3"); + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("dot"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("unitvec") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f; + + QTest::newRow("complex") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)6.0f + << (qreal)-3.0f << (qreal)6.0f << (qreal)-3.0f + << (qreal)32.0f; +} +void tst_QVector::crossProduct() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QVector3D v4 = QVector3D::crossProduct(v1, v2); + QVERIFY(v4 == v3); + + // Compute the cross-product long-hand and check again. + qreal xres = y1 * z2 - z1 * y2; + qreal yres = z1 * x2 - x1 * z2; + qreal zres = x1 * y2 - y1 * x2; + + QCOMPARE(v4.x(), xres); + QCOMPARE(v4.y(), yres); + QCOMPARE(v4.z(), zres); +} + +// Test the computation of normals. +void tst_QVector::normal_data() +{ + // Use the same test data as the crossProduct test. + crossProduct_data(); +} +void tst_QVector::normal() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QVERIFY(QVector3D::normal(v1, v2) == v3.normalized()); + QVERIFY(QVector3D::normal(QVector3D(), v1, v2) == v3.normalized()); + + QVector3D point(1.0f, 2.0f, 3.0f); + QVERIFY(QVector3D::normal(point, v1 + point, v2 + point) == v3.normalized()); +} + +// Test distance to plane calculations. +void tst_QVector::distanceToPlane_data() +{ + QTest::addColumn("x1"); // Point on plane + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("x2"); // Normal to plane + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("x3"); // Point to test for distance + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("x4"); // Second point on plane + QTest::addColumn("y4"); + QTest::addColumn("z4"); + QTest::addColumn("x5"); // Third point on plane + QTest::addColumn("y5"); + QTest::addColumn("z5"); + QTest::addColumn("distance"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("above") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)2.0f + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)2.0f; + + QTest::newRow("below") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)-1.0f << (qreal)1.0f << (qreal)-2.0f + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)2.0f << (qreal)0.0f + << (qreal)-2.0f; +} +void tst_QVector::distanceToPlane() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, x4); + QFETCH(qreal, y4); + QFETCH(qreal, z4); + QFETCH(qreal, x5); + QFETCH(qreal, y5); + QFETCH(qreal, z5); + QFETCH(qreal, distance); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + QVector3D v4(x4, y4, z4); + QVector3D v5(x5, y5, z5); + + QCOMPARE(v3.distanceToPlane(v1, v2), distance); + QCOMPARE(v3.distanceToPlane(v1, v4, v5), distance); +} + +// Test distance to line calculations. +void tst_QVector::distanceToLine_data() +{ + QTest::addColumn("x1"); // Point on line + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("x2"); // Direction of the line + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("x3"); // Point to test for distance + QTest::addColumn("y3"); + QTest::addColumn("z3"); + QTest::addColumn("distance"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("on line") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)5.0f + << (qreal)0.0f; + + QTest::newRow("off line") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)1.0f; + + QTest::newRow("off line 2") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f << (qreal)-2.0f << (qreal)0.0f + << (qreal)2.0f; + + QTest::newRow("points") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)5.0f << (qreal)0.0f + << (qreal)5.0f; +} +void tst_QVector::distanceToLine() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, distance); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + QVector3D v3(x3, y3, z3); + + QCOMPARE(v3.distanceToLine(v1, v2), distance); +} + +// Test the computation of dot products for 2D vectors. +void tst_QVector::dotProduct2_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("dot"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("unitvec") + << (qreal)1.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)1.0f + << (qreal)0.0f; + + QTest::newRow("complex") + << (qreal)1.0f << (qreal)2.0f + << (qreal)4.0f << (qreal)5.0f + << (qreal)14.0f; +} +void tst_QVector::dotProduct2() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, dot); + + QVector2D v1(x1, y1); + QVector2D v2(x2, y2); + + QVERIFY(QVector2D::dotProduct(v1, v2) == dot); + + // Compute the dot-product long-hand and check again. + qreal d = x1 * x2 + y1 * y2; + + QCOMPARE(QVector2D::dotProduct(v1, v2), d); +} + +// Test the computation of dot products for 3D vectors. +void tst_QVector::dotProduct3_data() +{ + // Use the same test data as the crossProduct test. + crossProduct_data(); +} +void tst_QVector::dotProduct3() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, x3); + QFETCH(qreal, y3); + QFETCH(qreal, z3); + QFETCH(qreal, dot); + + Q_UNUSED(x3); + Q_UNUSED(y3); + Q_UNUSED(z3); + + QVector3D v1(x1, y1, z1); + QVector3D v2(x2, y2, z2); + + QVERIFY(QVector3D::dotProduct(v1, v2) == dot); + + // Compute the dot-product long-hand and check again. + qreal d = x1 * x2 + y1 * y2 + z1 * z2; + + QCOMPARE(QVector3D::dotProduct(v1, v2), d); +} + +// Test the computation of dot products for 4D vectors. +void tst_QVector::dotProduct4_data() +{ + QTest::addColumn("x1"); + QTest::addColumn("y1"); + QTest::addColumn("z1"); + QTest::addColumn("w1"); + QTest::addColumn("x2"); + QTest::addColumn("y2"); + QTest::addColumn("z2"); + QTest::addColumn("w2"); + QTest::addColumn("dot"); + + QTest::newRow("null") + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("unitvec") + << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f << (qreal)1.0f << (qreal)0.0f << (qreal)0.0f + << (qreal)0.0f; + + QTest::newRow("complex") + << (qreal)1.0f << (qreal)2.0f << (qreal)3.0f << (qreal)4.0f + << (qreal)4.0f << (qreal)5.0f << (qreal)6.0f << (qreal)7.0f + << (qreal)60.0f; +} +void tst_QVector::dotProduct4() +{ + QFETCH(qreal, x1); + QFETCH(qreal, y1); + QFETCH(qreal, z1); + QFETCH(qreal, w1); + QFETCH(qreal, x2); + QFETCH(qreal, y2); + QFETCH(qreal, z2); + QFETCH(qreal, w2); + QFETCH(qreal, dot); + + QVector4D v1(x1, y1, z1, w1); + QVector4D v2(x2, y2, z2, w2); + + QVERIFY(QVector4D::dotProduct(v1, v2) == dot); + + // Compute the dot-product long-hand and check again. + qreal d = x1 * x2 + y1 * y2 + z1 * z2 + w1 * w2; + + QCOMPARE(QVector4D::dotProduct(v1, v2), d); +} + +// Force the fixed-point version of the test case to put a +// different test name on the front of failure reports. +class tst_QVectorFixed : public tst_QVector +{ + Q_OBJECT +public: + tst_QVectorFixed() {} + ~tst_QVectorFixed() {} +}; + +#ifdef QT_GL_FIXED_PREFERRED + +QTEST_APPLESS_MAIN(tst_QVectorFixed) + +#else + +QTEST_APPLESS_MAIN(tst_QVector) + +#endif + +#include "tst_qvectornd.moc" diff --git a/tests/auto/math3d/qvectornd_fixed/qvectornd_fixed.pro b/tests/auto/math3d/qvectornd_fixed/qvectornd_fixed.pro new file mode 100644 index 0000000..a667fcc --- /dev/null +++ b/tests/auto/math3d/qvectornd_fixed/qvectornd_fixed.pro @@ -0,0 +1,8 @@ +load(qttest_p4) +VPATH += ../shared +VPATH += ../qvectornd +INCLUDEPATH += ../shared +INCLUDEPATH += ../../../../src/gui/math3d +DEFINES += FIXED_POINT_TESTS +HEADERS += math3dincludes.h +SOURCES += tst_qvectornd.cpp math3dincludes.cpp diff --git a/tests/auto/math3d/shared/math3dincludes.cpp b/tests/auto/math3d/shared/math3dincludes.cpp new file mode 100644 index 0000000..c4e1533 --- /dev/null +++ b/tests/auto/math3d/shared/math3dincludes.cpp @@ -0,0 +1,24 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#include "math3dincludes.h" + +#if defined(FIXED_POINT_TESTS) + +#include "qmatrix4x4.cpp" +#include "qgenericmatrix.cpp" +#include "qvector2d.cpp" +#include "qvector3d.cpp" +#include "qvector4d.cpp" +#include "qquaternion.cpp" +#include "qmath3dutil.cpp" + +#endif diff --git a/tests/auto/math3d/shared/math3dincludes.h b/tests/auto/math3d/shared/math3dincludes.h new file mode 100644 index 0000000..9e406ee --- /dev/null +++ b/tests/auto/math3d/shared/math3dincludes.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the $MODULE$ of the Qt Toolkit. +** +** $TROLLTECH_DUAL_LICENSE$ +** +****************************************************************************/ + +#ifndef MATH3DINCLUDES_H +#define MATH3DINCLUDES_H + +#if defined(FIXED_POINT_TESTS) + +// Rename the classes we want to test in fixed-point mode so that +// they don't conflict with the ones that are built into Qt. +#define QT_NO_GL_FLOAT 1 +#define QVector2D tst_QVector2D +#define QVector3D tst_QVector3D +#define QVector4D tst_QVector4D +#define QQuaternion tst_QQuaternionX +#define QMatrix2x2 tst_QMatrix2x2 +#define QMatrix3x3 tst_QMatrix3x3 +#define QMatrix4x4 tst_QMatrix4x4 +#define QMatrix2x3 tst_QMatrix2x3 +#define QMatrix2x4 tst_QMatrix2x4 +#define QMatrix3x2 tst_QMatrix3x2 +#define QMatrix3x4 tst_QMatrix3x4 +#define QMatrix4x2 tst_QMatrix4x2 +#define QMatrix4x3 tst_QMatrix4x3 +#define QGenericMatrix tst_QGenericMatrix +#define qt_math3d_sincos tst_qt_math3d_sincos +#define qt_math3d_convert tst_qt_math3d_convert +#define qrealinner tst_qrealinner + +// We need to re-include the headers with the changed class names. +#undef QGENERICMATRIX_H +#undef QMATH3DGLOBAL_H +#undef QMATH3DUTIL_P_H +#undef QMATRIX4X4_H +#undef QQUATERNION_H +#undef QVECTOR2D_H +#undef QVECTOR3D_H +#undef QVECTOR4D_H + +#endif + +#include +#include +#include +#include +#include +#include + +#endif -- cgit v0.12 From 211ae2145228d300c3743d25c689ab0275b23e33 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 26 Mar 2009 10:11:45 +0100 Subject: Avoids calling function pointer in constructor of QVariant Instead, it calls directly the v_construct template function. --- src/corelib/kernel/qvariant.cpp | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index b4427c0..fa55100 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1619,44 +1619,44 @@ QVariant::QVariant(double val) { d.is_null = false; d.type = Double; d.data.d = val; } QVariant::QVariant(const QByteArray &val) -{ create(ByteArray, &val); } +{ d.is_null = false; d.type = ByteArray; v_construct(&d, &val); } QVariant::QVariant(const QBitArray &val) -{ create(BitArray, &val); } +{ d.is_null = false; d.type = BitArray; v_construct(&d, &val); } QVariant::QVariant(const QString &val) -{ create(String, &val); } +{ d.is_null = false; d.type = String; v_construct(&d, &val); } QVariant::QVariant(const QChar &val) -{ create (Char, &val); } +{ d.is_null = false; d.type = Char; v_construct(&d, &val); } QVariant::QVariant(const QLatin1String &val) -{ QString str(val); create(String, &str); } +{ QString str(val); d.is_null = false; d.type = String; v_construct(&d, &str); } QVariant::QVariant(const QStringList &val) -{ create(StringList, &val); } +{ d.is_null = false; d.type = StringList; v_construct(&d, &val); } QVariant::QVariant(const QDate &val) -{ create(Date, &val); } +{ d.is_null = false; d.type = Date; v_construct(&d, &val); } QVariant::QVariant(const QTime &val) -{ create(Time, &val); } +{ d.is_null = false; d.type = Time; v_construct(&d, &val); } QVariant::QVariant(const QDateTime &val) -{ create(DateTime, &val); } +{ d.is_null = false; d.type = DateTime; v_construct(&d, &val); } QVariant::QVariant(const QList &list) -{ create(List, &list); } +{ d.is_null = false; d.type = List; v_construct(&d, &list); } QVariant::QVariant(const QMap &map) -{ create(Map, &map); } +{ d.is_null = false; d.type = Map; v_construct(&d, &map); } QVariant::QVariant(const QHash &hash) -{ create(Hash, &hash); } +{ d.is_null = false; d.type = Hash; v_construct(&d, &hash); } #ifndef QT_NO_GEOM_VARIANT -QVariant::QVariant(const QPoint &pt) { create(Point, &pt); } -QVariant::QVariant(const QPointF &pt) { create (PointF, &pt); } -QVariant::QVariant(const QRectF &r) { create (RectF, &r); } -QVariant::QVariant(const QLineF &l) { create (LineF, &l); } -QVariant::QVariant(const QLine &l) { create (Line, &l); } -QVariant::QVariant(const QRect &r) { create(Rect, &r); } -QVariant::QVariant(const QSize &s) { create(Size, &s); } -QVariant::QVariant(const QSizeF &s) { create(SizeF, &s); } +QVariant::QVariant(const QPoint &pt) { d.is_null = false; d.type = Point; v_construct(&d, &pt); } +QVariant::QVariant(const QPointF &pt) { d.is_null = false; d.type = PointF; v_construct(&d, &pt); } +QVariant::QVariant(const QRectF &r) { d.is_null = false; d.type = RectF; v_construct(&d, &r); } +QVariant::QVariant(const QLineF &l) { d.is_null = false; d.type = LineF; v_construct(&d, &l); } +QVariant::QVariant(const QLine &l) { d.is_null = false; d.type = Line; v_construct(&d, &l); } +QVariant::QVariant(const QRect &r) { d.is_null = false; d.type = Rect; v_construct(&d, &r); } +QVariant::QVariant(const QSize &s) { d.is_null = false; d.type = Size; v_construct(&d, &s); } +QVariant::QVariant(const QSizeF &s) { d.is_null = false; d.type = SizeF; v_construct(&d, &s); } #endif -QVariant::QVariant(const QUrl &u) { create(Url, &u); } -QVariant::QVariant(const QLocale &l) { create(Locale, &l); } +QVariant::QVariant(const QUrl &u) { d.is_null = false; d.type = Url; v_construct(&d, &u); } +QVariant::QVariant(const QLocale &l) { d.is_null = false; d.type = Locale; v_construct(&d, &l); } #ifndef QT_NO_REGEXP -QVariant::QVariant(const QRegExp ®Exp) { create(RegExp, ®Exp); } +QVariant::QVariant(const QRegExp ®Exp) { d.is_null = false; d.type = RegExp; v_construct(&d, ®Exp); } #endif QVariant::QVariant(Qt::GlobalColor color) { create(62, &color); } -- cgit v0.12 From 51467afe563ca66d01e41dfd0f287d886117c415 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 26 Mar 2009 10:27:34 +0100 Subject: Added template to the private classes to avoid double allocation in QVariant --- src/corelib/kernel/qvariant_p.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 727a390..72c09ec 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -91,13 +91,25 @@ inline T *v_cast(QVariant::Private *d, T * = 0) #endif + +//a simple template that avoids to allocate 2 memory chunks when creating a QVariant +template class QVariantPrivateSharedEx : public QVariant::PrivateShared +{ +public: + QVariantPrivateSharedEx() : QVariant::PrivateShared(&m_t) { } + QVariantPrivateSharedEx(const T&t) : QVariant::PrivateShared(&m_t), m_t(t) { } + +private: + T m_t; +}; + // constructs a new variant if copy is 0, otherwise copy-constructs template inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) { if (sizeof(T) > sizeof(QVariant::Private::Data)) { - x->data.shared = copy ? new QVariant::PrivateShared(new T(*static_cast(copy))) - : new QVariant::PrivateShared(new T); + x->data.shared = copy ? new QVariantPrivateSharedEx(*static_cast(copy)) + : new QVariantPrivateSharedEx; x->is_shared = true; } else { if (copy) @@ -111,12 +123,11 @@ inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) template inline void v_clear(QVariant::Private *d, T* = 0) { - if (sizeof(T) > sizeof(QVariant::Private::Data)) { - delete v_cast(d); + //now we need to call the destructor in any case + //because QVariant::PrivateShared doesn't have a virtual destructor + v_cast(d)->~T(); + if (sizeof(T) > sizeof(QVariant::Private::Data)) delete d->data.shared; - } else { - v_cast(d)->~T(); - } } QT_END_NAMESPACE -- cgit v0.12 From 262ce9e47036a60d5bd466e3f5cdc4006c7974e2 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 26 Mar 2009 10:31:42 +0100 Subject: small simplification in internals of QVariant constDataHelper dones't need to know about the type if the variant --- src/corelib/kernel/qvariant.cpp | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index fa55100..76e5a00 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -71,27 +71,6 @@ QT_BEGIN_NAMESPACE # define FLT_DIG 6 #endif - -static const void *constDataHelper(const QVariant::Private &d) -{ - switch (d.type) { - case QVariant::Int: - return &d.data.i; - case QVariant::UInt: - return &d.data.u; - case QVariant::Bool: - return &d.data.b; - case QVariant::LongLong: - return &d.data.ll; - case QVariant::ULongLong: - return &d.data.ull; - case QVariant::Double: - return &d.data.d; - default: - return d.is_shared ? d.data.shared->ptr : reinterpret_cast(&d.data.ptr); - } -} - static void construct(QVariant::Private *x, const void *copy) { x->is_shared = false; @@ -1907,7 +1886,7 @@ void QVariant::load(QDataStream &s) } // const cast is safe since we operate on a newly constructed variant - if (!QMetaType::load(s, d.type, const_cast(constDataHelper(d)))) { + if (!QMetaType::load(s, d.type, const_cast(constData()))) { s.setStatus(QDataStream::ReadCorruptData); qWarning("QVariant::load: unable to load type %d.", d.type); } @@ -1947,7 +1926,7 @@ void QVariant::save(QDataStream &s) const return; } - if (!QMetaType::save(s, d.type, constDataHelper(d))) { + if (!QMetaType::save(s, d.type, constData())) { Q_ASSERT_X(false, "QVariant::save", "Invalid type to save"); qWarning("QVariant::save: unable to save type %d.", d.type); } @@ -2726,7 +2705,7 @@ bool QVariant::cmp(const QVariant &v) const const void *QVariant::constData() const { - return constDataHelper(d); + return d.is_shared ? d.data.shared->ptr : reinterpret_cast(&d.data.ptr); } /*! @@ -2739,7 +2718,7 @@ const void *QVariant::constData() const void* QVariant::data() { detach(); - return const_cast(constDataHelper(d)); + return const_cast(constData()); } -- cgit v0.12 From 5ca5a64a5c714b18ef23c093307f9f4061235731 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 26 Mar 2009 10:41:53 +0100 Subject: Improved qVariantSetValue by reusing the internals if possible This is possible if the type is the same of type < Char (simple types) --- src/corelib/kernel/qvariant.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index d7b7e3c..284e68c 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -443,7 +443,18 @@ inline QVariant qVariantFromValue(const QVariant &t) { return t; } template inline void qVariantSetValue(QVariant &v, const T &t) { - v = QVariant(qMetaTypeId(reinterpret_cast(0)), &t); + //if possible we reuse the current QVariant private + const int type = qMetaTypeId(reinterpret_cast(0)); + QVariant::Private &d = v.data_ptr(); + if (type <= int(QVariant::Char) || (type == d.type && v.isDetached())) { + d.type = type; + T *old = reinterpret_cast(d.is_shared ? d.data.shared->ptr : &d.data.ptr); + if (QTypeInfo::isComplex) + old->~T(); + new (old) T(t); //call the copy constructor + } else { + v = QVariant(type, &t); + } } inline QVariant::QVariant() {} -- cgit v0.12 From f68ce7374bef952ebc17f1edb7816a3f81044b4a Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 26 Mar 2009 11:17:39 +0100 Subject: add proper support for floats to QVariant --- src/corelib/kernel/qvariant.cpp | 26 +++++++++++++++++++------- src/corelib/kernel/qvariant.h | 2 ++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 76e5a00..16ca5b0 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -158,6 +158,9 @@ static void construct(QVariant::Private *x, const void *copy) case QVariant::Double: x->data.d = copy ? *static_cast(copy) : 0.0; break; + case QMetaType::Float: + x->data.f = copy ? *static_cast(copy) : 0.0f; + break; case QVariant::LongLong: x->data.ll = copy ? *static_cast(copy) : Q_INT64_C(0); break; @@ -253,6 +256,7 @@ static void clear(QVariant::Private *d) case QVariant::LongLong: case QVariant::ULongLong: case QVariant::Double: + case QMetaType::Float: break; case QVariant::Invalid: case QVariant::UserType: @@ -470,7 +474,7 @@ static qlonglong qMetaTypeNumber(const QVariant::Private *d) case QMetaType::Long: return qlonglong(*static_cast(d->data.shared->ptr)); case QMetaType::Float: - return qRound64(*static_cast(d->data.shared->ptr)); + return qRound64(d->data.f); case QVariant::Double: return qRound64(d->data.d); } @@ -607,7 +611,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *str = QString::number(qMetaTypeUNumber(d)); break; case QMetaType::Float: - *str = QString::number(*static_cast(d->data.shared->ptr), 'g', FLT_DIG); + *str = QString::number(d->data.f, 'g', FLT_DIG); break; case QVariant::Double: *str = QString::number(d->data.d, 'g', DBL_DIG); @@ -778,7 +782,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *ba = QByteArray::number(d->data.d, 'g', DBL_DIG); break; case QMetaType::Float: - *ba = QByteArray::number(*static_cast(d->data.shared->ptr), 'g', FLT_DIG); + *ba = QByteArray::number(d->data.f, 'g', FLT_DIG); break; case QMetaType::Char: case QMetaType::UChar: @@ -880,7 +884,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *f = double(d->data.b); break; case QMetaType::Float: - *f = *static_cast(d->data.shared->ptr); + *f = double(d->data.f); break; case QVariant::LongLong: case QVariant::Int: @@ -1334,7 +1338,7 @@ void QVariant::create(int type, const void *copy) QVariant::~QVariant() { - if (d.type > Char && (!d.is_shared || !d.data.shared->ref.deref())) + if (d.type > Char && d.type != QMetaType::Float && (!d.is_shared || !d.data.shared->ref.deref())) handler->clear(&d); } @@ -1350,7 +1354,7 @@ QVariant::QVariant(const QVariant &p) { if (d.is_shared) { d.data.shared->ref.ref(); - } else if (p.d.type > Char) { + } else if (p.d.type > Char && p.d.type != QMetaType::Float) { handler->construct(&d, p.constData()); d.is_null = p.d.is_null; } @@ -1544,6 +1548,12 @@ QVariant::QVariant(const char *val) */ /*! + \fn QVariant::QVariant(float val) + + Constructs a new variant with a floating point value, \a val. +*/ + +/*! \fn QVariant::QVariant(const QList &val) Constructs a new variant with a list value, \a val. @@ -1596,6 +1606,8 @@ QVariant::QVariant(bool val) { d.is_null = false; d.type = Bool; d.data.b = val; } QVariant::QVariant(double val) { d.is_null = false; d.type = Double; d.data.d = val; } +QVariant::QVariant(float val) +{ d.is_null = false; d.type = QMetaType::Float; d.data.f = val; } QVariant::QVariant(const QByteArray &val) { d.is_null = false; d.type = ByteArray; v_construct(&d, &val); } @@ -1700,7 +1712,7 @@ QVariant& QVariant::operator=(const QVariant &variant) if (variant.d.is_shared) { variant.d.data.shared->ref.ref(); d = variant.d; - } else if (variant.d.type > Char) { + } else if (variant.d.type > Char && variant.d.type != QMetaType::Float) { d.type = variant.d.type; handler->construct(&d, variant.constData()); d.is_null = variant.d.is_null; diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 284e68c..ede8074 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -181,6 +181,7 @@ class Q_CORE_EXPORT QVariant QVariant(qulonglong ull); QVariant(bool b); QVariant(double d); + QVariant(float f); #ifndef QT_NO_CAST_FROM_ASCII QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str); #endif @@ -349,6 +350,7 @@ class Q_CORE_EXPORT QVariant uint u; bool b; double d; + float f; qlonglong ll; qulonglong ull; void *ptr; -- cgit v0.12 From 58cbec72215d795948f7ed06cd9e6f199776806b Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 27 Mar 2009 12:22:04 +1000 Subject: Bug in QGLShaderProgram::addShader() that stopped partial shaders working. --- src/opengl/qglshaderprogram.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 934b5a5..3c19434 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -849,13 +849,16 @@ bool QGLShaderProgram::addShader(QGLShader *shader) return false; if (d->shaders.contains(shader)) return true; // Already added to this shader program. - if (d->program && shader && shader->d->shader) { + if (d->program && shader) { if (!shader->d->compiled) return false; - if (!shader->d->isPartial) + if (!shader->d->isPartial) { + if (!shader->d->shader) + return false; glAttachShader(d->program, shader->d->shader); - else + } else { d->hasPartialShaders = true; + } d->linked = false; // Program needs to be relinked. d->shaders.append(shader); return true; -- cgit v0.12 From 96e13b0411ed3f4ef8753edafc41503fc9aceb0f Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 27 Mar 2009 12:34:48 +1000 Subject: Fix loading of partial shaders from files. --- src/opengl/qglshaderprogram.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 3c19434..5738acd 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -573,9 +573,6 @@ bool QGLShader::setSourceCode(const QString& source) */ bool QGLShader::setSourceCodeFile(const QString& fileName) { - if (!d->shader) - return false; - QFile file(fileName); if (!file.open(QFile::ReadOnly)) { qWarning() << "QGLShader: Unable to open file" << fileName; -- cgit v0.12 From 64cdff9b09b42514ef934e61dccba86834eec9b0 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Tue, 31 Mar 2009 10:48:52 +0200 Subject: small change wrt to destruction (patch suggested by ogoffart) --- src/corelib/kernel/qvariant_p.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 72c09ec..a5ba9ff 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -123,11 +123,15 @@ inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) template inline void v_clear(QVariant::Private *d, T* = 0) { - //now we need to call the destructor in any case - //because QVariant::PrivateShared doesn't have a virtual destructor - v_cast(d)->~T(); - if (sizeof(T) > sizeof(QVariant::Private::Data)) - delete d->data.shared; + + if (sizeof(T) > sizeof(QVariant::Private::Data)) { + //now we need to cast + //because QVariant::PrivateShared doesn't have a virtual destructor + delete static_cast*>(d->data.shared); + } else { + v_cast(d)->~T(); + } + } QT_END_NAMESPACE -- cgit v0.12 From 400c5eac739c600e745a5467dcfe2c6ada300e2a Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Tue, 31 Mar 2009 10:54:19 +0200 Subject: make the float constructor inline (improves construction/destruction performance by 20%) --- src/corelib/kernel/qvariant.cpp | 2 -- src/corelib/kernel/qvariant.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 16ca5b0..96e5b4e 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1606,8 +1606,6 @@ QVariant::QVariant(bool val) { d.is_null = false; d.type = Bool; d.data.b = val; } QVariant::QVariant(double val) { d.is_null = false; d.type = Double; d.data.d = val; } -QVariant::QVariant(float val) -{ d.is_null = false; d.type = QMetaType::Float; d.data.f = val; } QVariant::QVariant(const QByteArray &val) { d.is_null = false; d.type = ByteArray; v_construct(&d, &val); } diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index ede8074..d73fcbc 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -181,7 +181,7 @@ class Q_CORE_EXPORT QVariant QVariant(qulonglong ull); QVariant(bool b); QVariant(double d); - QVariant(float f); + QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; } #ifndef QT_NO_CAST_FROM_ASCII QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str); #endif -- cgit v0.12 From ba31fca51ce7bdbbc6acabda2f0ac05d2700507d Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Tue, 31 Mar 2009 11:09:41 +0200 Subject: make construction for known type faster There is one less test thanks to usage of reference instead of pointers --- src/corelib/kernel/qvariant.cpp | 46 ++++++++++++++++++++--------------------- src/corelib/kernel/qvariant_p.h | 11 ++++++++++ 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 96e5b4e..ea66658 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1608,44 +1608,44 @@ QVariant::QVariant(double val) { d.is_null = false; d.type = Double; d.data.d = val; } QVariant::QVariant(const QByteArray &val) -{ d.is_null = false; d.type = ByteArray; v_construct(&d, &val); } +{ d.is_null = false; d.type = ByteArray; v_construct(&d, val); } QVariant::QVariant(const QBitArray &val) -{ d.is_null = false; d.type = BitArray; v_construct(&d, &val); } +{ d.is_null = false; d.type = BitArray; v_construct(&d, val); } QVariant::QVariant(const QString &val) -{ d.is_null = false; d.type = String; v_construct(&d, &val); } +{ d.is_null = false; d.type = String; v_construct(&d, val); } QVariant::QVariant(const QChar &val) -{ d.is_null = false; d.type = Char; v_construct(&d, &val); } +{ d.is_null = false; d.type = Char; v_construct(&d, val); } QVariant::QVariant(const QLatin1String &val) -{ QString str(val); d.is_null = false; d.type = String; v_construct(&d, &str); } +{ QString str(val); d.is_null = false; d.type = String; v_construct(&d, str); } QVariant::QVariant(const QStringList &val) -{ d.is_null = false; d.type = StringList; v_construct(&d, &val); } +{ d.is_null = false; d.type = StringList; v_construct(&d, val); } QVariant::QVariant(const QDate &val) -{ d.is_null = false; d.type = Date; v_construct(&d, &val); } +{ d.is_null = false; d.type = Date; v_construct(&d, val); } QVariant::QVariant(const QTime &val) -{ d.is_null = false; d.type = Time; v_construct(&d, &val); } +{ d.is_null = false; d.type = Time; v_construct(&d, val); } QVariant::QVariant(const QDateTime &val) -{ d.is_null = false; d.type = DateTime; v_construct(&d, &val); } +{ d.is_null = false; d.type = DateTime; v_construct(&d, val); } QVariant::QVariant(const QList &list) -{ d.is_null = false; d.type = List; v_construct(&d, &list); } +{ d.is_null = false; d.type = List; v_construct(&d, list); } QVariant::QVariant(const QMap &map) -{ d.is_null = false; d.type = Map; v_construct(&d, &map); } +{ d.is_null = false; d.type = Map; v_construct(&d, map); } QVariant::QVariant(const QHash &hash) -{ d.is_null = false; d.type = Hash; v_construct(&d, &hash); } +{ d.is_null = false; d.type = Hash; v_construct(&d, hash); } #ifndef QT_NO_GEOM_VARIANT -QVariant::QVariant(const QPoint &pt) { d.is_null = false; d.type = Point; v_construct(&d, &pt); } -QVariant::QVariant(const QPointF &pt) { d.is_null = false; d.type = PointF; v_construct(&d, &pt); } -QVariant::QVariant(const QRectF &r) { d.is_null = false; d.type = RectF; v_construct(&d, &r); } -QVariant::QVariant(const QLineF &l) { d.is_null = false; d.type = LineF; v_construct(&d, &l); } -QVariant::QVariant(const QLine &l) { d.is_null = false; d.type = Line; v_construct(&d, &l); } -QVariant::QVariant(const QRect &r) { d.is_null = false; d.type = Rect; v_construct(&d, &r); } -QVariant::QVariant(const QSize &s) { d.is_null = false; d.type = Size; v_construct(&d, &s); } -QVariant::QVariant(const QSizeF &s) { d.is_null = false; d.type = SizeF; v_construct(&d, &s); } +QVariant::QVariant(const QPoint &pt) { d.is_null = false; d.type = Point; v_construct(&d, pt); } +QVariant::QVariant(const QPointF &pt) { d.is_null = false; d.type = PointF; v_construct(&d, pt); } +QVariant::QVariant(const QRectF &r) { d.is_null = false; d.type = RectF; v_construct(&d, r); } +QVariant::QVariant(const QLineF &l) { d.is_null = false; d.type = LineF; v_construct(&d, l); } +QVariant::QVariant(const QLine &l) { d.is_null = false; d.type = Line; v_construct(&d, l); } +QVariant::QVariant(const QRect &r) { d.is_null = false; d.type = Rect; v_construct(&d, r); } +QVariant::QVariant(const QSize &s) { d.is_null = false; d.type = Size; v_construct(&d, s); } +QVariant::QVariant(const QSizeF &s) { d.is_null = false; d.type = SizeF; v_construct(&d, s); } #endif -QVariant::QVariant(const QUrl &u) { d.is_null = false; d.type = Url; v_construct(&d, &u); } -QVariant::QVariant(const QLocale &l) { d.is_null = false; d.type = Locale; v_construct(&d, &l); } +QVariant::QVariant(const QUrl &u) { d.is_null = false; d.type = Url; v_construct(&d, u); } +QVariant::QVariant(const QLocale &l) { d.is_null = false; d.type = Locale; v_construct(&d, l); } #ifndef QT_NO_REGEXP -QVariant::QVariant(const QRegExp ®Exp) { d.is_null = false; d.type = RegExp; v_construct(&d, ®Exp); } +QVariant::QVariant(const QRegExp ®Exp) { d.is_null = false; d.type = RegExp; v_construct(&d, regExp); } #endif QVariant::QVariant(Qt::GlobalColor color) { create(62, &color); } diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index a5ba9ff..033b760 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -105,6 +105,17 @@ private: // constructs a new variant if copy is 0, otherwise copy-constructs template +inline void v_construct(QVariant::Private *x, const T &t) +{ + if (sizeof(T) > sizeof(QVariant::Private::Data)) { + x->data.shared = new QVariantPrivateSharedEx(t); + x->is_shared = true; + } else { + new (&x->data.ptr) T(t); + } +} + +template inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) { if (sizeof(T) > sizeof(QVariant::Private::Data)) { -- cgit v0.12 From 1adae6c51e530d124a3b90d6dd2ee8d7ebb99812 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 6 Apr 2009 08:08:05 +0200 Subject: Update the qmake documentation regarding when the .qmake.cache is processed. Reviewed-by: TrustMe (cherry picked from commit 020ced4994bace0ed7f494bec8905afa959f76ed) --- doc/src/qmake-manual.qdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc index 27cfa0b..39581a2 100644 --- a/doc/src/qmake-manual.qdoc +++ b/doc/src/qmake-manual.qdoc @@ -3080,6 +3080,9 @@ called \c{.qmake.cache} in parent directories of the current directory. If it fails to find this file, it will silently ignore this step of processing. + If it finds a \c{.qmake.cache} file then it will process this file first before + it processes the project file. + \target LibDepend \section1 Library Dependencies -- cgit v0.12 From 274083441de4459fff5cbaf7f70d02eefb6c1dfa Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 6 Apr 2009 10:20:56 +0200 Subject: Fix up color matching on 64-bit Cocoa. It seems that GetThemeTextColor is not available at all for 64-bit versions of the operating system and there is no good equivalent. We were using a technique where we would create a small pixmap and then use HIThemeSetTextFillColor() with the proper enum. However, this function will silently set a black color if it doesn't know about the enum. So, we get black when we really shouldn't. It also seems to produce colors that are a bit different from the Carbon function. So, in the meantime, just hard code the values in. It might break if you are hacking the resources in Mac OS X, but we'll have to live with that until we get a real function. Task-number: 248918 Reviewed-by: Prasanth Ullattil (cherry picked from commit c350892f55a1d8633be54f09e6e4596f4687bc89) --- src/gui/kernel/qt_mac.cpp | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp index 4703475..b1247e8 100644 --- a/src/gui/kernel/qt_mac.cpp +++ b/src/gui/kernel/qt_mac.cpp @@ -131,16 +131,47 @@ QColor qcolorForTheme(ThemeBrush brush) QColor qcolorForThemeTextColor(ThemeTextColor themeColor) { -#ifndef QT_MAC_USE_COCOA +#ifdef QT_OS_MAC32 RGBColor c; GetThemeTextColor(themeColor, 32, true, &c); - return QColor(c.red / 265, c.green / 256, c.blue / 256); + QColor color = QColor(c.red / 265, c.green / 256, c.blue / 256); + return color; #else - QNativeImage nativeImage(16,16, QNativeImage::systemFormat()); - CGRect cgrect = CGRectMake(0, 0, 16, 16); - HIThemeSetTextFill(themeColor, 0, nativeImage.cg, kHIThemeOrientationNormal); - CGContextFillRect(nativeImage.cg, cgrect); - return QColor(nativeImage.image.pixel(0 , 0)); + // There is no equivalent to GetThemeTextColor in 64-bit and it was rather bad that + // I didn't file a request to implement this for Snow Leopard. So, in the meantime + // I've encoded the values from the GetThemeTextColor. This is not exactly ideal + // as if someone really wants to mess with themeing, these colors will be wrong. + // It also means that we need to make sure the values for differences between + // OS releases (and it will be likely that we are a step behind.) + switch (themeColor) { + case kThemeTextColorAlertActive: + case kThemeTextColorTabFrontActive: + case kThemeTextColorBevelButtonActive: + case kThemeTextColorListView: + case kThemeTextColorPlacardActive: + case kThemeTextColorPopupButtonActive: + case kThemeTextColorPopupLabelActive: + case kThemeTextColorPushButtonActive: + return Qt::black; + case kThemeTextColorAlertInactive: + case kThemeTextColorDialogInactive: + case kThemeTextColorPlacardInactive: + return QColor(67, 69, 69, 255); + case kThemeTextColorPopupButtonInactive: + case kThemeTextColorPopupLabelInactive: + case kThemeTextColorPushButtonInactive: + case kThemeTextColorTabFrontInactive: + case kThemeTextColorBevelButtonInactive: + return QColor(123, 127, 127, 255); + default: { + QNativeImage nativeImage(16,16, QNativeImage::systemFormat()); + CGRect cgrect = CGRectMake(0, 0, 16, 16); + HIThemeSetTextFill(themeColor, 0, nativeImage.cg, kHIThemeOrientationNormal); + CGContextFillRect(nativeImage.cg, cgrect); + QColor color = nativeImage.image.pixel(0,0); + return QColor(nativeImage.image.pixel(0 , 0)); + } + } #endif } QT_END_NAMESPACE -- cgit v0.12 From 4f8b33f7da6e3710e697e189be0ba11212ba8af8 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 1 Apr 2009 13:04:44 +0200 Subject: QThread::start(): priority has no effect on Linux systems The default scheduling policy on Linux doesn't allow specifying thread priorities, so the priority passed to start() and setPriority() has no effect. Document this. Task number: 249997 Reviewed-by: Kavindra Devi Palaraja (cherry picked from commit 638b61dec0d335b12d48fe561b19a0f0f6ef83a3) --- src/corelib/thread/qthread.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 7f87897..2fb6335 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -297,6 +297,12 @@ void QAdoptedThread::run() priority parameter. If the thread is already running, this function does nothing. + The effect of the \a priority parameter is dependent on the + operating system's scheduling policy. In particular, the \a priority + will be ignored on systems that do not support thread priorities + (such as on Linux, see http://linux.die.net/man/2/sched_setscheduler + for more details). + \sa run(), terminate() */ @@ -590,6 +596,12 @@ void QThread::cleanup() The \a priority argument can be any value in the \c QThread::Priority enum except for \c InheritPriorty. + The effect of the \a priority parameter is dependent on the + operating system's scheduling policy. In particular, the \a priority + will be ignored on systems that do not support thread priorities + (such as on Linux, see http://linux.die.net/man/2/sched_setscheduler + for more details). + \sa Priority priority() start() */ -- cgit v0.12 From e1bd6e3e69be7ae4612d4c2b5bae6f694cd420c8 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 6 Apr 2009 11:30:45 +0200 Subject: BT: Fix a crash when running a widget window modal when it has no parent We changed the logic for determining sheets, but it seems we forgot to take the parentWidget() into account. It's required for WindowModality to make any sense. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 1e32cdefa382b16eaffc663594ccab1dbe1faebb) --- src/gui/kernel/qwidget_mac.mm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 7a586e1..f2a532f 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -295,9 +295,7 @@ bool qt_mac_is_macsheet(const QWidget *w) Qt::WindowModality modality = w->windowModality(); if (modality == Qt::ApplicationModal) return false; - if (modality == Qt::WindowModal || w->windowType() == Qt::Sheet) - return true; - return false; + return w->parentWidget() && (modality == Qt::WindowModal || w->windowType() == Qt::Sheet); } bool qt_mac_is_macdrawer(const QWidget *w) @@ -4583,11 +4581,11 @@ void QWidgetPrivate::setModal_sys() OSWindowRef windowRef = qt_mac_window_for(q); #ifdef QT_MAC_USE_COCOA - bool windowIsSheet = [windowRef styleMask] & NSDocModalWindowMask; + bool alreadySheet = [windowRef styleMask] & NSDocModalWindowMask; - if (q->windowModality() == Qt::WindowModal){ + if (windowParent && q->windowModality() == Qt::WindowModal){ // Window should be window-modal, which implies a sheet. - if (!windowIsSheet) + if (!alreadySheet) recreateMacWindow(); if ([windowRef isKindOfClass:[NSPanel class]]){ // If the primary window of the sheet parent is a child of a modal dialog, @@ -4601,7 +4599,7 @@ void QWidgetPrivate::setModal_sys() } } else { // Window shold not be window-modal, and as such, not a sheet. - if (windowIsSheet){ + if (alreadySheet){ // NB: the following call will call setModal_sys recursivly: recreateMacWindow(); windowRef = qt_mac_window_for(q); -- cgit v0.12 From 08bfe19304e6f7cb2e47205ed36fa52a55972c22 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 6 Apr 2009 10:38:54 +0200 Subject: Fix moc autotest failures We have to pass the correct include paths when testing the multiple inheritance warning, because we want moc to find the QtGui and QObject headers. In addition we have to adjust the line numbers and include QObject in the qobject test to avoid a warning about the unknown QObject superclass. Reviewed-by: Bradley T. Hughes (cherry picked from commit 73cffd26dcfbfee48caf86329d636361d02e5c03) --- tests/auto/moc/forgotten-qinterface.h | 2 ++ tests/auto/moc/tst_moc.cpp | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/auto/moc/forgotten-qinterface.h b/tests/auto/moc/forgotten-qinterface.h index a11793b..370a3d0 100644 --- a/tests/auto/moc/forgotten-qinterface.h +++ b/tests/auto/moc/forgotten-qinterface.h @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include + struct MyInterface { virtual ~MyInterface() {} diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 39f4f23..1499536 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -851,7 +851,10 @@ void tst_Moc::warnOnMultipleInheritance() QVERIFY(!qgetenv("QTDIR").isNull()); QProcess proc; - proc.start("moc", QStringList(srcify("warn-on-multiple-qobject-subclasses.h"))); + QStringList args; + args << "-I" << qgetenv("QTDIR") + "/include/QtGui" + << srcify("warn-on-multiple-qobject-subclasses.h"); + proc.start("moc", args); QVERIFY(proc.waitForFinished()); QCOMPARE(proc.exitCode(), 0); QByteArray mocOut = proc.readAllStandardOutput(); @@ -873,14 +876,17 @@ void tst_Moc::forgottenQInterface() QVERIFY(!qgetenv("QTDIR").isNull()); QProcess proc; - proc.start("moc", QStringList(srcify("forgotten-qinterface.h"))); + QStringList args; + args << "-I" << qgetenv("QTDIR") + "/include/QtCore" + << srcify("forgotten-qinterface.h"); + proc.start("moc", args); QVERIFY(proc.waitForFinished()); QCOMPARE(proc.exitCode(), 0); QByteArray mocOut = proc.readAllStandardOutput(); QVERIFY(!mocOut.isEmpty()); QString mocWarning = QString::fromLocal8Bit(proc.readAllStandardError()); QCOMPARE(mocWarning, QString(SRCDIR) + - QString("/forgotten-qinterface.h:53: Warning: Class Test implements the interface MyInterface but does not list it in Q_INTERFACES. qobject_cast to MyInterface will not work!\n")); + QString("/forgotten-qinterface.h:55: Warning: Class Test implements the interface MyInterface but does not list it in Q_INTERFACES. qobject_cast to MyInterface will not work!\n")); #else QSKIP("Only tested on linux/gcc", SkipAll); #endif -- cgit v0.12 From af16243a69ad5f9708ec165113c3441731865d83 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 6 Apr 2009 10:58:51 +0200 Subject: Moc autotest cleanup Remove unused QTDIR tests. Reviewed-by: Bradley T. Hughes (cherry picked from commit 10ba12c7b73b89761a43a450c2932c8a56bf64db) --- tests/auto/moc/tst_moc.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 1499536..4d31dfc 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -584,8 +584,6 @@ void tst_Moc::warnOnExtraSignalSlotQualifiaction() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; proc.start("moc", QStringList(srcify("extraqualification.h"))); QVERIFY(proc.waitForFinished()); @@ -630,8 +628,6 @@ void tst_Moc::inputFileNameWithDotsButNoExtension() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; proc.setWorkingDirectory(QString(SRCDIR) + "/task71021"); proc.start("moc", QStringList("../Header")); @@ -957,8 +953,6 @@ void tst_Moc::frameworkSearchPath() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_UNIX) - QVERIFY(!qgetenv("QTDIR").isNull()); - QStringList args; args << "-F" << srcify(".") << srcify("interface-from-framework.h") @@ -997,8 +991,6 @@ void tst_Moc::templateGtGt() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; proc.start("moc", QStringList(srcify("template-gtgt.h"))); QVERIFY(proc.waitForFinished()); @@ -1015,8 +1007,6 @@ void tst_Moc::templateGtGt() void tst_Moc::defineMacroViaCmdline() { #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; QStringList args; @@ -1105,8 +1095,6 @@ void tst_Moc::warnOnPropertyWithoutREAD() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; proc.start("moc", QStringList(srcify("warn-on-property-without-read.h"))); QVERIFY(proc.waitForFinished()); -- cgit v0.12 From e9f43d9047362ba4be9c7381ca2d7d57540758bd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 6 Apr 2009 11:00:05 +0200 Subject: Remove QTDIR dependency from moc autotest Use qmake -query QT_INSTALL_HEADERS at test startup time instead of relying on the dead QTDIR environment variable. Reviewed-by: Bradley T. Hughes (cherry picked from commit d071b3528f51aaded18029f2f22e8db03e47a2a6) --- tests/auto/moc/tst_moc.cpp | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 4d31dfc..4e4f6e7 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -466,6 +466,8 @@ public: inline tst_Moc() {} private slots: + void initTestCase(); + void slotWithException() throw(MyStruct); void dontStripNamespaces(); void oldStyleCasts(); @@ -519,8 +521,28 @@ private: bool user2() { return false; }; bool user3() { return false; }; bool userFunction(){ return false; }; + +private: + QString qtIncludePath; }; +void tst_Moc::initTestCase() +{ +#if defined(Q_OS_UNIX) + QProcess proc; + proc.start("qmake", QStringList() << "-query" << "QT_INSTALL_HEADERS"); + QVERIFY(proc.waitForFinished()); + QCOMPARE(proc.exitCode(), 0); + QByteArray output = proc.readAllStandardOutput(); + QVERIFY(!output.isEmpty()); + QCOMPARE(proc.readAllStandardError(), QByteArray()); + qtIncludePath = QString::fromLocal8Bit(output).trimmed(); + QFileInfo fi(qtIncludePath); + QVERIFY(fi.exists()); + QVERIFY(fi.isDir()); +#endif +} + void tst_Moc::slotWithException() throw(MyStruct) { // be happy @@ -552,8 +574,6 @@ void tst_Moc::oldStyleCasts() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; proc.start("moc", QStringList(srcify("/oldstyle-casts.h"))); QVERIFY(proc.waitForFinished()); @@ -564,7 +584,7 @@ void tst_Moc::oldStyleCasts() QStringList args; args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "." - << "-I" << qgetenv("QTDIR") + "/include" << "-o" << "/dev/null" << "-"; + << "-I" << qtIncludePath << "-o" << "/dev/null" << "-"; proc.start("gcc", args); QVERIFY(proc.waitForStarted()); proc.write(mocOut); @@ -639,7 +659,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension() QStringList args; args << "-c" << "-x" << "c++" << "-I" << ".." - << "-I" << qgetenv("QTDIR") + "/include" << "-o" << "/dev/null" << "-"; + << "-I" << qtIncludePath << "-o" << "/dev/null" << "-"; proc.start("gcc", args); QVERIFY(proc.waitForStarted()); proc.write(mocOut); @@ -844,11 +864,9 @@ void tst_Moc::warnOnMultipleInheritance() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; QStringList args; - args << "-I" << qgetenv("QTDIR") + "/include/QtGui" + args << "-I" << qtIncludePath + "/QtGui" << srcify("warn-on-multiple-qobject-subclasses.h"); proc.start("moc", args); QVERIFY(proc.waitForFinished()); @@ -869,11 +887,9 @@ void tst_Moc::forgottenQInterface() QSKIP("Not tested when cross-compiled", SkipAll); #endif #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) - QVERIFY(!qgetenv("QTDIR").isNull()); - QProcess proc; QStringList args; - args << "-I" << qgetenv("QTDIR") + "/include/QtCore" + args << "-I" << qtIncludePath + "/QtCore" << srcify("forgotten-qinterface.h"); proc.start("moc", args); QVERIFY(proc.waitForFinished()); -- cgit v0.12 From 52f1ecd5ed1b7008a1f037be0fbe4e6b69576bf4 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Mon, 6 Apr 2009 12:39:13 +0200 Subject: Doc - Clarified that button style on X11 platforms may depend on the desktop environment. Task-number: 250338 Reviewed-by: Jens Bache-Wiig (cherry picked from commit 38b5bff2fab59e965aba59b4f121a7c8945e4d75) --- src/gui/widgets/qdialogbuttonbox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 246da95..4a95292 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -752,7 +752,8 @@ QDialogButtonBox::~QDialogButtonBox() \value KdeLayout Use a policy appropriate for applications on KDE. \value GnomeLayout Use a policy appropriate for applications on GNOME. - The button layout is specified by the \l{style()}{current style}. + The button layout is specified by the \l{style()}{current style}. However, + on the X11 platform, it may be influenced by the desktop environment. */ /*! -- cgit v0.12 From 578b3a4570651cbad26c99f3bbeeea33c65db04f Mon Sep 17 00:00:00 2001 From: jasplin Date: Mon, 6 Apr 2009 12:43:53 +0200 Subject: Corrected typo. Reviewed-by: jasplin (cherry picked from commit 1a125061f201bb7ee746f1eddc0604cd85a6545c) --- dist/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/README b/dist/README index 110be1c..38b3a1c 100644 --- a/dist/README +++ b/dist/README @@ -114,7 +114,7 @@ HOW TO REPORT A BUG If you think you have found a bug in Qt, we would like to hear about it so that we can fix it. Before reporting a bug, please check http://qtsoftware.com/developer/faqs/ and -http://qtsoftware.com/products/appdev/platform/platforms/ to see if the to see if +http://qtsoftware.com/products/appdev/platform/platforms/ to see if the issue is already known. Always include the following information in your bug report: the name -- cgit v0.12 From 303af8987689ee526b15d0bfb8ee41fa678e43e4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Apr 2009 11:18:34 +0200 Subject: Install the animation.mng file. Otherwise, for people who install Qt (everyone outside Nokia), the animation file isn't present. Reviewed-by: Trust Me BT: yes (cherry picked from commit 73f5131793d52d93b18a40d36599e063f18246e9) --- examples/widgets/movie/movie.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro index b5f0a7a..1c7cbae 100644 --- a/examples/widgets/movie/movie.pro +++ b/examples/widgets/movie/movie.pro @@ -4,6 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie -sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro movies +sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie INSTALLS += target sources -- cgit v0.12 From c27d0c8bdac01bcf231ac1a9bc5fb2122489f4d2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Apr 2009 13:16:39 +0200 Subject: Rename these files to have lowercase .txt extension. mkdist doesn't case-insensitive comparison. Reviewed-by: TrustMe BT: yes (cherry picked from commit 5bb504a78cad5e38cd522785a37898f4e88cd272) --- FAQ | 18 ------------------ FAQ.txt | 18 ++++++++++++++++++ LGPL_EXCEPTION.TXT | 3 --- LGPL_EXCEPTION.txt | 3 +++ 4 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 FAQ create mode 100644 FAQ.txt delete mode 100644 LGPL_EXCEPTION.TXT create mode 100644 LGPL_EXCEPTION.txt diff --git a/FAQ b/FAQ deleted file mode 100644 index c243e5c..0000000 --- a/FAQ +++ /dev/null @@ -1,18 +0,0 @@ -This is a list of Frequently Asked Questions regarding Qt Release 4.5.0. - -Q: I'm using a Unix system and I downloaded the Zip package. However, when I try -to run the configure script, I get the following error message: -"bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory" -A: The problem here is converting files from Windows style line endings (CRLF) -to Unix style line endings (LF). To avoid this problem, uncompress the file -again and give the option "-a" to unzip, which will then add the correct line -endings. - -Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe -version of Qt. However, when I try to run the examples I get an error saying: -"The application failed to start because the application configuration is -incorrect. Reinstalling the application may fix this problem.". I reinstalled -the package but the error persists. What am I doing wrong? -A: The problem is an incorrect version of the CRT. Visual studio requires CRT90 -while Windows XP comes with CRT80. To solve this problem, please install the -2008 CRT redistributable package from Microsoft. diff --git a/FAQ.txt b/FAQ.txt new file mode 100644 index 0000000..c243e5c --- /dev/null +++ b/FAQ.txt @@ -0,0 +1,18 @@ +This is a list of Frequently Asked Questions regarding Qt Release 4.5.0. + +Q: I'm using a Unix system and I downloaded the Zip package. However, when I try +to run the configure script, I get the following error message: +"bash: ./configure: /bin/sh^M: bad interpreter: No such file or directory" +A: The problem here is converting files from Windows style line endings (CRLF) +to Unix style line endings (LF). To avoid this problem, uncompress the file +again and give the option "-a" to unzip, which will then add the correct line +endings. + +Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe +version of Qt. However, when I try to run the examples I get an error saying: +"The application failed to start because the application configuration is +incorrect. Reinstalling the application may fix this problem.". I reinstalled +the package but the error persists. What am I doing wrong? +A: The problem is an incorrect version of the CRT. Visual studio requires CRT90 +while Windows XP comes with CRT80. To solve this problem, please install the +2008 CRT redistributable package from Microsoft. diff --git a/LGPL_EXCEPTION.TXT b/LGPL_EXCEPTION.TXT deleted file mode 100644 index 8d0f85e..0000000 --- a/LGPL_EXCEPTION.TXT +++ /dev/null @@ -1,3 +0,0 @@ -Nokia Qt LGPL Exception version 1.0 - -As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library; and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates. \ No newline at end of file diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt new file mode 100644 index 0000000..8d0f85e --- /dev/null +++ b/LGPL_EXCEPTION.txt @@ -0,0 +1,3 @@ +Nokia Qt LGPL Exception version 1.0 + +As a special exception to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that the incorporated material (i) does not exceed more than 5% of the total size of the Library; and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates. \ No newline at end of file -- cgit v0.12 From b1d02bc759401d478168c1e2d27276ee4ff30c67 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Mon, 6 Apr 2009 13:15:00 +0200 Subject: Doc - Mentioned what the default filters are for QFileSystemModel::filter(). Task-number: 250285 Reviewed-by: Benjamin Poulain (cherry picked from commit cf65dea821a2ba796bb1f32c80de6b9db224dff5) --- src/gui/dialogs/qfilesystemmodel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index c7b3137..012d3a1 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -1430,7 +1430,10 @@ void QFileSystemModel::setFilter(QDir::Filters filters) } /*! - Returns the filter specification for the directory model. + Returns the filter specified for the directory model. + + If a filter has not been set, the default filter is QDir::AllEntries | + QDir::NoDotAndDotDot | QDir::AllDirs. \sa QDir::Filters */ -- cgit v0.12 From c7320b26455bf259b4da5868a3e227164e458b88 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 6 Apr 2009 14:17:15 +0200 Subject: BT: Fix combobox background color regression There was a regression in the background color for QComboBox popups. This should resolve it. It essentially tells the system to stay off the system palette while QGtkStyle is used. We will introduce a cleaner style hint for this in 4.6. Reviewed-by: nrc (cherry picked from commit f06c4f2d7378b40a0a184393a8986032d5a700ee) --- src/gui/kernel/qapplication_x11.cpp | 6 ++++-- src/gui/styles/gtksymbols.cpp | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 10fb886..b1270bc 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1362,8 +1362,10 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0, pal.setColor(QPalette::Disabled, QPalette::Highlight, Qt::darkBlue); } - QApplicationPrivate::setSystemPalette(pal); - + // QGtkStyle sets it's own system palette + if (!(QApplicationPrivate::app_style && QApplicationPrivate::app_style->inherits("QGtkStyle"))) { + QApplicationPrivate::setSystemPalette(pal); + } QColor::setAllowX11ColorNames(allowX11ColorNames); } diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index 8123d32..f7af8f8 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -504,13 +504,6 @@ static QPalette gtkWidgetPalette(const QString >kWidgetName) pal.setBrush(QPalette::Disabled, QPalette::WindowText, disabledTextColor); pal.setBrush(QPalette::All, QPalette::ButtonText, textColor); pal.setBrush(QPalette::Disabled, QPalette::ButtonText, disabledTextColor); - if (gtkWidgetName == QLS("GtkMenu")) { - // This really applies to the combo box rendering since - // QComboBox copies the palette from a QMenu - GdkColor gdkBg = gtkWidget->style->bg[GTK_STATE_NORMAL]; - QColor bgColor(gdkBg.red>>8, gdkBg.green>>8, gdkBg.blue>>8); - pal.setBrush(QPalette::Base, bgColor); - } return pal; } @@ -528,6 +521,7 @@ void QGtk::applyCustomPaletteHash() GdkColor gdkBg = QGtk::gtkWidget(QLS("GtkMenu"))->style->bg[GTK_STATE_NORMAL]; QColor bgColor(gdkBg.red>>8, gdkBg.green>>8, gdkBg.blue>>8); menuPal.setBrush(QPalette::Base, bgColor); + menuPal.setBrush(QPalette::Window, bgColor); qApp->setPalette(menuPal, "QMenu"); QPalette toolbarPal = gtkWidgetPalette(QLS("GtkToolbar")); -- cgit v0.12 From 31ea067ae86e5db326452cab34dfb904ad1aec8d Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 6 Apr 2009 14:42:31 +0200 Subject: remove dead code Reviewed-by: jbache (cherry picked from commit 6ce4a3b66e2b31f80d1a2d09a4c4087f88a7a9e8) --- tests/auto/qmenubar/tst_qmenubar.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index 277e15c..e0a9f42 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -1337,7 +1337,6 @@ tst_QMenuBar::allowActiveAndDisabled() // disabled menu items are added QMenu fileMenu("&File"); - QAction disabledAction() ; // Task 241043 : check that second menu is activated // if all items are disabled QAction *act = fileMenu.addAction("Disabled"); -- cgit v0.12 From d1284be76fcca238125a9012c59f2babd9bb3879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 6 Apr 2009 15:57:22 +0200 Subject: Update WebKit from code.staikos.net/srv/git/webkit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using branch origin/qtwebkit-4.5 (f72c14123c593dc9d649d25b7186334bba0026b5) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-04-06 Tor Arne Vestbø Reviewed by Simon Hausmann. [Qt] Don't show and hide the platformPluginWidget, as it's our QWebView * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::show): (WebCore::PluginView::hide): (WebCore::PluginView::setParentVisible): 2009-04-06 Mike Belshe Reviewed by Eric Seidel. HTMLCanvasElement crash when ImageBuffer creation fails. https://bugs.webkit.org/show_bug.cgi?id=23212 Check for NULL before using the ImageBuffer as we might be low on memory and creation may have failed. Test case creation blocked by: https://bugs.webkit.org/show_bug.cgi?id=25055 * html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::createImageBuffer): 2009-04-05 Erik L. Bunce Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=25050 Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView. * platform/qt/DragDataQt.cpp: (WebCore::DragData::asURL): ++ b/WebKitTools/ChangeLog 2009-03-31 Adam Roben Make resolve-ChangeLogs -f work when the working tree has spaces in its path Reviewed by Mark Rowe and David Kilzer. * Scripts/resolve-ChangeLogs: (sub fixMergedChangeLogs): Quote the path to resolve-ChangeLogs in case it contains spaces. 2009-03-17 David Kilzer resolve-ChangeLogs should not die on unmerged non-ChangeLog files Reviewed by Adam Roben. Fixes the following bug in resolve-ChangeLogs: Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132. Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164. * Scripts/resolve-ChangeLogs: (findUnmergedChangeLogs): Check the result of findChangeLog() to make sure we don't add undef values to the list of files being returned. 2009-03-11 David Kilzer Bug 24378: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs Reviewed by Adam Roben. * Scripts/resolve-ChangeLogs: If -f|--fix-merged is not passed and no file or directory names are specified on the command-line then try to find unmerged ChangeLog files based on 'svn stat' or 'git diff'. Added global $isGit and $isSVN variables so that isGit() and isSVN() only have to be called once. (findUnmergedChangeLogs): Added. (cherry picked from commit 1d3706f2b66ba5fbb586e532fc29852f55d81c86) --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 38 + .../webkit/WebCore/generated/CSSPropertyNames.cpp | 5 +- .../webkit/WebCore/generated/CSSValueKeywords.c | 5 +- src/3rdparty/webkit/WebCore/generated/ColorData.c | 5 +- .../webkit/WebCore/generated/DocTypeStrings.cpp | 5 +- .../webkit/WebCore/generated/HTMLEntityNames.c | 5 +- .../webkit/WebCore/generated/tokenizer.cpp | 2315 ++++++-------------- .../webkit/WebCore/html/HTMLCanvasElement.cpp | 4 + .../webkit/WebCore/platform/qt/DragDataQt.cpp | 6 +- .../webkit/WebCore/plugins/mac/PluginViewMac.cpp | 9 - src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 +- 12 files changed, 744 insertions(+), 1657 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 1ebf6ef..9decb66 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb + f72c14123c593dc9d649d25b7186334bba0026b5 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index e8850f3..d0382f2 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,41 @@ +2009-04-06 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + [Qt] Don't show and hide the platformPluginWidget, as it's our QWebView + + * plugins/mac/PluginViewMac.cpp: + (WebCore::PluginView::show): + (WebCore::PluginView::hide): + (WebCore::PluginView::setParentVisible): + +2009-04-06 Mike Belshe + + Reviewed by Eric Seidel. + + HTMLCanvasElement crash when ImageBuffer creation fails. + https://bugs.webkit.org/show_bug.cgi?id=23212 + + Check for NULL before using the ImageBuffer as we might + be low on memory and creation may have failed. + + Test case creation blocked by: + https://bugs.webkit.org/show_bug.cgi?id=25055 + + * html/HTMLCanvasElement.cpp: + (WebCore::HTMLCanvasElement::createImageBuffer): + +2009-04-05 Erik L. Bunce + + Reviewed by Simon Hausmann. + + https://bugs.webkit.org/show_bug.cgi?id=25050 + + Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView. + + * platform/qt/DragDataQt.cpp: + (WebCore::DragData::asURL): + 2009-03-27 Zack Rusin Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp index 25313ac..ca4ea5a 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ /* Command-line: gperf -a -L ANSI-C -E -C -c -o -t --key-positions='*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 CSSPropertyNames.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -217,9 +217,6 @@ hash_prop (register const char *str, register unsigned int len) #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif const struct props * findProp (register const char *str, register unsigned int len) diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c index 5ff0858..d0433e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ /* Command-line: gperf -L ANSI-C -E -C -n -o -t --key-positions='*' -NfindValue -Hhash_val -Wwordlist_value -D CSSValueKeywords.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -179,9 +179,6 @@ hash_val (register const char *str, register unsigned int len) #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif const struct css_value * findValue (register const char *str, register unsigned int len) diff --git a/src/3rdparty/webkit/WebCore/generated/ColorData.c b/src/3rdparty/webkit/WebCore/generated/ColorData.c index 478566c..18d9926 100644 --- a/src/3rdparty/webkit/WebCore/generated/ColorData.c +++ b/src/3rdparty/webkit/WebCore/generated/ColorData.c @@ -1,5 +1,5 @@ #include // bogus -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ /* Command-line: gperf -CDEot -L ANSI-C --key-positions='*' -N findColor -D -s 2 */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -141,9 +141,6 @@ hash (register const char *str, register unsigned int len) #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif const struct NamedColor * findColor (register const char *str, register unsigned int len) diff --git a/src/3rdparty/webkit/WebCore/generated/DocTypeStrings.cpp b/src/3rdparty/webkit/WebCore/generated/DocTypeStrings.cpp index 686629c..ad63b9e 100644 --- a/src/3rdparty/webkit/WebCore/generated/DocTypeStrings.cpp +++ b/src/3rdparty/webkit/WebCore/generated/DocTypeStrings.cpp @@ -1,5 +1,5 @@ #include // bogus -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ /* Command-line: gperf -CEot -L ANSI-C --key-positions='*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -331,9 +331,6 @@ hash (register const char *str, register unsigned int len) #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif const struct PubIDInfo * findDoctypeEntry (register const char *str, register unsigned int len) diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLEntityNames.c b/src/3rdparty/webkit/WebCore/generated/HTMLEntityNames.c index 993e106..470c4cd 100644 --- a/src/3rdparty/webkit/WebCore/generated/HTMLEntityNames.c +++ b/src/3rdparty/webkit/WebCore/generated/HTMLEntityNames.c @@ -1,4 +1,4 @@ -/* ANSI-C code produced by gperf version 3.0.3 */ +/* ANSI-C code produced by gperf version 3.0.2 */ /* Command-line: gperf -a -L ANSI-C -C -G -c -o -t --key-positions='*' -N findEntity -D -s 2 */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -520,9 +520,6 @@ static const short lookup[] = #ifdef __GNUC__ __inline -#ifdef __GNUC_STDC_INLINE__ -__attribute__ ((__gnu_inline__)) -#endif #endif const struct Entity * findEntity (register const char *str, register unsigned int len) diff --git a/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp b/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp index 8462f51..1da1a0b 100644 --- a/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp +++ b/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp @@ -78,42 +78,42 @@ static yyconst flex_int16_t yy_accept[479] = { 0, 0, 0, 0, 0, 0, 0, 69, 67, 2, 2, 67, 67, 67, 67, 67, 67, 67, 67, 67, 56, - 67, 67, 15, 15, 15, 67, 67, 67, 67, 66, + 67, 67, 67, 67, 15, 15, 15, 67, 67, 66, 15, 15, 15, 65, 15, 2, 0, 0, 0, 14, - 0, 0, 0, 18, 18, 0, 8, 0, 0, 9, - 0, 0, 15, 15, 15, 0, 57, 0, 55, 0, - 0, 56, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 16, 54, 54, 51, 54, 0, 54, 0, 0, - 35, 35, 35, 35, 35, 35, 35, 0, 62, 15, - 0, 0, 15, 15, 0, 15, 15, 15, 7, 6, + 0, 0, 0, 0, 18, 18, 8, 0, 0, 9, + 0, 0, 0, 15, 15, 15, 57, 0, 55, 0, + 0, 56, 0, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 16, 54, 54, 51, 54, 0, 0, + 0, 35, 35, 35, 35, 35, 35, 35, 15, 15, + 7, 62, 15, 0, 0, 15, 15, 0, 15, 6, 5, 15, 15, 15, 15, 0, 0, 0, 14, 0, - 0, 0, 18, 18, 0, 18, 18, 0, 0, 14, - 0, 0, 4, 16, 15, 0, 0, 54, 0, 41, - 54, 37, 39, 54, 52, 43, 54, 42, 50, 54, - 45, 44, 40, 54, 54, 54, 54, 54, 0, 35, - 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, - 15, 15, 16, 15, 15, 63, 63, 15, 15, 12, - 10, 15, 13, 0, 0, 0, 17, 17, 18, 18, - 18, 0, 0, 15, 0, 1, 54, 54, 46, 54, - 53, 16, 47, 54, 54, 54, 3, 35, 35, 35, - - 35, 35, 35, 35, 35, 35, 35, 15, 58, 0, - 63, 63, 63, 62, 15, 11, 0, 0, 0, 18, - 18, 18, 0, 15, 0, 0, 54, 48, 49, 54, - 54, 35, 35, 35, 35, 35, 35, 35, 20, 35, - 15, 64, 63, 63, 63, 63, 0, 0, 0, 0, - 60, 0, 15, 0, 0, 0, 18, 18, 18, 0, - 15, 54, 54, 38, 35, 35, 35, 35, 35, 21, - 35, 35, 15, 64, 63, 63, 63, 63, 63, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, - 0, 15, 0, 0, 17, 17, 18, 18, 0, 15, - - 54, 54, 35, 35, 35, 35, 19, 35, 35, 15, - 64, 63, 63, 63, 63, 63, 63, 0, 59, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 18, 18, 0, 15, 54, 54, 35, - 35, 23, 35, 35, 35, 15, 64, 63, 63, 63, + 0, 0, 18, 18, 18, 0, 18, 0, 0, 14, + 0, 0, 4, 16, 15, 0, 0, 54, 54, 54, + 0, 54, 41, 54, 37, 39, 54, 52, 43, 54, + 42, 50, 54, 45, 44, 40, 54, 54, 0, 35, + 35, 35, 35, 0, 35, 35, 35, 35, 35, 35, + 15, 15, 15, 16, 15, 15, 63, 63, 15, 12, + 10, 15, 13, 0, 0, 0, 17, 18, 18, 18, + 17, 0, 0, 15, 0, 1, 54, 54, 54, 54, + 46, 54, 53, 16, 47, 54, 3, 35, 35, 35, + + 35, 35, 35, 35, 35, 35, 35, 15, 15, 58, + 0, 63, 63, 63, 62, 11, 0, 0, 0, 18, + 18, 18, 0, 15, 0, 0, 54, 54, 54, 48, + 49, 35, 35, 35, 35, 35, 35, 35, 35, 20, + 15, 15, 64, 63, 63, 63, 63, 0, 0, 0, + 0, 60, 0, 0, 0, 0, 18, 18, 18, 0, + 15, 54, 54, 38, 35, 35, 35, 35, 35, 35, + 21, 35, 15, 15, 64, 63, 63, 63, 63, 63, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, + 0, 0, 0, 0, 17, 18, 18, 17, 0, 15, + + 54, 54, 35, 35, 35, 35, 35, 19, 35, 15, + 15, 64, 63, 63, 63, 63, 63, 63, 0, 59, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 18, 18, 0, 15, 54, 54, 35, + 35, 35, 23, 35, 35, 15, 64, 63, 63, 63, 63, 63, 63, 63, 0, 59, 0, 0, 0, 59, 0, 0, 0, 0, 18, 15, 54, 35, 35, 35, 35, 64, 0, 0, 0, 36, 15, 35, 35, 35, @@ -122,7 +122,7 @@ static yyconst flex_int16_t yy_accept[479] = 35, 35, 35, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 25, 35, - 35, 35, 0, 61, 0, 0, 0, 0, 26, 35, + 35, 35, 0, 0, 0, 61, 0, 0, 26, 35, 35, 35, 35, 27, 35, 0, 0, 0, 0, 31, 35, 35, 35, 35, 0, 0, 0, 35, 35, 35, 35, 0, 0, 35, 35, 29, 35, 0, 0, 35, @@ -138,909 +138,437 @@ static yyconst flex_int32_t yy_ec[256] = 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 12, 18, 19, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 12, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 12, 54, 12, 55, 56, 12, 57, 58, 59, 60, - - 61, 62, 63, 64, 65, 37, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 12, 84, 1, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85 + 24, 25, 26, 27, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 12, 28, 12, 29, 30, 12, 31, 32, 33, 34, + + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 12, 59, 1, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60 } ; -static yyconst flex_int32_t yy_meta[86] = +static yyconst flex_int32_t yy_meta[61] = { 0, - 1, 2, 3, 4, 4, 5, 6, 7, 6, 6, - 6, 6, 7, 8, 9, 6, 6, 10, 6, 6, - 11, 6, 6, 6, 6, 12, 6, 13, 13, 13, - 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 6, 14, 13, 13, 13, 13, - 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 6, 6, 6, 14 + 1, 2, 3, 3, 3, 4, 5, 5, 5, 5, + 5, 5, 5, 6, 7, 5, 5, 8, 5, 5, + 9, 5, 5, 5, 5, 10, 5, 11, 5, 11, + 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 5, 5, 5, 11 } ; -static yyconst flex_int16_t yy_base[550] = +static yyconst flex_int16_t yy_base[517] = { 0, - 0, 0, 64, 66, 54, 56, 1407, 6578, 93, 98, - 107, 83, 155, 1376, 77, 1350, 99, 1345, 1328, 207, - 1334, 275, 100, 108, 125, 326, 1315, 1313, 1312, 6578, - 141, 110, 151, 6578, 105, 197, 295, 89, 107, 6578, - 387, 120, 0, 429, 1281, 471, 6578, 117, 532, 6578, - 1283, 269, 137, 176, 281, 574, 283, 1289, 1292, 1246, - 1257, 0, 1221, 249, 135, 282, 276, 153, 91, 169, - 299, 308, 318, 266, 1219, 320, 616, 102, 1246, 348, - 1209, 316, 127, 359, 346, 347, 375, 658, 6578, 208, - 700, 1241, 400, 409, 1220, 397, 327, 761, 6578, 6578, - - 6578, 411, 419, 414, 424, 248, 368, 355, 356, 822, - 883, 0, 1191, 925, 967, 1190, 1028, 381, 421, 464, - 1089, 1150, 6578, 214, 456, 1225, 312, 1151, 1192, 1142, - 442, 1139, 1134, 452, 1131, 1104, 458, 1082, 1060, 358, - 1046, 1028, 1027, 462, 453, 1000, 1253, 469, 1023, 463, - 986, 1295, 492, 486, 500, 484, 502, 513, 969, 1356, - 425, 1417, 1001, 545, 494, 193, 993, 543, 1459, 544, - 554, 558, 555, 508, 398, 1520, 0, 1562, 956, 1623, - 1684, 570, 1745, 563, 993, 6578, 948, 1806, 935, 520, - 921, 498, 914, 546, 1848, 564, 6578, 585, 913, 1909, - - 568, 576, 586, 606, 631, 640, 1951, 2012, 6578, 0, - 203, 924, 907, 694, 2054, 565, 543, 2115, 0, 2157, - 2218, 2279, 2340, 669, 912, 505, 2401, 856, 840, 2443, - 612, 615, 2504, 608, 557, 639, 682, 668, 839, 2546, - 2607, 0, 288, 863, 841, 819, 741, 794, 573, 418, - 6578, 2668, 2710, 620, 2771, 0, 2813, 2874, 2935, 2996, - 3057, 3131, 3173, 3234, 670, 3295, 718, 719, 729, 763, - 684, 3337, 3398, 0, 456, 782, 777, 760, 742, 829, - 649, 834, 3459, 572, 3520, 854, 894, 915, 920, 3581, - 3642, 3684, 593, 3745, 6578, 697, 3806, 3867, 3928, 3989, - - 4050, 4111, 730, 4172, 731, 683, 672, 759, 4214, 4275, - 0, 762, 682, 429, 417, 414, 411, 859, 6578, 650, - 838, 957, 4336, 4397, 607, 926, 988, 4458, 4519, 4580, - 1002, 672, 1010, 4622, 4664, 1042, 752, 4706, 4767, 756, - 4828, 376, 812, 847, 1069, 1033, 0, 387, 6578, 6578, - 6578, 6578, 6578, 6578, 1122, 924, 963, 4870, 1162, 1049, - 1050, 4912, 4973, 678, 1063, 850, 1074, 5005, 1103, 841, - 989, 0, 5062, 5104, 5146, 6578, 1066, 1080, 1081, 1084, - 1108, 1137, 877, 328, 273, 6578, 5188, 5230, 5272, 641, - 1140, 884, 916, 836, 1105, 1161, 5314, 5356, 1233, 1286, - - 1147, 1138, 919, 1206, 1165, 1186, 1141, 1207, 1291, 1263, - 1316, 1345, 1327, 5398, 1086, 1029, 1225, 1133, 258, 1247, - 1248, 1310, 1388, 6578, 1427, 5440, 1449, 5501, 242, 1311, - 1341, 1324, 1326, 173, 1317, 1454, 5562, 1480, 5604, 170, - 1061, 1328, 1355, 1372, 1552, 5646, 5688, 1351, 1374, 1389, - 1409, 5730, 5772, 1419, 1456, 154, 1453, 5814, 5856, 1457, - 112, 897, 793, 5898, 1557, 1418, 109, 1348, 1582, 1550, - 1477, 1481, 1485, 90, 1564, 1458, 39, 6578, 5959, 5964, - 5977, 5982, 5987, 5994, 6004, 6017, 296, 6022, 6032, 6045, - 6059, 651, 6064, 6074, 6079, 6089, 6099, 6103, 571, 6112, - - 6125, 6138, 6152, 6166, 6176, 6186, 6191, 6203, 657, 6217, - 758, 6222, 6234, 6247, 801, 6261, 859, 6266, 6278, 6291, - 6304, 6317, 6330, 1086, 6335, 6348, 1120, 6353, 6365, 6378, - 6391, 6404, 6417, 6430, 6435, 6448, 1216, 6453, 6465, 6478, - 6491, 6504, 6517, 1219, 1220, 6530, 6543, 6553, 6563 + 0, 0, 39, 41, 1573, 1566, 1594, 2399, 62, 71, + 76, 61, 69, 1560, 78, 1559, 89, 1561, 1565, 132, + 1573, 91, 123, 1555, 80, 104, 97, 1554, 1551, 2399, + 85, 176, 175, 2399, 177, 193, 204, 1531, 84, 2399, + 242, 110, 180, 196, 1545, 205, 2399, 113, 277, 2399, + 1547, 72, 221, 133, 206, 234, 181, 1555, 1548, 1530, + 1528, 0, 268, 118, 1515, 221, 60, 240, 92, 230, + 95, 223, 244, 267, 238, 286, 1512, 268, 1521, 279, + 294, 1510, 278, 190, 290, 232, 292, 293, 308, 335, + 2399, 2399, 317, 326, 1516, 351, 336, 356, 366, 2399, + + 2399, 320, 367, 369, 370, 1478, 393, 327, 345, 420, + 455, 398, 1495, 490, 1481, 446, 481, 372, 365, 386, + 525, 560, 2399, 325, 388, 1491, 387, 1477, 595, 1476, + 516, 399, 1475, 34, 1472, 1461, 378, 1438, 1430, 318, + 1429, 1426, 323, 1424, 1423, 1422, 231, 387, 1430, 377, + 1411, 630, 1396, 551, 382, 108, 415, 408, 419, 412, + 586, 436, 665, 1400, 624, 456, 419, 1382, 457, 490, + 491, 625, 492, 1362, 526, 656, 672, 681, 1378, 716, + 707, 527, 723, 561, 1374, 2399, 732, 1346, 767, 437, + 1322, 410, 1312, 445, 1311, 546, 2399, 469, 758, 1303, + + 802, 576, 482, 580, 470, 440, 472, 793, 809, 2399, + 818, 515, 1288, 1273, 853, 552, 1205, 839, 855, 861, + 877, 883, 899, 645, 1227, 483, 905, 921, 612, 1183, + 1168, 609, 927, 943, 626, 517, 628, 508, 629, 1167, + 949, 965, 971, 550, 1167, 1157, 1123, 1006, 1020, 666, + 682, 2399, 1047, 1091, 1006, 1038, 1055, 1063, 1071, 1079, + 632, 1087, 1095, 1105, 539, 1103, 1111, 542, 543, 681, + 1097, 683, 1119, 1127, 1135, 585, 1091, 1083, 1067, 1039, + 721, 752, 772, 1170, 717, 1205, 1184, 1217, 1244, 1258, + 1285, 1320, 984, 1244, 2399, 1276, 1311, 917, 1328, 767, + + 1336, 1344, 733, 1352, 1360, 734, 578, 899, 582, 1395, + 1381, 1397, 623, 853, 822, 794, 793, 760, 807, 2399, + 875, 788, 1432, 1459, 1494, 818, 769, 1440, 1529, 1564, + 1438, 702, 1485, 919, 1520, 1555, 849, 963, 1572, 587, + 1299, 1580, 706, 441, 614, 1615, 1601, 715, 2399, 2399, + 2399, 2399, 2399, 2399, 1473, 839, 856, 1617, 1652, 804, + 852, 1638, 1654, 633, 1480, 871, 1508, 1650, 1542, 644, + 834, 1673, 1679, 1695, 1701, 2399, 1015, 872, 915, 916, + 877, 959, 704, 616, 586, 2399, 1717, 1723, 1739, 1002, + 1148, 514, 961, 989, 990, 1016, 1745, 1761, 1767, 1802, + + 1137, 1008, 1018, 1017, 985, 1129, 878, 1038, 1790, 1806, + 1829, 1211, 1827, 1849, 944, 1057, 1152, 787, 584, 615, + 1196, 918, 1863, 1890, 1279, 2399, 1869, 1867, 516, 1199, + 1154, 943, 1242, 515, 653, 1904, 1906, 1941, 1968, 480, + 945, 1200, 1149, 1214, 1927, 1949, 1947, 1239, 1301, 1207, + 1302, 1974, 1990, 1392, 1267, 411, 1354, 1996, 2012, 1310, + 376, 1241, 1039, 2018, 2034, 1338, 348, 1377, 2040, 1216, + 1391, 1421, 1394, 324, 1226, 1376, 263, 2399, 2075, 2080, + 2091, 2096, 2101, 2110, 2117, 2128, 2137, 2142, 2153, 2165, + 2167, 2176, 2181, 2190, 2195, 2204, 2213, 2225, 2234, 2243, + + 2248, 2260, 2265, 2276, 2281, 2292, 2303, 2314, 2319, 2330, + 2341, 2346, 2357, 2366, 2377, 2386 } ; -static yyconst flex_int16_t yy_def[550] = +static yyconst flex_int16_t yy_def[517] = { 0, 478, 1, 1, 1, 1, 1, 478, 478, 478, 478, 478, 479, 480, 478, 481, 478, 482, 478, 478, 478, - 478, 483, 484, 484, 484, 485, 478, 478, 478, 478, - 484, 484, 484, 478, 484, 478, 478, 478, 479, 478, - 486, 480, 487, 488, 488, 489, 478, 481, 490, 478, - 478, 478, 484, 484, 484, 485, 20, 491, 478, 492, - 478, 20, 493, 493, 493, 493, 493, 493, 493, 493, - 493, 493, 493, 493, 493, 493, 494, 493, 478, 483, - 495, 495, 495, 495, 495, 495, 495, 496, 478, 484, - 497, 478, 484, 484, 498, 484, 484, 484, 478, 478, - - 478, 484, 484, 484, 484, 478, 479, 479, 479, 479, - 486, 499, 488, 488, 500, 488, 114, 501, 501, 501, - 501, 502, 478, 478, 484, 503, 504, 493, 505, 493, - 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, + 478, 483, 484, 478, 485, 485, 485, 478, 478, 478, + 485, 485, 485, 478, 485, 478, 478, 478, 479, 478, + 486, 480, 478, 487, 488, 488, 478, 481, 489, 478, + 478, 478, 484, 485, 485, 485, 20, 490, 478, 491, + 478, 20, 492, 493, 493, 493, 493, 493, 493, 493, + 493, 493, 493, 493, 493, 493, 493, 493, 478, 483, + 494, 495, 495, 495, 495, 495, 495, 495, 485, 485, + 478, 478, 485, 496, 478, 485, 485, 478, 485, 478, + + 478, 485, 485, 485, 485, 478, 479, 479, 479, 479, + 486, 478, 488, 46, 488, 497, 46, 481, 481, 481, + 481, 489, 478, 478, 485, 490, 498, 493, 493, 493, + 499, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, 478, 495, - 495, 506, 495, 495, 495, 495, 495, 495, 495, 495, - 484, 98, 478, 484, 484, 507, 478, 484, 98, 484, - 484, 484, 484, 478, 508, 508, 509, 114, 488, 114, - 114, 501, 501, 484, 510, 478, 493, 147, 493, 493, - 493, 493, 493, 493, 147, 493, 478, 495, 495, 160, - - 495, 495, 495, 495, 495, 495, 160, 98, 478, 511, - 512, 478, 478, 513, 98, 484, 478, 514, 515, 114, - 114, 114, 501, 484, 510, 516, 147, 493, 493, 147, - 493, 495, 160, 495, 495, 495, 495, 495, 495, 160, - 98, 517, 518, 478, 478, 478, 519, 519, 520, 521, - 478, 522, 98, 478, 523, 524, 525, 525, 258, 526, - 98, 147, 147, 147, 495, 160, 495, 495, 495, 495, - 495, 160, 98, 527, 528, 478, 478, 478, 478, 478, - 520, 478, 529, 530, 531, 532, 532, 532, 532, 532, - 533, 98, 478, 534, 478, 535, 535, 297, 536, 98, - - 147, 301, 495, 160, 495, 495, 495, 495, 160, 98, - 537, 538, 478, 478, 478, 478, 478, 478, 478, 539, - 539, 539, 539, 540, 541, 541, 541, 541, 542, 543, - 300, 478, 534, 297, 298, 536, 300, 301, 301, 495, - 160, 495, 495, 495, 495, 300, 544, 478, 478, 478, - 478, 478, 478, 478, 539, 539, 539, 323, 541, 541, - 541, 328, 543, 478, 335, 300, 339, 495, 495, 495, - 495, 545, 323, 328, 363, 478, 300, 495, 495, 495, - 495, 495, 495, 495, 495, 478, 323, 328, 363, 300, - 495, 495, 495, 495, 495, 495, 323, 328, 543, 546, - - 495, 495, 495, 495, 495, 495, 495, 495, 539, 541, - 546, 546, 547, 548, 495, 495, 495, 495, 495, 495, - 495, 495, 478, 478, 547, 549, 547, 547, 495, 495, - 495, 495, 495, 495, 495, 547, 428, 547, 428, 495, - 495, 495, 495, 495, 547, 437, 428, 495, 495, 495, - 495, 437, 428, 495, 495, 495, 495, 437, 428, 495, - 495, 495, 495, 437, 547, 495, 495, 495, 547, 495, + 495, 495, 495, 500, 495, 495, 495, 495, 495, 495, + 90, 485, 90, 478, 485, 485, 501, 478, 485, 485, + 485, 485, 485, 478, 479, 110, 478, 114, 488, 114, + 46, 481, 121, 485, 502, 478, 129, 493, 129, 493, + 493, 493, 493, 493, 493, 493, 478, 495, 152, 495, + + 152, 495, 495, 495, 495, 495, 495, 90, 163, 478, + 478, 503, 478, 478, 504, 485, 478, 110, 478, 114, + 180, 46, 121, 485, 502, 498, 129, 189, 493, 493, + 493, 495, 152, 201, 495, 495, 495, 495, 495, 495, + 90, 163, 478, 505, 478, 478, 478, 504, 504, 506, + 507, 478, 508, 478, 110, 478, 114, 180, 46, 121, + 485, 129, 189, 493, 495, 152, 201, 495, 495, 495, + 495, 495, 90, 163, 478, 509, 478, 478, 478, 478, + 478, 506, 478, 510, 507, 511, 504, 504, 504, 504, + 504, 508, 478, 110, 478, 114, 180, 488, 121, 485, + + 129, 189, 495, 152, 201, 495, 495, 495, 495, 485, + 163, 478, 512, 478, 478, 478, 478, 478, 478, 478, + 506, 506, 506, 506, 510, 507, 507, 507, 507, 511, + 291, 478, 110, 488, 180, 121, 485, 493, 189, 495, + 495, 201, 495, 495, 495, 485, 478, 478, 478, 478, + 478, 478, 478, 478, 506, 506, 506, 324, 507, 507, + 507, 329, 291, 478, 488, 485, 493, 495, 495, 495, + 495, 478, 324, 329, 291, 478, 485, 495, 495, 495, + 495, 495, 495, 495, 495, 478, 324, 329, 291, 485, + 495, 495, 495, 495, 495, 495, 324, 329, 291, 513, + + 495, 495, 495, 495, 495, 495, 495, 495, 324, 329, + 513, 411, 514, 515, 495, 495, 495, 495, 495, 495, + 495, 495, 515, 515, 478, 478, 515, 516, 495, 495, + 495, 495, 495, 495, 495, 515, 424, 515, 424, 495, + 495, 495, 495, 495, 424, 515, 439, 495, 495, 495, + 495, 424, 439, 495, 495, 495, 495, 424, 439, 495, + 495, 495, 495, 424, 439, 495, 495, 495, 439, 495, 495, 495, 495, 495, 495, 495, 495, 0, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478 + 478, 478, 478, 478, 478, 478 } ; -static yyconst flex_int16_t yy_nxt[6664] = +static yyconst flex_int16_t yy_nxt[2460] = { 0, 8, 9, 10, 9, 9, 9, 11, 12, 13, 14, 8, 8, 15, 8, 8, 16, 8, 17, 18, 19, - 20, 8, 21, 8, 8, 8, 22, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 24, 23, 23, 23, 23, 23, 23, 25, 23, 23, - 23, 23, 23, 26, 27, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 24, 23, - 23, 23, 23, 23, 23, 25, 23, 23, 23, 23, - 23, 8, 28, 29, 23, 30, 35, 30, 35, 40, - 40, 31, 152, 31, 36, 36, 36, 36, 36, 36, - - 36, 36, 36, 36, 32, 33, 32, 33, 37, 37, - 37, 37, 37, 89, 40, 35, 51, 35, 89, 52, - 31, 89, 31, 89, 92, 93, 92, 93, 106, 40, - 49, 136, 32, 33, 32, 33, 41, 478, 89, 54, - 478, 95, 38, 152, 129, 34, 105, 34, 55, 94, - 89, 103, 56, 91, 89, 129, 106, 148, 91, 136, - 41, 91, 152, 91, 89, 152, 131, 54, 154, 96, - 49, 38, 42, 46, 105, 43, 55, 94, 91, 103, - 152, 102, 44, 44, 44, 44, 44, 44, 129, 89, - 91, 104, 92, 93, 91, 131, 154, 96, 36, 36, - - 36, 36, 36, 137, 91, 135, 129, 152, 46, 102, - 210, 44, 44, 44, 44, 44, 44, 59, 212, 104, - 210, 89, 129, 152, 60, 61, 152, 62, 244, 91, - 92, 92, 137, 135, 63, 63, 64, 65, 66, 63, - 67, 68, 69, 63, 70, 63, 71, 72, 63, 73, - 63, 74, 75, 76, 63, 63, 63, 63, 63, 63, - 77, 91, 78, 63, 63, 64, 65, 66, 63, 67, - 68, 69, 70, 63, 71, 72, 63, 73, 63, 74, - 75, 76, 63, 63, 63, 63, 63, 63, 130, 52, - 174, 63, 80, 144, 89, 152, 37, 37, 37, 37, - - 37, 478, 129, 57, 82, 210, 112, 83, 112, 124, - 84, 152, 125, 276, 85, 86, 130, 87, 174, 129, - 134, 132, 144, 63, 92, 140, 152, 127, 88, 129, - 38, 186, 133, 82, 91, 129, 83, 124, 138, 84, - 89, 125, 85, 86, 139, 87, 98, 141, 134, 132, - 153, 63, 129, 98, 98, 98, 98, 98, 98, 38, - 133, 129, 40, 40, 142, 478, 138, 145, 143, 152, - 39, 129, 139, 129, 157, 40, 141, 156, 192, 153, - 91, 152, 98, 98, 98, 98, 98, 98, 39, 39, - 39, 107, 142, 40, 109, 145, 143, 150, 155, 152, - - 152, 88, 158, 157, 210, 40, 156, 110, 41, 41, - 89, 129, 152, 89, 110, 110, 110, 110, 110, 110, - 164, 41, 89, 478, 89, 150, 155, 89, 152, 152, - 282, 158, 89, 40, 49, 168, 354, 89, 89, 353, - 111, 170, 352, 110, 110, 110, 110, 110, 110, 114, - 91, 41, 172, 91, 351, 165, 114, 114, 114, 114, - 114, 114, 91, 168, 91, 171, 478, 91, 173, 89, - 170, 285, 91, 210, 49, 189, 40, 91, 91, 190, - 172, 313, 115, 165, 184, 114, 114, 114, 114, 114, - 114, 117, 193, 171, 198, 129, 173, 194, 117, 117, - - 117, 117, 117, 117, 189, 129, 129, 209, 190, 91, - 191, 129, 196, 184, 204, 129, 152, 49, 192, 201, - 226, 193, 129, 198, 186, 194, 202, 117, 117, 117, - 117, 117, 117, 48, 48, 48, 118, 152, 191, 152, - 196, 205, 203, 204, 120, 152, 206, 91, 201, 217, - 228, 129, 121, 152, 202, 152, 214, 89, 89, 121, - 121, 121, 121, 121, 121, 164, 152, 209, 89, 205, - 203, 89, 478, 129, 268, 206, 89, 217, 89, 228, - 282, 177, 40, 177, 282, 122, 229, 254, 121, 121, - 121, 121, 121, 121, 98, 231, 91, 91, 91, 129, - - 224, 98, 98, 98, 98, 98, 98, 91, 91, 216, - 152, 91, 234, 232, 229, 254, 91, 129, 91, 282, - 332, 152, 235, 49, 231, 285, 283, 236, 224, 152, - 98, 98, 98, 98, 98, 98, 147, 216, 152, 152, - 234, 237, 232, 147, 147, 147, 147, 147, 147, 332, - 235, 264, 265, 267, 400, 236, 282, 282, 90, 152, - 285, 152, 238, 63, 63, 129, 293, 219, 152, 219, - 237, 239, 147, 147, 147, 147, 147, 147, 160, 264, - 265, 267, 89, 269, 152, 160, 160, 160, 160, 160, - 160, 238, 152, 152, 293, 247, 247, 247, 247, 247, - - 239, 249, 283, 283, 261, 303, 250, 350, 251, 270, - 343, 269, 364, 271, 160, 160, 160, 160, 160, 160, - 162, 152, 91, 152, 376, 152, 308, 162, 162, 162, - 162, 162, 162, 261, 303, 152, 152, 152, 270, 343, - 364, 271, 247, 247, 247, 247, 247, 252, 249, 305, - 115, 306, 376, 250, 308, 251, 162, 162, 162, 162, - 162, 162, 97, 97, 97, 97, 97, 317, 242, 90, - 242, 152, 152, 368, 89, 307, 340, 342, 305, 210, - 306, 169, 152, 152, 152, 316, 344, 349, 169, 169, - 169, 169, 169, 169, 252, 280, 280, 280, 280, 280, - - 366, 478, 315, 307, 340, 342, 478, 314, 251, 152, - 468, 256, 152, 256, 91, 344, 152, 169, 169, 169, - 169, 169, 169, 108, 175, 175, 175, 108, 366, 40, - 280, 280, 280, 280, 280, 318, 318, 318, 318, 318, - 478, 370, 176, 251, 279, 282, 152, 252, 319, 176, - 176, 176, 176, 176, 176, 280, 280, 280, 280, 280, - 318, 318, 318, 318, 318, 152, 278, 90, 251, 274, - 370, 274, 384, 319, 405, 41, 371, 377, 176, 176, - 176, 176, 176, 176, 39, 39, 39, 107, 277, 152, - 109, 283, 152, 129, 152, 280, 280, 280, 280, 280, - - 152, 384, 405, 110, 396, 371, 377, 252, 251, 129, - 110, 110, 110, 110, 110, 110, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 478, 226, 478, 251, - 152, 282, 246, 396, 251, 403, 111, 152, 282, 110, - 110, 110, 110, 110, 110, 178, 404, 252, 467, 245, - 152, 417, 178, 178, 178, 178, 178, 178, 355, 318, - 318, 318, 355, 403, 282, 478, 152, 129, 252, 152, - 282, 356, 152, 252, 129, 404, 467, 283, 115, 285, - 417, 178, 178, 178, 178, 178, 178, 180, 129, 359, - 318, 318, 318, 359, 180, 180, 180, 180, 180, 180, - - 282, 129, 360, 97, 97, 97, 97, 97, 226, 115, - 283, 108, 175, 175, 175, 108, 283, 40, 213, 90, - 385, 163, 152, 180, 180, 180, 180, 180, 180, 116, - 116, 116, 116, 116, 161, 161, 161, 161, 161, 152, - 197, 285, 152, 119, 182, 182, 182, 119, 181, 385, - 90, 478, 478, 129, 40, 181, 181, 181, 181, 181, - 181, 282, 282, 41, 179, 179, 179, 179, 179, 430, - 159, 159, 159, 159, 159, 187, 187, 187, 187, 187, - 129, 129, 152, 90, 181, 181, 181, 181, 181, 181, - 119, 182, 182, 182, 119, 49, 295, 430, 295, 129, - - 448, 40, 285, 285, 199, 199, 199, 199, 199, 183, - 390, 391, 392, 129, 152, 393, 183, 183, 183, 183, - 183, 183, 152, 355, 318, 318, 318, 355, 448, 282, - 311, 429, 311, 152, 152, 129, 356, 152, 390, 152, - 391, 392, 49, 406, 393, 183, 183, 183, 183, 183, - 183, 48, 48, 48, 118, 394, 152, 129, 152, 429, - 432, 152, 120, 359, 318, 318, 318, 359, 395, 401, - 121, 406, 402, 416, 282, 283, 360, 121, 121, 121, - 121, 121, 121, 394, 129, 415, 152, 129, 421, 432, - 152, 152, 129, 152, 152, 129, 419, 395, 401, 407, - - 152, 402, 416, 122, 129, 408, 121, 121, 121, 121, - 121, 121, 188, 415, 152, 285, 421, 420, 152, 188, - 188, 188, 188, 188, 188, 419, 347, 407, 347, 372, - 386, 372, 386, 408, 286, 286, 286, 286, 286, 152, - 127, 418, 422, 115, 115, 167, 420, 251, 188, 188, - 188, 188, 188, 188, 146, 146, 146, 146, 146, 152, - 152, 163, 152, 149, 326, 361, 361, 361, 326, 431, - 418, 422, 129, 195, 129, 282, 433, 57, 152, 434, - 195, 195, 195, 195, 195, 195, 252, 411, 411, 411, - 411, 411, 321, 357, 357, 357, 321, 431, 282, 77, - - 152, 152, 59, 412, 127, 433, 129, 123, 434, 195, - 195, 195, 195, 195, 195, 200, 285, 411, 411, 411, - 411, 411, 200, 200, 200, 200, 200, 200, 423, 423, - 423, 423, 423, 412, 115, 101, 100, 435, 99, 414, - 79, 424, 440, 58, 283, 444, 478, 478, 478, 478, - 478, 200, 200, 200, 200, 200, 200, 159, 159, 159, - 159, 159, 478, 152, 152, 57, 435, 442, 441, 414, - 152, 440, 443, 50, 444, 449, 207, 152, 471, 152, - 426, 152, 454, 207, 207, 207, 207, 207, 207, 423, - 423, 423, 423, 423, 152, 442, 450, 441, 414, 47, - - 443, 152, 424, 449, 152, 455, 478, 471, 152, 152, - 451, 454, 207, 207, 207, 207, 207, 207, 161, 161, - 161, 161, 161, 478, 450, 152, 478, 152, 423, 423, - 423, 423, 423, 456, 455, 478, 460, 208, 451, 478, - 457, 424, 152, 478, 208, 208, 208, 208, 208, 208, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 478, 456, 152, 424, 461, 470, 478, 478, 424, 457, - 478, 152, 152, 208, 208, 208, 208, 208, 208, 215, - 426, 423, 423, 423, 423, 423, 215, 215, 215, 215, - 215, 215, 461, 470, 424, 478, 478, 478, 463, 478, - - 462, 466, 426, 477, 478, 478, 152, 426, 473, 152, - 152, 152, 474, 478, 475, 215, 215, 215, 215, 215, - 215, 108, 175, 175, 175, 108, 463, 40, 462, 466, - 152, 477, 478, 426, 152, 478, 478, 473, 152, 478, - 218, 474, 478, 475, 478, 478, 478, 218, 218, 218, - 218, 218, 218, 423, 423, 423, 423, 423, 438, 438, - 438, 438, 438, 478, 478, 478, 424, 478, 478, 478, - 478, 424, 478, 41, 478, 478, 218, 218, 218, 218, - 218, 218, 220, 445, 445, 445, 445, 445, 472, 220, - 220, 220, 220, 220, 220, 478, 424, 478, 478, 478, - - 478, 478, 476, 152, 478, 426, 478, 478, 478, 478, - 426, 478, 478, 478, 478, 478, 472, 152, 220, 220, - 220, 220, 220, 220, 179, 179, 179, 179, 179, 478, - 476, 478, 478, 478, 478, 426, 478, 478, 478, 478, - 478, 478, 478, 221, 478, 478, 478, 478, 478, 478, - 221, 221, 221, 221, 221, 221, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 221, - 221, 221, 221, 221, 221, 116, 116, 116, 116, 116, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 222, 478, 478, 478, 478, 478, - 478, 222, 222, 222, 222, 222, 222, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 222, 222, 222, 222, 222, 222, 119, 182, 182, 182, - 119, 478, 478, 478, 478, 478, 478, 40, 478, 478, - 478, 478, 478, 478, 478, 223, 478, 478, 478, 478, - 478, 478, 223, 223, 223, 223, 223, 223, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 49, 478, - - 478, 223, 223, 223, 223, 223, 223, 187, 187, 187, - 187, 187, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 227, 478, 478, 478, - 478, 478, 478, 227, 227, 227, 227, 227, 227, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 227, 227, 227, 227, 227, 227, 230, 478, - 478, 478, 478, 478, 478, 230, 230, 230, 230, 230, - 230, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 230, 230, 230, 230, 230, 230, - 199, 199, 199, 199, 199, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 233, - 478, 478, 478, 478, 478, 478, 233, 233, 233, 233, - 233, 233, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 233, 233, 233, 233, 233, - 233, 240, 478, 478, 478, 478, 478, 478, 240, 240, - 240, 240, 240, 240, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 240, 240, 240, - 240, 240, 240, 161, 161, 161, 161, 161, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 241, 478, 478, 478, 478, 478, 478, 241, - 241, 241, 241, 241, 241, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 241, 241, - 241, 241, 241, 241, 253, 478, 478, 478, 478, 478, - 478, 253, 253, 253, 253, 253, 253, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 253, 253, 253, 253, 253, 253, 108, 175, 175, 175, - 108, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 255, 478, 478, 478, 478, - 478, 478, 255, 255, 255, 255, 255, 255, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 41, 478, - 478, 255, 255, 255, 255, 255, 255, 257, 478, 478, - 478, 478, 478, 478, 257, 257, 257, 257, 257, 257, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 257, 257, 257, 257, 257, 257, 179, - 179, 179, 179, 179, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 258, 478, - 478, 478, 478, 478, 478, 258, 258, 258, 258, 258, - 258, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 258, 258, 258, 258, 258, 258, - 116, 116, 116, 116, 116, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 259, - - 478, 478, 478, 478, 478, 478, 259, 259, 259, 259, - 259, 259, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 259, 259, 259, 259, 259, - 259, 119, 182, 182, 182, 119, 478, 478, 478, 478, - 478, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 260, 478, 478, 478, 478, 478, 478, 260, 260, 260, - 260, 260, 260, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 49, 478, 478, 260, 260, 260, 260, - - 260, 260, 187, 187, 187, 187, 187, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 262, 478, 478, 478, 478, 478, 478, 262, 262, - 262, 262, 262, 262, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 262, 262, 262, - 262, 262, 262, 263, 478, 478, 478, 478, 478, 478, - 263, 263, 263, 263, 263, 263, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 263, - - 263, 263, 263, 263, 263, 199, 199, 199, 199, 199, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 266, 478, 478, 478, 478, 478, - 478, 266, 266, 266, 266, 266, 266, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 266, 266, 266, 266, 266, 266, 272, 478, 478, 478, - 478, 478, 478, 272, 272, 272, 272, 272, 272, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 272, 272, 272, 272, 272, 272, 161, 161, - 161, 161, 161, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 273, 478, 478, - 478, 478, 478, 478, 273, 273, 273, 273, 273, 273, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 273, 273, 273, 273, 273, 273, 280, - 280, 280, 280, 286, 478, 288, 478, 478, 478, 478, - 288, 288, 289, 478, 478, 478, 478, 478, 290, 478, - 478, 478, 478, 478, 478, 290, 290, 290, 290, 290, - - 290, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 291, 478, 478, 290, 290, 290, 290, 290, 290, - 292, 478, 478, 478, 478, 478, 478, 292, 292, 292, - 292, 292, 292, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 292, 292, 292, 292, - 292, 292, 108, 175, 175, 175, 108, 478, 40, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 294, 478, 478, 478, 478, 478, 478, 294, 294, - - 294, 294, 294, 294, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 41, 478, 478, 294, 294, 294, - 294, 294, 294, 296, 478, 478, 478, 478, 478, 478, - 296, 296, 296, 296, 296, 296, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 115, 478, 478, 296, - 296, 296, 296, 296, 296, 179, 179, 179, 179, 179, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 297, 478, 478, 478, 478, 478, - - 478, 297, 297, 297, 297, 297, 297, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 115, 478, 478, - 297, 297, 297, 297, 297, 297, 116, 116, 116, 116, - 116, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 298, 478, 478, 478, 478, - 478, 478, 298, 298, 298, 298, 298, 298, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 298, 298, 298, 298, 298, 298, 119, 182, 182, - - 182, 119, 478, 478, 478, 478, 478, 478, 40, 478, - 478, 478, 478, 478, 478, 478, 299, 478, 478, 478, - 478, 478, 478, 299, 299, 299, 299, 299, 299, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 49, - 478, 478, 299, 299, 299, 299, 299, 299, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 90, 478, 478, - 478, 478, 478, 478, 90, 90, 90, 90, 90, 90, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 300, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 90, 90, 90, 90, 90, 90, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 300, 187, 187, 187, 187, 187, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 301, 478, 478, 478, 478, 478, 478, 301, 301, - 301, 301, 301, 301, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 301, 301, 301, - 301, 301, 301, 302, 478, 478, 478, 478, 478, 478, - - 302, 302, 302, 302, 302, 302, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 302, - 302, 302, 302, 302, 302, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 128, 478, 478, 478, 478, 478, - 478, 128, 128, 128, 128, 128, 128, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 128, 128, 128, 128, 128, 128, 199, 199, 199, 199, - - 199, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 304, 478, 478, 478, 478, - 478, 478, 304, 304, 304, 304, 304, 304, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 304, 304, 304, 304, 304, 304, 309, 478, 478, - 478, 478, 478, 478, 309, 309, 309, 309, 309, 309, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 309, 309, 309, 309, 309, 309, 161, - - 161, 161, 161, 161, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 310, 478, - 478, 478, 478, 478, 478, 310, 310, 310, 310, 310, - 310, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 310, 310, 310, 310, 310, 310, - 281, 281, 281, 320, 478, 478, 322, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 323, - 478, 478, 478, 478, 478, 478, 323, 323, 323, 323, - 323, 323, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 324, 478, 478, 323, 323, 323, 323, 323, - 323, 284, 284, 284, 325, 478, 478, 478, 478, 478, - 478, 478, 327, 478, 478, 478, 478, 478, 478, 478, - 328, 478, 478, 478, 478, 478, 478, 328, 328, 328, - 328, 328, 328, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 329, 478, 478, 328, 328, 328, 328, - 328, 328, 286, 286, 286, 286, 286, 478, 478, 478, - 478, 478, 478, 478, 478, 251, 478, 478, 478, 478, - - 478, 330, 478, 478, 478, 478, 478, 478, 330, 330, - 330, 330, 330, 330, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 252, 478, 478, 330, 330, 330, - 330, 330, 330, 280, 280, 280, 280, 286, 478, 288, - 478, 478, 478, 478, 288, 288, 289, 478, 478, 478, - 478, 478, 290, 478, 478, 478, 478, 478, 478, 290, - 290, 290, 290, 290, 290, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 291, 478, 478, 290, 290, - - 290, 290, 290, 290, 331, 478, 478, 478, 478, 478, - 478, 331, 331, 331, 331, 331, 331, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 331, 331, 331, 331, 331, 331, 108, 175, 175, 175, - 108, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 333, 478, 478, 478, 478, - 478, 478, 333, 333, 333, 333, 333, 333, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 41, 478, - - 478, 333, 333, 333, 333, 333, 333, 179, 179, 179, - 179, 179, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 334, 478, 478, 478, - 478, 478, 478, 334, 334, 334, 334, 334, 334, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 115, - 478, 478, 334, 334, 334, 334, 334, 334, 116, 116, - 116, 116, 116, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 335, 478, 478, - 478, 478, 478, 478, 335, 335, 335, 335, 335, 335, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 335, 335, 335, 335, 335, 335, 119, - 182, 182, 182, 119, 478, 478, 478, 478, 478, 478, - 40, 478, 478, 478, 478, 478, 478, 478, 336, 478, - 478, 478, 478, 478, 478, 336, 336, 336, 336, 336, - 336, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 49, 478, 478, 336, 336, 336, 336, 336, 336, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 337, 478, 478, 90, - 478, 478, 478, 478, 478, 478, 90, 90, 90, 90, - 90, 90, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 90, 90, 90, 90, 90, - 90, 187, 187, 187, 187, 187, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 338, 478, 478, 478, 478, 478, 478, 338, 338, 338, - 338, 338, 338, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 338, 338, 338, 338, - 338, 338, 146, 146, 146, 146, 146, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 339, 478, 478, 478, 478, 478, 478, 339, 339, - 339, 339, 339, 339, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 339, 339, 339, - 339, 339, 339, 199, 199, 199, 199, 199, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 341, 478, 478, 478, 478, 478, 478, 341, - - 341, 341, 341, 341, 341, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 341, 341, - 341, 341, 341, 341, 345, 478, 478, 478, 478, 478, - 478, 345, 345, 345, 345, 345, 345, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 345, 345, 345, 345, 345, 345, 161, 161, 161, 161, - 161, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 346, 478, 478, 478, 478, - - 478, 478, 346, 346, 346, 346, 346, 346, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 346, 346, 346, 346, 346, 346, 321, 357, 357, - 357, 321, 478, 282, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 358, 478, 478, 478, - 478, 478, 478, 358, 358, 358, 358, 358, 358, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 283, - 478, 478, 358, 358, 358, 358, 358, 358, 281, 281, - - 281, 320, 478, 478, 322, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 323, 478, 478, - 478, 478, 478, 478, 323, 323, 323, 323, 323, 323, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 324, 478, 478, 323, 323, 323, 323, 323, 323, 326, - 361, 361, 361, 326, 478, 478, 478, 478, 478, 478, - 282, 478, 478, 478, 478, 478, 478, 478, 362, 478, - 478, 478, 478, 478, 478, 362, 362, 362, 362, 362, - 362, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 285, 478, 478, 362, 362, 362, 362, 362, 362, - 284, 284, 284, 325, 478, 478, 478, 478, 478, 478, - 478, 327, 478, 478, 478, 478, 478, 478, 478, 328, - 478, 478, 478, 478, 478, 478, 328, 328, 328, 328, - 328, 328, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 329, 478, 478, 328, 328, 328, 328, 328, - 328, 286, 286, 286, 286, 286, 478, 478, 478, 478, - 478, 478, 478, 478, 251, 478, 478, 478, 478, 478, - - 363, 478, 478, 478, 478, 478, 478, 363, 363, 363, - 363, 363, 363, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 252, 478, 478, 363, 363, 363, 363, - 363, 363, 365, 478, 478, 478, 478, 478, 478, 365, - 365, 365, 365, 365, 365, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 365, 365, - 365, 365, 365, 365, 113, 478, 478, 478, 478, 478, - 478, 113, 113, 113, 113, 113, 113, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 113, 113, 113, 113, 113, 113, 367, 478, 478, 478, - 478, 478, 478, 367, 367, 367, 367, 367, 367, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 367, 367, 367, 367, 367, 367, 146, 146, - 146, 146, 146, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 128, 478, 478, - 478, 478, 478, 478, 128, 128, 128, 128, 128, 128, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 128, 128, 128, 128, 128, 128, 199, - 199, 199, 199, 199, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 369, 478, - 478, 478, 478, 478, 478, 369, 369, 369, 369, 369, - 369, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 369, 369, 369, 369, 369, 369, - 373, 478, 478, 478, 478, 478, 478, 373, 373, 373, - - 373, 373, 373, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 373, 373, 373, 373, - 373, 373, 374, 478, 478, 478, 478, 478, 478, 374, - 374, 374, 374, 374, 374, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 374, 374, - 374, 374, 374, 374, 286, 286, 286, 286, 286, 478, - 478, 478, 478, 478, 478, 478, 478, 251, 478, 478, - 478, 478, 478, 375, 478, 478, 478, 478, 478, 478, - - 375, 375, 375, 375, 375, 375, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 252, 478, 478, 375, - 375, 375, 375, 375, 375, 378, 478, 478, 478, 478, - 478, 478, 379, 478, 380, 478, 478, 478, 478, 381, - 382, 478, 478, 383, 478, 478, 478, 478, 152, 478, - 478, 478, 478, 478, 378, 478, 478, 478, 478, 478, - 379, 478, 380, 478, 478, 478, 478, 381, 382, 478, - 478, 383, 387, 478, 478, 478, 478, 478, 478, 387, - 387, 387, 387, 387, 387, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 387, 387, - 387, 387, 387, 387, 388, 478, 478, 478, 478, 478, - 478, 388, 388, 388, 388, 388, 388, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 388, 388, 388, 388, 388, 388, 389, 478, 478, 478, - 478, 478, 478, 389, 389, 389, 389, 389, 389, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 389, 389, 389, 389, 389, 389, 397, 478, - 478, 478, 478, 478, 478, 397, 397, 397, 397, 397, - 397, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 397, 397, 397, 397, 397, 397, - 398, 478, 478, 478, 478, 478, 478, 398, 398, 398, - 398, 398, 398, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 398, 398, 398, 398, - 398, 398, 399, 478, 478, 478, 478, 478, 478, 399, - - 399, 399, 399, 399, 399, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 399, 399, - 399, 399, 399, 399, 409, 478, 478, 478, 478, 478, - 478, 409, 409, 409, 409, 409, 409, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 409, 409, 409, 409, 409, 409, 410, 478, 478, 478, - 478, 478, 478, 410, 410, 410, 410, 410, 410, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 410, 410, 410, 410, 410, 410, 428, 478, - 478, 478, 478, 478, 478, 428, 428, 428, 428, 428, - 428, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 428, 428, 428, 428, 428, 428, - 437, 478, 478, 478, 478, 478, 478, 437, 437, 437, - 437, 437, 437, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 437, 437, 437, 437, - - 437, 437, 438, 438, 438, 438, 438, 478, 478, 478, - 478, 478, 478, 478, 478, 424, 478, 478, 478, 478, - 478, 439, 478, 478, 478, 478, 478, 478, 439, 439, - 439, 439, 439, 439, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 426, 478, 478, 439, 439, 439, - 439, 439, 439, 445, 445, 445, 445, 445, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 446, 478, 478, 478, 478, 478, 478, 446, - 446, 446, 446, 446, 446, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 446, 446, - 446, 446, 446, 446, 447, 478, 478, 478, 478, 478, - 478, 447, 447, 447, 447, 447, 447, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 447, 447, 447, 447, 447, 447, 452, 478, 478, 478, - 478, 478, 478, 452, 452, 452, 452, 452, 452, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 452, 452, 452, 452, 452, 452, 453, 478, - 478, 478, 478, 478, 478, 453, 453, 453, 453, 453, - 453, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 453, 453, 453, 453, 453, 453, - 458, 478, 478, 478, 478, 478, 478, 458, 458, 458, - 458, 458, 458, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 458, 458, 458, 458, - 458, 458, 459, 478, 478, 478, 478, 478, 478, 459, - - 459, 459, 459, 459, 459, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 459, 459, - 459, 459, 459, 459, 464, 478, 478, 478, 478, 478, - 478, 464, 464, 464, 464, 464, 464, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 464, 464, 464, 464, 464, 464, 465, 478, 478, 478, - 478, 478, 478, 465, 465, 465, 465, 465, 465, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 465, 465, 465, 465, 465, 465, 469, 478, - 478, 478, 478, 478, 478, 469, 469, 469, 469, 469, - 469, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 469, 469, 469, 469, 469, 469, - 39, 478, 478, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 45, 45, 478, 45, 45, 48, 478, - 478, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 53, 53, 478, 53, 53, 81, 478, 478, 81, - - 81, 90, 478, 90, 90, 478, 90, 90, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 108, 108, + 20, 8, 21, 8, 8, 8, 22, 23, 24, 25, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 26, 25, 25, 25, 25, 25, 25, + 27, 25, 25, 25, 25, 25, 8, 28, 29, 25, + 30, 131, 30, 36, 36, 36, 36, 36, 40, 31, + 191, 31, 36, 36, 36, 36, 36, 37, 37, 37, + 37, 37, 32, 33, 32, 33, 42, 131, 41, 43, + 40, 40, 52, 92, 134, 34, 44, 34, 92, 46, + + 46, 46, 46, 46, 46, 49, 51, 94, 80, 52, + 92, 41, 94, 98, 38, 124, 53, 92, 81, 131, + 95, 96, 131, 83, 94, 40, 84, 478, 102, 85, + 478, 94, 55, 86, 87, 154, 88, 44, 139, 137, + 49, 56, 59, 90, 99, 131, 92, 132, 97, 60, + 61, 203, 62, 90, 90, 90, 90, 90, 90, 63, + 94, 64, 65, 65, 66, 67, 68, 65, 69, 70, + 71, 65, 72, 65, 73, 74, 65, 75, 65, 76, + 77, 78, 65, 65, 65, 65, 65, 65, 92, 92, + 92, 65, 95, 96, 36, 36, 36, 36, 36, 478, + + 112, 57, 94, 94, 94, 37, 37, 37, 37, 37, + 112, 112, 112, 112, 112, 112, 114, 154, 104, 92, + 103, 105, 95, 96, 65, 117, 114, 114, 114, 114, + 114, 114, 116, 94, 156, 117, 117, 117, 117, 117, + 117, 90, 38, 39, 39, 39, 107, 92, 131, 109, + 131, 90, 90, 90, 90, 90, 90, 131, 131, 154, + 140, 94, 110, 133, 195, 131, 158, 131, 125, 111, + 144, 131, 110, 110, 110, 110, 110, 110, 48, 48, + 48, 118, 135, 95, 143, 138, 141, 145, 129, 120, + 154, 146, 142, 136, 131, 131, 478, 121, 129, 129, + + 129, 129, 129, 129, 122, 154, 81, 121, 121, 121, + 121, 121, 121, 131, 152, 155, 147, 154, 148, 154, + 154, 92, 159, 160, 152, 152, 152, 152, 152, 152, + 92, 150, 157, 92, 40, 94, 89, 89, 89, 89, + 89, 95, 95, 194, 94, 131, 163, 94, 92, 92, + 131, 154, 40, 170, 41, 161, 163, 163, 163, 163, + 163, 163, 94, 94, 92, 161, 161, 161, 161, 161, + 161, 165, 41, 193, 48, 154, 167, 40, 94, 92, + 92, 168, 92, 92, 40, 166, 167, 167, 167, 167, + 167, 167, 49, 94, 94, 39, 94, 94, 40, 49, + + 40, 92, 127, 154, 154, 131, 186, 169, 192, 154, + 172, 198, 202, 49, 131, 94, 171, 173, 177, 184, + 41, 108, 175, 175, 175, 108, 131, 40, 177, 177, + 177, 177, 177, 177, 196, 154, 211, 131, 154, 154, + 176, 205, 154, 230, 213, 190, 154, 41, 207, 92, + 176, 176, 176, 176, 176, 176, 39, 39, 39, 107, + 204, 206, 109, 94, 131, 194, 180, 154, 154, 210, + 215, 229, 131, 370, 239, 110, 180, 180, 180, 180, + 180, 180, 111, 94, 94, 110, 110, 110, 110, 110, + 110, 113, 113, 113, 113, 113, 154, 154, 226, 154, + + 232, 181, 186, 92, 210, 92, 240, 154, 238, 154, + 178, 181, 181, 181, 181, 181, 181, 94, 94, 94, + 178, 178, 178, 178, 178, 178, 119, 182, 182, 182, + 119, 236, 211, 40, 269, 154, 189, 40, 271, 40, + 245, 154, 154, 154, 154, 183, 189, 189, 189, 189, + 189, 189, 49, 41, 49, 183, 183, 183, 183, 183, + 183, 48, 48, 48, 118, 92, 154, 211, 403, 154, + 154, 201, 120, 131, 92, 277, 306, 303, 307, 94, + 121, 201, 201, 201, 201, 201, 201, 122, 94, 231, + 121, 121, 121, 121, 121, 121, 128, 128, 128, 128, + + 128, 224, 211, 154, 368, 154, 208, 154, 344, 154, + 314, 154, 345, 154, 154, 187, 208, 208, 208, 208, + 208, 208, 131, 235, 237, 187, 187, 187, 187, 187, + 187, 151, 151, 151, 151, 151, 154, 92, 92, 131, + 211, 154, 154, 154, 165, 92, 371, 433, 349, 265, + 199, 94, 94, 154, 264, 154, 154, 154, 92, 94, + 199, 199, 199, 199, 199, 199, 162, 162, 162, 162, + 162, 154, 94, 283, 268, 270, 218, 272, 384, 216, + 154, 300, 376, 261, 444, 209, 218, 218, 218, 218, + 218, 218, 219, 284, 283, 209, 209, 209, 209, 209, + + 209, 220, 219, 219, 219, 219, 219, 219, 154, 286, + 154, 220, 220, 220, 220, 220, 220, 179, 179, 179, + 179, 179, 281, 281, 281, 281, 281, 222, 309, 283, + 308, 154, 211, 154, 396, 252, 221, 222, 222, 222, + 222, 222, 222, 223, 286, 364, 221, 221, 221, 221, + 221, 221, 227, 223, 223, 223, 223, 223, 223, 283, + 154, 154, 227, 227, 227, 227, 227, 227, 188, 188, + 188, 188, 188, 319, 319, 319, 319, 319, 233, 284, + 92, 283, 340, 343, 337, 354, 320, 228, 233, 233, + 233, 233, 233, 233, 94, 283, 286, 228, 228, 228, + + 228, 228, 228, 200, 200, 200, 200, 200, 319, 319, + 319, 319, 319, 241, 154, 284, 283, 432, 353, 352, + 285, 320, 234, 241, 241, 241, 241, 241, 241, 242, + 283, 286, 234, 234, 234, 234, 234, 234, 243, 242, + 242, 242, 242, 242, 242, 286, 283, 351, 243, 243, + 243, 243, 243, 243, 248, 248, 248, 248, 248, 255, + 250, 154, 92, 283, 283, 251, 284, 252, 385, 255, + 255, 255, 255, 255, 255, 256, 94, 282, 350, 286, + 253, 257, 283, 284, 92, 256, 256, 256, 256, 256, + 256, 257, 257, 257, 257, 257, 257, 258, 94, 154, + + 366, 377, 284, 259, 154, 154, 391, 258, 258, 258, + 258, 258, 258, 259, 259, 259, 259, 259, 259, 260, + 113, 113, 113, 113, 113, 262, 154, 394, 421, 260, + 260, 260, 260, 260, 260, 262, 262, 262, 262, 262, + 262, 263, 154, 154, 116, 154, 116, 266, 435, 392, + 393, 263, 263, 263, 263, 263, 263, 266, 266, 266, + 266, 266, 266, 267, 128, 128, 128, 128, 128, 273, + 154, 154, 154, 267, 267, 267, 267, 267, 267, 273, + 273, 273, 273, 273, 273, 274, 154, 448, 154, 442, + 131, 275, 429, 395, 404, 274, 274, 274, 274, 274, + + 274, 275, 275, 275, 275, 275, 275, 248, 248, 248, + 248, 248, 154, 250, 332, 400, 154, 154, 251, 419, + 252, 281, 281, 281, 281, 281, 294, 478, 92, 94, + 405, 406, 478, 253, 252, 154, 294, 294, 294, 294, + 294, 294, 94, 154, 154, 154, 416, 253, 281, 281, + 281, 281, 287, 417, 289, 418, 468, 407, 295, 289, + 289, 290, 390, 408, 318, 154, 154, 291, 295, 295, + 295, 295, 295, 295, 292, 296, 422, 291, 291, 291, + 291, 291, 291, 297, 154, 296, 296, 296, 296, 296, + 296, 298, 317, 297, 297, 297, 297, 297, 297, 299, + + 430, 298, 298, 298, 298, 298, 298, 301, 316, 299, + 299, 299, 299, 299, 299, 302, 315, 301, 301, 301, + 301, 301, 301, 304, 154, 302, 302, 302, 302, 302, + 302, 305, 131, 304, 304, 304, 304, 304, 304, 310, + 293, 305, 305, 305, 305, 305, 305, 311, 280, 310, + 310, 310, 310, 310, 310, 312, 154, 311, 311, 311, + 311, 311, 311, 420, 154, 312, 312, 312, 312, 312, + 312, 282, 282, 282, 321, 154, 154, 323, 415, 154, + 401, 154, 279, 402, 441, 281, 281, 281, 281, 281, + 324, 478, 278, 450, 154, 131, 478, 325, 252, 431, + + 324, 324, 324, 324, 324, 324, 285, 285, 285, 326, + 131, 253, 478, 478, 478, 478, 478, 328, 281, 281, + 281, 281, 281, 154, 478, 329, 154, 154, 478, 478, + 434, 252, 330, 440, 154, 329, 329, 329, 329, 329, + 329, 154, 226, 154, 253, 281, 281, 281, 281, 281, + 449, 478, 254, 154, 456, 451, 478, 472, 252, 281, + 281, 281, 281, 281, 333, 478, 154, 476, 154, 154, + 478, 253, 252, 454, 333, 333, 333, 333, 333, 333, + 425, 425, 425, 425, 425, 253, 287, 287, 287, 287, + 287, 443, 478, 426, 154, 467, 334, 478, 247, 252, + + 151, 151, 151, 151, 151, 331, 334, 334, 334, 334, + 334, 334, 253, 246, 462, 331, 331, 331, 331, 331, + 331, 281, 281, 281, 281, 287, 154, 289, 154, 154, + 154, 335, 289, 289, 290, 455, 457, 154, 131, 131, + 291, 335, 335, 335, 335, 335, 335, 292, 336, 131, + 291, 291, 291, 291, 291, 291, 338, 466, 336, 336, + 336, 336, 336, 336, 339, 154, 338, 338, 338, 338, + 338, 338, 341, 131, 339, 339, 339, 339, 339, 339, + 342, 154, 341, 341, 341, 341, 341, 341, 470, 226, + 342, 342, 342, 342, 342, 342, 89, 89, 89, 89, + + 89, 346, 463, 154, 154, 116, 217, 214, 92, 460, + 471, 346, 346, 346, 346, 346, 346, 347, 154, 154, + 164, 154, 94, 154, 477, 473, 475, 347, 347, 347, + 347, 347, 347, 355, 319, 319, 319, 355, 154, 283, + 461, 359, 319, 319, 319, 359, 356, 197, 154, 131, + 131, 131, 283, 131, 360, 474, 131, 131, 363, 284, + 322, 357, 357, 357, 322, 131, 283, 286, 363, 363, + 363, 363, 363, 363, 355, 319, 319, 319, 355, 358, + 283, 179, 179, 179, 179, 179, 284, 356, 131, 358, + 358, 358, 358, 358, 358, 282, 282, 282, 321, 131, + + 284, 323, 131, 131, 131, 39, 127, 116, 116, 188, + 188, 188, 188, 188, 324, 39, 39, 39, 39, 39, + 39, 325, 116, 174, 324, 324, 324, 324, 324, 324, + 327, 361, 361, 361, 327, 131, 164, 154, 149, 131, + 365, 283, 131, 200, 200, 200, 200, 200, 57, 362, + 365, 365, 365, 365, 365, 365, 286, 63, 59, 362, + 362, 362, 362, 362, 362, 285, 285, 285, 326, 154, + 127, 123, 116, 106, 101, 48, 328, 100, 91, 79, + 58, 57, 50, 47, 329, 48, 48, 48, 48, 48, + 48, 330, 367, 478, 329, 329, 329, 329, 329, 329, + + 369, 35, 367, 367, 367, 367, 367, 367, 35, 478, + 369, 369, 369, 369, 369, 369, 162, 162, 162, 162, + 162, 372, 478, 478, 478, 478, 478, 478, 92, 478, + 478, 372, 372, 372, 372, 372, 372, 373, 478, 478, + 478, 478, 94, 478, 478, 478, 478, 373, 373, 373, + 373, 373, 373, 359, 319, 319, 319, 359, 374, 478, + 478, 478, 478, 478, 283, 478, 360, 478, 374, 374, + 374, 374, 374, 374, 375, 478, 478, 154, 478, 286, + 478, 478, 478, 378, 375, 375, 375, 375, 375, 375, + 379, 478, 380, 386, 478, 478, 478, 381, 382, 387, + + 478, 383, 478, 386, 386, 386, 386, 386, 386, 387, + 387, 387, 387, 387, 387, 388, 478, 478, 478, 478, + 478, 389, 478, 478, 478, 388, 388, 388, 388, 388, + 388, 389, 389, 389, 389, 389, 389, 397, 478, 478, + 478, 478, 478, 398, 478, 478, 478, 397, 397, 397, + 397, 397, 397, 398, 398, 398, 398, 398, 398, 399, + 478, 478, 478, 478, 478, 409, 478, 478, 478, 399, + 399, 399, 399, 399, 399, 409, 409, 409, 409, 409, + 409, 410, 478, 478, 478, 478, 478, 249, 478, 478, + 478, 410, 410, 410, 410, 410, 410, 249, 249, 249, + + 249, 249, 249, 411, 411, 411, 411, 411, 478, 478, + 282, 478, 478, 478, 478, 478, 478, 478, 478, 412, + 282, 282, 282, 282, 282, 282, 285, 478, 478, 413, + 411, 411, 411, 411, 411, 478, 285, 285, 285, 285, + 285, 285, 478, 478, 478, 478, 412, 424, 478, 478, + 425, 425, 425, 425, 425, 478, 413, 424, 424, 424, + 424, 424, 424, 426, 425, 425, 425, 425, 425, 478, + 425, 425, 425, 425, 425, 478, 428, 426, 478, 478, + 478, 478, 478, 426, 478, 478, 478, 439, 478, 478, + 428, 436, 436, 436, 436, 436, 428, 439, 439, 439, + + 439, 439, 439, 478, 426, 425, 425, 425, 425, 425, + 437, 478, 478, 478, 478, 478, 478, 428, 426, 478, + 437, 437, 437, 437, 437, 437, 445, 478, 478, 478, + 478, 428, 478, 478, 478, 478, 445, 445, 445, 445, + 445, 445, 425, 425, 425, 425, 425, 452, 478, 478, + 425, 425, 425, 425, 425, 426, 478, 452, 452, 452, + 452, 452, 452, 426, 478, 478, 478, 453, 428, 446, + 446, 446, 446, 446, 478, 478, 428, 453, 453, 453, + 453, 453, 453, 478, 478, 478, 478, 478, 447, 478, + 478, 478, 478, 478, 458, 478, 478, 478, 447, 447, + + 447, 447, 447, 447, 458, 458, 458, 458, 458, 458, + 459, 478, 478, 478, 478, 478, 464, 478, 478, 478, + 459, 459, 459, 459, 459, 459, 464, 464, 464, 464, + 464, 464, 465, 478, 478, 478, 478, 478, 427, 478, + 478, 478, 465, 465, 465, 465, 465, 465, 427, 427, + 427, 427, 427, 427, 469, 478, 478, 478, 478, 478, + 427, 478, 478, 478, 469, 469, 469, 469, 469, 469, + 427, 427, 427, 427, 427, 427, 39, 478, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 45, 45, 478, + 45, 45, 48, 478, 48, 48, 48, 48, 48, 48, + + 48, 48, 48, 54, 54, 478, 54, 54, 82, 478, + 478, 82, 82, 89, 89, 89, 89, 89, 89, 89, + 89, 89, 93, 478, 93, 93, 478, 93, 93, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 113, 113, 478, 113, 113, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 126, - 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 128, 128, 478, 128, 128, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 151, 151, - 478, 151, 151, 159, 159, 159, 159, 159, 159, 159, - - 159, 159, 159, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 166, 166, 166, 179, 179, 179, 179, - 179, 179, 179, 179, 179, 179, 48, 48, 478, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 119, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, - - 211, 211, 211, 211, 39, 478, 478, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 225, 225, 225, + 113, 113, 113, 113, 113, 113, 113, 113, 113, 115, + 115, 478, 115, 115, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 65, 65, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 130, 130, + 478, 130, 130, 151, 151, 151, 151, 151, 151, 151, + + 151, 151, 153, 153, 478, 153, 153, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 179, 179, 179, 179, + 179, 179, 179, 179, 179, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 188, 188, 188, + 188, 188, 188, 188, 188, 188, 200, 200, 200, 200, + 200, 200, 200, 200, 200, 212, 212, 212, 478, 212, 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 225, 243, 243, 243, 243, 248, 248, 248, 248, 248, - 248, 478, 248, 248, 248, 248, 248, 248, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 275, 275, 275, 275, 248, - 248, 248, 248, 248, 248, 478, 248, 248, 248, 248, - 248, 248, 281, 478, 478, 281, 281, 281, 281, 281, - - 281, 281, 281, 281, 281, 284, 478, 478, 284, 284, - 284, 284, 284, 284, 284, 284, 284, 284, 287, 287, - 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, - 287, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 113, 113, 478, 113, 113, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 312, 312, 312, 312, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 284, - 478, 478, 284, 284, 284, 284, 284, 284, 284, 284, - 284, 284, 326, 326, 326, 326, 326, 326, 326, 326, - - 326, 326, 326, 326, 326, 248, 248, 248, 248, 248, - 478, 478, 248, 248, 248, 248, 248, 248, 287, 287, - 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, - 287, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 113, 113, 478, 113, 113, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 348, 348, 348, 348, 281, 281, 478, 281, - 281, 281, 281, 281, 281, 281, 281, 281, 281, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 284, 284, 478, 284, 284, 284, 284, 284, - - 284, 284, 284, 284, 284, 326, 326, 326, 326, 326, - 326, 326, 326, 326, 326, 326, 326, 326, 248, 248, - 248, 248, 248, 478, 478, 248, 248, 248, 248, 248, - 248, 413, 413, 413, 413, 478, 478, 478, 478, 413, - 478, 478, 413, 413, 425, 425, 425, 425, 478, 478, - 478, 425, 425, 425, 478, 425, 425, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 436, 436, 436, - 436, 436, 436, 436, 436, 436, 436, 7, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, + 225, 225, 244, 244, 244, 478, 244, 249, 249, 249, + 249, 478, 249, 249, 249, 249, 249, 249, 276, 276, + 276, 478, 276, 282, 478, 282, 282, 282, 282, 282, + + 282, 282, 282, 282, 285, 478, 285, 285, 285, 285, + 285, 285, 285, 285, 285, 288, 288, 288, 288, 288, + 288, 288, 288, 288, 288, 288, 313, 313, 313, 478, + 313, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 327, 327, 327, 327, 327, 327, 327, 327, + 327, 327, 327, 348, 348, 348, 478, 348, 414, 414, + 414, 478, 478, 478, 414, 478, 478, 414, 414, 423, + 423, 423, 423, 423, 423, 423, 423, 423, 427, 427, + 427, 478, 478, 427, 427, 427, 478, 427, 427, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 7, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478 + 478, 478, 478, 478, 478, 478, 478, 478, 478 } ; -static yyconst flex_int16_t yy_chk[6664] = +static yyconst flex_int16_t yy_chk[2460] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1048,733 +576,270 @@ static yyconst flex_int16_t yy_chk[6664] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 5, 4, 6, 15, - 12, 3, 477, 4, 9, 9, 9, 9, 9, 10, - - 10, 10, 10, 10, 3, 3, 4, 4, 11, 11, - 11, 11, 11, 23, 39, 5, 17, 6, 35, 17, - 3, 24, 4, 32, 24, 24, 32, 32, 38, 48, - 15, 69, 3, 3, 4, 4, 12, 42, 25, 17, - 42, 25, 11, 474, 69, 3, 35, 4, 17, 24, - 53, 32, 17, 23, 31, 78, 38, 78, 35, 69, - 39, 24, 467, 32, 33, 461, 65, 17, 83, 25, - 48, 11, 13, 42, 35, 13, 17, 24, 25, 32, - 83, 31, 13, 13, 13, 13, 13, 13, 65, 54, - 53, 33, 54, 54, 31, 65, 83, 25, 36, 36, - - 36, 36, 36, 70, 33, 68, 68, 456, 13, 31, - 166, 13, 13, 13, 13, 13, 13, 20, 166, 33, - 211, 90, 70, 440, 20, 20, 434, 20, 211, 54, - 124, 124, 70, 68, 20, 20, 20, 20, 20, 20, + 3, 134, 4, 9, 9, 9, 9, 9, 12, 3, + 134, 4, 10, 10, 10, 10, 10, 11, 11, 11, + 11, 11, 3, 3, 4, 4, 13, 67, 12, 13, + 15, 39, 52, 25, 67, 3, 13, 4, 31, 13, + + 13, 13, 13, 13, 13, 15, 17, 25, 22, 17, + 27, 39, 31, 27, 11, 52, 17, 26, 22, 69, + 26, 26, 71, 22, 27, 48, 22, 42, 31, 22, + 42, 26, 17, 22, 22, 156, 22, 42, 71, 69, + 48, 17, 20, 23, 27, 64, 54, 64, 26, 20, + 20, 156, 20, 23, 23, 23, 23, 23, 23, 20, + 54, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 90, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 64, 52, - 106, 20, 22, 74, 55, 429, 37, 37, 37, 37, - - 37, 57, 64, 57, 22, 243, 487, 22, 487, 52, - 22, 419, 55, 243, 22, 22, 64, 22, 106, 74, - 67, 66, 74, 57, 72, 72, 385, 127, 22, 67, - 37, 127, 66, 22, 55, 66, 22, 52, 71, 22, - 97, 55, 22, 22, 71, 22, 26, 73, 67, 66, - 82, 57, 71, 26, 26, 26, 26, 26, 26, 37, - 66, 72, 108, 109, 73, 80, 71, 76, 73, 82, - 107, 73, 71, 76, 86, 107, 73, 85, 140, 82, - 97, 384, 26, 26, 26, 26, 26, 26, 41, 41, - 41, 41, 73, 118, 41, 76, 73, 80, 84, 85, - - 86, 80, 87, 86, 348, 175, 85, 41, 108, 109, - 96, 140, 84, 93, 41, 41, 41, 41, 41, 41, - 93, 107, 94, 119, 102, 80, 84, 104, 87, 342, - 250, 87, 103, 119, 118, 96, 317, 105, 161, 316, - 41, 102, 315, 41, 41, 41, 41, 41, 41, 44, - 96, 175, 104, 93, 314, 94, 44, 44, 44, 44, - 44, 44, 94, 96, 102, 103, 120, 104, 105, 125, - 102, 250, 103, 275, 119, 131, 120, 105, 161, 134, - 104, 275, 44, 94, 125, 44, 44, 44, 44, 44, - 44, 46, 144, 103, 150, 131, 105, 145, 46, 46, - - 46, 46, 46, 46, 131, 134, 145, 165, 134, 125, - 137, 137, 148, 125, 156, 144, 150, 120, 192, 153, - 226, 144, 148, 150, 226, 145, 154, 46, 46, 46, - 46, 46, 46, 49, 49, 49, 49, 156, 137, 154, - 148, 157, 155, 156, 49, 153, 158, 165, 153, 174, - 190, 192, 49, 155, 154, 157, 168, 170, 164, 49, - 49, 49, 49, 49, 49, 164, 158, 171, 173, 157, - 155, 172, 182, 190, 235, 158, 184, 174, 216, 190, - 249, 499, 182, 499, 284, 49, 194, 217, 49, 49, - 49, 49, 49, 49, 56, 196, 168, 170, 164, 194, - - 184, 56, 56, 56, 56, 56, 56, 171, 173, 172, - 235, 172, 201, 198, 194, 217, 184, 196, 216, 325, - 293, 201, 202, 182, 196, 284, 249, 203, 184, 202, - 56, 56, 56, 56, 56, 56, 77, 172, 198, 203, - 201, 204, 198, 77, 77, 77, 77, 77, 77, 293, - 202, 231, 232, 234, 390, 203, 281, 320, 390, 204, - 325, 234, 205, 492, 492, 231, 254, 509, 232, 509, - 204, 206, 77, 77, 77, 77, 77, 77, 88, 231, - 232, 234, 224, 236, 205, 88, 88, 88, 88, 88, - 88, 205, 236, 206, 254, 214, 214, 214, 214, 214, - - 206, 214, 281, 320, 224, 265, 214, 313, 214, 237, - 306, 236, 332, 238, 88, 88, 88, 88, 88, 88, - 91, 238, 224, 265, 364, 307, 271, 91, 91, 91, - 91, 91, 91, 224, 265, 237, 306, 271, 237, 306, - 332, 238, 247, 247, 247, 247, 247, 214, 247, 267, - 296, 268, 364, 247, 271, 247, 91, 91, 91, 91, - 91, 91, 98, 98, 98, 98, 98, 279, 511, 337, - 511, 267, 268, 340, 98, 269, 303, 305, 267, 312, - 268, 98, 269, 303, 305, 278, 308, 312, 98, 98, - 98, 98, 98, 98, 247, 248, 248, 248, 248, 248, - - 337, 248, 277, 269, 303, 305, 248, 276, 248, 340, - 463, 515, 308, 515, 98, 308, 270, 98, 98, 98, - 98, 98, 98, 110, 110, 110, 110, 110, 337, 110, - 280, 280, 280, 280, 280, 282, 282, 282, 282, 282, - 321, 343, 110, 280, 246, 321, 463, 248, 282, 110, - 110, 110, 110, 110, 110, 286, 286, 286, 286, 286, - 318, 318, 318, 318, 318, 343, 245, 366, 286, 517, - 343, 517, 370, 318, 394, 110, 344, 366, 110, 110, - 110, 110, 110, 110, 111, 111, 111, 111, 244, 394, - 111, 321, 239, 229, 370, 287, 287, 287, 287, 287, - - 344, 370, 394, 111, 383, 344, 366, 286, 287, 228, - 111, 111, 111, 111, 111, 111, 288, 288, 288, 288, - 288, 289, 289, 289, 289, 289, 356, 225, 326, 288, - 383, 356, 213, 383, 289, 392, 111, 392, 326, 111, - 111, 111, 111, 111, 111, 114, 393, 287, 462, 212, - 462, 403, 114, 114, 114, 114, 114, 114, 322, 322, - 322, 322, 322, 392, 322, 357, 199, 193, 288, 393, - 357, 322, 403, 289, 191, 393, 462, 356, 114, 326, - 403, 114, 114, 114, 114, 114, 114, 115, 189, 327, - 327, 327, 327, 327, 115, 115, 115, 115, 115, 115, - - 327, 187, 327, 331, 331, 331, 331, 331, 185, 179, - 322, 333, 333, 333, 333, 333, 357, 333, 167, 331, - 371, 163, 159, 115, 115, 115, 115, 115, 115, 117, - 117, 117, 117, 117, 346, 346, 346, 346, 346, 151, - 149, 327, 371, 336, 336, 336, 336, 336, 117, 371, - 346, 360, 361, 146, 336, 117, 117, 117, 117, 117, - 117, 360, 361, 333, 365, 365, 365, 365, 365, 416, - 345, 345, 345, 345, 345, 367, 367, 367, 367, 367, - 143, 142, 416, 377, 117, 117, 117, 117, 117, 117, - 121, 121, 121, 121, 121, 336, 524, 416, 524, 141, - - 441, 121, 360, 361, 369, 369, 369, 369, 369, 121, - 377, 378, 379, 139, 441, 380, 121, 121, 121, 121, - 121, 121, 345, 355, 355, 355, 355, 355, 441, 355, - 527, 415, 527, 378, 379, 138, 355, 380, 377, 415, - 378, 379, 121, 395, 380, 121, 121, 121, 121, 121, - 121, 122, 122, 122, 122, 381, 369, 136, 395, 415, - 418, 381, 122, 359, 359, 359, 359, 359, 382, 391, - 122, 395, 391, 402, 359, 355, 359, 122, 122, 122, - 122, 122, 122, 381, 135, 401, 418, 133, 407, 418, - 382, 402, 132, 391, 407, 130, 405, 382, 391, 396, - - 401, 391, 402, 122, 128, 396, 122, 122, 122, 122, - 122, 122, 129, 401, 396, 359, 407, 406, 405, 129, - 129, 129, 129, 129, 129, 405, 537, 396, 537, 544, - 545, 544, 545, 396, 399, 399, 399, 399, 399, 406, - 126, 404, 408, 116, 113, 95, 406, 399, 129, 129, - 129, 129, 129, 129, 147, 147, 147, 147, 147, 404, - 408, 92, 81, 79, 410, 410, 410, 410, 410, 417, - 404, 408, 75, 147, 63, 410, 420, 61, 417, 421, - 147, 147, 147, 147, 147, 147, 399, 400, 400, 400, - 400, 400, 409, 409, 409, 409, 409, 417, 409, 60, - - 420, 421, 59, 400, 58, 420, 147, 51, 421, 147, - 147, 147, 147, 147, 147, 152, 410, 411, 411, 411, - 411, 411, 152, 152, 152, 152, 152, 152, 413, 413, - 413, 413, 413, 411, 45, 29, 28, 422, 27, 400, - 21, 413, 430, 19, 409, 435, 412, 412, 412, 412, - 412, 152, 152, 152, 152, 152, 152, 160, 160, 160, - 160, 160, 412, 422, 430, 18, 422, 432, 431, 411, - 435, 430, 433, 16, 435, 442, 160, 432, 468, 433, - 413, 442, 448, 160, 160, 160, 160, 160, 160, 423, - 423, 423, 423, 423, 431, 432, 443, 431, 412, 14, - - 433, 468, 423, 442, 448, 449, 7, 468, 443, 160, - 444, 448, 160, 160, 160, 160, 160, 160, 162, 162, - 162, 162, 162, 0, 443, 444, 0, 449, 425, 425, - 425, 425, 425, 450, 449, 0, 454, 162, 444, 0, - 451, 425, 450, 0, 162, 162, 162, 162, 162, 162, - 427, 427, 427, 427, 427, 436, 436, 436, 436, 436, - 0, 450, 451, 427, 454, 466, 0, 0, 436, 451, - 0, 466, 454, 162, 162, 162, 162, 162, 162, 169, - 425, 438, 438, 438, 438, 438, 169, 169, 169, 169, - 169, 169, 454, 466, 438, 0, 0, 0, 457, 0, - - 455, 460, 427, 476, 0, 0, 457, 436, 471, 455, - 460, 476, 472, 0, 473, 169, 169, 169, 169, 169, - 169, 176, 176, 176, 176, 176, 457, 176, 455, 460, - 471, 476, 0, 438, 472, 0, 0, 471, 473, 0, - 176, 472, 0, 473, 0, 0, 0, 176, 176, 176, - 176, 176, 176, 445, 445, 445, 445, 445, 465, 465, - 465, 465, 465, 0, 0, 0, 445, 0, 0, 0, - 0, 465, 0, 176, 0, 0, 176, 176, 176, 176, - 176, 176, 178, 469, 469, 469, 469, 469, 470, 178, - 178, 178, 178, 178, 178, 0, 469, 0, 0, 0, - - 0, 0, 475, 470, 0, 445, 0, 0, 0, 0, - 465, 0, 0, 0, 0, 0, 470, 475, 178, 178, - 178, 178, 178, 178, 180, 180, 180, 180, 180, 0, - 475, 0, 0, 0, 0, 469, 0, 0, 0, 0, - 0, 0, 0, 180, 0, 0, 0, 0, 0, 0, - 180, 180, 180, 180, 180, 180, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, - 180, 180, 180, 180, 180, 181, 181, 181, 181, 181, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 181, 0, 0, 0, 0, 0, - 0, 181, 181, 181, 181, 181, 181, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 181, 181, 181, 181, 181, 183, 183, 183, 183, - 183, 0, 0, 0, 0, 0, 0, 183, 0, 0, - 0, 0, 0, 0, 0, 183, 0, 0, 0, 0, - 0, 0, 183, 183, 183, 183, 183, 183, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 183, 0, - - 0, 183, 183, 183, 183, 183, 183, 188, 188, 188, - 188, 188, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 188, 0, 0, 0, - 0, 0, 0, 188, 188, 188, 188, 188, 188, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 188, 188, 188, 188, 188, 188, 195, 0, - 0, 0, 0, 0, 0, 195, 195, 195, 195, 195, - 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 195, 195, 195, 195, 195, 195, - 200, 200, 200, 200, 200, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, - 0, 0, 0, 0, 0, 0, 200, 200, 200, 200, - 200, 200, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 200, 200, 200, 200, - 200, 207, 0, 0, 0, 0, 0, 0, 207, 207, - 207, 207, 207, 207, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 207, 207, 207, - 207, 207, 207, 208, 208, 208, 208, 208, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 208, 0, 0, 0, 0, 0, 0, 208, - 208, 208, 208, 208, 208, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 208, 208, - 208, 208, 208, 208, 215, 0, 0, 0, 0, 0, - 0, 215, 215, 215, 215, 215, 215, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 215, 215, 215, 215, 215, 215, 218, 218, 218, 218, - 218, 0, 218, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 218, 0, 0, 0, 0, - 0, 0, 218, 218, 218, 218, 218, 218, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 218, 0, - 0, 218, 218, 218, 218, 218, 218, 220, 0, 0, - 0, 0, 0, 0, 220, 220, 220, 220, 220, 220, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 220, 220, 220, 220, 220, 220, 221, - 221, 221, 221, 221, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 221, 0, - 0, 0, 0, 0, 0, 221, 221, 221, 221, 221, - 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 221, 221, 221, 221, 221, 221, - 222, 222, 222, 222, 222, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, - - 0, 0, 0, 0, 0, 0, 222, 222, 222, 222, - 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 222, 222, 222, 222, 222, - 222, 223, 223, 223, 223, 223, 0, 0, 0, 0, - 0, 0, 223, 0, 0, 0, 0, 0, 0, 0, - 223, 0, 0, 0, 0, 0, 0, 223, 223, 223, - 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 223, 0, 0, 223, 223, 223, 223, - - 223, 223, 227, 227, 227, 227, 227, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 227, 0, 0, 0, 0, 0, 0, 227, 227, - 227, 227, 227, 227, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 227, 227, 227, - 227, 227, 227, 230, 0, 0, 0, 0, 0, 0, - 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, - - 230, 230, 230, 230, 230, 233, 233, 233, 233, 233, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 233, 0, 0, 0, 0, 0, - 0, 233, 233, 233, 233, 233, 233, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 233, 233, 233, 233, 233, 233, 240, 0, 0, 0, - 0, 0, 0, 240, 240, 240, 240, 240, 240, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 240, 240, 240, 240, 240, 240, 241, 241, - 241, 241, 241, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 241, 0, 0, - 0, 0, 0, 0, 241, 241, 241, 241, 241, 241, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 241, 241, 241, 241, 241, 241, 252, - 252, 252, 252, 252, 0, 252, 0, 0, 0, 0, - 252, 252, 252, 0, 0, 0, 0, 0, 252, 0, - 0, 0, 0, 0, 0, 252, 252, 252, 252, 252, - - 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 252, 0, 0, 252, 252, 252, 252, 252, 252, - 253, 0, 0, 0, 0, 0, 0, 253, 253, 253, - 253, 253, 253, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 253, 253, 253, 253, - 253, 253, 255, 255, 255, 255, 255, 0, 255, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 0, 0, 0, 255, 255, - - 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 0, 0, 255, 255, 255, - 255, 255, 255, 257, 0, 0, 0, 0, 0, 0, - 257, 257, 257, 257, 257, 257, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 257, 0, 0, 257, - 257, 257, 257, 257, 257, 258, 258, 258, 258, 258, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 258, 0, 0, 0, 0, 0, - - 0, 258, 258, 258, 258, 258, 258, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 258, 0, 0, - 258, 258, 258, 258, 258, 258, 259, 259, 259, 259, - 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 259, 0, 0, 0, 0, - 0, 0, 259, 259, 259, 259, 259, 259, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 259, 259, 259, 259, 259, 259, 260, 260, 260, - - 260, 260, 0, 0, 0, 0, 0, 0, 260, 0, - 0, 0, 0, 0, 0, 0, 260, 0, 0, 0, - 0, 0, 0, 260, 260, 260, 260, 260, 260, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 260, - 0, 0, 260, 260, 260, 260, 260, 260, 261, 261, - 261, 261, 261, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 261, 0, 0, - 0, 0, 0, 0, 261, 261, 261, 261, 261, 261, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 261, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 261, 261, 261, 261, 261, 261, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 261, 262, 262, 262, 262, 262, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 262, 0, 0, 0, 0, 0, 0, 262, 262, - 262, 262, 262, 262, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 262, 262, 262, - 262, 262, 262, 263, 0, 0, 0, 0, 0, 0, - - 263, 263, 263, 263, 263, 263, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 263, - 263, 263, 263, 263, 263, 264, 264, 264, 264, 264, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 264, 0, 0, 0, 0, 0, - 0, 264, 264, 264, 264, 264, 264, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 264, 264, 264, 264, 264, 264, 266, 266, 266, 266, - - 266, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 266, 0, 0, 0, 0, - 0, 0, 266, 266, 266, 266, 266, 266, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 266, 266, 266, 266, 266, 266, 272, 0, 0, - 0, 0, 0, 0, 272, 272, 272, 272, 272, 272, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 272, 272, 272, 272, 272, 272, 273, - - 273, 273, 273, 273, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 273, 0, - 0, 0, 0, 0, 0, 273, 273, 273, 273, 273, - 273, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 273, 273, 273, 273, 273, 273, - 283, 283, 283, 283, 0, 0, 283, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 283, - 0, 0, 0, 0, 0, 0, 283, 283, 283, 283, - 283, 283, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 283, 0, 0, 283, 283, 283, 283, 283, - 283, 285, 285, 285, 285, 0, 0, 0, 0, 0, - 0, 0, 285, 0, 0, 0, 0, 0, 0, 0, - 285, 0, 0, 0, 0, 0, 0, 285, 285, 285, - 285, 285, 285, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 285, 0, 0, 285, 285, 285, 285, - 285, 285, 290, 290, 290, 290, 290, 0, 0, 0, - 0, 0, 0, 0, 0, 290, 0, 0, 0, 0, - - 0, 290, 0, 0, 0, 0, 0, 0, 290, 290, - 290, 290, 290, 290, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 290, 0, 0, 290, 290, 290, - 290, 290, 290, 291, 291, 291, 291, 291, 0, 291, - 0, 0, 0, 0, 291, 291, 291, 0, 0, 0, - 0, 0, 291, 0, 0, 0, 0, 0, 0, 291, - 291, 291, 291, 291, 291, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 291, 0, 0, 291, 291, - - 291, 291, 291, 291, 292, 0, 0, 0, 0, 0, - 0, 292, 292, 292, 292, 292, 292, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 292, 292, 292, 292, 292, 292, 294, 294, 294, 294, - 294, 0, 294, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 294, 0, 0, 0, 0, - 0, 0, 294, 294, 294, 294, 294, 294, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 294, 0, - - 0, 294, 294, 294, 294, 294, 294, 297, 297, 297, - 297, 297, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 297, 0, 0, 0, - 0, 0, 0, 297, 297, 297, 297, 297, 297, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 297, - 0, 0, 297, 297, 297, 297, 297, 297, 298, 298, - 298, 298, 298, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 298, 0, 0, - 0, 0, 0, 0, 298, 298, 298, 298, 298, 298, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 298, 298, 298, 298, 298, 298, 299, - 299, 299, 299, 299, 0, 0, 0, 0, 0, 0, - 299, 0, 0, 0, 0, 0, 0, 0, 299, 0, - 0, 0, 0, 0, 0, 299, 299, 299, 299, 299, - 299, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 299, 0, 0, 299, 299, 299, 299, 299, 299, - 300, 300, 300, 300, 300, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 300, 0, 0, 300, - 0, 0, 0, 0, 0, 0, 300, 300, 300, 300, - 300, 300, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 300, 300, 300, 300, 300, - 300, 301, 301, 301, 301, 301, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 301, 0, 0, 0, 0, 0, 0, 301, 301, 301, - 301, 301, 301, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 301, 301, 301, 301, - 301, 301, 302, 302, 302, 302, 302, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 302, 0, 0, 0, 0, 0, 0, 302, 302, - 302, 302, 302, 302, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 302, 302, 302, - 302, 302, 302, 304, 304, 304, 304, 304, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 304, 0, 0, 0, 0, 0, 0, 304, - - 304, 304, 304, 304, 304, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 304, 304, - 304, 304, 304, 304, 309, 0, 0, 0, 0, 0, - 0, 309, 309, 309, 309, 309, 309, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 309, 309, 309, 309, 309, 309, 310, 310, 310, 310, - 310, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 310, 0, 0, 0, 0, - - 0, 0, 310, 310, 310, 310, 310, 310, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 310, 310, 310, 310, 310, 310, 323, 323, 323, - 323, 323, 0, 323, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 323, 0, 0, 0, - 0, 0, 0, 323, 323, 323, 323, 323, 323, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 323, - 0, 0, 323, 323, 323, 323, 323, 323, 324, 324, - - 324, 324, 0, 0, 324, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, - 0, 0, 0, 0, 324, 324, 324, 324, 324, 324, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 324, 0, 0, 324, 324, 324, 324, 324, 324, 328, - 328, 328, 328, 328, 0, 0, 0, 0, 0, 0, - 328, 0, 0, 0, 0, 0, 0, 0, 328, 0, - 0, 0, 0, 0, 0, 328, 328, 328, 328, 328, - 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 328, 0, 0, 328, 328, 328, 328, 328, 328, - 329, 329, 329, 329, 0, 0, 0, 0, 0, 0, - 0, 329, 0, 0, 0, 0, 0, 0, 0, 329, - 0, 0, 0, 0, 0, 0, 329, 329, 329, 329, - 329, 329, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 329, 0, 0, 329, 329, 329, 329, 329, - 329, 330, 330, 330, 330, 330, 0, 0, 0, 0, - 0, 0, 0, 0, 330, 0, 0, 0, 0, 0, - - 330, 0, 0, 0, 0, 0, 0, 330, 330, 330, - 330, 330, 330, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 330, 0, 0, 330, 330, 330, 330, - 330, 330, 334, 0, 0, 0, 0, 0, 0, 334, - 334, 334, 334, 334, 334, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 334, 334, - 334, 334, 334, 334, 335, 0, 0, 0, 0, 0, - 0, 335, 335, 335, 335, 335, 335, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 335, 335, 335, 335, 335, 335, 338, 0, 0, 0, - 0, 0, 0, 338, 338, 338, 338, 338, 338, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 338, 338, 338, 338, 338, 338, 339, 339, - 339, 339, 339, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 339, 0, 0, - 0, 0, 0, 0, 339, 339, 339, 339, 339, 339, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 339, 339, 339, 339, 339, 339, 341, - 341, 341, 341, 341, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 341, 0, - 0, 0, 0, 0, 0, 341, 341, 341, 341, 341, - 341, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 341, 341, 341, 341, 341, 341, - 358, 0, 0, 0, 0, 0, 0, 358, 358, 358, - - 358, 358, 358, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 358, 358, 358, 358, - 358, 358, 362, 0, 0, 0, 0, 0, 0, 362, - 362, 362, 362, 362, 362, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 362, 362, - 362, 362, 362, 362, 363, 363, 363, 363, 363, 0, - 0, 0, 0, 0, 0, 0, 0, 363, 0, 0, - 0, 0, 0, 363, 0, 0, 0, 0, 0, 0, - - 363, 363, 363, 363, 363, 363, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 363, 0, 0, 363, - 363, 363, 363, 363, 363, 368, 0, 0, 0, 0, - 0, 0, 368, 0, 368, 0, 0, 0, 0, 368, - 368, 0, 0, 368, 0, 0, 0, 0, 368, 0, - 0, 0, 0, 0, 368, 0, 0, 0, 0, 0, - 368, 0, 368, 0, 0, 0, 0, 368, 368, 0, - 0, 368, 373, 0, 0, 0, 0, 0, 0, 373, - 373, 373, 373, 373, 373, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 373, 373, - 373, 373, 373, 373, 374, 0, 0, 0, 0, 0, - 0, 374, 374, 374, 374, 374, 374, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 374, 374, 374, 374, 374, 374, 375, 0, 0, 0, - 0, 0, 0, 375, 375, 375, 375, 375, 375, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 375, 375, 375, 375, 375, 375, 387, 0, - 0, 0, 0, 0, 0, 387, 387, 387, 387, 387, - 387, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 387, 387, 387, 387, 387, 387, - 388, 0, 0, 0, 0, 0, 0, 388, 388, 388, - 388, 388, 388, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 388, 388, 388, 388, - 388, 388, 389, 0, 0, 0, 0, 0, 0, 389, - - 389, 389, 389, 389, 389, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 389, 389, - 389, 389, 389, 389, 397, 0, 0, 0, 0, 0, - 0, 397, 397, 397, 397, 397, 397, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 397, 397, 397, 397, 397, 397, 398, 0, 0, 0, - 0, 0, 0, 398, 398, 398, 398, 398, 398, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 398, 398, 398, 398, 398, 398, 414, 0, - 0, 0, 0, 0, 0, 414, 414, 414, 414, 414, - 414, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 414, 414, 414, 414, 414, 414, - 426, 0, 0, 0, 0, 0, 0, 426, 426, 426, - 426, 426, 426, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 426, 426, 426, 426, - - 426, 426, 428, 428, 428, 428, 428, 0, 0, 0, - 0, 0, 0, 0, 0, 428, 0, 0, 0, 0, - 0, 428, 0, 0, 0, 0, 0, 0, 428, 428, - 428, 428, 428, 428, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 428, 0, 0, 428, 428, 428, - 428, 428, 428, 437, 437, 437, 437, 437, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 437, 0, 0, 0, 0, 0, 0, 437, - 437, 437, 437, 437, 437, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 437, 437, - 437, 437, 437, 437, 439, 0, 0, 0, 0, 0, - 0, 439, 439, 439, 439, 439, 439, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 439, 439, 439, 439, 439, 439, 446, 0, 0, 0, - 0, 0, 0, 446, 446, 446, 446, 446, 446, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 446, 446, 446, 446, 446, 446, 447, 0, - 0, 0, 0, 0, 0, 447, 447, 447, 447, 447, - 447, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 447, 447, 447, 447, 447, 447, - 452, 0, 0, 0, 0, 0, 0, 452, 452, 452, - 452, 452, 452, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 452, 452, 452, 452, - 452, 452, 453, 0, 0, 0, 0, 0, 0, 453, - - 453, 453, 453, 453, 453, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 453, 453, - 453, 453, 453, 453, 458, 0, 0, 0, 0, 0, - 0, 458, 458, 458, 458, 458, 458, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 458, 458, 458, 458, 458, 458, 459, 0, 0, 0, - 0, 0, 0, 459, 459, 459, 459, 459, 459, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 459, 459, 459, 459, 459, 459, 464, 0, - 0, 0, 0, 0, 0, 464, 464, 464, 464, 464, - 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 464, 464, 464, 464, 464, 464, - 479, 0, 0, 479, 479, 479, 479, 479, 479, 479, - 479, 479, 479, 480, 480, 0, 480, 480, 481, 0, - 0, 481, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 482, 482, 0, 482, 482, 483, 0, 0, 483, - - 483, 484, 0, 484, 484, 0, 484, 484, 485, 485, - 485, 485, 485, 485, 485, 485, 485, 485, 486, 486, + 20, 20, 20, 20, 20, 20, 20, 20, 33, 32, + 35, 20, 32, 32, 36, 36, 36, 36, 36, 57, + + 43, 57, 33, 32, 35, 37, 37, 37, 37, 37, + 43, 43, 43, 43, 43, 43, 44, 84, 33, 55, + 32, 35, 55, 55, 57, 46, 44, 44, 44, 44, + 44, 44, 46, 55, 84, 46, 46, 46, 46, 46, + 46, 53, 37, 41, 41, 41, 41, 56, 66, 41, + 72, 53, 53, 53, 53, 53, 53, 70, 147, 86, + 72, 56, 41, 66, 147, 75, 86, 68, 56, 41, + 75, 73, 41, 41, 41, 41, 41, 41, 49, 49, + 49, 49, 68, 74, 74, 70, 73, 75, 63, 49, + 477, 75, 73, 68, 74, 78, 80, 49, 63, 63, + + 63, 63, 63, 63, 49, 83, 80, 49, 49, 49, + 49, 49, 49, 76, 81, 83, 76, 85, 78, 87, + 88, 89, 87, 88, 81, 81, 81, 81, 81, 81, + 93, 80, 85, 102, 108, 89, 90, 90, 90, 90, + 90, 124, 124, 143, 93, 140, 94, 102, 90, 97, + 143, 474, 109, 102, 108, 90, 94, 94, 94, 94, + 94, 94, 90, 97, 96, 90, 90, 90, 90, 90, + 90, 96, 109, 140, 118, 467, 98, 119, 96, 99, + 103, 98, 104, 105, 118, 97, 98, 98, 98, 98, + 98, 98, 119, 99, 103, 107, 104, 105, 120, 118, + + 107, 125, 127, 461, 150, 137, 127, 99, 137, 155, + 104, 150, 155, 120, 148, 125, 103, 105, 112, 125, + 107, 110, 110, 110, 110, 110, 132, 110, 112, 112, + 112, 112, 112, 112, 148, 158, 167, 192, 456, 160, + 110, 158, 157, 192, 167, 132, 159, 110, 160, 162, + 110, 110, 110, 110, 110, 110, 111, 111, 111, 111, + 157, 159, 111, 162, 190, 194, 116, 206, 344, 166, + 169, 190, 194, 344, 206, 111, 116, 116, 116, 116, + 116, 116, 111, 166, 169, 111, 111, 111, 111, 111, + 111, 114, 114, 114, 114, 114, 198, 205, 226, 207, + + 198, 117, 226, 170, 171, 173, 207, 440, 205, 203, + 114, 117, 117, 117, 117, 117, 117, 170, 171, 173, + 114, 114, 114, 114, 114, 114, 121, 121, 121, 121, + 121, 203, 212, 175, 236, 238, 131, 121, 238, 182, + 212, 392, 434, 429, 236, 121, 131, 131, 131, 131, + 131, 131, 121, 175, 182, 121, 121, 121, 121, 121, + 121, 122, 122, 122, 122, 216, 265, 244, 392, 268, + 269, 154, 122, 196, 184, 244, 268, 265, 269, 216, + 122, 154, 154, 154, 154, 154, 154, 122, 184, 196, + 122, 122, 122, 122, 122, 122, 129, 129, 129, 129, + + 129, 184, 276, 202, 340, 307, 161, 204, 307, 309, + 276, 419, 309, 385, 340, 129, 161, 161, 161, 161, + 161, 161, 129, 202, 204, 129, 129, 129, 129, 129, + 129, 152, 152, 152, 152, 152, 232, 165, 172, 229, + 313, 345, 420, 384, 165, 261, 345, 420, 313, 232, + 152, 165, 172, 235, 229, 237, 239, 152, 224, 261, + 152, 152, 152, 152, 152, 152, 163, 163, 163, 163, + 163, 370, 224, 250, 235, 237, 176, 239, 370, 172, + 435, 261, 364, 224, 435, 163, 176, 176, 176, 176, + 176, 176, 177, 250, 251, 163, 163, 163, 163, 163, + + 163, 178, 177, 177, 177, 177, 177, 177, 270, 251, + 272, 178, 178, 178, 178, 178, 178, 180, 180, 180, + 180, 180, 281, 281, 281, 281, 281, 181, 272, 285, + 270, 383, 348, 343, 383, 281, 180, 181, 181, 181, + 181, 181, 181, 183, 285, 332, 180, 180, 180, 180, + 180, 180, 187, 183, 183, 183, 183, 183, 183, 282, + 303, 306, 187, 187, 187, 187, 187, 187, 189, 189, + 189, 189, 189, 283, 283, 283, 283, 283, 199, 282, + 300, 327, 303, 306, 300, 318, 283, 189, 199, 199, + 199, 199, 199, 199, 300, 322, 327, 189, 189, 189, + + 189, 189, 189, 201, 201, 201, 201, 201, 319, 319, + 319, 319, 319, 208, 418, 322, 360, 418, 317, 316, + 326, 319, 201, 208, 208, 208, 208, 208, 208, 209, + 326, 360, 201, 201, 201, 201, 201, 201, 211, 209, + 209, 209, 209, 209, 209, 326, 356, 315, 211, 211, + 211, 211, 211, 211, 215, 215, 215, 215, 215, 218, + 215, 371, 337, 357, 361, 215, 356, 215, 371, 218, + 218, 218, 218, 218, 218, 219, 337, 321, 314, 361, + 215, 220, 321, 357, 366, 219, 219, 219, 219, 219, + 219, 220, 220, 220, 220, 220, 220, 221, 366, 378, + + 337, 366, 321, 222, 381, 407, 378, 221, 221, 221, + 221, 221, 221, 222, 222, 222, 222, 222, 222, 223, + 334, 334, 334, 334, 334, 227, 308, 381, 407, 223, + 223, 223, 223, 223, 223, 227, 227, 227, 227, 227, + 227, 228, 379, 380, 298, 422, 334, 233, 422, 379, + 380, 228, 228, 228, 228, 228, 228, 233, 233, 233, + 233, 233, 233, 234, 338, 338, 338, 338, 338, 241, + 432, 415, 441, 234, 234, 234, 234, 234, 234, 241, + 241, 241, 241, 241, 241, 242, 382, 441, 393, 432, + 338, 243, 415, 382, 393, 242, 242, 242, 242, 242, + + 242, 243, 243, 243, 243, 243, 243, 248, 248, 248, + 248, 248, 405, 248, 293, 390, 394, 395, 248, 405, + 248, 249, 249, 249, 249, 249, 255, 249, 377, 390, + 394, 395, 249, 248, 249, 402, 255, 255, 255, 255, + 255, 255, 377, 396, 404, 403, 402, 249, 253, 253, + 253, 253, 253, 403, 253, 404, 463, 396, 256, 253, + 253, 253, 377, 396, 280, 408, 463, 253, 256, 256, + 256, 256, 256, 256, 253, 257, 408, 253, 253, 253, + 253, 253, 253, 258, 416, 257, 257, 257, 257, 257, + 257, 259, 279, 258, 258, 258, 258, 258, 258, 260, + + 416, 259, 259, 259, 259, 259, 259, 262, 278, 260, + 260, 260, 260, 260, 260, 263, 277, 262, 262, 262, + 262, 262, 262, 266, 271, 263, 263, 263, 263, 263, + 263, 267, 264, 266, 266, 266, 266, 266, 266, 273, + 254, 267, 267, 267, 267, 267, 267, 274, 247, 273, + 273, 273, 273, 273, 273, 275, 406, 274, 274, 274, + 274, 274, 274, 406, 401, 275, 275, 275, 275, 275, + 275, 284, 284, 284, 284, 391, 443, 284, 401, 417, + 391, 431, 246, 391, 431, 287, 287, 287, 287, 287, + 284, 287, 245, 443, 240, 231, 287, 284, 287, 417, + + 284, 284, 284, 284, 284, 284, 286, 286, 286, 286, + 230, 287, 412, 412, 412, 412, 412, 286, 288, 288, + 288, 288, 288, 421, 288, 286, 430, 442, 412, 288, + 421, 288, 286, 430, 450, 286, 286, 286, 286, 286, + 286, 444, 225, 470, 288, 289, 289, 289, 289, 289, + 442, 289, 217, 475, 450, 444, 289, 470, 289, 290, + 290, 290, 290, 290, 294, 290, 448, 475, 462, 433, + 290, 289, 290, 448, 294, 294, 294, 294, 294, 294, + 425, 425, 425, 425, 425, 290, 291, 291, 291, 291, + 291, 433, 291, 425, 455, 462, 296, 291, 214, 291, + + 341, 341, 341, 341, 341, 291, 296, 296, 296, 296, + 296, 296, 291, 213, 455, 291, 291, 291, 291, 291, + 291, 292, 292, 292, 292, 292, 341, 292, 449, 451, + 200, 297, 292, 292, 292, 449, 451, 460, 195, 193, + 292, 297, 297, 297, 297, 297, 297, 292, 299, 191, + 292, 292, 292, 292, 292, 292, 301, 460, 299, 299, + 299, 299, 299, 299, 302, 466, 301, 301, 301, 301, + 301, 301, 304, 188, 302, 302, 302, 302, 302, 302, + 305, 457, 304, 304, 304, 304, 304, 304, 466, 185, + 305, 305, 305, 305, 305, 305, 310, 310, 310, 310, + + 310, 311, 457, 476, 468, 179, 174, 168, 310, 454, + 468, 311, 311, 311, 311, 311, 311, 312, 471, 454, + 164, 473, 310, 153, 476, 471, 473, 312, 312, 312, + 312, 312, 312, 323, 323, 323, 323, 323, 151, 323, + 454, 328, 328, 328, 328, 328, 323, 149, 472, 146, + 145, 144, 328, 142, 328, 472, 141, 139, 331, 323, + 324, 324, 324, 324, 324, 138, 324, 328, 331, 331, + 331, 331, 331, 331, 355, 355, 355, 355, 355, 324, + 355, 365, 365, 365, 365, 365, 324, 355, 136, 324, + 324, 324, 324, 324, 324, 325, 325, 325, 325, 135, + + 355, 325, 133, 130, 128, 333, 126, 365, 115, 367, + 367, 367, 367, 367, 325, 333, 333, 333, 333, 333, + 333, 325, 113, 106, 325, 325, 325, 325, 325, 325, + 329, 329, 329, 329, 329, 367, 95, 82, 79, 77, + 335, 329, 65, 369, 369, 369, 369, 369, 61, 329, + 335, 335, 335, 335, 335, 335, 329, 60, 59, 329, + 329, 329, 329, 329, 329, 330, 330, 330, 330, 369, + 58, 51, 45, 38, 29, 336, 330, 28, 24, 21, + 19, 18, 16, 14, 330, 336, 336, 336, 336, 336, + 336, 330, 339, 7, 330, 330, 330, 330, 330, 330, + + 342, 6, 339, 339, 339, 339, 339, 339, 5, 0, + 342, 342, 342, 342, 342, 342, 346, 346, 346, 346, + 346, 347, 0, 0, 0, 0, 0, 0, 346, 0, + 0, 347, 347, 347, 347, 347, 347, 358, 0, 0, + 0, 0, 346, 0, 0, 0, 0, 358, 358, 358, + 358, 358, 358, 359, 359, 359, 359, 359, 362, 0, + 0, 0, 0, 0, 359, 0, 359, 0, 362, 362, + 362, 362, 362, 362, 363, 0, 0, 368, 0, 359, + 0, 0, 0, 368, 363, 363, 363, 363, 363, 363, + 368, 0, 368, 372, 0, 0, 0, 368, 368, 373, + + 0, 368, 0, 372, 372, 372, 372, 372, 372, 373, + 373, 373, 373, 373, 373, 374, 0, 0, 0, 0, + 0, 375, 0, 0, 0, 374, 374, 374, 374, 374, + 374, 375, 375, 375, 375, 375, 375, 387, 0, 0, + 0, 0, 0, 388, 0, 0, 0, 387, 387, 387, + 387, 387, 387, 388, 388, 388, 388, 388, 388, 389, + 0, 0, 0, 0, 0, 397, 0, 0, 0, 389, + 389, 389, 389, 389, 389, 397, 397, 397, 397, 397, + 397, 398, 0, 0, 0, 0, 0, 399, 0, 0, + 0, 398, 398, 398, 398, 398, 398, 399, 399, 399, + + 399, 399, 399, 400, 400, 400, 400, 400, 0, 0, + 409, 0, 0, 0, 0, 0, 0, 0, 0, 400, + 409, 409, 409, 409, 409, 409, 410, 0, 0, 400, + 411, 411, 411, 411, 411, 0, 410, 410, 410, 410, + 410, 410, 0, 0, 0, 0, 411, 413, 0, 0, + 414, 414, 414, 414, 414, 0, 411, 413, 413, 413, + 413, 413, 413, 414, 423, 423, 423, 423, 423, 0, + 427, 427, 427, 427, 427, 0, 414, 423, 0, 0, + 0, 0, 0, 427, 0, 0, 0, 428, 0, 0, + 423, 424, 424, 424, 424, 424, 427, 428, 428, 428, + + 428, 428, 428, 0, 424, 436, 436, 436, 436, 436, + 424, 0, 0, 0, 0, 0, 0, 424, 436, 0, + 424, 424, 424, 424, 424, 424, 437, 0, 0, 0, + 0, 436, 0, 0, 0, 0, 437, 437, 437, 437, + 437, 437, 438, 438, 438, 438, 438, 445, 0, 0, + 446, 446, 446, 446, 446, 438, 0, 445, 445, 445, + 445, 445, 445, 446, 0, 0, 0, 447, 438, 439, + 439, 439, 439, 439, 0, 0, 446, 447, 447, 447, + 447, 447, 447, 0, 0, 0, 0, 0, 439, 0, + 0, 0, 0, 0, 452, 0, 0, 0, 439, 439, + + 439, 439, 439, 439, 452, 452, 452, 452, 452, 452, + 453, 0, 0, 0, 0, 0, 458, 0, 0, 0, + 453, 453, 453, 453, 453, 453, 458, 458, 458, 458, + 458, 458, 459, 0, 0, 0, 0, 0, 464, 0, + 0, 0, 459, 459, 459, 459, 459, 459, 464, 464, + 464, 464, 464, 464, 465, 0, 0, 0, 0, 0, + 469, 0, 0, 0, 465, 465, 465, 465, 465, 465, + 469, 469, 469, 469, 469, 469, 479, 0, 479, 479, + 479, 479, 479, 479, 479, 479, 479, 480, 480, 0, + 480, 480, 481, 0, 481, 481, 481, 481, 481, 481, + + 481, 481, 481, 482, 482, 0, 482, 482, 483, 0, + 0, 483, 483, 484, 484, 484, 484, 484, 484, 484, + 484, 484, 485, 0, 485, 485, 0, 485, 485, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, - 486, 488, 488, 0, 488, 488, 489, 489, 489, 489, - 489, 489, 489, 489, 489, 489, 490, 490, 490, 490, - 490, 490, 490, 490, 490, 490, 490, 490, 490, 491, - 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, - 491, 491, 491, 493, 493, 0, 493, 493, 494, 494, - 494, 494, 494, 494, 494, 494, 494, 494, 495, 495, - 0, 495, 495, 496, 496, 496, 496, 496, 496, 496, - - 496, 496, 496, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 497, 498, 498, 498, 500, 500, 500, 500, - 500, 500, 500, 500, 500, 500, 501, 501, 0, 501, - 501, 501, 501, 501, 501, 501, 501, 501, 501, 502, + 487, 487, 487, 487, 487, 487, 487, 487, 487, 488, + 488, 0, 488, 488, 489, 489, 489, 489, 489, 489, + 489, 489, 489, 489, 489, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 491, 491, 492, + 492, 492, 492, 492, 492, 492, 492, 492, 493, 493, + 0, 493, 493, 494, 494, 494, 494, 494, 494, 494, + + 494, 494, 495, 495, 0, 495, 495, 496, 496, 496, + 496, 496, 496, 496, 496, 496, 497, 497, 497, 497, + 497, 497, 497, 497, 497, 498, 498, 498, 498, 498, + 498, 498, 498, 498, 498, 498, 498, 499, 499, 499, + 499, 499, 499, 499, 499, 499, 500, 500, 500, 500, + 500, 500, 500, 500, 500, 501, 501, 501, 0, 501, 502, 502, 502, 502, 502, 502, 502, 502, 502, 502, - 502, 502, 503, 503, 503, 503, 503, 503, 503, 503, - 503, 503, 503, 503, 503, 503, 504, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, - 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, - - 507, 507, 507, 507, 508, 0, 0, 508, 508, 508, - 508, 508, 508, 508, 508, 508, 508, 510, 510, 510, - 510, 510, 510, 510, 510, 510, 510, 510, 510, 510, - 510, 512, 512, 512, 512, 513, 513, 513, 513, 513, - 513, 0, 513, 513, 513, 513, 513, 513, 514, 514, - 514, 514, 514, 514, 514, 514, 514, 514, 514, 514, - 514, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 518, 518, 518, 518, 519, - 519, 519, 519, 519, 519, 0, 519, 519, 519, 519, - 519, 519, 520, 0, 0, 520, 520, 520, 520, 520, - - 520, 520, 520, 520, 520, 521, 0, 0, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 522, 522, - 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, - 522, 523, 523, 523, 523, 523, 523, 523, 523, 523, - 523, 523, 523, 523, 525, 525, 0, 525, 525, 526, - 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, - 526, 526, 528, 528, 528, 528, 529, 529, 529, 529, - 529, 529, 529, 529, 529, 529, 529, 529, 529, 530, - 0, 0, 530, 530, 530, 530, 530, 530, 530, 530, - 530, 530, 531, 531, 531, 531, 531, 531, 531, 531, - - 531, 531, 531, 531, 531, 532, 532, 532, 532, 532, - 0, 0, 532, 532, 532, 532, 532, 532, 533, 533, - 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, - 533, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 535, 535, 0, 535, 535, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 538, 538, 538, 538, 539, 539, 0, 539, - 539, 539, 539, 539, 539, 539, 539, 539, 539, 540, - 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, - 540, 540, 541, 541, 0, 541, 541, 541, 541, 541, - - 541, 541, 541, 541, 541, 542, 542, 542, 542, 542, - 542, 542, 542, 542, 542, 542, 542, 542, 543, 543, - 543, 543, 543, 0, 0, 543, 543, 543, 543, 543, - 543, 546, 546, 546, 546, 0, 0, 0, 0, 546, - 0, 0, 546, 546, 547, 547, 547, 547, 0, 0, - 0, 547, 547, 547, 0, 547, 547, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 549, 549, 549, - 549, 549, 549, 549, 549, 549, 549, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, + 502, 502, 503, 503, 503, 0, 503, 504, 504, 504, + 504, 0, 504, 504, 504, 504, 504, 504, 505, 505, + 505, 0, 505, 506, 0, 506, 506, 506, 506, 506, + + 506, 506, 506, 506, 507, 0, 507, 507, 507, 507, + 507, 507, 507, 507, 507, 508, 508, 508, 508, 508, + 508, 508, 508, 508, 508, 508, 509, 509, 509, 0, + 509, 510, 510, 510, 510, 510, 510, 510, 510, 510, + 510, 510, 511, 511, 511, 511, 511, 511, 511, 511, + 511, 511, 511, 512, 512, 512, 0, 512, 513, 513, + 513, 0, 0, 0, 513, 0, 0, 513, 513, 514, + 514, 514, 514, 514, 514, 514, 514, 514, 515, 515, + 515, 0, 0, 515, 515, 515, 0, 515, 515, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478 + 478, 478, 478, 478, 478, 478, 478, 478, 478 } ; #line 1 "" @@ -1813,7 +878,7 @@ YY_DECL yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 6578 ); + while ( yy_base[yy_current_state] != 2399 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2185,7 +1250,7 @@ YY_RULE_SETUP #line 110 "" ECHO; YY_BREAK -#line 2738 "" +#line 1761 "" case YY_STATE_EOF(INITIAL): case YY_END_OF_BUFFER: case YY_STATE_EOF(mediaquery): diff --git a/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp index fb6d9fe..76c3202 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp @@ -257,6 +257,10 @@ void HTMLCanvasElement::createImageBuffer() const return; m_imageBuffer.set(ImageBuffer::create(size, false).release()); + // The convertLogicalToDevice MaxCanvasArea check should prevent common cases + // where ImageBuffer::create() returns NULL, however we could still be low on memory. + if (!m_imageBuffer) + return; m_imageBuffer->context()->scale(FloatSize(size.width() / unscaledSize.width(), size.height() / unscaledSize.height())); m_imageBuffer->context()->setShadowsIgnoreTransforms(true); } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp index 9d95373..218f7be 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -126,6 +126,10 @@ String DragData::asURL(String* title) const if (!m_platformDragData) return String(); QList urls = m_platformDragData->urls(); + + if (urls.isEmpty()) + return String(); + return urls.first().toString(); } diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index e0e178b..1d7d570 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -299,9 +299,6 @@ void PluginView::show() setSelfVisible(true); - if (isParentVisible() && platformPluginWidget()) - platformPluginWidget()->setVisible(true); - Widget::show(); } @@ -311,9 +308,6 @@ void PluginView::hide() setSelfVisible(false); - if (isParentVisible() && platformPluginWidget()) - platformPluginWidget()->setVisible(false); - Widget::hide(); } @@ -345,9 +339,6 @@ void PluginView::setParentVisible(bool visible) return; Widget::setParentVisible(visible); - - if (isSelfVisible() && platformPluginWidget()) - platformPluginWidget()->setVisible(visible); } void PluginView::setNPWindowRect(const IntRect&) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 14288e2..de37383 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1095,7 +1095,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const This enum describes the types of action which can be performed on the web page. Actions only have an effect when they are applicable. The availability of - actions can be be determined by checking \l{QAction::}{isEnabled()} on the + actions can be be determined by checking \l{QAction::}{enabled()} on the action returned by \l{QWebPage::}{action()}. One method of enabling the text editing, cursor movement, and text selection actions -- cgit v0.12 From cdc86d4ba99c71c6145fce9df0b28421d955e487 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Mon, 6 Apr 2009 16:56:36 +0200 Subject: Removed usage of NaN in SVG gradients. The previous change 6c2dd295b2ca2f9125fe072d035a3784ce748718 to remove usage of NaN in SVG gradients was incomplete. This commit should fix that. Task-number: 250146 Reviewed-by: Samuel (cherry picked from commit 003223dcfc1fa884b82085db19d4c4056bf6eaa0) --- src/svg/qsvghandler.cpp | 6 ++++-- src/svg/qsvgstyle.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 18ba71c..433a3ad 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -2587,10 +2587,12 @@ static void parseBaseGradient(QSvgNode *node, if (prop && prop->type() == QSvgStyleProperty::GRADIENT) { QSvgGradientStyle *inherited = static_cast(prop); - if (!inherited->stopLink().isEmpty()) + if (!inherited->stopLink().isEmpty()) { gradProp->setStopLink(inherited->stopLink(), handler->document()); - else + } else { grad->setStops(inherited->qgradient()->stops()); + gradProp->setGradientStopsSet(inherited->gradientStopsSet()); + } matrix = inherited->qmatrix(); } else { diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 4a40bed..b065395 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -257,7 +257,7 @@ void QSvgGradientStyle::apply(QPainter *p, const QRectF &/*rect*/, QSvgNode *, Q // If the gradient is marked as empty, insert transparent black if (!m_gradientStopsSet) { - m_gradient->setColorAt(0.0, QColor(0, 0, 0, 0)); + m_gradient->setStops(QGradientStops() << QGradientStop(0.0, QColor(0, 0, 0, 0))); m_gradientStopsSet = true; } -- cgit v0.12 From 52792607c7a0099a8261fb66b93323406c826bfe Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 6 Apr 2009 17:10:26 +0200 Subject: BT: Adjust the colliding mice example to work with coalesced updates. It seems that Cocoa is much more strict about coalesced updates than Carbon ever was. The upshot of this is that some examples that "worked" after a fashion in Carbon, do not exhibit good frame rates with Cocoa. The reason why is that apparently Cocoa will decide to flush to the screen every time a timer fires. If you have a lot of timers that are all dependent on doing on update to the screen, you will get undesirable effects. Thankfully, it is possible to adjust the examples to follow best practices and get a good result. So, we now only do the animation once using QGraphicsScene::advance(). We are also able to make the mice less heavy (no QObject subclass). I've updated the docs and someone on the doc team has kindly volunteered to go through them. Reviewed-by: Andreas (cherry picked from commit 1bb9d8fcd59a91751c8d91e2885e2b05eff4d1bb) --- doc/src/examples/collidingmice-example.qdoc | 39 ++++++++++++++------------- examples/graphicsview/collidingmice/main.cpp | 4 +++ examples/graphicsview/collidingmice/mouse.cpp | 5 ++-- examples/graphicsview/collidingmice/mouse.h | 7 ++--- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/doc/src/examples/collidingmice-example.qdoc b/doc/src/examples/collidingmice-example.qdoc index 7ea2ca2..657a204 100644 --- a/doc/src/examples/collidingmice-example.qdoc +++ b/doc/src/examples/collidingmice-example.qdoc @@ -66,7 +66,7 @@ \section1 Mouse Class Definition - The \c mouse class inherits both QObject and QGraphicsItem. The + The \c mouse class inherits from QGraphicsItem. The QGraphicsItem class is the base class for all graphical items in the Graphics View framework, and provides a light-weight foundation for writing your own custom items. @@ -78,14 +78,11 @@ {QGraphicsItem::}{boundingRect()}, which returns an estimate of the area painted by the item, and \l {QGraphicsItem::}{paint()}, which implements the actual painting. In addition, we reimplement - the \l {QGraphicsItem::}{shape()} function to return an accurate + the \l {QGraphicsItem::}{shape()} and \l {QGraphicsItem::}{advance()}. + We reimplement \l {QGraphicsItem::}{shape()} to return an accurate shape of our mouse item; the default implementation simply returns - the item's bounding rectangle. - - The rationale for deriving from QObject in addition to - QGraphicsItem is to be able to animate our items by reimplementing - QObject's \l {QObject::}{timerEvent()} function and use - QObject::startTimer() to generate timer events. + the item's bounding rectangle. We reimplement \l {QGraphicsItem::}{advance()} + to handle the animation so it all happens on one update. \section1 Mouse Class Definition @@ -105,19 +102,18 @@ calling the item's \l {QGraphicsItem::rotate()}{rotate()} function we alter the direction in which the mouse will start moving. - In the end we call QObject's \l {QObject::}{startTimer()} - function, emitting a timer event every 1000/33 millisecond. This - enables us to animate our mouse item using our reimplementation of - the \l {QObject::}{timerEvent()} function; whenever a mouse - receives a timer event it will trigger \l - {QObject::}{timerEvent()}: - + When the QGraphicsScene decides to advance the scene a frame it will call + QGraphicsItem::advance() on each of the items. This enables us to animate + our mouse using our reimplementation of the advance() function. + \snippet examples/graphicsview/collidingmice/mouse.cpp 4 \snippet examples/graphicsview/collidingmice/mouse.cpp 5 \snippet examples/graphicsview/collidingmice/mouse.cpp 6 - First we ensure that the mice stays within a circle with a radius - of 150 pixels. + First, we don't bother doing any advance if the step is 0 since we want to our advance in + the actual advance (advance() is called twice, once with step == 0 indicating that items + are about to advance and with step == 1 for the actual advance). We also ensure that the + mice stays within a circle with a radius of 150 pixels. Note the \l {QGraphicsItem::mapFromScene()}{mapFromScene()} function provided by QGraphicsItem. This function maps a position @@ -275,5 +271,12 @@ In the end, we set the application window's title and size before we enter the main event loop using the QApplication::exec() function. -*/ + Finally, we create a QTimer and connect its timeout() signal to the advance() + slot of the scene. Every time the timer fires, the scene will advance one frame. + We then tell the timer to fire every 1000/33 millisecond. This will + give us a frame rate of 30 frames a second, which is fast enough for most animations. + Doing the animation with a single timer connect to advance the scene ensures that all the + mice are moved at one point and, more importantly, only one update is sent to the screen + after all the mice have moved. +*/ \ No newline at end of file diff --git a/examples/graphicsview/collidingmice/main.cpp b/examples/graphicsview/collidingmice/main.cpp index 4a44481..23c91b0 100644 --- a/examples/graphicsview/collidingmice/main.cpp +++ b/examples/graphicsview/collidingmice/main.cpp @@ -83,6 +83,10 @@ int main(int argc, char **argv) view.resize(400, 300); view.show(); + QTimer timer; + QObject::connect(&timer, SIGNAL(timeout()), &scene, SLOT(advance())); + timer.start(1000 / 33); + return app.exec(); } //! [6] diff --git a/examples/graphicsview/collidingmice/mouse.cpp b/examples/graphicsview/collidingmice/mouse.cpp index 1d10574..bbdb4e3 100644 --- a/examples/graphicsview/collidingmice/mouse.cpp +++ b/examples/graphicsview/collidingmice/mouse.cpp @@ -65,7 +65,6 @@ Mouse::Mouse() color(qrand() % 256, qrand() % 256, qrand() % 256) { rotate(qrand() % (360 * 16)); - startTimer(1000 / 33); } //! [0] @@ -123,8 +122,10 @@ void Mouse::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget * //! [3] //! [4] -void Mouse::timerEvent(QTimerEvent *) +void Mouse::advance(int step) { + if (!step) + return; //! [4] // Don't move too far away //! [5] diff --git a/examples/graphicsview/collidingmice/mouse.h b/examples/graphicsview/collidingmice/mouse.h index 832ea53..c08ce4a 100644 --- a/examples/graphicsview/collidingmice/mouse.h +++ b/examples/graphicsview/collidingmice/mouse.h @@ -43,13 +43,10 @@ #define MOUSE_H #include -#include //! [0] -class Mouse : public QObject, public QGraphicsItem +class Mouse : public QGraphicsItem { - Q_OBJECT - public: Mouse(); @@ -59,7 +56,7 @@ public: QWidget *widget); protected: - void timerEvent(QTimerEvent *event); + void advance(int step); private: qreal angle; -- cgit v0.12 From c40d4b7180be3ff33ced7d09e11d8607f475190c Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 6 Apr 2009 17:52:58 +0200 Subject: BT: Fixed treeview painting regression on Vista The old code did not split up the frame from the central parts of the itemview selection box correctly. We now draw the edges as border images instead. Previously this would lead to somewhat ugly scaling artifacts for small header sections. Task: 248839 Reviewed-by: ogoffart (cherry picked from commit 041a8ecdb5f11dfc499f8f8f77d85cb63508c093) --- src/gui/styles/qwindowsvistastyle.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index 4c3060d..b14b8b3 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -801,12 +801,20 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt if (vopt->viewItemPosition == QStyleOptionViewItemV4::OnlyOne || vopt->viewItemPosition == QStyleOptionViewItemV4::Invalid) painter->drawPixmap(pixmapRect.topLeft(), pixmap); - else if (reverse ? rightSection : leftSection) - painter->drawPixmap(pixmapRect, pixmap, srcRect.adjusted(0, 0, -frame, 0)); - else if (reverse ? leftSection : rightSection) - painter->drawPixmap(pixmapRect, pixmap, - srcRect.adjusted(frame, 0, 0, 0)); - else if (vopt->viewItemPosition == QStyleOptionViewItemV4::Middle) + else if (reverse ? rightSection : leftSection){ + painter->drawPixmap(QRect(pixmapRect.topLeft(), + QSize(frame, pixmapRect.height())), pixmap, + QRect(QPoint(0, 0), QSize(frame, pixmapRect.height()))); + painter->drawPixmap(pixmapRect.adjusted(frame, 0, 0, 0), + pixmap, srcRect.adjusted(frame, 0, -frame, 0)); + } else if (reverse ? leftSection : rightSection) { + painter->drawPixmap(QRect(pixmapRect.topRight() - QPoint(frame - 1, 0), + QSize(frame, pixmapRect.height())), pixmap, + QRect(QPoint(pixmapRect.width() - frame, 0), + QSize(frame, pixmapRect.height()))); + painter->drawPixmap(pixmapRect.adjusted(0, 0, -frame, 0), + pixmap, srcRect.adjusted(frame, 0, -frame, 0)); + } else if (vopt->viewItemPosition == QStyleOptionViewItemV4::Middle) painter->drawPixmap(pixmapRect, pixmap, srcRect.adjusted(frame, 0, -frame, 0)); } else { -- cgit v0.12 From 9dcc109d4101ecd73af8ddfb9155f737ec977340 Mon Sep 17 00:00:00 2001 From: Bill King Date: Tue, 7 Apr 2009 07:45:10 +1000 Subject: Make compile when Qt3Support is turned off (cherry picked from commit 6393b9fa8474b7b9e86319f54477cba9bec65d11) --- tests/auto/qsqldatabase/tst_qsqldatabase.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index e10a0ca..1a66769 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -1045,6 +1045,7 @@ void tst_QSqlDatabase::recordMySQL() int minor = tst_Databases::getMySqlVersion( db ).section( QChar('.'), 1, 1 ).toInt(); int revision = tst_Databases::getMySqlVersion( db ).section( QChar('.'), 2, 2 ).toInt(); +#ifdef QT3_SUPPORT /* The below is broken in mysql below 5.0.15 see http://dev.mysql.com/doc/refman/5.0/en/binary-varbinary.html specifically: Before MySQL 5.0.15, the pad value is space. Values are right-padded @@ -1054,6 +1055,7 @@ void tst_QSqlDatabase::recordMySQL() bin10 = FieldDef("binary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abc "))); varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abcv "))); } +#endif static QDateTime dt(QDate::currentDate(), QTime(1, 2, 3, 0)); static const FieldDef fieldDefs[] = { -- cgit v0.12 From 9990af66808c3deefa87acdc7d83e52c907ca371 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 6 Apr 2009 16:18:40 +0200 Subject: compile for non x11 systems Reviewed-by: joerg (cherry picked from commit a93551a2e3e590400b09bc076d3a6883c162b75d) --- tests/auto/qwidget/tst_qwidget.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index dfd0792..4b41bdb 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -8734,7 +8734,9 @@ void tst_QWidget::toplevelLineEditFocus() QLineEdit w; w.show(); +#ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&w); +#endif QTest::qWait(200); QCOMPARE(QApplication::activeWindow(), &w); -- cgit v0.12 From af6b19e074cecc81fa943f8e1a7e6e24549583d7 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 6 Apr 2009 15:07:58 +0200 Subject: compile Reviewed-by: thartman function declaration was missing arguments as done in the other testcases in 831d2742b7c41924f052acd81620e8bfc58afde7 (cherry picked from commit e517ecc9025b68179c67a383791eefbedfee0543) --- tests/auto/qsqlthread/tst_qsqlthread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/qsqlthread/tst_qsqlthread.cpp index d871be4..8b8fc65 100644 --- a/tests/auto/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/qsqlthread/tst_qsqlthread.cpp @@ -70,7 +70,7 @@ public: void recreateTestTables(); void repopulateTestTables(); - void generic_data(); + void generic_data(const QString &engine=QString()); tst_Databases dbs; public slots: -- cgit v0.12 From 7255e03be8f9caa8fc9240ada2605a7b60a31e36 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 6 Apr 2009 14:29:02 +0200 Subject: compile for systems without Qt3Support Reviewed-by: joerg QTest::newRow only accepts char* and without Qt3Support there is no implicit cast available. (cherry picked from commit b8dcae1572651774085024ddf4cb02e4a954bcd7) --- tests/auto/qpainter/tst_qpainter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index a4c768d..fb8df2e 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -3629,7 +3629,7 @@ void tst_QPainter::drawImage_data() QString("srcFormat %1, dstFormat %2, odd x: %3, odd width: %4") .arg(srcFormat).arg(dstFormat).arg(odd_x).arg(odd_width); - QTest::newRow(description) << (10 + odd_x) << 10 << (20 + odd_width) << 20 + QTest::newRow(qPrintable(description)) << (10 + odd_x) << 10 << (20 + odd_width) << 20 << QImage::Format(srcFormat) << QImage::Format(dstFormat); } -- cgit v0.12 From 10eee82df6affdbb4518edebe4e845907d4ce0c3 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 2 Apr 2009 11:27:57 +0200 Subject: Works around a crash in q3richtext. Full fix will potentially break other code and is thus avoided Task-number: 248992 Reviewed-by: Trond (cherry picked from commit e0560bcaa3703fafccc21dd709731341a123a0e4) --- src/qt3support/text/q3richtext.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp index c058e37..e508001 100644 --- a/src/qt3support/text/q3richtext.cpp +++ b/src/qt3support/text/q3richtext.cpp @@ -4895,7 +4895,8 @@ void Q3TextParagraph::drawString(QPainter &painter, const QString &str, int star bool extendRight = false; bool extendLeft = false; bool selWrap = (real_selEnd == length()-1 && n && n->hasSelection(it.key())); - if (selWrap || this->str->at(real_selEnd).lineStart) { + if (selWrap + || ((real_selEnd < this->str->length()) && this->str->at(real_selEnd).lineStart)) { extendRight = (fullSelectionWidth != 0); if (!extendRight && !rightToLeft) tmpw += painter.fontMetrics().width(QLatin1Char(' ')); -- cgit v0.12 From 3336a02eebfea039fc56355769072aefbca0ba55 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 7 Apr 2009 17:31:51 +1000 Subject: Change to license files for release (cherry picked from commit 0d29af709e168096f5b33ff27e3338129678ff09) Conflicts: LGPL_EXCEPTION.txt --- .LICENSE-ALLOS | 567 +++++++++++++++++++++++++++++++++++++++ .LICENSE-ALLOS-US | 594 +++++++++++++++++++++++++++++++++++++++++ .LICENSE-DESKTOP | 526 +++++++++++++++++++++++++++++++++++++ .LICENSE-DESKTOP-US | 556 +++++++++++++++++++++++++++++++++++++++ .LICENSE-EMBEDDED | 506 +++++++++++++++++++++++++++++++++++ .LICENSE-EMBEDDED-US | 533 +++++++++++++++++++++++++++++++++++++ .LICENSE-EVALUATION | 287 ++++++++++++++++++++ .LICENSE-EVALUATION-US | 300 +++++++++++++++++++++ LICENSE.LGPL | 10 - LICENSE.PREVIEW.COMMERCIAL | 642 --------------------------------------------- 10 files changed, 3869 insertions(+), 652 deletions(-) create mode 100644 .LICENSE-ALLOS create mode 100644 .LICENSE-ALLOS-US create mode 100644 .LICENSE-DESKTOP create mode 100644 .LICENSE-DESKTOP-US create mode 100644 .LICENSE-EMBEDDED create mode 100644 .LICENSE-EMBEDDED-US create mode 100644 .LICENSE-EVALUATION create mode 100644 .LICENSE-EVALUATION-US delete mode 100644 LICENSE.PREVIEW.COMMERCIAL diff --git a/.LICENSE-ALLOS b/.LICENSE-ALLOS new file mode 100644 index 0000000..45ebb93 --- /dev/null +++ b/.LICENSE-ALLOS @@ -0,0 +1,567 @@ +Qt All Operating Systems Commercial Developer License Agreement +Agreement version 1.1 + + +This Qt All Operating Systems Commercial Developer License Agreement +("Agreement") is a legal agreement between Nokia Corporation ("Nokia") +with its registered office at Keilalahdentie 4, 02150 Espoo, Finland, +and you (either an individual or a legal entity) ("Licensee") for the +Licensed Software (as defined below). + + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Deployment Platforms" shall mean the Embedded Linux, Windows(R) CE +and Windows Mobile operating system(s). + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee's consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Platforms and Designated Users. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Platforms" shall mean the operating system(s) listed in the License +Certificate. + +"Redistributables" shall mean the portions of the Licensed Software +set forth in Appendix 1, Section 1 that may be distributed with or as +part of Applications in object code form. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancements, new features, bug fixes, error corrections +and other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + + +3. MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate accompanying the Licensed Software. The +terms of the License Certificate are considered part of the +Agreement. In the event of inconsistency or conflict between the +language of this Agreement and the License Certificate, the provisions +of this Agreement shall govern. + +4. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee +should not install, copy, or otherwise use the Licensed Software. In +addition, by installing, copying, or otherwise using any Updates or +other components of the Licensed Software that Licensee receives +separately as part of the Licensed Software, Licensee agrees to be +bound by any additional license terms that accompany such Updates, if +any. If Licensee does not agree to the additional license terms that +accompany such Updates, Licensee should not install, copy, or +otherwise use such Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + + +5. LICENSES + +5.1 Using, Modifying and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for Designated +Users specified in the License Certificate for the sole purposes of: + +(i) designing, developing, and testing Application(s); + +(ii) modifying the Licensed Software as limited by section 8 below; and + +(iii) compiling the Licensed Software and/or Modified Software source + code into object code. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2 Limited Redistribution + +a) Nokia grants Licensee a non-exclusive, royalty-free right to + reproduce and distribute the object code form of Redistributables + (listed in Appendix 1, Section 1) for execution on the specified + Platforms, excluding the Deployment Platforms. Copies of + Redistributables may only be distributed with and for the sole + purpose of executing Applications permitted under this Agreement + that Licensee has created using the Licensed Software. Under no + circumstances may any copies of Redistributables be distributed + separately. This Agreement does not give Licensee any rights to + distribute any of the parts of the Licensed Software listed in + Appendix 1, Section 2, neither as a whole nor as parts or snippets + of code. + +b) Licensee may not distribute, transfer, assign or otherwise dispose + of Applications and/or Redistributables, in binary/compiled form, + or in any other form, if such action is part of a joint software + and hardware distribution, except as provided by a separate runtime + distribution license with Nokia or one of its authorized + distributors. A joint hardware and software distribution shall be + defined as either: + + (i) distribution of a hardware device where, in its final end user + configuration, the main user interface of the device is + provided by Application(s) created by Licensee or others, using + a commercial version of a Qt or Qt-based product, and depends + on the Licensed Software or an open source version of any Qt or + Qt-based software product; or + + (ii) distribution of the Licensed Software with a device designed + to facilitate the installation of the Licensed Software onto + the same device where the main user interface of such device + is provided by Application(s) created by Licensee or others, + using a commercial version of a Qt or Qt-based product, and + depends on the Licensed Software. + +c) Licensee's distribution of Licensed Software and/or Modified + Software or Applications on Deployment Platforms requires a + separate distribution license from Nokia. Notwithstanding the + above limitation, Licensee may distribute the Application in + binary/compiled form onto devices running Windows CE/Windows + Mobile, provided the core functionality of the device does not + depend on either the Licensed Software or the Application. + +5.3 Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + + +6. VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia will not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + + +7. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (i) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (ii) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +8. CONDITIONS FOR CREATING APPLICATIONS + +The licenses granted in this Agreement for Licensee to create, modify +and distribute Applications is subject to all of the following +conditions: (i) all copies of the Applications Licensee creates must +bear a valid copyright notice either Licensee's own or the copyright +notice that appears on the Licensed Software; (ii) Licensee may not +remove or alter any copyright, trademark or other proprietary rights +notice contained in any portion of the Licensed Software including but +not limited to the About Boxes; (iii) Licensee will indemnify and hold +Nokia, its Affiliates, contractors, and its suppliers, harmless from +and against any claims or liabilities arising out of the use, +reproduction or distribution of Applications; (iv) Applications must +be developed using a licensed, registered copy of the Licensed +Software; (v) Applications must add primary and substantial +functionality to the Licensed Software; (vi) Applications may not pass +on functionality which in any way makes it possible for others to +create software with the Licensed Software; however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (vii) Licensee may create Modified Software that +breaks the source or binary compatibility with the Licensed +Software. This includes, but is not limited to, changing the +application programming interfaces ("API") by adding, changing or +deleting any variable, method, or class signature in the Licensed +Software, the inter-process QCop specification, and/or any +inter-process protocols, services or standards in the Licensed +Software libraries. To the extent that Licensee breaks source or +binary compatibility with the Licensed Software, Licensee acknowledges +that Nokia's ability to provide Support may be prevented or limited +and Licensee's ability to make use of Updates may be restricted; +(viii) Applications may not compete with the Licensed Software; (ix) +Licensee may not use Nokia's or any of its suppliers' names, logos, or +trademarks to market Applications, except to state that Licensee's +Application(s) was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set +forth above, the Licensed Software is licensed to Licensee "as is". +To the maximum extent permitted by applicable law, Nokia on behalf of +itself and its suppliers, disclaims all warranties and conditions, +either express or implied, including, but not limited to, implied +warranties of merchantability and fitness for a particular purpose, +title and non-infringement with regard to the Licensed Software. + + +10. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held to be +liable to Licensee whether in contract, tort, or any other legal +theory, based on the Licensed Software, Nokia's entire liability to +Licensee and Licensee's exclusive remedy shall be, at Nokia's option, +either (a) return of the price Licensee paid for the Licensed +Software, or (b) repair or replacement of the Licensed Software, +provided Licensee returns to Nokia all copies of the Licensed Software +as originally delivered to Licensee. Nokia shall not under any +circumstances be liable to Licensee based on failure of the Licensed +Software if the failure resulted from accident, abuse or +misapplication, nor shall Nokia, under any circumstances, be liable +for special damages, punitive or exemplary damages, damages for loss +of profits or interruption of business or for loss or corruption of +data. Any award of damages from Nokia to Licensee shall not exceed the +total amount Licensee has paid to Nokia in connection with this +Agreement. + + +11. SUPPORT AND UPDATES + +Licensee will be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + + +12. CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +13. GENERAL PROVISIONS + +13.1 Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3 Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of the Licenses, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections 2, 5.1, 6, 7, 8(iii), 10, 12, +13.5, 13.6, 13.9, 13.10, and 13.11 shall survive the termination of +the Agreement. Notwithstanding the foregoing, Section 5.1 shall not +survive if the Agreement is terminated for material breach. + +13.5 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +13.6 Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7 Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + +13.8 Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia Norge AS +Sandakerveien 116 +NO-0484 Oslo, Norway +Fax: +47 21 69 48 02 + +13.9 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10 Governing Law and Legal Venue + +This Agreement shall be construed and interpreted in accordance with +the laws of Finland, excluding its choice of law provisions. Any +disputes arising out of or relating to this Agreement shall be +resolved in arbitration under the Rules of Arbitration of the Chamber +of Commerce of Helsinki, Finland. The arbitration tribunal shall +consist of one (1), or if either Party so requires, of three (3), +arbitrators. The award shall be final and binding and enforceable in +any court of competent jurisdiction. The arbitration shall be held in +Helsinki, Finland and the process shall be conducted in the English +language. + + +13.11 No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. + + + + +Appendix 1 + + +1. Parts of the Licensed Software that are permitted for distribution ("Redistributables"): + +- The Licensed Software's main and plug-in libraries in object code form +- The Licensed Software's configuration tool ("qtconfig") +- The Licensed Software's help tool in object code/executable form ("Qt Assistant") +- The Licensed Software's internationalization tools in object code/executable form ("Qt Linguist", "lupdate", "lrelease") +- The Licensed Software's designer tool ("Qt Designer") +- The Licensed Software's IDE tool ("Qt Creator") + + +2. Parts of the Licensed Software that are not permitted for distribution include, but are not limited to: + +- The Licensed Software's source code and header files +- The Licensed Software's documentation +- The Licensed Software's tool for writing makefiles ("qmake") +- The Licensed Software's Meta Object Compiler ("moc") +- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") +- The Licensed Software's Resource Compiler ("rcc") +- The Licensed Software's generator (only in the case of Qt Jambi if applicable) +- The Licensed Software's Qt SDK + + + diff --git a/.LICENSE-ALLOS-US b/.LICENSE-ALLOS-US new file mode 100644 index 0000000..673ded0 --- /dev/null +++ b/.LICENSE-ALLOS-US @@ -0,0 +1,594 @@ +Qt All Operating Systems Commercial Developer License Agreement +Agreement version 1.1 + + +This Qt All Operating Systems Commercial Developer License Agreement +("Agreement") is a legal agreement between Nokia, Inc. ("Nokia") with +its registered office at 102 Corporate Park Drive, White Plains, NY +10604, U.S.A., and you (either an individual or a legal entity) +("Licensee") for the Licensed Software (as defined below). + + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Deployment Platforms" shall mean the Embedded Linux, Windows(R) CE +and Windows Mobile operating system(s). + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee's consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Platforms and Designated Users. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Platforms" shall mean the operating system(s) listed in the License +Certificate. + +"Redistributables" shall mean the portions of the Licensed Software +set forth in Appendix 1, Section 1 that may be distributed with or as +part of Applications in object code form. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancements, new features, bug fixes, error corrections +and other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + + +3. MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate accompanying the Licensed Software. The +terms of the License Certificate are considered part of the +Agreement. In the event of inconsistency or conflict between the +language of this Agreement and the License Certificate, the provisions +of this Agreement shall govern. + + +4. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee +should not install, copy, or otherwise use the Licensed Software. In +addition, by installing, copying, or otherwise using any Updates or +other components of the Licensed Software that Licensee receives +separately as part of the Licensed Software, Licensee agrees to be +bound by any additional license terms that accompany such Updates, if +any. If Licensee does not agree to the additional license terms that +accompany such Updates, Licensee should not install, copy, or +otherwise use such Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + + +5. LICENSES + +5.1 Using, Modifying and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for Designated +Users specified in the License Certificate for the sole purposes of: + +(i) designing, developing, and testing Application(s); + +(ii) modifying the Licensed Software as limited by section 8 below; and + +(iii) compiling the Licensed Software and/or Modified Software source + code into object code. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2 Limited Redistribution + +a) Nokia grants Licensee a non-exclusive, royalty-free right to + reproduce and distribute the object code form of Redistributables + (listed in Appendix 1, Section 1) for execution on the specified + Platforms, excluding the Deployment Platforms. Copies of + Redistributables may only be distributed with and for the sole + purpose of executing Applications permitted under this Agreement + that Licensee has created using the Licensed Software. Under no + circumstances may any copies of Redistributables be distributed + separately. This Agreement does not give Licensee any rights to + distribute any of the parts of the Licensed Software listed in + Appendix 1, Section 2, neither as a whole nor as parts or snippets + of code. + +b) Licensee may not distribute, transfer, assign or otherwise dispose + of Applications and/or Redistributables, in binary/compiled form, + or in any other form, if such action is part of a joint software + and hardware distribution, except as provided by a separate runtime + distribution license with Nokia or one of its authorized + distributors. A joint hardware and software distribution shall be + defined as either: + + (i) distribution of a hardware device where, in its final end user + configuration, the main user interface of the device is + provided by Application(s) created by Licensee or others, using + a commercial version of a Qt or Qt-based product, and depends + on the Licensed Software or an open source version of any Qt or + Qt-based software product; or + + (ii) distribution of the Licensed Software with a device designed + to facilitate the installation of the Licensed Software onto + the same device where the main user interface of such device + is provided by Application(s) created by Licensee or others, + using a commercial version of a Qt or Qt-based product, and + depends on the Licensed Software. + +c) Licensee's distribution of Licensed Software and/or Modified + Software or Applications on Deployment Platforms requires a + separate distribution license from Nokia. Notwithstanding the + above limitation, Licensee may distribute the Application in + binary/compiled form onto devices running Windows CE/Windows + Mobile, provided the core functionality of the device does not + depend on either the Licensed Software or the Application. + +5.3 Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + + +6. VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia will not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + + +7. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (i) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (ii) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +8. CONDITIONS FOR CREATING APPLICATIONS + +The licenses granted in this Agreement for Licensee to create, modify +and distribute Applications is subject to all of the following +conditions: (i) all copies of the Applications Licensee creates must +bear a valid copyright notice either Licensee's own or the copyright +notice that appears on the Licensed Software; (ii) Licensee may not +remove or alter any copyright, trademark or other proprietary rights +notice contained in any portion of the Licensed Software including but +not limited to the About Boxes; (iii) Licensee will indemnify and hold +Nokia, its Affiliates, contractors, and its suppliers, harmless from +and against any claims or liabilities arising out of the use, +reproduction or distribution of Applications; (iv) Applications must +be developed using a licensed, registered copy of the Licensed +Software; (v) Applications must add primary and substantial +functionality to the Licensed Software; (vi) Applications may not pass +on functionality which in any way makes it possible for others to +create software with the Licensed Software; however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (vii) Licensee may create Modified Software that +breaks the source or binary compatibility with the Licensed +Software. This includes, but is not limited to, changing the +application programming interfaces ("API") by adding, changing or +deleting any variable, method, or class signature in the Licensed +Software, the inter-process QCop specification, and/or any +inter-process protocols, services or standards in the Licensed +Software libraries. To the extent that Licensee breaks source or +binary compatibility with the Licensed Software, Licensee acknowledges +that Nokia's ability to provide Support may be prevented or limited +and Licensee's ability to make use of Updates may be restricted; +(viii) Applications may not compete with the Licensed Software; (ix) +Licensee may not use Nokia's or any of its suppliers' names, logos, or +trademarks to market Applications, except to state that Licensee's +Application(s) was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set +forth above, the Licensed Software is licensed to Licensee "as is". +To the maximum extent permitted by applicable law, Nokia on behalf of +itself and its suppliers, disclaims all warranties and conditions, +either express or implied, including, but not limited to, implied +warranties of merchantability and fitness for a particular purpose, +title and non-infringement with regard to the Licensed Software. + + +10. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held to be +liable to Licensee whether in contract, tort, or any other legal +theory, based on the Licensed Software, Nokia's entire liability to +Licensee and Licensee's exclusive remedy shall be, at Nokia's option, +either (a) return of the price Licensee paid for the Licensed +Software, or (b) repair or replacement of the Licensed Software, +provided Licensee returns to Nokia all copies of the Licensed Software +as originally delivered to Licensee. Nokia shall not under any +circumstances be liable to Licensee based on failure of the Licensed +Software if the failure resulted from accident, abuse or +misapplication, nor shall Nokia, under any circumstances, be liable +for special damages, punitive or exemplary damages, damages for loss +of profits or interruption of business or for loss or corruption of +data. Any award of damages from Nokia to Licensee shall not exceed the +total amount Licensee has paid to Nokia in connection with this +Agreement. + + +11. SUPPORT AND UPDATES + +Licensee will be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + + +12. CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + + + +13. GENERAL PROVISIONS + +13.1 Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3 Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of the Licenses, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections 2, 5.1, 6, 7, 8(iii), 10, 12, +13.5, 13.6, 13.9, 13.10, and 13.11 shall survive the termination of +the Agreement. Notwithstanding the foregoing, Section 5.1 shall not +survive if the Agreement is terminated for material breach. + +13.5 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + + +13.6 Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7 Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + +13.8 Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia, Inc. +555 Twin Dolphin Drive, Suite 280 +Redwood City, CA 94065 U.S.A. +Fax: +1-650551-1851 + +13.9 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10 Governing Law and Legal Venue + +This Agreement shall be governed by and construed in accordance with +the federal laws of the United States of America and the internal laws +of the State of New York without given effect to any choice of law +rule that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction +of the United States District Court for the Southern District of New +York (or if such court lacks jurisdiction, the state courts of the +State of New York) for the purposes of any action, claim, suit or +proceeding between the Parties in connection with any controversy, +claim, or dispute arising out of or relating to this Agreement; and +(b) hereby waives, and agrees not to assert by way of motion, as a +defense or otherwise, in any such action, claim, suit or proceeding, +any claim that is not personally subject to the jurisdiction of such +court(s), that the action, claim, suit or proceeding is brought in an +inconvenient forum or that the venue of the action, claim, suit or +proceeding is improper. Notwithstanding the foregoing, nothing in +this Section 13.10 is intended to, or shall be deemed to, constitute a +submission or consent to, or selection of, jurisdiction, forum or +venue for any action for patent infringement, whether or not such +action relates to this Agreement. + + +13.11 No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. + +13.11 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if +Licensee is a U.S. Government End User. The Licensed Software is a +"commercial item," as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of "commercial computer software" and +"commercial computer software documentation," as such terms are used +in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 +and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all +U.S. Government End Users acquire the Licensed Software with only +those rights set forth herein. The Licensed Software (including +related documentation) is provided to U.S. Government End Users: (a) +only as a commercial end item; and (b) only pursuant to this +Agreement. + + + +Appendix 1 + + +1. Parts of the Licensed Software that are permitted for distribution ("Redistributables"): + +- The Licensed Software's main and plug-in libraries in object code form +- The Licensed Software's configuration tool ("qtconfig") +- The Licensed Software's help tool in object code/executable form ("Qt Assistant") +- The Licensed Software's internationalization tools in object code/executable form ("Qt Linguist", "lupdate", "lrelease") +- The Licensed Software's designer tool ("Qt Designer") +- The Licensed Software's IDE tool ("Qt Creator") + + +2. Parts of the Licensed Software that are not permitted for distribution include, but are not limited to: + +- The Licensed Software's source code and header files +- The Licensed Software's documentation +- The Licensed Software's tool for writing makefiles ("qmake") +- The Licensed Software's Meta Object Compiler ("moc") +- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") +- The Licensed Software's Resource Compiler ("rcc") +- The Licensed Software's generator (only in the case of Qt Jambi if applicable) +- The Licensed Software's Qt SDK diff --git a/.LICENSE-DESKTOP b/.LICENSE-DESKTOP new file mode 100644 index 0000000..3efb367 --- /dev/null +++ b/.LICENSE-DESKTOP @@ -0,0 +1,526 @@ +Qt COMMERCIAL LICENSE AGREEMENT +Agreement version 3.7 + + +This Qt Commercial License Agreement ("Agreement") is a legal +agreement between Nokia Corporation ("Nokia"), with its registered +office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an +individual or a legal entity) ("Licensee") for the Licensed Software +(as defined below). + +1.DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee?s software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee?s consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Platforms and Designated Users. + +"Licensed Software" shall mean the computer software, ?online? or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Platforms" shall mean the operating systems listed in the License +Certificate. + +"Redistributables" shall mean the portions of the Licensed Software +set forth in Appendix 1, Section 1 that may be distributed with or as +part of Applications in object code form. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancement, new features, bug fixes, error corrections and +other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + +2.OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + +3.MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate. The terms of the License Certificate are +considered part of the Agreement. In the event of inconsistency or +conflict between the language of this Agreement and the License +Certificate, the provisions of this Agreement shall govern. + +4.VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee may +not install, copy, or otherwise use the Licensed Software. Licensee +may, however, return it to Licensee's place of purchase within +fourteen (14) days of purchase for a full refund. In addition, by +installing, copying, or otherwise using any Updates or other +components of the Licensed Software that Licensee receives separately +as part of the Licensed Software, Licensee agrees to be bound by any +additional license terms that accompany such Updates, if any. If +Licensee does not agree to the additional license terms that accompany +such Updates, Licensee may not install, copy, or otherwise use such +Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + +5.LICENSES + +5.1.Using, modifying and copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for the +Designated User(s) specified in the License Certificate for the sole +purposes of designing, developing, and testing Application(s). + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2.Redistribution + +a) Nokia grants Licensee a non-exclusive, royalty-free right to + reproduce and distribute the object code form of Redistributables + for execution on the specified Platforms. Copies of + Redistributables may only be distributed with and for the sole + purpose of executing Applications permitted under this Agreement + that Licensee has created using the Licensed Software. Under no + circumstances may any copies of Redistributables be distributed + separately. This Agreement does not give Licensee any rights to + distribute any of the parts of the Licensed Software listed in + Appendix 1, Section 2, neither as a whole nor as parts or snippets + of code. + +b) Licensee may not distribute, transfer, assign or otherwise dispose + of Applications and/or Redistributables, in binary/compiled form, + or in any other form, if such action is part of a joint software + and hardware distribution, except as provided by a separate runtime + distribution license with Nokia or one of its authorized + distributors. A joint hardware and software distribution shall be + defined as either: + + (i) distribution of a hardware device where, in its final end user + configuration, the main user interface of the device is + provided by Application(s) created by Licensee or others, using + a commercial version of Qt or a Qt-based product, and depends + on the Licensed Software or an open source version of any Qt or + Qt-based software product; or + + (ii) distribution of the Licensed Software with a device designed + to facilitate the installation of the Licensed Software onto + the same device where the main user interface of such device + is provided by Application(s) created by Licensee or others, + using a commercial version of Qt or a Qt-based product, and + depends on the Licensed Software. + +5.3.Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + +6.VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia shall not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + +7.THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (1) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (2) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + +8.CONDITIONS FOR CREATING APPLICATIONS AND DISTRIBUTING REDISTRIBUTABLES + +The licenses granted in this Agreement for Licensee to create +Applications and distribute them and the Redistributables (if any) to +Licensee's customers is subject to all of the following conditions: +(i) all copies of the Applications which Licensee creates must bear a +valid copyright notice, either Licensee's own or the copyright notice +that appears on the Licensed Software; (ii) Licensee may not remove or +alter any copyright, trademark or other proprietary rights notice +contained in any portion of the Licensed Software, including but not +limited to the About Boxes in "Qt Assistant" and "Qt Linguist" as +defined in Appendix 1; (iii) Redistributables, if any, shall be +licensed to Licensee's customer "as is"; (iv) Licensee shall indemnify +and hold Nokia, its Affiliates, contractors, and its suppliers, +harmless from and against any claims or liabilities arising out of the +use, reproduction or distribution of Applications; (v) Applications +must be developed using a licensed, registered copy of the Licensed +Software; (vi) Applications must add primary and substantial +functionality to the Licensed Software; (vii) Applications may not +pass on functionality which in any way makes it possible for others to +create software with the Licensed Software, however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (viii) Applications may not compete with the Licensed +Software; (ix) Licensee may not use Nokia's or any of its suppliers' +names, logos, or trademarks to market Application(s), except to state +that Application was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9.LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set forth +above, the Licensed Software is licensed to Licensee "as is". To the +maximum extent permitted by applicable law, Nokia on behalf of itself +and its suppliers, disclaims all warranties and conditions, either +express or implied, including, but not limited to, implied warranties +of merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + +10.LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable +to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, Nokia's entire liability to Licensee +and Licensee's exclusive remedy shall be, at Nokia's option, either +(A) return of the price Licensee paid for the Licensed Software, or +(B) repair or replacement of the Licensed Software, provided Licensee +returns to Nokia all copies of the Licensed Software as originally +delivered to Licensee. Nokia shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the +failure resulted from accident, abuse or misapplication, nor shall +Nokia under any circumstances be liable for special damages, punitive +or exemplary damages, damages for loss of profits or interruption of +business or for loss or corruption of data. Any award of damages from +Nokia to Licensee shall not exceed the total amount Licensee has paid +to Nokia in connection with this Agreement. + +11.SUPPORT AND UPDATES + +Licensee shall be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + +12.CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + +13.GENERAL PROVISIONS + +13.1.Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2.No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3.Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of this Agreement, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4.Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5.1, 6, 7, 8(iv), 10, 12, +13.5, 13.6, 13.9, 13.10 and 13.11 of this Agreement. Notwithstanding +the foregoing, Section 5.1 shall not survive if the Agreement is +terminated for material breach. + +13.5.Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +13.6.Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7 Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + +13.8.Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia Norge AS +Sandakerveien 116 +NO-0484 Oslo, Norway +Fax: +47 21 69 48 02 + +13.9.Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10.Governing Law and Legal Venue + +This Agreement shall be construed and interpreted in accordance with +the laws of Finland, excluding its choice of law provisions. Any +disputes arising out of or relating to this Agreement shall be +resolved in arbitration under the Rules of Arbitration of the Chamber +of Commerce of Helsinki, Finland. The arbitration tribunal shall +consist of one (1), or if either Party so requires, of three (3), +arbitrators. The award shall be final and binding and enforceable in +any court of competent jurisdiction. The arbitration shall be held in +Helsinki, Finland and the process shall be conducted in the English +language. + +13.11.No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. + + + + +Appendix 1 + + +1. Parts of the Licensed Software that are permitted for distribution ("Redistributables"): + +- The Licensed Software's main and plug-in libraries in object code form +- The Licensed Software's configuration tool ("qtconfig") +- The Licensed Software's help tool in object code/executable form ("Qt Assistant") +- The Licensed Software's internationalization tools in object code/executable form ("Qt Linguist", "lupdate", "lrelease") +- The Licensed Software's designer tool ("Qt Designer") +- The Licensed Software's IDE tool ("Qt Creator") + + +2. Parts of the Licensed Software that are not permitted for distribution include, but are not limited to: + +- The Licensed Software's source code and header files +- The Licensed Software's documentation +- The Licensed Software's tool for writing makefiles ("qmake") +- The Licensed Software's Meta Object Compiler ("moc") +- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") +- The Licensed Software's Resource Compiler ("rcc") +- The Licensed Software's generator (only in the case of Qt Jambi if applicable) +- The Licensed Software's Qt SDK diff --git a/.LICENSE-DESKTOP-US b/.LICENSE-DESKTOP-US new file mode 100644 index 0000000..660eda7 --- /dev/null +++ b/.LICENSE-DESKTOP-US @@ -0,0 +1,556 @@ +Qt COMMERCIAL LICENSE AGREEMENT +Agreement version 3.7 + +This Qt Commercial License Agreement ("Agreement") is a legal +agreement between Nokia Inc. ("Nokia"), with its registered office at +102 Corporate Park Drive, White Plains, NY 10604 U.S.A. and you +(either an individual or a legal entity) ("Licensee") for the Licensed +Software (as defined below). + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee?s consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Platforms and Designated Users. + +"Licensed Software" shall mean the computer software, ?online? or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Platforms" shall mean the operating systems listed in the License +Certificate. + +"Redistributables" shall mean the portions of the Licensed Software +set forth in Appendix 1, Section 1 that may be distributed with or as +part of Applications in object code form. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancement, new features, bug fixes, error corrections and +other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + +3. MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate. The terms of the License Certificate are +considered part of the Agreement. In the event of inconsistency or +conflict between the language of this Agreement and the License +Certificate, the provisions of this Agreement shall govern. + +4. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee may +not install, copy, or otherwise use the Licensed Software. Licensee +may, however, return it to Licensee's place of purchase within +fourteen (14) days of purchase for a full refund. In addition, by +installing, copying, or otherwise using any Updates or other +components of the Licensed Software that Licensee receives separately +as part of the Licensed Software, Licensee agrees to be bound by any +additional license terms that accompany such Updates, if any. If +Licensee does not agree to the additional license terms that accompany +such Updates, Licensee may not install, copy, or otherwise use such +Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + +5. LICENSES + +5.1 Using, modifying and copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for the +Designated User(s) specified in the License Certificate for the sole +purposes of designing, developing, and testing Application(s). + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2 Redistribution + +a) Nokia grants Licensee a non-exclusive, royalty-free right to + reproduce and distribute the object code form of Redistributables + for execution on the specified Platforms. Copies of + Redistributables may only be distributed with and for the sole + purpose of executing Applications permitted under this Agreement + that Licensee has created using the Licensed Software. Under no + circumstances may any copies of Redistributables be distributed + separately. This Agreement does not give Licensee any rights to + distribute any of the parts of the Licensed Software listed in + Appendix 1, Section 2, neither as a whole nor as parts or snippets + of code. + +b) Licensee may not distribute, transfer, assign or otherwise dispose + of Applications and/or Redistributables, in binary/compiled form, + or in any other form, if such action is part of a joint software + and hardware distribution, except as provided by a separate runtime + distribution license with Nokia or one of its authorized + distributors. A joint hardware and software distribution shall be + defined as either: + + (i) distribution of a hardware device where, in its final end user + configuration, the main user interface of the device is + provided by Application(s) created by Licensee or others, using + a commercial version of Qt or a Qt-based product, and depends + on the Licensed Software or an open source version of any Qt or + Qt-based software product; or + + (ii) distribution of the Licensed Software with a device designed + to facilitate the installation of the Licensed Software onto + the same device where the main user interface of such device + is provided by Application(s) created by Licensee or others, + using a commercial version of Qt or a Qt-based product, and + depends on the Licensed Software. + +5.3 Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + +6. VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia shall not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + +7. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (1) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (2) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + +8. CONDITIONS FOR CREATING APPLICATIONS AND DISTRIBUTING REDISTRIBUTABLES + +The licenses granted in this Agreement for Licensee to create +Applications and distribute them and the Redistributables (if any) to +Licensee's customers is subject to all of the following conditions: +(i) all copies of the Applications which Licensee creates must bear a +valid copyright notice, either Licensee's own or the copyright notice +that appears on the Licensed Software; (ii) Licensee may not remove or +alter any copyright, trademark or other proprietary rights notice +contained in any portion of the Licensed Software, including but not +limited to the About Boxes in "Qt Assistant" and "Qt Linguist" as +defined in Appendix 1; (iii) Redistributables, if any, shall be +licensed to Licensee's customer "as is"; (iv) Licensee shall indemnify +and hold Nokia, its Affiliates, contractors, and its suppliers, +harmless from and against any claims or liabilities arising out of the +use, reproduction or distribution of Applications; (v) Applications +must be developed using a licensed, registered copy of the Licensed +Software; (vi) Applications must add primary and substantial +functionality to the Licensed Software; (vii) Applications may not +pass on functionality which in any way makes it possible for others to +create software with the Licensed Software, however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (viii) Applications may not compete with the Licensed +Software; (ix) Licensee may not use Nokia's or any of its suppliers' +names, logos, or trademarks to market Application(s), except to state +that Application was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set forth +above, the Licensed Software is licensed to Licensee "as is". To the +maximum extent permitted by applicable law, Nokia on behalf of itself +and its suppliers, disclaims all warranties and conditions, either +express or implied, including, but not limited to, implied warranties +of merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + +10. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable +to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, Nokia's entire liability to Licensee +and Licensee's exclusive remedy shall be, at Nokia's option, either +(A) return of the price Licensee paid for the Licensed Software, or +(B) repair or replacement of the Licensed Software, provided Licensee +returns to Nokia all copies of the Licensed Software as originally +delivered to Licensee. Nokia shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the +failure resulted from accident, abuse or misapplication, nor shall +Nokia under any circumstances be liable for special damages, punitive +or exemplary damages, damages for loss of profits or interruption of +business or for loss or corruption of data. Any award of damages from +Nokia to Licensee shall not exceed the total amount Licensee has paid +to Nokia in connection with this Agreement. + +11. SUPPORT AND UPDATES + +Licensee shall be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + +12. CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + +13. GENERAL PROVISIONS + +13.1 Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3 Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of this Agreement, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5.1, 6, 7, 8(iv), 10, 12, +13.5, 13.6, 13.9, 13.10 and 13.11 of this Agreement. Notwithstanding +the foregoing, Section 5.1 shall not survive if the Agreement is +terminated for material breach. + +13.5 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +13.6 Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7 Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + +13.8 Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia, Inc. +555 Twin Dolphin Drive, Suite 280 +Redwood City, CA 94065 U.S.A. +Fax: +1-650-551-1851 + +13.9 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10 Governing Law and Legal Venue + +This Agreement shall be governed by and construed in accordance with +the federal laws of the United States of America and the internal laws +of the State of New York without given effect to any choice of law +rule that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction +of the United States District Court for the Southern District of New +York (or if such court lacks jurisdiction, the state courts of the +State of New York) for the purposes of any action, claim, suit or +proceeding between the Parties in connection with any controversy, +claim, or dispute arising out of or relating to this Agreement; and +(b) hereby waives, and agrees not to assert by way of motion, as a +defense or otherwise, in any such action, claim, suit or proceeding, +any claim that is not personally subject to the jurisdiction of such +court(s), that the action, claim, suit or proceeding is brought in an +inconvenient forum or that the venue of the action, claim, suit or +proceeding is improper. Notwithstanding the foregoing, nothing in +this Section 13.10 is intended to, or shall be deemed to, constitute a +submission or consent to, or selection of, jurisdiction, forum or +venue for any action for patent infringement, whether or not such +action relates to this Agreement. + + +13.11 No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. + +13.12 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if +Licensee is a U.S. Government End User. The Licensed Software is a +"commercial item," as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of "commercial computer software" and +"commercial computer software documentation," as such terms are used +in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 +and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all +U.S. Government End Users acquire the Licensed Software with only +those rights set forth herein. The Licensed Software (including +related documentation) is provided to U.S. Government End Users: (a) +only as a commercial end item; and (b) only pursuant to this +Agreement. + + + + +Appendix 1 + + +1. Parts of the Licensed Software that are permitted for distribution ("Redistributables"): + +- The Licensed Software's main and plug-in libraries in object code form +- The Licensed Software's configuration tool ("qtconfig") +- The Licensed Software's help tool in object code/executable form ("Qt Assistant") +- The Licensed Software's internationalization tools in object code/executable form ("Qt Linguist", "lupdate", "lrelease") +- The Licensed Software's designer tool ("Qt Designer") +- The Licensed Software's IDE tool ("Qt Creator") + + +2. Parts of the Licensed Software that are not permitted for distribution include, but are not limited to: + +- The Licensed Software's source code and header files +- The Licensed Software's documentation +- The Licensed Software's tool for writing makefiles ("qmake") +- The Licensed Software's Meta Object Compiler ("moc") +- The Licensed Software's User Interface Compiler ("uic" or in the case of Qt Jambi: "juic") +- The Licensed Software's Resource Compiler ("rcc") +- The Licensed Software's generator (only in the case of Qt Jambi if applicable) +- The Licensed Software's Qt SDK + + diff --git a/.LICENSE-EMBEDDED b/.LICENSE-EMBEDDED new file mode 100644 index 0000000..607e3f2 --- /dev/null +++ b/.LICENSE-EMBEDDED @@ -0,0 +1,506 @@ +Qt Embedded Commercial Developer License Agreement +Agreement version 1.2 + + +This Qt Embedded Commercial License Agreement ("Agreement") is a legal +agreement between Nokia Corporation ("Nokia"), with its registered +office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an +individual or a legal entity) ("Licensee") for the Licensed Software +(as defined below). + + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Deployment Platforms" shall mean the operating system(s) listed in +the License Certificate onto which Licensee is authorized to deploy +Applications. + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee's consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Development Platforms" shall mean the operating system(s) listed in +the License Certificate on which Licensee may use, develop and modify +the Licensed Software. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Development Platforms, Deployment Platforms and +Designated Users. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancements, new features, bug fixes, error corrections +and other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + + +3. MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate accompanying the Licensed Software. The +terms of the License Certificate are considered part of the +Agreement. In the event of inconsistency or conflict between the +language of this Agreement and the License Certificate, the provisions +of this Agreement shall govern. + + +4. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee +should not install, copy, or otherwise use the Licensed Software. In +addition, by installing, copying, or otherwise using any Updates or +other components of the Licensed Software that Licensee receives +separately as part of the Licensed Software, Licensee agrees to be +bound by any additional license terms that accompany such Updates, if +any. If Licensee does not agree to the additional license terms that +accompany such Updates, Licensee should not install, copy, or +otherwise use such Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + + +5. LICENSES + +5.1 Using, Modifying and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for Designated +Users specified in the License Certificate for the sole purposes of: + +(i) designing, developing, and testing Application(s); + +(ii) modifying the Licensed Software as limited by Section 8 below; and + +(iii) compiling the Licensed Software and/or Modified Software source + code into object code. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2 No Distribution and Limited Exception + +Licensee may not distribute, transfer, assign or otherwise dispose of +the Licensed Software and/or Modified Software, except as provided by +a separate distribution agreement with Nokia for the Deployment +Platforms that Licensee has licensed from Nokia. Distribution on +Platforms, other than Deployment Platforms is strictly prohibited. + +Notwithstanding the above limitation, Licensee may distribute the +Application in binary/compiled form onto devices running Windows +CE/Windows Mobile, provided the core functionality of the device does +not depend on either the Licensed Software or the Application. + +5.3 Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + + +6. VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia will not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + + +7. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (i) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (ii) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +8. CONDITIONS FOR CREATING APPLICATIONS + +The licenses granted in this Agreement for Licensee to create, modify +and distribute Applications is subject to all of the following +conditions: (i) all copies of the Applications Licensee creates must +bear a valid copyright notice either Licensee's own or the copyright +notice that appears on the Licensed Software; (ii) Licensee may not +remove or alter any copyright, trademark or other proprietary rights +notice contained in any portion of the Licensed Software including but +not limited to the About Boxes; (iii) Licensee will indemnify and hold +Nokia, its Affiliates, contractors, and its suppliers, harmless from +and against any claims or liabilities arising out of the use, +reproduction or distribution of Applications; (iv) Applications must +be developed using a licensed, registered copy of the Licensed +Software; (v) Applications must add primary and substantial +functionality to the Licensed Software; (vi) Applications may not pass +on functionality which in any way makes it possible for others to +create software with the Licensed Software; however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (vii) Licensee may create Modified Software that +breaks the source or binary compatibility with the Licensed +Software. This includes, but is not limited to, changing the +application programming interfaces ("API") by adding, changing or +deleting any variable, method, or class signature in the Licensed +Software, the inter-process QCop specification, and/or any +inter-process protocols, services or standards in the Licensed +Software libraries. To the extent that Licensee breaks source or +binary compatibility with the Licensed Software, Licensee acknowledges +that Nokia's ability to provide Support may be prevented or limited +and Licensee's ability to make use of Updates may be restricted; +(viii) Applications may not compete with the Licensed Software; (ix) +Licensee may not use Nokia's or any of its suppliers' names, logos, or +trademarks to market Applications, except to state that Licensee's +Application was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set +forth above, the Licensed Software is licensed to Licensee "as is". +To the maximum extent permitted by applicable law, Nokia on behalf of +itself and its suppliers, disclaims all warranties and conditions, +either express or implied, including, but not limited to, implied +warranties of merchantability and fitness for a particular purpose, +title and non-infringement with regard to the Licensed Software. + + +10. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held to be +liable to Licensee whether in contract, tort, or any other legal +theory, based on the Licensed Software, Nokia's entire liability to +Licensee and Licensee's exclusive remedy shall be, at Nokia's option, +either (a) return of the price Licensee paid for the Licensed +Software, or (b) repair or replacement of the Licensed Software, +provided Licensee returns to Nokia all copies of the Licensed Software +as originally delivered to Licensee. Nokia shall not under any +circumstances be liable to Licensee based on failure of the Licensed +Software if the failure resulted from accident, abuse or +misapplication, nor shall Nokia, under any circumstances, be liable +for special damages, punitive or exemplary damages, damages for loss +of profits or interruption of business or for loss or corruption of +data. Any award of damages from Nokia to Licensee shall not exceed the +total amount Licensee has paid to Nokia in connection with this +Agreement. + + +11. SUPPORT AND UPDATES + +Licensee will be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + + +12. CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +13. GENERAL PROVISIONS + +13.1. Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2. No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3. Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of the Licenses, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4. Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections 2, 5.1, 6, 7, 8(iii), 10, 12, +13.5, 13.6, 13.9, 13.10, and 13.11 shall survive the termination of +the Agreement. Notwithstanding the foregoing, Sections 5.1 shall not +survive if the Agreement is terminated for material breach. + +13.5. Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +13.6. Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7. Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + + +13.8. Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia Norge AS +Sandakerveien 116 +NO-0484 Oslo, Norway +Fax: +47 21 69 48 02 + +13.9. Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10. Governing Law and Legal Venue: + +This Agreement shall be construed and interpreted in accordance with +the laws of Finland, excluding its choice of law provisions. Any +disputes arising out of or relating to this Agreement shall be +resolved in arbitration under the Rules of Arbitration of the Chamber +of Commerce of Helsinki, Finland. The arbitration tribunal shall +consist of one (1), or if either Party so requires, of three (3), +arbitrators. The award shall be final and binding and enforceable in +any court of competent jurisdiction. The arbitration shall be held in +Helsinki, Finland and the process shall be conducted in the English +language. + +13.11 No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. diff --git a/.LICENSE-EMBEDDED-US b/.LICENSE-EMBEDDED-US new file mode 100644 index 0000000..55c9f01 --- /dev/null +++ b/.LICENSE-EMBEDDED-US @@ -0,0 +1,533 @@ +Qt Embedded Commercial Developer License Agreement +Agreement version 1.2 + + +This Qt Embedded Commercial Developer License Agreement ("Agreement") +is a legal agreement between Nokia, Inc. ("Nokia") with a registered +business address at 102 Corporate Park Drive, White Plains, NY 10604, +U.S.A. and you (either an individual or a legal entity) ("Licensee") +for the Licensed Software (as defined below). + + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using +the Licensed Software which may include portions of the Licensed +Software. + +"Deployment Platforms" shall mean the operating system(s) listed in +the License Certificate onto which Licensee is authorized to deploy +Applications. + +"Designated User(s)" shall mean the employee(s) of Licensee acting +within the scope of their employment or Licensee's consultant(s) or +contractor(s) acting within the scope of their services for Licensee +and on behalf of Licensee. + +"Development Platforms" shall mean the operating system(s) listed in +the License Certificate on which Licensee may use, develop and modify +the Licensed Software. + +"Initial Term" shall mean the period of time one (1) year from the +later of (a) the Effective Date; or (b) the date the Licensed Software +was initially delivered to Licensee by Nokia. If no specific +Effective Date is set forth in the Agreement, the Effective Date shall +be deemed to be the date the Licensed Software was initially delivered +to Licensee. + +"License Certificate" shall mean the document accompanying the +Licensed Software which specifies the modules which are licensed under +the Agreement, Development Platforms, Deployment Platforms and +Designated Users. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. +Licensed Software does not include Third Party Software (as defined in +Section 7). + +"Modified Software" shall mean modifications made to the Licensed +Software by Licensee. + +"Party or Parties" shall mean Licensee and/or Nokia. + +"Support" shall mean standard developer support that is provided by +Nokia to assist eligible Designated Users in using the Licensed +Software in accordance with its established standard support +procedures listed at: +http://www.qtsoftware.com/support-services/files/pdf/. + +"Updates" shall mean a release or version of the Licensed Software +containing enhancements, new features, bug fixes, error corrections +and other changes that are generally made available to users of the +Licensed Software that have contracted for maintenance and support. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +Nokia shall own all right, title and interest including the +intellectual property rights in and to the information on bug fixes or +error corrections relating to the Licensed Software that are submitted +by Licensee to Nokia as well as any intellectual property rights to +the correction of any errors, if any. To the extent any rights do not +automatically vest in Nokia, Licensee assigns, and shall ensure that +all of its Affiliates, agents, subcontractors and employees assign, +all such rights to Nokia. All Nokia's and/or its licensors' +trademarks, service marks, trade names, logos or other words or +symbols are and shall remain the exclusive property of Nokia or its +licensors respectively. + + +3. MODULES + +Some of the files in the Licensed Software have been grouped into +Modules. These files contain specific notices defining the Module of +which they are a part. The Modules licensed to Licensee are specified +in the License Certificate accompanying the Licensed Software. The +terms of the License Certificate are considered part of the +Agreement. In the event of inconsistency or conflict between the +language of this Agreement and the License Certificate, the provisions +of this Agreement shall govern. + + +4. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee +should not install, copy, or otherwise use the Licensed Software. In +addition, by installing, copying, or otherwise using any Updates or +other components of the Licensed Software that Licensee receives +separately as part of the Licensed Software, Licensee agrees to be +bound by any additional license terms that accompany such Updates, if +any. If Licensee does not agree to the additional license terms that +accompany such Updates, Licensee should not install, copy, or +otherwise use such Updates. + +Upon Licensee's acceptance of the terms and conditions of this +Agreement, Nokia grants Licensee the right to use the Licensed +Software in the manner provided below. + + +5. LICENSES + +5.1 Using, Modifying and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, perpetual +license to use, modify and copy the Licensed Software for Designated +Users specified in the License Certificate for the sole purposes of: + +(i) designing, developing, and testing Application(s); + +(ii) modifying the Licensed Software as limited by Section 8 below; and + +(iii) compiling the Licensed Software and/or Modified Software source + code into object code. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the +Licensed Software. Licensee may at any time designate another +Designated User to replace a then-current Designated User by notifying +Nokia, provided that a) the then-current Designated User has not been +designated as a replacement during the last six (6) months; and b) +there is no more than the specified number of Designated Users at any +given time. + +5.2 No Distribution and Limited Exception + +Licensee may not distribute, transfer, assign or otherwise dispose of +the Licensed Software and/or Modified Software, except as provided by +a separate distribution agreement with Nokia for the Deployment +Platforms that Licensee has licensed from Nokia. Distribution on +Platforms, other than Deployment Platforms is strictly prohibited. + +Notwithstanding the above limitation, Licensee may distribute the +Application in binary/compiled form onto devices running Windows +CE/Windows Mobile, provided the core functionality of the device does +not depend on either the Licensed Software or the Application. + +5.3 Further Requirements + +The licenses granted in this Section 5 by Nokia to Licensee are +subject to Licensee's compliance with Section 8 of this Agreement. + + +6. VERIFICATION + +Nokia or a certified auditor on Nokia's behalf, may, upon its +reasonable request and at its expense, audit Licensee with respect to +the use of the Licensed Software. Such audit may be conducted by mail, +electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably +interfere with Licensee's business activities. Nokia will not remove, +copy, or redistribute any electronic material during the course of an +audit. If an audit reveals that Licensee is using the Licensed +Software in a way that is in material violation of the terms of the +Agreement, then Licensee shall pay Nokia's reasonable costs of +conducting the audit. In the case of a material violation, Licensee +agrees to pay Nokia any amounts owing that are attributable to the +unauthorized use. In the alternative, Nokia reserves the right, at +Nokia's sole option, to terminate the licenses for the Licensed +Software. + + +7. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (i) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (ii) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +8. CONDITIONS FOR CREATING APPLICATIONS + +The licenses granted in this Agreement for Licensee to create, modify +and distribute Applications is subject to all of the following +conditions: (i) all copies of the Applications Licensee creates must +bear a valid copyright notice either Licensee's own or the copyright +notice that appears on the Licensed Software; (ii) Licensee may not +remove or alter any copyright, trademark or other proprietary rights +notice contained in any portion of the Licensed Software including but +not limited to the About Boxes; (iii) Licensee will indemnify and hold +Nokia, its Affiliates, contractors, and its suppliers, harmless from +and against any claims or liabilities arising out of the use, +reproduction or distribution of Applications; (iv) Applications must +be developed using a licensed, registered copy of the Licensed +Software; (v) Applications must add primary and substantial +functionality to the Licensed Software; (vi) Applications may not pass +on functionality which in any way makes it possible for others to +create software with the Licensed Software; however Licensee may use +the Licensed Software's scripting functionality solely in order to +enable scripting that augments the functionality of the Application(s) +without adding primary and substantial functionality to the +Application(s); (vii) Licensee may create Modified Software that +breaks the source or binary compatibility with the Licensed +Software. This includes, but is not limited to, changing the +application programming interfaces ("API") by adding, changing or +deleting any variable, method, or class signature in the Licensed +Software, the inter-process QCop specification, and/or any +inter-process protocols, services or standards in the Licensed +Software libraries. To the extent that Licensee breaks source or +binary compatibility with the Licensed Software, Licensee acknowledges +that Nokia's ability to provide Support may be prevented or limited +and Licensee's ability to make use of Updates may be restricted; +(viii) Applications may not compete with the Licensed Software; (ix) +Licensee may not use Nokia's or any of its suppliers' names, logos, or +trademarks to market Applications, except to state that Licensee's +Application was developed using the Licensed Software. + +NOTE: The Open Source Editions of Nokia's Qt products and the Qt, +Qtopia and Qt Extended versions previously licensed by Trolltech +(collectively referred to as "Products") are licensed under the terms +of the GNU Lesser General Public License version 2.1 ("LGPL") and/or +the GNU General Public License versions 2.0 and 3.0 ("GPL") (as +applicable) and not under this Agreement. If Licensee has, at any +time, developed all (or any portions of) the Application(s) using a +version of one of these Products licensed under the LGPL or the GPL, +Licensee may not combine such development work with the Licensed +Software and must license such Application(s) (or any portions derived +there from) under the terms of the GNU Lesser General Public License +version 2.1 (Qt only) or GNU General Public License version 2.0 (Qt, +Qtopia and Qt Extended) or version 3 (Qt only) copies of which are +located at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. + + +9. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +Nokia hereby represents and warrants with respect to the Licensed +Software that it has the power and authority to grant the rights and +licenses granted to Licensee under this Agreement. Except as set +forth above, the Licensed Software is licensed to Licensee "as is". +To the maximum extent permitted by applicable law, Nokia on behalf of +itself and its suppliers, disclaims all warranties and conditions, +either express or implied, including, but not limited to, implied +warranties of merchantability and fitness for a particular purpose, +title and non-infringement with regard to the Licensed Software. + + +10. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held to be +liable to Licensee whether in contract, tort, or any other legal +theory, based on the Licensed Software, Nokia's entire liability to +Licensee and Licensee's exclusive remedy shall be, at Nokia's option, +either (a) return of the price Licensee paid for the Licensed +Software, or (b) repair or replacement of the Licensed Software, +provided Licensee returns to Nokia all copies of the Licensed Software +as originally delivered to Licensee. Nokia shall not under any +circumstances be liable to Licensee based on failure of the Licensed +Software if the failure resulted from accident, abuse or +misapplication, nor shall Nokia, under any circumstances, be liable +for special damages, punitive or exemplary damages, damages for loss +of profits or interruption of business or for loss or corruption of +data. Any award of damages from Nokia to Licensee shall not exceed the +total amount Licensee has paid to Nokia in connection with this +Agreement. + + +11. SUPPORT AND UPDATES + +Licensee will be eligible to receive Support and Updates during the +Initial Term, in accordance with Nokia's then current policies and +procedures, if any. Such policies and procedures may be changed from +time to time. Following the Initial Term, Nokia shall no longer make +the Licensed Software available to Licensee unless Licensee purchases +additional Support and Updates according to this Section 11 below. + +Licensee may purchase additional Support and Updates following the +Initial Term at Nokia's terms and conditions applicable at the time of +renewal. + + +12. CONFIDENTIALITY + +Each party acknowledges that during the Initial Term of this Agreement +it shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 12, this Section 12 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +13. GENERAL PROVISIONS + +13.1. Marketing + +Nokia may include Licensee's company name and logo in a publicly +available list of Nokia customers and in its public communications. + +13.2. No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +13.3. Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party +becomes insolvent, files for any form of bankruptcy, makes any +assignment for the benefit of creditors, has a receiver, +administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. + +Upon termination of the Licenses, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +13.4. Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections 2, 5.1, 6, 7, 8(iii), 10, 12, +13.5, 13.6, 13.9, 13.10, and 13.11 shall survive the termination of +the Agreement. Notwithstanding the foregoing, Sections 5.1 shall not +survive if the Agreement is terminated for material breach. + +13.5. Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 12. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +13.6. Payment and Taxes + +All payments under this Agreement are due within thirty (30) days of +the date Nokia mails its invoice to Licensee. All amounts payable are +gross amounts but exclusive of any value added tax, use tax, sales tax +or similar tax. Licensee shall be entitled to withhold from payments +any applicable withholding taxes and comply with all applicable tax +and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies +imposed on it under applicable laws, regulations and tax treaties as a +result of this Agreement and any payments made hereunder (including +those required to be withheld or deducted from payments). Each party +shall furnish evidence of such paid taxes as is sufficient to enable +the other party to obtain any credits available to it, including +original withholding tax certificates. + +13.7. Force Majeure + +Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation +of paying the license fees in the event and to the extent that such +delay or non-performance is due to an event of Force Majeure (as +defined below). If any event of Force Majeure results in a delay or +non-performance of a party for a period of three (3) months or longer, +then either party shall have the right to terminate this Agreement +with immediate effect without any liability (except for the +obligations of payment arising prior to the event of Force Majeure) +towards the other party. A "Force Majeure" event shall mean an act of +God, terrorist attack or other catastrophic event of nature that +prevents either party for fulfilling its obligations under this +Agreement. + + +13.8. Notices + +Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the +receiving party in writing or when successfully delivered to the +recipient by hand, fax, or special courier during normal business +hours on a business day to the addresses specified below. Each +communication and document made or delivered by one party to the other +party pursuant to this Agreement shall be in the English language or +accompanied by a translation thereof. + +Notices to Nokia shall be given to: + +Nokia, Inc. +555 Twin Dolphin Drive, Suite 280 +Redwood City, CA 94065 U.S.A. +Fax: +1-650-551-1851 + +13.9. Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software, Modified Software or +Applications. + +13.10. Governing Law and Legal Venue: + +This Agreement shall be governed by and construed in accordance with +the federal laws of the United States of America and the internal laws +of the State of New York without given effect to any choice of law +rule that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction +of the United States District Court for the Southern District of New +York (or if such court lacks jurisdiction, the state courts of the +State of New York) for the purposes of any action, claim, suit or +proceeding between the Parties in connection with any controversy, +claim, or dispute arising out of or relating to this Agreement; and +(b) hereby waives, and agrees not to assert by way of motion, as a +defense or otherwise, in any such action, claim, suit or proceeding, +any claim that is not personally subject to the jurisdiction of such +court(s), that the action, claim, suit or proceeding is brought in an +inconvenient forum or that the venue of the action, claim, suit or +proceeding is improper. Notwithstanding the foregoing, nothing in +this Section 13.10 is intended to, or shall be deemed to, constitute a +submission or consent to, or selection of, jurisdiction, forum or +venue for any action for patent infringement, whether or not such +action relates to this Agreement. + +13.11 No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software and/ Modified Software, as applicable, with any other +software or hardware not delivered by Nokia under this Agreement. + +13.11 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if +Licensee is a U.S. Government End User. The Licensed Software is a +"commercial item," as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of "commercial computer software" and +"commercial computer software documentation," as such terms are used +in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 +and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all +U.S. Government End Users acquire the Licensed Software with only +those rights set forth herein. The Licensed Software (including +related documentation) is provided to U.S. Government End Users: (a) +only as a commercial end item; and (b) only pursuant to this +Agreement. diff --git a/.LICENSE-EVALUATION b/.LICENSE-EVALUATION new file mode 100644 index 0000000..2b042b8 --- /dev/null +++ b/.LICENSE-EVALUATION @@ -0,0 +1,287 @@ +EVALUATION LICENSE AGREEMENT +Agreement version 2.0 + +This Evaluation License Agreement ("Agreement") is a legal agreement +between Nokia Corporation ("Nokia"), with its registered office at +Keilalahdentie 4, 02150 Espoo, Finland and you (either an individual +or a legal entity) ("Licensee") for the Licensed Software. + +1.DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Term" shall mean the period of time thirty (30) days from the later +of (a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Nokia. If no specific Effective +Date is set forth in the Agreement, the Effective Date shall be deemed +to be the date the Licensed Software was initially delivered to +Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. + +"Party or Parties" shall mean Licensee and/or Nokia. + + +2.OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any +existing patent rights of Licensee. To the extent Licensee owns or +controls any patents for such Feedback Licensee hereby grants to Nokia +and its Affiliates, a worldwide, perpetual, non-transferable, +sublicensable, royalty-free license to (i) use, copy and modify +Feedback and to create derivative works thereof, (ii) to make (and +have made), use, import, sell, offer for sale, lease, dispose, offer +for disposal or otherwise exploit any products or services of Nokia +containing Feedback,, and (iii) sublicense all the foregoing rights to +third party licensees and customers of Nokia and/or its Affiliates. + + +3.VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee may +not install, copy, or otherwise use the Licensed Software. Upon +Licensee's acceptance of the terms and conditions of this Agreement, +Nokia grants Licensee the right to use the Licensed Software in the +manner provided below. + + +4.LICENSES + +4.1.Using and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, +time-limited license to use and copy the Licensed Software for sole +purpose of evaluating the Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2.No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3.No Technical Support + +Nokia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5.THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (1) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (2) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +6.Limited Warranty and Warranty Disclaimer + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Nokia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +7.Limitation of Liability + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable +to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, Nokia's entire liability to Licensee +and Licensee's exclusive remedy shall be, at Nokia's option, either +(A) return of the price Licensee paid for the Licensed Software, or +(B) repair or replacement of the Licensed Software, provided Licensee +returns to Nokia all copies of the Licensed Software as originally +delivered to Licensee. Nokia shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the +failure resulted from accident, abuse or misapplication, nor shall +Nokia under any circumstances be liable for special damages, punitive +or exemplary damages, damages for loss of profits or interruption of +business or for loss or corruption of data. Any award of damages from +Nokia to Licensee shall not exceed the total amount Licensee has paid +to Nokia in connection with this Agreement. + + +8. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it +shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its Affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 8, this Section 8 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +9. GENERAL PROVISIONS + +9.1.No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +9.2.Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +9.3.Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9.2, 9.3, 9.4, +9.5, 9.6, 9.7, and 9.8 of this Agreement. + +9.4.Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 8. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +9.5.Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and shall procure all necessary +governmental authorizations, including without limitation, all +necessary licenses, approvals, permissions or consents, where +necessary for the re-exportation of the Licensed Software., + +9.6.Governing Law and Legal Venue + +This Agreement shall be construed and interpreted in accordance with +the laws of Finland, excluding its choice of law provisions. Any +disputes arising out of or relating to this Agreement shall be +resolved in arbitration under the Rules of Arbitration of the Chamber +of Commerce of Helsinki, Finland. The arbitration tribunal shall +consist of one (1), or if either Party so requires, of three (3), +arbitrators. The award shall be final and binding and enforceable in +any court of competent jurisdiction. The arbitration shall be held in +Helsinki, Finland and the process shall be conducted in the English +language. + +9.7.No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software with any other software or hardware not delivered by Nokia +under this Agreement. + +9.8.Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if +Licensee is a U.S. Government End User. The Licensed Software is a +"commercial item," as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of "commercial computer software" and +"commercial computer software documentation," as such terms are used +in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 +and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all +U.S. Government End Users acquire the Licensed Software with only +those rights set forth herein. The Licensed Software (including +related documentation) is provided to U.S. Government End Users: (a) +only as a commercial end item; and (b) only pursuant to this +Agreement. diff --git a/.LICENSE-EVALUATION-US b/.LICENSE-EVALUATION-US new file mode 100644 index 0000000..fb2a7d8 --- /dev/null +++ b/.LICENSE-EVALUATION-US @@ -0,0 +1,300 @@ +EVALUATION LICENSE AGREEMENT +Agreement version 2.0 + +This Evaluation License Agreement ("Agreement") is a legal agreement +between Nokia, Inc. ("Nokia"), with its registered office at 6021 +Connection Drive, Irving, TX 75039, U.S.A. and you (either an +individual or a legal entity) ("Licensee") for the Licensed Software +(as defined below). + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in +such entity, is able to direct its affairs and/or to control the +composition of its board of directors or equivalent body. + +"Term" shall mean the period of time thirty (30) days from the later +of (a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Nokia. If no specific Effective +Date is set forth in the Agreement, the Effective Date shall be deemed +to be the date the Licensed Software was initially delivered to +Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Nokia to Licensee in conjunction with this Agreement. + +"Party or Parties" shall mean Licensee and/or Nokia. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any +existing patent rights of Licensee. To the extent Licensee owns or +controls any patents for such Feedback Licensee hereby grants to Nokia +and its Affiliates, a worldwide, perpetual, non-transferable, +sublicensable, royalty-free license to (i) use, copy and modify +Feedback and to create derivative works thereof, (ii) to make (and +have made), use, import, sell, offer for sale, lease, dispose, offer +for disposal or otherwise exploit any products or services of Nokia +containing Feedback,, and (iii) sublicense all the foregoing rights to +third party licensees and customers of Nokia and/or its Affiliates. + + +3. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If +Licensee does not agree to the terms of this Agreement, Licensee may +not install, copy, or otherwise use the Licensed Software. Upon +Licensee's acceptance of the terms and conditions of this Agreement, +Nokia grants Licensee the right to use the Licensed Software in the +manner provided below. + + +4. LICENSES + +4.1.Using and Copying + +Nokia grants to Licensee a non-exclusive, non-transferable, +time-limited license to use and copy the Licensed Software for sole +purpose of evaluating the Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2. No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3.No Technical Support + +Nokia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or +code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the +Licensed Software. In some cases, access to Third Party Software may +be included along with the Licensed Software delivery as a convenience +for development and testing only. Such source code and libraries may +be listed in the ".../src/3rdparty" source tree delivered with the +Licensed Software or documented in the Licensed Software where the +Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (1) that +some part of Third Party Software may require additional licensing of +copyright and patents from the owners of such, and (2) that +distribution of any of the Licensed Software referencing any portion +of a Third Party Software may require appropriate licensing from such +third parties. + + +6. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Nokia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +7. LIMITATION OF LIABILITY + +If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable +to Licensee, whether in contract, tort or any other legal theory, +based on the Licensed Software, Nokia's entire liability to Licensee +and Licensee's exclusive remedy shall be, at Nokia's option, either +(A) return of the price Licensee paid for the Licensed Software, or +(B) repair or replacement of the Licensed Software, provided Licensee +returns to Nokia all copies of the Licensed Software as originally +delivered to Licensee. Nokia shall not under any circumstances be +liable to Licensee based on failure of the Licensed Software if the +failure resulted from accident, abuse or misapplication, nor shall +Nokia under any circumstances be liable for special damages, punitive +or exemplary damages, damages for loss of profits or interruption of +business or for loss or corruption of data. Any award of damages from +Nokia to Licensee shall not exceed the total amount Licensee has paid +to Nokia in connection with this Agreement. + + +8. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it +shall have access to information about the other party's business, +business methods, business plans, customers, business relations, +technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, +and the value of which would be significantly reduced if disclosed to +third parties (the "Confidential Information"). Accordingly, when a +party (the "Receiving Party") receives Confidential Information from +another party (the "Disclosing Party"), the Receiving Party shall, and +shall obligate its employees and agents and employees and agents of +its Affiliates to: (i) maintain the Confidential Information in strict +confidence; (ii) not disclose the Confidential Information to a third +party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its +responsibilities pursuant to this Agreement. Each party shall take +reasonable measures to protect the Confidential Information of the +other party, which measures shall not be less than the measures taken +by such party to protect its own confidential and proprietary +information. + +"Confidential Information" shall not include information that (a) is +or becomes generally known to the public through no act or omission of +the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to +limitations on disclosure or use; (c) is developed by the Receiving +Party without access to the Confidential Information of the Disclosing +Party or by persons who have not had access to the Confidential +Information of the Disclosing Party as proven by the written records +of the Receiving Party; (d) is lawfully disclosed to the Receiving +Party without restrictions, by a third party not under an obligation +of confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall +assert the privileged and confidential nature of the information and +cooperate fully with the Disclosing Party to protect against and +prevent disclosure of any Confidential Information and to limit the +scope of disclosure and the dissemination of disclosed Confidential +Information by all legally available means. + +The obligations of the Receiving Party under this Section shall +continue during the Initial Term and for a period of five (5) years +after expiration or termination of this Agreement. To the extent that +the terms of the Non-Disclosure Agreement between Nokia and Licensee +conflict with the terms of this Section 8, this Section 8 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +9. GENERAL PROVISIONS + +9.1.No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the +prior written consent of Nokia, which shall not be unreasonably +withheld. + +9.2.Termination + +Nokia may terminate the Agreement at any time immediately upon written +notice by Nokia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Nokia all +copies of Licensed Software that were supplied by Nokia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Nokia a written confirmation that this has occurred. + +9.3.Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9.2, 9.3, 9.4, +9.5, 9.6, 9.7, and 9.8 of this Agreement. + +9.4.Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with +this Agreement ("Non-Disclosure Agreement"), if any, shall be subject +to Section 8. No modification of this Agreement shall be effective +unless contained in a writing executed by an authorized representative +of each party. No term or condition contained in Licensee's purchase +order shall apply unless expressly accepted by Nokia in writing. If +any provision of the Agreement is found void or unenforceable, the +remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its +essential purpose, all limitations of liability and exclusions of +damages set forth in this Agreement shall remain in effect. + +9.5.Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall +fully comply with all applicable export license restrictions and +requirements as well as with all laws and regulations relating to the +importation of the Licensed Software and shall procure all necessary +governmental authorizations, including without limitation, all +necessary licenses, approvals, permissions or consents, where +necessary for the re-exportation of the Licensed Software., + +9.6.Governing Law and Legal Venue + +This Agreement shall be governed by and construed in accordance with +the federal laws of the United States of America and the internal laws +of the State of New York without given effect to any choice of law +rule that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction +of the United States District Court for the Southern District of New +York (or if such court lacks jurisdiction, the state courts of the +State of New York) for the purposes of any action, claim, suit or +proceeding between the Parties in connection with any controversy, +claim, or dispute arising out of or relating to this Agreement; and +(b) hereby waives, and agrees not to assert by way of motion, as a +defense or otherwise, in any such action, claim, suit or proceeding, +any claim that is not personally subject to the jurisdiction of such +court(s), that the action, claim, suit or proceeding is brought in an +inconvenient forum or that the venue of the action, claim, suit or +proceeding is improper. Notwithstanding the foregoing, nothing in +this Section 9.6 is intended to, or shall be deemed to, constitute a +submission or consent to, or selection of, jurisdiction, forum or +venue for any action for patent infringement, whether or not such +action relates to this Agreement. + +9.7.No Implied License + +There are no implied licenses or other implied rights granted under +this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with Nokia and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed +Software with any other software or hardware not delivered by Nokia +under this Agreement. + +9.8.Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if +Licensee is a U.S. Government End User. The Licensed Software is a +"commercial item," as that term is defined in 48 C.F.R. 2.101 +(Oct. 1995), consisting of "commercial computer software" and +"commercial computer software documentation," as such terms are used +in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 +and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all +U.S. Government End Users acquire the Licensed Software with only +those rights set forth herein. The Licensed Software (including +related documentation) is provided to U.S. Government End Users: (a) +only as a commercial end item; and (b) only pursuant to this +Agreement. diff --git a/LICENSE.LGPL b/LICENSE.LGPL index bb95f25..5ab7695 100644 --- a/LICENSE.LGPL +++ b/LICENSE.LGPL @@ -1,14 +1,4 @@ GNU LESSER GENERAL PUBLIC LICENSE - - The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - Contact: Qt Software Information (qt-info@nokia.com) - - You may use, distribute and copy the Qt GUI Toolkit under the terms of - GNU Lesser General Public License version 2.1, which is displayed below. - -------------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL deleted file mode 100644 index 7f7b234..0000000 --- a/LICENSE.PREVIEW.COMMERCIAL +++ /dev/null @@ -1,642 +0,0 @@ -TECHNOLOGY PREVIEW LICENSE AGREEMENT - -For individuals and/or legal entities resident in the Americas (North -America, Central America and South America), the applicable licensing -terms are specified under the heading "Technology Preview License -Agreement: The Americas". - -For individuals and/or legal entities not resident in The Americas, -the applicable licensing terms are specified under the heading -"Technology Preview License Agreement: Rest of the World". - - -TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas -Agreement version 2.3 - -This Technology Preview License Agreement ("Agreement") is a legal -agreement between Nokia Inc. ("Nokia"), with its registered office at -6021 Connection Drive, Irving, TX 75039, U.S.A. and you (either an -individual or a legal entity) ("Licensee") for the Licensed Software -(as defined below). - - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or -indirectly controlling such Party; (ii) which is under the same direct -or indirect ownership or control as such Party; or (iii) which is -directly or indirectly owned or controlled by such Party. For these -purposes, an entity shall be treated as being controlled by another if -that other entity has fifty percent (50 %) or more of the votes in -such entity, is able to direct its affairs and/or to control the -composition of its board of directors or equivalent body. - -"Term" shall mean the period of time six (6) months from the later of -(a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Nokia. If no specific Effective -Date is set forth in the Agreement, the Effective Date shall be deemed -to be the date the Licensed Software was initially delivered to -Licensee. - -"Licensed Software" shall mean the computer software, "online" or -electronic documentation, associated media and printed materials, -including the source code, example programs and the documentation -delivered by Nokia to Licensee in conjunction with this Agreement. - -"Party" or "Parties" shall mean Licensee and/or Nokia. - - -2. OWNERSHIP - -The Licensed Software is protected by copyright laws and international -copyright treaties, as well as other intellectual property laws and -treaties. The Licensed Software is licensed, not sold. - -If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any -existing patent rights of Licensee. To the extent Licensee owns or -controls any patents for such Feedback Licensee hereby grants to Nokia -and its Affiliates, a worldwide, perpetual, non-transferable, -sublicensable, royalty-free license to (i) use, copy and modify -Feedback and to create derivative works thereof, (ii) to make (and -have made), use, import, sell, offer for sale, lease, dispose, offer -for disposal or otherwise exploit any products or services of Nokia -containing Feedback,, and (iii) sublicense all the foregoing rights to -third party licensees and customers of Nokia and/or its Affiliates. - - -3. VALIDITY OF THE AGREEMENT - -By installing, copying, or otherwise using the Licensed Software, -Licensee agrees to be bound by the terms of this Agreement. If -Licensee does not agree to the terms of this Agreement, Licensee may -not install, copy, or otherwise use the Licensed Software. Upon -Licensee's acceptance of the terms and conditions of this Agreement, -Nokia grants Licensee the right to use the Licensed Software in the -manner provided below. - - -4. LICENSES - -4.1 Using and Copying - -Nokia grants to Licensee a non-exclusive, non-transferable, -time-limited license to use and copy the Licensed Software for sole -purpose of evaluating and testing the Licensed Software during the -Term. - -Licensee may install copies of the Licensed Software on an unlimited -number of computers provided that (a) if an individual, only such -individual; or (b) if a legal entity only its employees; use the -Licensed Software for the authorized purposes. - -4.2 No Distribution or Modifications - -Licensee may not disclose, modify, sell, market, commercialise, -distribute, loan, rent, lease, or license the Licensed Software or any -copy of it or use the Licensed Software for any purpose that is not -expressly granted in this Section 4. Licensee may not alter or remove -any details of ownership, copyright, trademark or other property right -connected with the Licensed Software. Licensee may not distribute any -software statically or dynamically linked with the Licensed Software. - -4.3 No Technical Support - -Nokia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. - - -5. PRE-RELEASE CODE - -The Licensed Software contains pre-release code that is not at the -level of performance and compatibility of a final, generally -available, product offering. The Licensed Software may not operate -correctly and may be substantially modified prior to the first -commercial product release, if any. Nokia is not obligated to make -this or any later version of the Licensed Software commercially -available. The License Software is "Not for Commercial Use" and may -only be used for the purposes described in Section 4. The Licensed -Software may not be used in a live operating environment where it may -be relied upon to perform in the same manner as a commercially -released product or with data that has not been sufficiently backed -up. - - -6. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or -code (collectively "Third Party Software") to implement various -functions. Third Party Software does not comprise part of the -Licensed Software. In some cases, access to Third Party Software may -be included along with the Licensed Software delivery as a convenience -for development and testing only. Such source code and libraries may -be listed in the ".../src/3rdparty" source tree delivered with the -Licensed Software or documented in the Licensed Software where the -Third Party Software is used, as may be amended from time to time, do -not comprise the Licensed Software. Licensee acknowledges (1) that -some part of Third Party Software may require additional licensing of -copyright and patents from the owners of such, and (2) that -distribution of any of the Licensed Software referencing any portion -of a Third Party Software may require appropriate licensing from such -third parties. - - -7. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Nokia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or -implied, including, but not limited to, implied warranties of -merchantability, fitness for a particular purpose, title and -non-infringement with regard to the Licensed Software. - - -8. LIMITATION OF LIABILITY - -If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable -to Licensee, whether in contract, tort or any other legal theory, -based on the Licensed Software, Nokia's entire liability to Licensee -and Licensee's exclusive remedy shall be, at Nokia's option, either -(A) return of the price Licensee paid for the Licensed Software, or -(B) repair or replacement of the Licensed Software, provided Licensee -returns to Nokia all copies of the Licensed Software as originally -delivered to Licensee. Nokia shall not under any circumstances be -liable to Licensee based on failure of the Licensed Software if the -failure resulted from accident, abuse or misapplication, nor shall -Nokia under any circumstances be liable for special damages, punitive -or exemplary damages, damages for loss of profits or interruption of -business or for loss or corruption of data. Any award of damages from -Nokia to Licensee shall not exceed the total amount Licensee has paid -to Nokia in connection with this Agreement. - - -9. CONFIDENTIALITY - -Each party acknowledges that during the Term of this Agreement it -shall have access to information about the other party's business, -business methods, business plans, customers, business relations, -technology, and other information, including the terms of this -Agreement, that is confidential and of great value to the other party, -and the value of which would be significantly reduced if disclosed to -third parties (the "Confidential Information"). Accordingly, when a -party (the "Receiving Party") receives Confidential Information from -another party (the "Disclosing Party"), the Receiving Party shall, and -shall obligate its employees and agents and employees and agents of -its Affiliates to: (i) maintain the Confidential Information in strict -confidence; (ii) not disclose the Confidential Information to a third -party without the Disclosing Party's prior written approval; and (iii) -not, directly or indirectly, use the Confidential Information for any -purpose other than for exercising its rights and fulfilling its -responsibilities pursuant to this Agreement. Each party shall take -reasonable measures to protect the Confidential Information of the -other party, which measures shall not be less than the measures taken -by such party to protect its own confidential and proprietary -information. - -"Confidential Information" shall not include information that (a) is -or becomes generally known to the public through no act or omission of -the Receiving Party; (b) was in the Receiving Party's lawful -possession prior to the disclosure hereunder and was not subject to -limitations on disclosure or use; (c) is developed by the Receiving -Party without access to the Confidential Information of the Disclosing -Party or by persons who have not had access to the Confidential -Information of the Disclosing Party as proven by the written records -of the Receiving Party; (d) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation -of confidentiality; or (e) the Receiving Party is legally compelled to -disclose the information, in which case the Receiving Party shall -assert the privileged and confidential nature of the information and -cooperate fully with the Disclosing Party to protect against and -prevent disclosure of any Confidential Information and to limit the -scope of disclosure and the dissemination of disclosed Confidential -Information by all legally available means. - -The obligations of the Receiving Party under this Section shall -continue during the Initial Term and for a period of five (5) years -after expiration or termination of this Agreement. To the extent that -the terms of the Non-Disclosure Agreement between Nokia and Licensee -conflict with the terms of this Section 8, this Section 8 shall be -controlling over the terms of the Non-Disclosure Agreement. - - -10. GENERAL PROVISIONS - -10.1 No Assignment - -Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the -prior written consent of Nokia, which shall not be unreasonably -withheld. - -10.2 Termination - -Nokia may terminate the Agreement at any time immediately upon written -notice by Nokia to Licensee if Licensee breaches this Agreement. - -Upon termination of this Agreement, Licensee shall return to Nokia all -copies of Licensed Software that were supplied by Nokia. All other -copies of Licensed Software in the possession or control of Licensee -must be erased or destroyed. An officer of Licensee must promptly -deliver to Nokia a written confirmation that this has occurred. - -10.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably -should survive a cancellation or termination of this Agreement shall -also be deemed to survive. Such terms and conditions include, but are -not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, -10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement. - -10.4 Entire Agreement - -This Agreement constitutes the complete agreement between the parties -and supersedes all prior or contemporaneous discussions, -representations, and proposals, written or oral, with respect to the -subject matters discussed herein, with the exception of the -non-disclosure agreement executed by the parties in connection with -this Agreement ("Non-Disclosure Agreement"), if any, shall be subject -to Section 8. No modification of this Agreement shall be effective -unless contained in a writing executed by an authorized representative -of each party. No term or condition contained in Licensee's purchase -order shall apply unless expressly accepted by Nokia in writing. If -any provision of the Agreement is found void or unenforceable, the -remainder shall remain valid and enforceable according to its -terms. If any remedy provided is determined to have failed for its -essential purpose, all limitations of liability and exclusions of -damages set forth in this Agreement shall remain in effect. - -10.5 Export Control - -Licensee acknowledges that the Licensed Software may be subject to -export control restrictions of various countries. Licensee shall fully -comply with all applicable export license restrictions and -requirements as well as with all laws and regulations relating to the -importation of the Licensed Software and shall procure all necessary -governmental authorizations, including without limitation, all -necessary licenses, approvals, permissions or consents, where -necessary for the re-exportation of the Licensed Software., - -10.6 Governing Law and Legal Venue - -This Agreement shall be governed by and construed in accordance with -the federal laws of the United States of America and the internal laws -of the State of New York without given effect to any choice of law -rule that would result in the application of the laws of any other -jurisdiction. The United Nations Convention on Contracts for the -International Sale of Goods (CISG) shall not apply. Each Party (a) -hereby irrevocably submits itself to and consents to the jurisdiction -of the United States District Court for the Southern District of New -York (or if such court lacks jurisdiction, the state courts of the -State of New York) for the purposes of any action, claim, suit or -proceeding between the Parties in connection with any controversy, -claim, or dispute arising out of or relating to this Agreement; and -(b) hereby waives, and agrees not to assert by way of motion, as a -defense or otherwise, in any such action, claim, suit or proceeding, -any claim that is not personally subject to the jurisdiction of such -court(s), that the action, claim, suit or proceeding is brought in an -inconvenient forum or that the venue of the action, claim, suit or -proceeding is improper. Notwithstanding the foregoing, nothing in -this Section 9.6 is intended to, or shall be deemed to, constitute a -submission or consent to, or selection of, jurisdiction, forum or -venue for any action for patent infringement, whether or not such -action relates to this Agreement. - -10.7 No Implied License - -There are no implied licenses or other implied rights granted under -this Agreement, and all rights, save for those expressly granted -hereunder, shall remain with Nokia and its licensors. In addition, no -licenses or immunities are granted to the combination of the Licensed -Software with any other software or hardware not delivered by Nokia -under this Agreement. - -10.8 Government End Users - -A "U.S. Government End User" shall mean any agency or entity of the -government of the United States. The following shall apply if Licensee -is a U.S. Government End User. The Licensed Software is a "commercial -item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), -consisting of "commercial computer software" and "commercial computer -software documentation," as such terms are used in 48 C.F.R. 12.212 -(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 -C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government -End Users acquire the Licensed Software with only those rights set -forth herein. The Licensed Software (including related documentation) -is provided to U.S. Government End Users: (a) only as a commercial -end item; and (b) only pursuant to this Agreement. - - - - - -TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World -Agreement version 2.3 - -This Technology Preview License Agreement ("Agreement") is a legal -agreement between Nokia Corporation ("Nokia"), with its registered -office at Keilalahdentie 4, 02150 Espoo, Finland and you (either an -individual or a legal entity) ("Licensee") for the Licensed Software -(as defined below). - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or -indirectly controlling such Party; (ii) which is under the same direct -or indirect ownership or control as such Party; or (iii) which is -directly or indirectly owned or controlled by such Party. For these -purposes, an entity shall be treated as being controlled by another if -that other entity has fifty percent (50 %) or more of the votes in -such entity, is able to direct its affairs and/or to control the -composition of its board of directors or equivalent body. - -"Term" shall mean the period of time six (6) months from the later of -(a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Nokia. If no specific Effective -Date is set forth in the Agreement, the Effective Date shall be deemed -to be the date the Licensed Software was initially delivered to -Licensee. - -"Licensed Software" shall mean the computer software, "online" or -electronic documentation, associated media and printed materials, -including the source code, example programs and the documentation -delivered by Nokia to Licensee in conjunction with this Agreement. - -"Party" or "Parties" shall mean Licensee and/or Nokia. - - -2. OWNERSHIP - -The Licensed Software is protected by copyright laws and international -copyright treaties, as well as other intellectual property laws and -treaties. The Licensed Software is licensed, not sold. - -If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any -existing patent rights of Licensee. To the extent Licensee owns or -controls any patents for such Feedback Licensee hereby grants to Nokia -and its Affiliates, a worldwide, perpetual, non-transferable, -sublicensable, royalty-free license to (i) use, copy and modify -Feedback and to create derivative works thereof, (ii) to make (and -have made), use, import, sell, offer for sale, lease, dispose, offer -for disposal or otherwise exploit any products or services of Nokia -containing Feedback,, and (iii) sublicense all the foregoing rights to -third party licensees and customers of Nokia and/or its Affiliates. - - -3. VALIDITY OF THE AGREEMENT - -By installing, copying, or otherwise using the Licensed Software, -Licensee agrees to be bound by the terms of this Agreement. If -Licensee does not agree to the terms of this Agreement, Licensee may -not install, copy, or otherwise use the Licensed Software. Upon -Licensee's acceptance of the terms and conditions of this Agreement, -Nokia grants Licensee the right to use the Licensed Software in the -manner provided below. - - -4. LICENSES - -4.1 Using and Copying - -Nokia grants to Licensee a non-exclusive, non-transferable, -time-limited license to use and copy the Licensed Software for sole -purpose of evaluating and testing the Licensed Software during the -Term. - -Licensee may install copies of the Licensed Software on an unlimited -number of computers provided that (a) if an individual, only such -individual; or (b) if a legal entity only its employees; use the -Licensed Software for the authorized purposes. - -4.2 No Distribution or Modifications - -Licensee may not disclose, modify, sell, market, commercialise, -distribute, loan, rent, lease, or license the Licensed Software or any -copy of it or use the Licensed Software for any purpose that is not -expressly granted in this Section 4. Licensee may not alter or remove -any details of ownership, copyright, trademark or other property right -connected with the Licensed Software. Licensee may not distribute any -software statically or dynamically linked with the Licensed Software. - -4.3 No Technical Support - -Nokia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. - - -5. PRE-RELEASE CODE - -The Licensed Software contains pre-release code that is not at the -level of performance and compatibility of a final, generally -available, product offering. The Licensed Software may not operate -correctly and may be substantially modified prior to the first -commercial product release, if any. Nokia is not obligated to make -this or any later version of the Licensed Software commercially -available. The License Software is "Not for Commercial Use" and may -only be used for the purposes described in Section 4. The Licensed -Software may not be used in a live operating environment where it may -be relied upon to perform in the same manner as a commercially -released product or with data that has not been sufficiently backed -up. - - -6. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or -code (collectively "Third Party Software") to implement various -functions. Third Party Software does not comprise part of the -Licensed Software. In some cases, access to Third Party Software may -be included along with the Licensed Software delivery as a convenience -for development and testing only. Such source code and libraries may -be listed in the ".../src/3rdparty" source tree delivered with the -Licensed Software or documented in the Licensed Software where the -Third Party Software is used, as may be amended from time to time, do -not comprise the Licensed Software. Licensee acknowledges (1) that -some part of Third Party Software may require additional licensing of -copyright and patents from the owners of such, and (2) that -distribution of any of the Licensed Software referencing any portion -of a Third Party Software may require appropriate licensing from such -third parties. - - -7. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Nokia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or -implied, including, but not limited to, implied warranties of -merchantability, fitness for a particular purpose, title and -non-infringement with regard to the Licensed Software. - - -8. LIMITATION OF LIABILITY - -If, Nokia's warranty disclaimer notwithstanding, Nokia is held liable -to Licensee, whether in contract, tort or any other legal theory, -based on the Licensed Software, Nokia's entire liability to Licensee -and Licensee's exclusive remedy shall be, at Nokia's option, either -(A) return of the price Licensee paid for the Licensed Software, or -(B) repair or replacement of the Licensed Software, provided Licensee -returns to Nokia all copies of the Licensed Software as originally -delivered to Licensee. Nokia shall not under any circumstances be -liable to Licensee based on failure of the Licensed Software if the -failure resulted from accident, abuse or misapplication, nor shall -Nokia under any circumstances be liable for special damages, punitive -or exemplary damages, damages for loss of profits or interruption of -business or for loss or corruption of data. Any award of damages from -Nokia to Licensee shall not exceed the total amount Licensee has paid -to Nokia in connection with this Agreement. - - -9. CONFIDENTIALITY - -Each party acknowledges that during the Term of this Agreement it -shall have access to information about the other party's business, -business methods, business plans, customers, business relations, -technology, and other information, including the terms of this -Agreement, that is confidential and of great value to the other party, -and the value of which would be significantly reduced if disclosed to -third parties (the "Confidential Information"). Accordingly, when a -party (the "Receiving Party") receives Confidential Information from -another party (the "Disclosing Party"), the Receiving Party shall, and -shall obligate its employees and agents and employees and agents of -its Affiliates to: (i) maintain the Confidential Information in strict -confidence; (ii) not disclose the Confidential Information to a third -party without the Disclosing Party's prior written approval; and (iii) -not, directly or indirectly, use the Confidential Information for any -purpose other than for exercising its rights and fulfilling its -responsibilities pursuant to this Agreement. Each party shall take -reasonable measures to protect the Confidential Information of the -other party, which measures shall not be less than the measures taken -by such party to protect its own confidential and proprietary -information. - -"Confidential Information" shall not include information that (a) is -or becomes generally known to the public through no act or omission of -the Receiving Party; (b) was in the Receiving Party's lawful -possession prior to the disclosure hereunder and was not subject to -limitations on disclosure or use; (c) is developed by the Receiving -Party without access to the Confidential Information of the Disclosing -Party or by persons who have not had access to the Confidential -Information of the Disclosing Party as proven by the written records -of the Receiving Party; (d) is lawfully disclosed to the Receiving -Party without restrictions, by a third party not under an obligation -of confidentiality; or (e) the Receiving Party is legally compelled to -disclose the information, in which case the Receiving Party shall -assert the privileged and confidential nature of the information and -cooperate fully with the Disclosing Party to protect against and -prevent disclosure of any Confidential Information and to limit the -scope of disclosure and the dissemination of disclosed Confidential -Information by all legally available means. - -The obligations of the Receiving Party under this Section shall -continue during the Initial Term and for a period of five (5) years -after expiration or termination of this Agreement. To the extent that -the terms of the Non-Disclosure Agreement between Nokia and Licensee -conflict with the terms of this Section 8, this Section 8 shall be -controlling over the terms of the Non-Disclosure Agreement. - - -10. GENERAL PROVISIONS - -10.1 No Assignment - -Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the -prior written consent of Nokia, which shall not be unreasonably -withheld. - -10.2 Termination - -Nokia may terminate the Agreement at any time immediately upon written -notice by Nokia to Licensee if Licensee breaches this Agreement. - -Upon termination of this Agreement, Licensee shall return to Nokia all -copies of Licensed Software that were supplied by Nokia. All other -copies of Licensed Software in the possession or control of Licensee -must be erased or destroyed. An officer of Licensee must promptly -deliver to Nokia a written confirmation that this has occurred. - -10.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably -should survive a cancellation or termination of this Agreement shall -also be deemed to survive. Such terms and conditions include, but are -not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, -10.4, 10.5, 10.6, 10.7, and 10.8 of this Agreement. - -10.4 Entire Agreement - -This Agreement constitutes the complete agreement between the parties -and supersedes all prior or contemporaneous discussions, -representations, and proposals, written or oral, with respect to the -subject matters discussed herein, with the exception of the -non-disclosure agreement executed by the parties in connection with -this Agreement ("Non-Disclosure Agreement"), if any, shall be subject -to Section 8. No modification of this Agreement shall be effective -unless contained in a writing executed by an authorized representative -of each party. No term or condition contained in Licensee's purchase -order shall apply unless expressly accepted by Nokia in writing. If -any provision of the Agreement is found void or unenforceable, the -remainder shall remain valid and enforceable according to its -terms. If any remedy provided is determined to have failed for its -essential purpose, all limitations of liability and exclusions of -damages set forth in this Agreement shall remain in effect. - -10.5 Export Control - -Licensee acknowledges that the Licensed Software may be subject to -export control restrictions of various countries. Licensee shall fully -comply with all applicable export license restrictions and -requirements as well as with all laws and regulations relating to the -importation of the Licensed Software and shall procure all necessary -governmental authorizations, including without limitation, all -necessary licenses, approvals, permissions or consents, where -necessary for the re-exportation of the Licensed Software., - -10.6 Governing Law and Legal Venue - -This Agreement shall be construed and interpreted in accordance with -the laws of Finland, excluding its choice of law provisions. Any -disputes arising out of or relating to this Agreement shall be -resolved in arbitration under the Rules of Arbitration of the Chamber -of Commerce of Helsinki, Finland. The arbitration tribunal shall -consist of one (1), or if either Party so requires, of three (3), -arbitrators. The award shall be final and binding and enforceable in -any court of competent jurisdiction. The arbitration shall be held in -Helsinki, Finland and the process shall be conducted in the English -language. - -10.7 No Implied License - -There are no implied licenses or other implied rights granted under -this Agreement, and all rights, save for those expressly granted -hereunder, shall remain with Nokia and its licensors. In addition, no -licenses or immunities are granted to the combination of the Licensed -Software with any other software or hardware not delivered by Nokia -under this Agreement. - -10.8 Government End Users - -A "U.S. Government End User" shall mean any agency or entity of the -government of the United States. The following shall apply if Licensee -is a U.S. Government End User. The Licensed Software is a "commercial -item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), -consisting of "commercial computer software" and "commercial computer -software documentation," as such terms are used in 48 C.F.R. 12.212 -(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 -C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government -End Users acquire the Licensed Software with only those rights set -forth herein. The Licensed Software (including related documentation) -is provided to U.S. Government End Users: (a) only as a commercial -end item; and (b) only pursuant to this Agreement. - - - - -- cgit v0.12 From 35667fd45ada49269a5987c235fdedfc43e92bb8 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 6 Apr 2009 17:18:22 +0200 Subject: BT: Fix regression when tooltips dissappear suddenly in Unified toolbar QWidget::childAt() makes some assumptions about its children (they are all contained in its geometry). This does not hold up when using the unified toolbar because the toolbar ends up in the "non-client" area. So, when dispatching an enter/leave event in tooltip show, we end up dispatching to the wrong widgets and that results in the tooltip cleverly thinking that it needs to hide itself because we've left the widget that needs the tooltip. I've special cased this by just having a "native" mapFromParent() that is only called for on the mac, though there is nothing that is limiting this from being called on other platfroms. Also QWidget::mapFromParent() probably needs to be looked at at some point. Task-number: 248048 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 640f2c732c6fd76866cd7e601a9140dbe7849e6f) --- src/gui/kernel/qt_mac_p.h | 1 + src/gui/kernel/qwidget.cpp | 24 ++++++++++++++++++++++-- src/gui/kernel/qwidget_mac.mm | 14 ++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h index 3aec23f..e65492d 100644 --- a/src/gui/kernel/qt_mac_p.h +++ b/src/gui/kernel/qt_mac_p.h @@ -233,6 +233,7 @@ extern QPaintDevice *qt_mac_safe_pdev; //qapplication_mac.cpp extern OSWindowRef qt_mac_window_for(const QWidget*); //qwidget_mac.mm extern OSViewRef qt_mac_nativeview_for(const QWidget *); //qwidget_mac.mm +extern QPoint qt_mac_nativeMapFromParent(const QWidget *child, const QPoint &pt); //qwidget_mac.mm #ifdef check # undef check diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index f92d660..6f2fec9 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -66,6 +66,7 @@ #ifdef Q_WS_MAC # include "qt_mac_p.h" # include "qt_cocoa_helpers_mac_p.h" +# include "qmainwindow.h" #endif #if defined(Q_WS_QWS) # include "qwsdisplay_qws.h" @@ -8966,17 +8967,36 @@ QWidget *QWidget::childAt(const QPoint &p) const QWidget *QWidgetPrivate::childAt_helper(const QPoint &p, bool ignoreChildrenInDestructor) const { Q_Q(const QWidget); - if (!q->rect().contains(p)) +#ifdef Q_WS_MAC + bool includeFrame = q->isWindow() && qobject_cast(q) + && static_cast(q)->unifiedTitleAndToolBarOnMac(); +#endif + + if ( +#ifdef Q_WS_MAC + !includeFrame && +#endif + !q->rect().contains(p)) return 0; + for (int i = children.size(); i > 0 ;) { --i; QWidget *w = qobject_cast(children.at(i)); - if (w && !w->isWindow() && !w->isHidden() && w->geometry().contains(p)) { + if (w && !w->isWindow() && !w->isHidden() + && (w->geometry().contains(p) +#ifdef Q_WS_MAC + || (includeFrame && w->geometry().contains(qt_mac_nativeMapFromParent(w, p))) +#endif + )) { if (ignoreChildrenInDestructor && w->data->in_destructor) continue; if (w->testAttribute(Qt::WA_TransparentForMouseEvents)) continue; QPoint childPoint = w->mapFromParent(p); +#ifdef Q_WS_MAC + if (includeFrame && !w->geometry().contains(p)) + childPoint = qt_mac_nativeMapFromParent(w, p); +#endif if (QWidget *t = w->d_func()->childAt_helper(childPoint, ignoreChildrenInDestructor)) return t; // if WMouseNoMask is set the widget mask is ignored, if diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index f2a532f..5432c55 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3274,6 +3274,20 @@ void QWidgetPrivate::show_sys() qt_event_request_window_change(q); } + +QPoint qt_mac_nativeMapFromParent(const QWidget *child, const QPoint &pt) +{ +#ifndef QT_MAC_USE_COCOA + CGPoint nativePoint = CGPointMake(pt.x(), pt.y()); + HIViewConvertPoint(&nativePoint, qt_mac_nativeview_for(child->parentWidget()), + qt_mac_nativeview_for(child)); +#else + NSPoint nativePoint = [qt_mac_nativeview_for(child) convertPoint:NSMakePoint(pt.x(), pt.y()) fromView:qt_mac_nativeview_for(child->parentWidget())]; +#endif + return QPoint(nativePoint.x, nativePoint.y); +} + + void QWidgetPrivate::hide_sys() { Q_Q(QWidget); -- cgit v0.12 From 16aefb2e4e2a189951205d350b658888e65b07af Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 7 Apr 2009 09:51:31 +0200 Subject: BT: Compile without QT3SUPPORT Reviewed-by: ogoffart (cherry picked from commit b9d6ecc1dbe5791fec6fb06de3be06186b485420) --- src/gui/styles/qgtkstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 6354ce7..b569b5c 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2634,7 +2634,7 @@ void QGtkStyle::drawControl(ControlElement element, QColor disabledTextColor = QColor(gdkDText.red>>8, gdkDText.green>>8, gdkDText.blue>>8); if (resolve_mask & (1 << QPalette::ButtonText)) { textColor = option->palette.buttonText().color(); - disabledTextColor = option->palette.brush(QPalette::Disabled, QPalette::ButtonText);; + disabledTextColor = option->palette.brush(QPalette::Disabled, QPalette::ButtonText).color(); } QColor highlightedTextColor = QColor(gdkHText.red>>8, gdkHText.green>>8, gdkHText.blue>>8); -- cgit v0.12 From a3912de43d99b6e54b9d0dedba57cc88adf73884 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Apr 2009 19:39:03 +0200 Subject: make shadow builds with default moc/ui dirs work again append the source dir to the include path, but only after the dirs with the generated files. this seems to have worked before only accidentally: the unqualified default dirs were expanded to the source dir instead of the build dir, but the build dir is added implicitly by default, so things magically worked. now that we qualify the moc/ui dirs, projects relying on the strange side effect suddenly break. we should probably add the source dir to the include path by default, but this coupling to uic/moc is closer to the historical behavior and thus should be safer. Reviewed-by: mariusSO (cherry picked from commit 3279b07302fde0eb14f9b197c9ad2e14d512817e) --- mkspecs/features/include_source_dir.prf | 1 + mkspecs/features/moc.prf | 7 +++++++ mkspecs/features/uic.prf | 7 +++++++ 3 files changed, 15 insertions(+) create mode 100644 mkspecs/features/include_source_dir.prf diff --git a/mkspecs/features/include_source_dir.prf b/mkspecs/features/include_source_dir.prf new file mode 100644 index 0000000..8794998 --- /dev/null +++ b/mkspecs/features/include_source_dir.prf @@ -0,0 +1 @@ +!equals(_PRO_FILE_PWD_, $$OUT_PWD):INCLUDEPATH *= . diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index f1dcf37..f18d462 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -66,6 +66,13 @@ win32:moc_dir_short ~= s,^.:,/, contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR +# Backwards compatibility: Make shadow builds with default MOC_DIR work +# if the user did not add the source dir explicitly. +equals(MOC_DIR, .) { + CONFIG -= include_source_dir + CONFIG = include_source_dir $$CONFIG +} + #auto depend on moc unix:!no_mocdepend { moc_source.depends += $$first(QMAKE_MOC) diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index c7b1686..0c7fb1b 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -39,6 +39,13 @@ win32:ui_dir_short ~= s,^.:,/, contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR +# Backwards compatibility: Make shadow builds with default UI_DIR work +# if the user did not add the source dir explicitly. +equals(UI_DIR, .) { + CONFIG -= include_source_dir + CONFIG = include_source_dir $$CONFIG +} + uic3 { isEmpty(FORMS3) { UIC3_FORMS = FORMS -- cgit v0.12 From 6accd6061dd680745d1f8f64edfb9ab4ce54a585 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 7 Apr 2009 13:16:28 +0200 Subject: Adjust comments Someone messed up the whitespace on this comment. (cherry picked from commit a6ab4f638a63755a601b61141fa7730d5ac6e793) --- src/gui/widgets/qcocoamenu_mac.mm | 67 ++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index c92dfc0..64da141 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -1,41 +1,41 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) + ** Contact: Qt Software Information (qt-info@nokia.com) ** ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ + ** 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 either Technology Preview License Agreement or the + ** Beta Release License Agreement. + ** + ** 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. + ** + ** In addition, as a special exception, Nokia gives you certain + ** additional rights. These rights are described in the Nokia Qt LGPL + ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this + ** package. + ** + ** 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. + ** + ** If you are unsure which license is appropriate for your use, please + ** contact the sales department at qt-sales@nokia.com. + ** $QT_END_LICENSE$ ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -134,8 +134,9 @@ QT_END_NAMESPACE // If it does, then we will first send the key sequence to the QWidget that has focus // since (in Qt's eyes) it needs to a chance at the key event first. If the widget // accepts the key event, we then return YES, but set the target and action to be nil, - // which means that the action should not be triggered. In every other case we return - // NO, which means that Cocoa can do as it pleases (i.e., fire the menu action). + // which means that the action should not be triggered, and instead dispatch the event ourselves. + // In every other case we return NO, which means that Cocoa can do as it pleases + // (i.e., fire the menu action). NSMenuItem *whichItem; if ([self hasShortcut:menu forKey:[event characters] -- cgit v0.12 From 6beee76eae6420b16095bdfbe60b188b18e4468f Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 7 Apr 2009 13:17:05 +0200 Subject: BT: Send the keyevent after we send the shortcutoverride in menu In our Cocoa menu we check if we need to send the key event to the qwidget before the menu has a chance at it, because logically in Qt, the key event should go to the widget and not the menubar first (a bit different than what happens on the mac). The way to determine this is to send a shortcut override event and see if it accepts it. If it does, that means we should just send it the key event. Previously we were sending the shortcut override, but not following through on the key event because we thought (however foolishly). That returning "YES" but not setting an action would somehow forward the event (it doesn't). There still seems to be some problems if you have a Dvorak-QWERTY+CWD layout, but this probably needs to be dealt with at the key mapper level. Reviewed-by: Prasanth Ullattil (cherry picked from commit acff913a6287ad50b0ac782d817d51072ccb479c) --- src/gui/widgets/qcocoamenu_mac.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index 64da141..bae270a 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -161,6 +161,7 @@ QT_END_NAMESPACE if (accel_ev.isAccepted()) { *target = nil; *action = nil; + [qt_mac_nativeview_for(widget) keyDown:event]; return YES; } } -- cgit v0.12 From de684d1de146db0e578d2fefb80ca32b19680d73 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 7 Apr 2009 13:19:11 +0200 Subject: BT: QFileDialog: A folder with a name containing diacritic is disabled on Mac OS X - cocoa The filename as NSString that we get from Cocoa does not have the correct file system encoding. This means that certain characters are implemented differently than what e.g. QFile::encoded returns. This fix normalizes the string from cocoa before using it. Task-number: 249928 Reviewed-by: Trenton Schulz (cherry picked from commit 179fafcc370c907a6070c7150695d446255e68d1) --- src/gui/dialogs/qfiledialog_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 4c13d01..90af9fc 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -278,7 +278,7 @@ QT_USE_NAMESPACE { Q_UNUSED(sender); QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename); - QFileInfo info(qtFileName); + QFileInfo info(qtFileName.normalized(QT_PREPEND_NAMESPACE(QString::NormalizationForm_C))); QString path = info.absolutePath(); if (path != *mLastFilterCheckPath){ *mLastFilterCheckPath = path; -- cgit v0.12 From c707fb9c1d86c5b9d9457e243ae695162f969192 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Tue, 7 Apr 2009 10:59:41 +0200 Subject: Drag cursor is not updated when modifier keys are pressed/released in the Cocoa Builds. The drag move events were compressed based only on the position of the cursor. It has to be based on both position and the "drag operation" in native event. Reviewed-by: nrc (cherry picked from commit ca2d62f97f991d042a781d9d7bd0dbda910e1d04) --- src/gui/kernel/qcocoaview_mac.mm | 6 ++++-- src/gui/kernel/qt_mac_p.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 19367d1..9b581c5 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -300,11 +300,13 @@ extern "C" { NSPoint windowPoint = [sender draggingLocation]; NSPoint globalPoint = [[sender draggingDestinationWindow] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; + NSDragOperation nsActions = [sender draggingSourceOperationMask]; QPoint posDrag(localPoint.x, localPoint.y); - if (qt_mac_mouse_inside_answer_rect(posDrag)) + if (qt_mac_mouse_inside_answer_rect(posDrag) + && QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) == nsActions) return QT_PREPEND_NAMESPACE(qt_mac_mapDropActions)(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastAction)); // send drag move event to the widget - NSDragOperation nsActions = [sender draggingSourceOperationMask]; + QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) = nsActions; Qt::DropActions qtAllowed = QT_PREPEND_NAMESPACE(qt_mac_mapNSDragOperations)(nsActions); QMimeData *mimeData = dropData; if (QDragManager::self()->source()) diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h index e65492d..ca995dc 100644 --- a/src/gui/kernel/qt_mac_p.h +++ b/src/gui/kernel/qt_mac_p.h @@ -250,11 +250,13 @@ struct QMacDndAnswerRecord { Qt::KeyboardModifiers modifiers; Qt::MouseButtons buttons; Qt::DropAction lastAction; + unsigned int lastOperation; void clear() { rect = QRect(); modifiers = Qt::NoModifier; buttons = Qt::NoButton; lastAction = Qt::IgnoreAction; + lastOperation = 0; } }; extern QMacDndAnswerRecord qt_mac_dnd_answer_rec; -- cgit v0.12 From 29f0bd468a6417d1334eff782d7341493acca86b Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 7 Apr 2009 14:15:39 +0200 Subject: My changelog for 4.5.1 (cherry picked from commit c5b0197611ebb3279b3426aca275458477edb42d) --- dist/changes-4.5.1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 1d2286e..de4eef7 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -33,9 +33,25 @@ Third party components * Library * **************************************************************************** +- QAbstractSocket + * [192037] Emit disconnected only if we were connected before + +- QAuthenticator + * [237979] fix implemenation of md5-sess + +- QFileInfo + * [205244] return valid file info also for relative UNC paths + +- QHttp + * [208445] cancel request upon receiving unknown authentication method + - QSharedPointer * [246843] Fixed a crash caused by using QSharedPointer in global statics +- QSSlSocket + * [245668] set also protocol, verifyMode and verifyDepth in + setSslConfiguration() + **************************************************************************** * Database Drivers * **************************************************************************** -- cgit v0.12 From 9e7f2b2029c13888509ce25f1fd96e131fef28d9 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Apr 2009 14:55:04 +0200 Subject: Fixes: mediaobject autotest for windows ce (waveout) RevBy: Joerg AutoTest: mediaobject Details: Since our wave files on Windows CE are very short (memory) we actually land up in the PausedState when playback is finished (cherry picked from commit 0ea43e7d28815c133e8029f3d966871a10fef8e0) --- tests/auto/mediaobject/tst_mediaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 96589b7..e0275de 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -787,7 +787,7 @@ void tst_MediaObject::setMediaAndPlay() QSignalSpy totalTimeChangedSignalSpy(m_media, SIGNAL(totalTimeChanged(qint64))); QVERIFY(m_media->currentSource().type() != MediaSource::Invalid); Phonon::State state = m_media->state(); - QVERIFY(state == Phonon::StoppedState || state == Phonon::PlayingState); + QVERIFY(state == Phonon::StoppedState || state == Phonon::PlayingState || Phonon::PausedState); m_media->setCurrentSource(m_url); // before calling play() we better make sure that if play() finishes very fast that we don't get // called again -- cgit v0.12 From e0b90b6cdfea29a2362d3ba825be7a816eaa7332 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 7 Apr 2009 15:03:11 +0200 Subject: fix tap-and-hold checkbox problem for Windows CE Symptom: checkboxes didn't get checked if you press, hold for some seconds and then release the mouse or stylus. In QAbstractButton we reacted on the contextMenuEvent that gets sent if the system recognizes the context menu gesture (tap and hold) and did call setDown(false). This change has been done because buttons in tool bars stayed in the down state when displaying the context menu with this gesture. I've now moved the handling of this to qtoolbar.cpp. Task-number: 246619 Reviewed-by: thartman (cherry picked from commit de007bd2a20a141aefe901408512c806879a2387) --- src/gui/widgets/qabstractbutton.cpp | 9 --------- src/gui/widgets/qabstractbutton.h | 3 --- src/gui/widgets/qtoolbar.cpp | 11 +++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp index 330a7f8..61ed0ea 100644 --- a/src/gui/widgets/qabstractbutton.cpp +++ b/src/gui/widgets/qabstractbutton.cpp @@ -1248,15 +1248,6 @@ void QAbstractButton::timerEvent(QTimerEvent *e) } } -#if defined(Q_OS_WINCE) && !defined(QT_NO_CONTEXTMENU) -/*! \reimp */ -void QAbstractButton::contextMenuEvent(QContextMenuEvent *e) -{ - e->ignore(); - setDown(false); -} -#endif - /*! \reimp */ void QAbstractButton::focusInEvent(QFocusEvent *e) { diff --git a/src/gui/widgets/qabstractbutton.h b/src/gui/widgets/qabstractbutton.h index 6503a56..f0cbb05 100644 --- a/src/gui/widgets/qabstractbutton.h +++ b/src/gui/widgets/qabstractbutton.h @@ -143,9 +143,6 @@ protected: void focusOutEvent(QFocusEvent *e); void changeEvent(QEvent *e); void timerEvent(QTimerEvent *e); -#ifdef Q_OS_WINCE - void contextMenuEvent(QContextMenuEvent *e); -#endif #ifdef QT3_SUPPORT public: diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index 85d6ea2..1babb6d 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -1153,6 +1153,17 @@ bool QToolBar::event(QEvent *event) if (d->mouseMoveEvent(static_cast(event))) return true; break; +#ifdef Q_OS_WINCE + case QEvent::ContextMenu: + { + QContextMenuEvent* contextMenuEvent = static_cast(event); + QWidget* child = childAt(contextMenuEvent->pos()); + QAbstractButton* button = qobject_cast(child); + if (button) + button->setDown(false); + } + break; +#endif case QEvent::Leave: if (d->state != 0 && d->state->dragging) { #ifdef Q_OS_WIN -- cgit v0.12 From 1da42bc25d414b52de0996608cbaf59c5cd3bf81 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 7 Apr 2009 15:30:12 +0200 Subject: BT: Prevent a crash in Designer when quiting when in the filter edit. Gah, my original change (f5ef0eb1a6543abdd29e07c23de7fa1128f6d623) had its heart in the right place, but it seems that it can cause crashes on closing where we refuse to give up the first responder and we end up with a dangling pointer. This lets that case happen (when we have no focus widget and are setting a nil first responder, there's no reason to stop that, but it refuses to do that when we do have a focus widget. Hopefully we don't get in a situation where our focus widget gets out of sync. Reviewed-by: Prasanth Ullattil (cherry picked from commit 773c4d326c24f8db12ab58e379bd223ce1126d72) --- src/gui/kernel/qcocoapanel_mac.mm | 5 +++-- src/gui/kernel/qcocoawindow_mac.mm | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm index c17b30c..95e20af 100644 --- a/src/gui/kernel/qcocoapanel_mac.mm +++ b/src/gui/kernel/qcocoapanel_mac.mm @@ -157,10 +157,11 @@ QT_USE_NAMESPACE [self release]; } - - (BOOL)makeFirstResponder:(NSResponder *)responder { - if (responder == nil) + // For some reason Cocoa wants to flip the first responder + // when Qt doesn't want to, sorry, but "No" :-) + if (responder == nil && qApp->focusWidget()) return NO; return [super makeFirstResponder:responder]; } diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm index ba121cd..e7b76a7 100644 --- a/src/gui/kernel/qcocoawindow_mac.mm +++ b/src/gui/kernel/qcocoawindow_mac.mm @@ -182,7 +182,9 @@ extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview. - (BOOL)makeFirstResponder:(NSResponder *)responder { - if (responder == nil) + // For some reason Cocoa wants to flip the first responder + // when Qt doesn't want to, sorry, but "No" :-) + if (responder == nil && qApp->focusWidget()) return NO; return [super makeFirstResponder:responder]; } -- cgit v0.12 From 291953f9b3a913f7200c396406567c7ccea0c6cc Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 7 Apr 2009 16:37:08 +0200 Subject: Bt: Fix regression in the Embedded dialogs example We had to revert an earlier fix since it obviously did not work correctly. However since we do not really need to propagate the palette on the viewContainer _before_ it is created, we can simply avoid the issue alltogether as it would happen because we implicitly added a child widget during the polish of the combo box. Reviewed-by: nrc (cherry picked from commit 35c26d696cbff269d551c012a212c09692dd6f6b) --- demos/embeddeddialogs/customproxy.cpp | 11 +++++++++-- src/gui/widgets/qcombobox.cpp | 24 +++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp index 56a0548..ed2fc76 100644 --- a/demos/embeddeddialogs/customproxy.cpp +++ b/demos/embeddeddialogs/customproxy.cpp @@ -111,8 +111,15 @@ bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event) QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &value) { - if (change == ItemChildRemovedChange) - removeSceneEventFilter(this); + if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { + QGraphicsItem *item = qVariantValue(value); + if (change == ItemChildAddedChange) { + item->setCacheMode(ItemCoordinateCache); + item->installSceneEventFilter(this); + } else { + item->removeSceneEventFilter(this); + } + } return QGraphicsProxyWidget::itemChange(change, value); } diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 09a51fe..b9dbc62 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2572,19 +2572,21 @@ void QComboBox::changeEvent(QEvent *e) hidePopup(); break; case QEvent::PaletteChange: { - QStyleOptionComboBox opt; - initStyleOption(&opt); + if (d->container) { + QStyleOptionComboBox opt; + initStyleOption(&opt); #ifndef QT_NO_MENU - if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, this)) { - QMenu menu; - menu.ensurePolished(); - d->viewContainer()->setPalette(menu.palette()); - d->viewContainer()->setWindowOpacity(menu.windowOpacity()); - } else + if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, this)) { + QMenu menu; + menu.ensurePolished(); + d->viewContainer()->setPalette(menu.palette()); + d->viewContainer()->setWindowOpacity(menu.windowOpacity()); + } else #endif - { - d->viewContainer()->setPalette(palette()); - d->viewContainer()->setWindowOpacity(1.0); + { + d->viewContainer()->setPalette(palette()); + d->viewContainer()->setWindowOpacity(1.0); + } } break; } -- cgit v0.12 From 154804f762a7cb6633b802a0c6c55c88368f6500 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 8 Apr 2009 17:18:16 +1000 Subject: Replace license headers with 'release' versions This change was performed by a script that was written by the previous release manager and reviewed by me. Thus Reviewed-by: Trust Me --- demos/affine/main.cpp | 10 ++-- demos/affine/xform.cpp | 10 ++-- demos/affine/xform.h | 10 ++-- demos/arthurplugin/plugin.cpp | 10 ++-- demos/books/bookdelegate.cpp | 10 ++-- demos/books/bookdelegate.h | 10 ++-- demos/books/bookwindow.cpp | 10 ++-- demos/books/bookwindow.h | 10 ++-- demos/books/initdb.h | 10 ++-- demos/books/main.cpp | 10 ++-- demos/boxes/basic.fsh | 10 ++-- demos/boxes/basic.vsh | 10 ++-- demos/boxes/dotted.fsh | 10 ++-- demos/boxes/fresnel.fsh | 10 ++-- demos/boxes/glass.fsh | 10 ++-- demos/boxes/glbuffers.cpp | 10 ++-- demos/boxes/glbuffers.h | 10 ++-- demos/boxes/glextensions.cpp | 10 ++-- demos/boxes/glextensions.h | 10 ++-- demos/boxes/glshaders.cpp | 10 ++-- demos/boxes/glshaders.h | 10 ++-- demos/boxes/gltrianglemesh.h | 10 ++-- demos/boxes/granite.fsh | 10 ++-- demos/boxes/main.cpp | 10 ++-- demos/boxes/marble.fsh | 10 ++-- demos/boxes/qtbox.cpp | 10 ++-- demos/boxes/qtbox.h | 10 ++-- demos/boxes/reflection.fsh | 10 ++-- demos/boxes/refraction.fsh | 10 ++-- demos/boxes/roundedbox.cpp | 10 ++-- demos/boxes/roundedbox.h | 10 ++-- demos/boxes/scene.cpp | 10 ++-- demos/boxes/scene.h | 10 ++-- demos/boxes/trackball.cpp | 10 ++-- demos/boxes/trackball.h | 10 ++-- demos/boxes/vector.h | 10 ++-- demos/boxes/wood.fsh | 10 ++-- demos/browser/autosaver.cpp | 10 ++-- demos/browser/autosaver.h | 10 ++-- demos/browser/bookmarks.cpp | 10 ++-- demos/browser/bookmarks.h | 10 ++-- demos/browser/browserapplication.cpp | 10 ++-- demos/browser/browserapplication.h | 10 ++-- demos/browser/browsermainwindow.cpp | 10 ++-- demos/browser/browsermainwindow.h | 10 ++-- demos/browser/chasewidget.cpp | 10 ++-- demos/browser/chasewidget.h | 10 ++-- demos/browser/cookiejar.cpp | 10 ++-- demos/browser/cookiejar.h | 10 ++-- demos/browser/downloadmanager.cpp | 10 ++-- demos/browser/downloadmanager.h | 10 ++-- demos/browser/edittableview.cpp | 10 ++-- demos/browser/edittableview.h | 10 ++-- demos/browser/edittreeview.cpp | 10 ++-- demos/browser/edittreeview.h | 10 ++-- demos/browser/history.cpp | 10 ++-- demos/browser/history.h | 10 ++-- demos/browser/main.cpp | 10 ++-- demos/browser/modelmenu.cpp | 10 ++-- demos/browser/modelmenu.h | 10 ++-- demos/browser/networkaccessmanager.cpp | 10 ++-- demos/browser/networkaccessmanager.h | 10 ++-- demos/browser/searchlineedit.cpp | 10 ++-- demos/browser/searchlineedit.h | 10 ++-- demos/browser/settings.cpp | 10 ++-- demos/browser/settings.h | 10 ++-- demos/browser/squeezelabel.cpp | 10 ++-- demos/browser/squeezelabel.h | 10 ++-- demos/browser/tabwidget.cpp | 10 ++-- demos/browser/tabwidget.h | 10 ++-- demos/browser/toolbarsearch.cpp | 10 ++-- demos/browser/toolbarsearch.h | 10 ++-- demos/browser/urllineedit.cpp | 10 ++-- demos/browser/urllineedit.h | 10 ++-- demos/browser/webview.cpp | 10 ++-- demos/browser/webview.h | 10 ++-- demos/browser/xbel.cpp | 10 ++-- demos/browser/xbel.h | 10 ++-- demos/chip/chip.cpp | 10 ++-- demos/chip/chip.h | 10 ++-- demos/chip/main.cpp | 10 ++-- demos/chip/mainwindow.cpp | 10 ++-- demos/chip/mainwindow.h | 10 ++-- demos/chip/view.cpp | 10 ++-- demos/chip/view.h | 10 ++-- demos/composition/composition.cpp | 10 ++-- demos/composition/composition.h | 10 ++-- demos/composition/main.cpp | 10 ++-- demos/deform/main.cpp | 10 ++-- demos/deform/pathdeform.cpp | 10 ++-- demos/deform/pathdeform.h | 10 ++-- .../embeddedsvgviewer/embeddedsvgviewer.cpp | 10 ++-- .../embedded/embeddedsvgviewer/embeddedsvgviewer.h | 10 ++-- demos/embedded/embeddedsvgviewer/main.cpp | 10 ++-- demos/embedded/fluidlauncher/demoapplication.cpp | 10 ++-- demos/embedded/fluidlauncher/demoapplication.h | 10 ++-- demos/embedded/fluidlauncher/fluidlauncher.cpp | 10 ++-- demos/embedded/fluidlauncher/fluidlauncher.h | 10 ++-- demos/embedded/fluidlauncher/main.cpp | 10 ++-- demos/embedded/fluidlauncher/pictureflow.cpp | 10 ++-- demos/embedded/fluidlauncher/pictureflow.h | 10 ++-- demos/embedded/fluidlauncher/slideshow.cpp | 10 ++-- demos/embedded/fluidlauncher/slideshow.h | 10 ++-- demos/embedded/styledemo/main.cpp | 10 ++-- demos/embedded/styledemo/stylewidget.cpp | 10 ++-- demos/embedded/styledemo/stylewidget.h | 10 ++-- demos/embeddeddialogs/customproxy.cpp | 10 ++-- demos/embeddeddialogs/customproxy.h | 10 ++-- demos/embeddeddialogs/embeddeddialog.cpp | 10 ++-- demos/embeddeddialogs/embeddeddialog.h | 10 ++-- demos/embeddeddialogs/main.cpp | 10 ++-- demos/gradients/gradients.cpp | 10 ++-- demos/gradients/gradients.h | 10 ++-- demos/gradients/main.cpp | 10 ++-- demos/interview/main.cpp | 10 ++-- demos/interview/model.cpp | 10 ++-- demos/interview/model.h | 10 ++-- demos/macmainwindow/macmainwindow.h | 10 ++-- demos/macmainwindow/macmainwindow.mm | 10 ++-- demos/macmainwindow/main.cpp | 10 ++-- demos/mainwindow/colorswatch.cpp | 10 ++-- demos/mainwindow/colorswatch.h | 10 ++-- demos/mainwindow/main.cpp | 10 ++-- demos/mainwindow/mainwindow.cpp | 10 ++-- demos/mainwindow/mainwindow.h | 10 ++-- demos/mainwindow/toolbar.cpp | 10 ++-- demos/mainwindow/toolbar.h | 10 ++-- demos/mediaplayer/main.cpp | 10 ++-- demos/mediaplayer/mediaplayer.cpp | 10 ++-- demos/mediaplayer/mediaplayer.h | 10 ++-- demos/pathstroke/main.cpp | 10 ++-- demos/pathstroke/pathstroke.cpp | 10 ++-- demos/pathstroke/pathstroke.h | 10 ++-- demos/qtdemo/colors.cpp | 10 ++-- demos/qtdemo/colors.h | 10 ++-- demos/qtdemo/demoitem.cpp | 10 ++-- demos/qtdemo/demoitem.h | 10 ++-- demos/qtdemo/demoitemanimation.cpp | 10 ++-- demos/qtdemo/demoitemanimation.h | 10 ++-- demos/qtdemo/demoscene.cpp | 10 ++-- demos/qtdemo/demoscene.h | 10 ++-- demos/qtdemo/demotextitem.cpp | 10 ++-- demos/qtdemo/demotextitem.h | 10 ++-- demos/qtdemo/dockitem.cpp | 10 ++-- demos/qtdemo/dockitem.h | 10 ++-- demos/qtdemo/examplecontent.cpp | 10 ++-- demos/qtdemo/examplecontent.h | 10 ++-- demos/qtdemo/guide.cpp | 10 ++-- demos/qtdemo/guide.h | 10 ++-- demos/qtdemo/guidecircle.cpp | 10 ++-- demos/qtdemo/guidecircle.h | 10 ++-- demos/qtdemo/guideline.cpp | 10 ++-- demos/qtdemo/guideline.h | 10 ++-- demos/qtdemo/headingitem.cpp | 10 ++-- demos/qtdemo/headingitem.h | 10 ++-- demos/qtdemo/imageitem.cpp | 10 ++-- demos/qtdemo/imageitem.h | 10 ++-- demos/qtdemo/itemcircleanimation.cpp | 10 ++-- demos/qtdemo/itemcircleanimation.h | 10 ++-- demos/qtdemo/letteritem.cpp | 10 ++-- demos/qtdemo/letteritem.h | 10 ++-- demos/qtdemo/main.cpp | 10 ++-- demos/qtdemo/mainwindow.cpp | 10 ++-- demos/qtdemo/mainwindow.h | 10 ++-- demos/qtdemo/menucontent.cpp | 10 ++-- demos/qtdemo/menucontent.h | 10 ++-- demos/qtdemo/menumanager.cpp | 10 ++-- demos/qtdemo/menumanager.h | 10 ++-- demos/qtdemo/scanitem.cpp | 10 ++-- demos/qtdemo/scanitem.h | 10 ++-- demos/qtdemo/score.cpp | 10 ++-- demos/qtdemo/score.h | 10 ++-- demos/qtdemo/textbutton.cpp | 10 ++-- demos/qtdemo/textbutton.h | 10 ++-- demos/shared/arthurstyle.cpp | 10 ++-- demos/shared/arthurstyle.h | 10 ++-- demos/shared/arthurwidgets.cpp | 10 ++-- demos/shared/arthurwidgets.h | 10 ++-- demos/shared/hoverpoints.cpp | 10 ++-- demos/shared/hoverpoints.h | 10 ++-- demos/spreadsheet/main.cpp | 10 ++-- demos/spreadsheet/printview.cpp | 10 ++-- demos/spreadsheet/printview.h | 10 ++-- demos/spreadsheet/spreadsheet.cpp | 10 ++-- demos/spreadsheet/spreadsheet.h | 10 ++-- demos/spreadsheet/spreadsheetdelegate.cpp | 10 ++-- demos/spreadsheet/spreadsheetdelegate.h | 10 ++-- demos/spreadsheet/spreadsheetitem.cpp | 10 ++-- demos/spreadsheet/spreadsheetitem.h | 10 ++-- demos/sqlbrowser/browser.cpp | 10 ++-- demos/sqlbrowser/browser.h | 10 ++-- demos/sqlbrowser/connectionwidget.cpp | 10 ++-- demos/sqlbrowser/connectionwidget.h | 10 ++-- demos/sqlbrowser/main.cpp | 10 ++-- demos/sqlbrowser/qsqlconnectiondialog.cpp | 10 ++-- demos/sqlbrowser/qsqlconnectiondialog.h | 10 ++-- demos/textedit/main.cpp | 10 ++-- demos/textedit/textedit.cpp | 10 ++-- demos/textedit/textedit.h | 10 ++-- demos/undo/commands.cpp | 10 ++-- demos/undo/commands.h | 10 ++-- demos/undo/document.cpp | 10 ++-- demos/undo/document.h | 10 ++-- demos/undo/main.cpp | 10 ++-- demos/undo/mainwindow.cpp | 10 ++-- demos/undo/mainwindow.h | 10 ++-- doc/src/3rdparty.qdoc | 10 ++-- doc/src/accelerators.qdoc | 10 ++-- doc/src/accessible.qdoc | 10 ++-- doc/src/activeqt-dumpcpp.qdoc | 10 ++-- doc/src/activeqt-dumpdoc.qdoc | 10 ++-- doc/src/activeqt-idc.qdoc | 10 ++-- doc/src/activeqt-testcon.qdoc | 10 ++-- doc/src/activeqt.qdoc | 10 ++-- doc/src/annotated.qdoc | 10 ++-- doc/src/appicon.qdoc | 10 ++-- doc/src/assistant-manual.qdoc | 10 ++-- doc/src/atomic-operations.qdoc | 10 ++-- doc/src/bughowto.qdoc | 10 ++-- doc/src/classes.qdoc | 10 ++-- doc/src/codecs.qdoc | 10 ++-- doc/src/commercialeditions.qdoc | 10 ++-- doc/src/compatclasses.qdoc | 10 ++-- doc/src/containers.qdoc | 10 ++-- doc/src/coordsys.qdoc | 10 ++-- doc/src/credits.qdoc | 10 ++-- doc/src/custom-types.qdoc | 10 ++-- doc/src/datastreamformat.qdoc | 10 ++-- doc/src/debug.qdoc | 10 ++-- doc/src/demos.qdoc | 10 ++-- doc/src/demos/affine.qdoc | 10 ++-- doc/src/demos/arthurplugin.qdoc | 10 ++-- doc/src/demos/books.qdoc | 10 ++-- doc/src/demos/boxes.qdoc | 10 ++-- doc/src/demos/browser.qdoc | 10 ++-- doc/src/demos/chip.qdoc | 10 ++-- doc/src/demos/composition.qdoc | 10 ++-- doc/src/demos/deform.qdoc | 10 ++-- doc/src/demos/embeddeddialogs.qdoc | 10 ++-- doc/src/demos/gradients.qdoc | 10 ++-- doc/src/demos/interview.qdoc | 10 ++-- doc/src/demos/macmainwindow.qdoc | 10 ++-- doc/src/demos/mainwindow.qdoc | 10 ++-- doc/src/demos/mediaplayer.qdoc | 10 ++-- doc/src/demos/pathstroke.qdoc | 10 ++-- doc/src/demos/spreadsheet.qdoc | 10 ++-- doc/src/demos/sqlbrowser.qdoc | 10 ++-- doc/src/demos/textedit.qdoc | 10 ++-- doc/src/demos/undo.qdoc | 10 ++-- doc/src/deployment.qdoc | 10 ++-- doc/src/designer-manual.qdoc | 10 ++-- doc/src/desktop-integration.qdoc | 10 ++-- doc/src/developing-on-mac.qdoc | 10 ++-- doc/src/distributingqt.qdoc | 10 ++-- doc/src/dnd.qdoc | 10 ++-- doc/src/ecmascript.qdoc | 10 ++-- doc/src/editions.qdoc | 10 ++-- doc/src/emb-accel.qdoc | 10 ++-- doc/src/emb-charinput.qdoc | 10 ++-- doc/src/emb-crosscompiling.qdoc | 10 ++-- doc/src/emb-deployment.qdoc | 10 ++-- doc/src/emb-differences.qdoc | 10 ++-- doc/src/emb-envvars.qdoc | 10 ++-- doc/src/emb-features.qdoc | 10 ++-- doc/src/emb-fonts.qdoc | 10 ++-- doc/src/emb-framebuffer-howto.qdoc | 10 ++-- doc/src/emb-install.qdoc | 10 ++-- doc/src/emb-makeqpf.qdoc | 10 ++-- doc/src/emb-performance.qdoc | 10 ++-- doc/src/emb-pointer.qdoc | 10 ++-- doc/src/emb-porting.qdoc | 10 ++-- doc/src/emb-qvfb.qdoc | 10 ++-- doc/src/emb-running.qdoc | 10 ++-- doc/src/emb-vnc.qdoc | 10 ++-- doc/src/eventsandfilters.qdoc | 10 ++-- doc/src/examples-overview.qdoc | 10 ++-- doc/src/examples.qdoc | 10 ++-- doc/src/examples/2dpainting.qdoc | 10 ++-- doc/src/examples/activeqt/comapp.qdoc | 10 ++-- doc/src/examples/activeqt/dotnet.qdoc | 10 ++-- doc/src/examples/activeqt/hierarchy.qdoc | 10 ++-- doc/src/examples/activeqt/menus.qdoc | 10 ++-- doc/src/examples/activeqt/multiple.qdoc | 10 ++-- doc/src/examples/activeqt/opengl.qdoc | 10 ++-- doc/src/examples/activeqt/qutlook.qdoc | 10 ++-- doc/src/examples/activeqt/simple.qdoc | 10 ++-- doc/src/examples/activeqt/webbrowser.qdoc | 10 ++-- doc/src/examples/activeqt/wrapper.qdoc | 10 ++-- doc/src/examples/addressbook.qdoc | 10 ++-- doc/src/examples/ahigl.qdoc | 10 ++-- doc/src/examples/analogclock.qdoc | 10 ++-- doc/src/examples/application.qdoc | 10 ++-- doc/src/examples/arrowpad.qdoc | 10 ++-- doc/src/examples/basicdrawing.qdoc | 10 ++-- doc/src/examples/basicgraphicslayouts.qdoc | 10 ++-- doc/src/examples/basiclayouts.qdoc | 10 ++-- doc/src/examples/basicsortfiltermodel.qdoc | 10 ++-- doc/src/examples/blockingfortuneclient.qdoc | 10 ++-- doc/src/examples/borderlayout.qdoc | 10 ++-- doc/src/examples/broadcastreceiver.qdoc | 10 ++-- doc/src/examples/broadcastsender.qdoc | 10 ++-- doc/src/examples/cachedtable.qdoc | 10 ++-- doc/src/examples/calculator.qdoc | 10 ++-- doc/src/examples/calculatorbuilder.qdoc | 10 ++-- doc/src/examples/calculatorform.qdoc | 10 ++-- doc/src/examples/calendar.qdoc | 10 ++-- doc/src/examples/calendarwidget.qdoc | 10 ++-- doc/src/examples/capabilitiesexample.qdoc | 10 ++-- doc/src/examples/charactermap.qdoc | 10 ++-- doc/src/examples/chart.qdoc | 10 ++-- doc/src/examples/classwizard.qdoc | 10 ++-- doc/src/examples/codecs.qdoc | 10 ++-- doc/src/examples/codeeditor.qdoc | 10 ++-- doc/src/examples/collidingmice-example.qdoc | 10 ++-- doc/src/examples/coloreditorfactory.qdoc | 10 ++-- doc/src/examples/combowidgetmapper.qdoc | 10 ++-- doc/src/examples/completer.qdoc | 10 ++-- doc/src/examples/complexpingpong.qdoc | 10 ++-- doc/src/examples/concentriccircles.qdoc | 10 ++-- doc/src/examples/configdialog.qdoc | 10 ++-- doc/src/examples/containerextension.qdoc | 10 ++-- doc/src/examples/context2d.qdoc | 10 ++-- doc/src/examples/customcompleter.qdoc | 10 ++-- doc/src/examples/customsortfiltermodel.qdoc | 10 ++-- doc/src/examples/customtype.qdoc | 10 ++-- doc/src/examples/customtypesending.qdoc | 10 ++-- doc/src/examples/customwidgetplugin.qdoc | 10 ++-- doc/src/examples/dbscreen.qdoc | 10 ++-- doc/src/examples/dbus-chat.qdoc | 10 ++-- doc/src/examples/dbus-listnames.qdoc | 10 ++-- doc/src/examples/dbus-remotecontrolledcar.qdoc | 10 ++-- doc/src/examples/defaultprototypes.qdoc | 10 ++-- doc/src/examples/delayedencoding.qdoc | 10 ++-- doc/src/examples/diagramscene.qdoc | 10 ++-- doc/src/examples/digitalclock.qdoc | 10 ++-- doc/src/examples/dirview.qdoc | 10 ++-- doc/src/examples/dockwidgets.qdoc | 10 ++-- doc/src/examples/dombookmarks.qdoc | 10 ++-- doc/src/examples/draganddroppuzzle.qdoc | 10 ++-- doc/src/examples/dragdroprobot.qdoc | 10 ++-- doc/src/examples/draggableicons.qdoc | 10 ++-- doc/src/examples/draggabletext.qdoc | 10 ++-- doc/src/examples/drilldown.qdoc | 10 ++-- doc/src/examples/dropsite.qdoc | 10 ++-- doc/src/examples/dynamiclayouts.qdoc | 10 ++-- doc/src/examples/echoplugin.qdoc | 10 ++-- doc/src/examples/editabletreemodel.qdoc | 10 ++-- doc/src/examples/elasticnodes.qdoc | 10 ++-- doc/src/examples/extension.qdoc | 10 ++-- doc/src/examples/filetree.qdoc | 10 ++-- doc/src/examples/findfiles.qdoc | 10 ++-- doc/src/examples/flowlayout.qdoc | 10 ++-- doc/src/examples/fontsampler.qdoc | 10 ++-- doc/src/examples/formextractor.qdoc | 10 ++-- doc/src/examples/fortuneclient.qdoc | 10 ++-- doc/src/examples/fortuneserver.qdoc | 10 ++-- doc/src/examples/framebufferobject.qdoc | 10 ++-- doc/src/examples/framebufferobject2.qdoc | 10 ++-- doc/src/examples/fridgemagnets.qdoc | 10 ++-- doc/src/examples/ftp.qdoc | 10 ++-- doc/src/examples/globalVariables.qdoc | 10 ++-- doc/src/examples/grabber.qdoc | 10 ++-- doc/src/examples/groupbox.qdoc | 10 ++-- doc/src/examples/hellogl.qdoc | 10 ++-- doc/src/examples/helloscript.qdoc | 10 ++-- doc/src/examples/hellotr.qdoc | 10 ++-- doc/src/examples/http.qdoc | 10 ++-- doc/src/examples/i18n.qdoc | 10 ++-- doc/src/examples/icons.qdoc | 10 ++-- doc/src/examples/imagecomposition.qdoc | 10 ++-- doc/src/examples/imageviewer.qdoc | 10 ++-- doc/src/examples/itemviewspuzzle.qdoc | 10 ++-- doc/src/examples/licensewizard.qdoc | 10 ++-- doc/src/examples/lineedits.qdoc | 10 ++-- doc/src/examples/localfortuneclient.qdoc | 10 ++-- doc/src/examples/localfortuneserver.qdoc | 10 ++-- doc/src/examples/loopback.qdoc | 10 ++-- doc/src/examples/mandelbrot.qdoc | 10 ++-- doc/src/examples/masterdetail.qdoc | 10 ++-- doc/src/examples/mdi.qdoc | 10 ++-- doc/src/examples/menus.qdoc | 10 ++-- doc/src/examples/mousecalibration.qdoc | 10 ++-- doc/src/examples/movie.qdoc | 10 ++-- doc/src/examples/multipleinheritance.qdoc | 10 ++-- doc/src/examples/musicplayerexample.qdoc | 10 ++-- doc/src/examples/network-chat.qdoc | 10 ++-- doc/src/examples/orderform.qdoc | 10 ++-- doc/src/examples/overpainting.qdoc | 10 ++-- doc/src/examples/padnavigator.qdoc | 10 ++-- doc/src/examples/painterpaths.qdoc | 10 ++-- doc/src/examples/pbuffers.qdoc | 10 ++-- doc/src/examples/pbuffers2.qdoc | 10 ++-- doc/src/examples/pixelator.qdoc | 10 ++-- doc/src/examples/plugandpaint.qdoc | 10 ++-- doc/src/examples/portedasteroids.qdoc | 10 ++-- doc/src/examples/portedcanvas.qdoc | 10 ++-- doc/src/examples/previewer.qdoc | 10 ++-- doc/src/examples/qobjectxmlmodel.qdoc | 10 ++-- doc/src/examples/qtconcurrent-imagescaling.qdoc | 10 ++-- doc/src/examples/qtconcurrent-map.qdoc | 10 ++-- doc/src/examples/qtconcurrent-progressdialog.qdoc | 10 ++-- doc/src/examples/qtconcurrent-runfunction.qdoc | 10 ++-- doc/src/examples/qtconcurrent-wordcount.qdoc | 10 ++-- doc/src/examples/qtscriptcalculator.qdoc | 10 ++-- doc/src/examples/qtscriptcustomclass.qdoc | 10 ++-- doc/src/examples/qtscripttetrix.qdoc | 10 ++-- doc/src/examples/querymodel.qdoc | 10 ++-- doc/src/examples/queuedcustomtype.qdoc | 10 ++-- doc/src/examples/qxmlstreambookmarks.qdoc | 10 ++-- doc/src/examples/recentfiles.qdoc | 10 ++-- doc/src/examples/recipes.qdoc | 10 ++-- doc/src/examples/regexp.qdoc | 10 ++-- doc/src/examples/relationaltablemodel.qdoc | 10 ++-- doc/src/examples/remotecontrol.qdoc | 10 ++-- doc/src/examples/rsslisting.qdoc | 10 ++-- doc/src/examples/samplebuffers.qdoc | 10 ++-- doc/src/examples/saxbookmarks.qdoc | 10 ++-- doc/src/examples/screenshot.qdoc | 10 ++-- doc/src/examples/scribble.qdoc | 10 ++-- doc/src/examples/sdi.qdoc | 10 ++-- doc/src/examples/securesocketclient.qdoc | 10 ++-- doc/src/examples/semaphores.qdoc | 10 ++-- doc/src/examples/settingseditor.qdoc | 10 ++-- doc/src/examples/shapedclock.qdoc | 10 ++-- doc/src/examples/sharedmemory.qdoc | 10 ++-- doc/src/examples/simpledecoration.qdoc | 10 ++-- doc/src/examples/simpledommodel.qdoc | 10 ++-- doc/src/examples/simpletextviewer.qdoc | 10 ++-- doc/src/examples/simpletreemodel.qdoc | 10 ++-- doc/src/examples/simplewidgetmapper.qdoc | 10 ++-- doc/src/examples/sipdialog.qdoc | 10 ++-- doc/src/examples/sliders.qdoc | 10 ++-- doc/src/examples/spinboxdelegate.qdoc | 10 ++-- doc/src/examples/spinboxes.qdoc | 10 ++-- doc/src/examples/sqlwidgetmapper.qdoc | 10 ++-- doc/src/examples/standarddialogs.qdoc | 10 ++-- doc/src/examples/stardelegate.qdoc | 10 ++-- doc/src/examples/styleplugin.qdoc | 10 ++-- doc/src/examples/styles.qdoc | 10 ++-- doc/src/examples/stylesheet.qdoc | 10 ++-- doc/src/examples/svgalib.qdoc | 10 ++-- doc/src/examples/svggenerator.qdoc | 10 ++-- doc/src/examples/svgviewer.qdoc | 10 ++-- doc/src/examples/syntaxhighlighter.qdoc | 10 ++-- doc/src/examples/systray.qdoc | 10 ++-- doc/src/examples/tabdialog.qdoc | 10 ++-- doc/src/examples/tablemodel.qdoc | 10 ++-- doc/src/examples/tablet.qdoc | 10 ++-- doc/src/examples/taskmenuextension.qdoc | 10 ++-- doc/src/examples/tetrix.qdoc | 10 ++-- doc/src/examples/textfinder.qdoc | 10 ++-- doc/src/examples/textobject.qdoc | 10 ++-- doc/src/examples/textures.qdoc | 10 ++-- doc/src/examples/threadedfortuneserver.qdoc | 10 ++-- doc/src/examples/tooltips.qdoc | 10 ++-- doc/src/examples/torrent.qdoc | 10 ++-- doc/src/examples/trafficinfo.qdoc | 10 ++-- doc/src/examples/transformations.qdoc | 10 ++-- doc/src/examples/treemodelcompleter.qdoc | 10 ++-- doc/src/examples/trivialwizard.qdoc | 10 ++-- doc/src/examples/trollprint.qdoc | 10 ++-- doc/src/examples/undoframework.qdoc | 10 ++-- doc/src/examples/waitconditions.qdoc | 10 ++-- doc/src/examples/wiggly.qdoc | 10 ++-- doc/src/examples/windowflags.qdoc | 10 ++-- doc/src/examples/worldtimeclockbuilder.qdoc | 10 ++-- doc/src/examples/worldtimeclockplugin.qdoc | 10 ++-- doc/src/examples/xmlstreamlint.qdoc | 10 ++-- doc/src/exportedfunctions.qdoc | 10 ++-- doc/src/external-resources.qdoc | 10 ++-- doc/src/focus.qdoc | 10 ++-- doc/src/functions.qdoc | 10 ++-- doc/src/gallery-cde.qdoc | 10 ++-- doc/src/gallery-cleanlooks.qdoc | 10 ++-- doc/src/gallery-macintosh.qdoc | 10 ++-- doc/src/gallery-motif.qdoc | 10 ++-- doc/src/gallery-plastique.qdoc | 10 ++-- doc/src/gallery-windows.qdoc | 10 ++-- doc/src/gallery-windowsvista.qdoc | 10 ++-- doc/src/gallery-windowsxp.qdoc | 10 ++-- doc/src/gallery.qdoc | 10 ++-- doc/src/geometry.qdoc | 10 ++-- doc/src/gpl.qdoc | 10 ++-- doc/src/graphicsview.qdoc | 10 ++-- doc/src/groups.qdoc | 10 ++-- doc/src/guibooks.qdoc | 10 ++-- doc/src/hierarchy.qdoc | 10 ++-- doc/src/how-to-learn-qt.qdoc | 10 ++-- doc/src/i18n.qdoc | 10 ++-- doc/src/index.qdoc | 10 ++-- doc/src/installation.qdoc | 10 ++-- doc/src/introtodbus.qdoc | 10 ++-- doc/src/ipc.qdoc | 10 ++-- doc/src/known-issues.qdoc | 10 ++-- doc/src/layout.qdoc | 10 ++-- doc/src/licenses.qdoc | 10 ++-- doc/src/linguist-manual.qdoc | 10 ++-- doc/src/mac-differences.qdoc | 10 ++-- doc/src/mainclasses.qdoc | 10 ++-- doc/src/metaobjects.qdoc | 10 ++-- doc/src/moc.qdoc | 10 ++-- doc/src/model-view-programming.qdoc | 10 ++-- doc/src/modules.qdoc | 10 ++-- doc/src/object.qdoc | 10 ++-- doc/src/objecttrees.qdoc | 10 ++-- doc/src/opensourceedition.qdoc | 10 ++-- doc/src/overviews.qdoc | 10 ++-- doc/src/paintsystem.qdoc | 10 ++-- doc/src/phonon.qdoc | 10 ++-- doc/src/platform-notes.qdoc | 10 ++-- doc/src/plugins-howto.qdoc | 10 ++-- doc/src/porting-qsa.qdoc | 10 ++-- doc/src/porting4-canvas.qdoc | 10 ++-- doc/src/porting4-designer.qdoc | 10 ++-- doc/src/porting4-overview.qdoc | 10 ++-- doc/src/porting4.qdoc | 10 ++-- doc/src/printing.qdoc | 10 ++-- doc/src/properties.qdoc | 10 ++-- doc/src/q3asciicache.qdoc | 10 ++-- doc/src/q3asciidict.qdoc | 10 ++-- doc/src/q3cache.qdoc | 10 ++-- doc/src/q3dict.qdoc | 10 ++-- doc/src/q3intcache.qdoc | 10 ++-- doc/src/q3intdict.qdoc | 10 ++-- doc/src/q3memarray.qdoc | 10 ++-- doc/src/q3popupmenu.qdoc | 10 ++-- doc/src/q3ptrdict.qdoc | 10 ++-- doc/src/q3ptrlist.qdoc | 10 ++-- doc/src/q3ptrqueue.qdoc | 10 ++-- doc/src/q3ptrstack.qdoc | 10 ++-- doc/src/q3ptrvector.qdoc | 10 ++-- doc/src/q3sqlfieldinfo.qdoc | 10 ++-- doc/src/q3sqlrecordinfo.qdoc | 10 ++-- doc/src/q3valuelist.qdoc | 10 ++-- doc/src/q3valuestack.qdoc | 10 ++-- doc/src/q3valuevector.qdoc | 10 ++-- doc/src/qalgorithms.qdoc | 10 ++-- doc/src/qaxcontainer.qdoc | 10 ++-- doc/src/qaxserver.qdoc | 10 ++-- doc/src/qcache.qdoc | 10 ++-- doc/src/qcolormap.qdoc | 10 ++-- doc/src/qdbusadaptors.qdoc | 20 ++++---- doc/src/qdesktopwidget.qdoc | 10 ++-- doc/src/qiterator.qdoc | 10 ++-- doc/src/qmake-manual.qdoc | 10 ++-- doc/src/qnamespace.qdoc | 10 ++-- doc/src/qpagesetupdialog.qdoc | 10 ++-- doc/src/qpaintdevice.qdoc | 10 ++-- doc/src/qpair.qdoc | 10 ++-- doc/src/qpatternistdummy.cpp | 10 ++-- doc/src/qplugin.qdoc | 10 ++-- doc/src/qprintdialog.qdoc | 10 ++-- doc/src/qprinterinfo.qdoc | 10 ++-- doc/src/qset.qdoc | 10 ++-- doc/src/qsignalspy.qdoc | 10 ++-- doc/src/qsizepolicy.qdoc | 10 ++-- doc/src/qsql.qdoc | 10 ++-- doc/src/qt-conf.qdoc | 10 ++-- doc/src/qt-embedded.qdoc | 10 ++-- doc/src/qt3support.qdoc | 10 ++-- doc/src/qt3to4.qdoc | 10 ++-- doc/src/qt4-accessibility.qdoc | 10 ++-- doc/src/qt4-arthur.qdoc | 10 ++-- doc/src/qt4-designer.qdoc | 10 ++-- doc/src/qt4-interview.qdoc | 10 ++-- doc/src/qt4-intro.qdoc | 10 ++-- doc/src/qt4-mainwindow.qdoc | 10 ++-- doc/src/qt4-network.qdoc | 10 ++-- doc/src/qt4-scribe.qdoc | 10 ++-- doc/src/qt4-sql.qdoc | 10 ++-- doc/src/qt4-styles.qdoc | 10 ++-- doc/src/qt4-threads.qdoc | 10 ++-- doc/src/qt4-tulip.qdoc | 10 ++-- doc/src/qtassistant.qdoc | 10 ++-- doc/src/qtcocoa-known-issues.qdoc | 10 ++-- doc/src/qtconfig.qdoc | 10 ++-- doc/src/qtcore.qdoc | 10 ++-- doc/src/qtdbus.qdoc | 20 ++++---- doc/src/qtdemo.qdoc | 10 ++-- doc/src/qtdesigner.qdoc | 10 ++-- doc/src/qtendian.qdoc | 10 ++-- doc/src/qtestevent.qdoc | 10 ++-- doc/src/qtestlib.qdoc | 10 ++-- doc/src/qtgui.qdoc | 10 ++-- doc/src/qthelp.qdoc | 10 ++-- doc/src/qtmac-as-native.qdoc | 20 ++++---- doc/src/qtmain.qdoc | 10 ++-- doc/src/qtnetwork.qdoc | 10 ++-- doc/src/qtopengl.qdoc | 10 ++-- doc/src/qtopiacore-architecture.qdoc | 10 ++-- doc/src/qtopiacore-displaymanagement.qdoc | 10 ++-- doc/src/qtopiacore-opengl.qdoc | 10 ++-- doc/src/qtopiacore.qdoc | 10 ++-- doc/src/qtscript.qdoc | 10 ++-- doc/src/qtscriptdebugger-manual.qdoc | 10 ++-- doc/src/qtscriptextensions.qdoc | 10 ++-- doc/src/qtscripttools.qdoc | 10 ++-- doc/src/qtsql.qdoc | 10 ++-- doc/src/qtsvg.qdoc | 10 ++-- doc/src/qttest.qdoc | 10 ++-- doc/src/qtuiloader.qdoc | 10 ++-- doc/src/qtxml.qdoc | 10 ++-- doc/src/qtxmlpatterns.qdoc | 10 ++-- doc/src/qundo.qdoc | 10 ++-- doc/src/qvarlengtharray.qdoc | 10 ++-- doc/src/qwaitcondition.qdoc | 10 ++-- doc/src/rcc.qdoc | 10 ++-- doc/src/resources.qdoc | 10 ++-- doc/src/richtext.qdoc | 10 ++-- doc/src/session.qdoc | 10 ++-- doc/src/sharedlibrary.qdoc | 10 ++-- doc/src/signalsandslots.qdoc | 10 ++-- doc/src/snippets/accessibilityfactorysnippet.cpp | 10 ++-- doc/src/snippets/accessibilitypluginsnippet.cpp | 10 ++-- doc/src/snippets/accessibilityslidersnippet.cpp | 10 ++-- doc/src/snippets/alphachannel.cpp | 10 ++-- doc/src/snippets/brush/brush.cpp | 10 ++-- doc/src/snippets/brush/gradientcreationsnippet.cpp | 10 ++-- doc/src/snippets/brushstyles/main.cpp | 10 ++-- doc/src/snippets/brushstyles/renderarea.cpp | 10 ++-- doc/src/snippets/brushstyles/renderarea.h | 10 ++-- doc/src/snippets/brushstyles/stylewidget.cpp | 10 ++-- doc/src/snippets/brushstyles/stylewidget.h | 10 ++-- doc/src/snippets/buffer/buffer.cpp | 10 ++-- doc/src/snippets/clipboard/clipwindow.cpp | 10 ++-- doc/src/snippets/clipboard/clipwindow.h | 10 ++-- doc/src/snippets/clipboard/main.cpp | 10 ++-- doc/src/snippets/coordsys/coordsys.cpp | 10 ++-- doc/src/snippets/customstyle/customstyle.cpp | 10 ++-- doc/src/snippets/customstyle/customstyle.h | 10 ++-- doc/src/snippets/customstyle/main.cpp | 10 ++-- .../designer/autoconnection/imagedialog.cpp | 10 ++-- .../snippets/designer/autoconnection/imagedialog.h | 10 ++-- doc/src/snippets/designer/autoconnection/main.cpp | 10 ++-- doc/src/snippets/designer/imagedialog/main.cpp | 10 ++-- .../designer/multipleinheritance/imagedialog.cpp | 10 ++-- .../designer/multipleinheritance/imagedialog.h | 10 ++-- .../snippets/designer/multipleinheritance/main.cpp | 10 ++-- .../designer/noautoconnection/imagedialog.cpp | 10 ++-- .../designer/noautoconnection/imagedialog.h | 10 ++-- .../snippets/designer/noautoconnection/main.cpp | 10 ++-- .../designer/singleinheritance/imagedialog.cpp | 10 ++-- .../designer/singleinheritance/imagedialog.h | 10 ++-- .../snippets/designer/singleinheritance/main.cpp | 10 ++-- doc/src/snippets/dialogs/dialogs.cpp | 10 ++-- doc/src/snippets/dockwidgets/main.cpp | 10 ++-- doc/src/snippets/dockwidgets/mainwindow.cpp | 10 ++-- doc/src/snippets/dockwidgets/mainwindow.h | 10 ++-- doc/src/snippets/draganddrop/dragwidget.cpp | 10 ++-- doc/src/snippets/draganddrop/dragwidget.h | 10 ++-- doc/src/snippets/draganddrop/main.cpp | 10 ++-- doc/src/snippets/draganddrop/mainwindow.cpp | 10 ++-- doc/src/snippets/draganddrop/mainwindow.h | 10 ++-- doc/src/snippets/dragging/main.cpp | 10 ++-- doc/src/snippets/dragging/mainwindow.cpp | 10 ++-- doc/src/snippets/dragging/mainwindow.h | 10 ++-- doc/src/snippets/dropactions/main.cpp | 10 ++-- doc/src/snippets/dropactions/window.cpp | 10 ++-- doc/src/snippets/dropactions/window.h | 10 ++-- doc/src/snippets/droparea.cpp | 10 ++-- doc/src/snippets/dropevents/main.cpp | 10 ++-- doc/src/snippets/dropevents/window.cpp | 10 ++-- doc/src/snippets/dropevents/window.h | 10 ++-- doc/src/snippets/droprectangle/main.cpp | 10 ++-- doc/src/snippets/droprectangle/window.cpp | 10 ++-- doc/src/snippets/droprectangle/window.h | 10 ++-- doc/src/snippets/eventfilters/filterobject.cpp | 10 ++-- doc/src/snippets/eventfilters/filterobject.h | 10 ++-- doc/src/snippets/eventfilters/main.cpp | 10 ++-- doc/src/snippets/events/events.cpp | 10 ++-- .../snippets/explicitlysharedemployee/employee.cpp | 10 ++-- .../snippets/explicitlysharedemployee/employee.h | 10 ++-- doc/src/snippets/explicitlysharedemployee/main.cpp | 10 ++-- doc/src/snippets/file/file.cpp | 10 ++-- doc/src/snippets/fileinfo/main.cpp | 10 ++-- doc/src/snippets/graphicssceneadditemsnippet.cpp | 10 ++-- doc/src/snippets/i18n-non-qt-class/main.cpp | 10 ++-- doc/src/snippets/i18n-non-qt-class/myclass.cpp | 10 ++-- doc/src/snippets/i18n-non-qt-class/myclass.h | 10 ++-- doc/src/snippets/image/image.cpp | 10 ++-- doc/src/snippets/image/supportedformat.cpp | 10 ++-- doc/src/snippets/inherited-slot/button.cpp | 10 ++-- doc/src/snippets/inherited-slot/button.h | 10 ++-- doc/src/snippets/inherited-slot/main.cpp | 10 ++-- doc/src/snippets/itemselection/main.cpp | 10 ++-- doc/src/snippets/itemselection/model.cpp | 10 ++-- doc/src/snippets/itemselection/model.h | 10 ++-- doc/src/snippets/javastyle.cpp | 10 ++-- doc/src/snippets/layouts/layouts.cpp | 10 ++-- doc/src/snippets/mainwindowsnippet.cpp | 10 ++-- doc/src/snippets/matrix/matrix.cpp | 10 ++-- doc/src/snippets/mdiareasnippets.cpp | 10 ++-- doc/src/snippets/moc/main.cpp | 10 ++-- doc/src/snippets/moc/myclass1.h | 10 ++-- doc/src/snippets/moc/myclass2.h | 10 ++-- doc/src/snippets/moc/myclass3.h | 10 ++-- doc/src/snippets/modelview-subclasses/main.cpp | 10 ++-- doc/src/snippets/modelview-subclasses/model.cpp | 10 ++-- doc/src/snippets/modelview-subclasses/model.h | 10 ++-- doc/src/snippets/modelview-subclasses/view.cpp | 10 ++-- doc/src/snippets/modelview-subclasses/view.h | 10 ++-- doc/src/snippets/modelview-subclasses/window.cpp | 10 ++-- doc/src/snippets/modelview-subclasses/window.h | 10 ++-- doc/src/snippets/myscrollarea.cpp | 10 ++-- doc/src/snippets/network/tcpwait.cpp | 10 ++-- doc/src/snippets/painterpath/painterpath.cpp | 10 ++-- doc/src/snippets/persistentindexes/main.cpp | 10 ++-- doc/src/snippets/persistentindexes/mainwindow.cpp | 10 ++-- doc/src/snippets/persistentindexes/mainwindow.h | 10 ++-- doc/src/snippets/persistentindexes/model.cpp | 10 ++-- doc/src/snippets/persistentindexes/model.h | 10 ++-- doc/src/snippets/phonon.cpp | 10 ++-- doc/src/snippets/picture/picture.cpp | 10 ++-- doc/src/snippets/plaintextlayout/main.cpp | 10 ++-- doc/src/snippets/plaintextlayout/window.cpp | 10 ++-- doc/src/snippets/plaintextlayout/window.h | 10 ++-- doc/src/snippets/pointer/pointer.cpp | 10 ++-- doc/src/snippets/polygon/polygon.cpp | 10 ++-- doc/src/snippets/porting4-dropevents/main.cpp | 10 ++-- doc/src/snippets/porting4-dropevents/window.cpp | 10 ++-- doc/src/snippets/porting4-dropevents/window.h | 10 ++-- doc/src/snippets/printing-qprinter/main.cpp | 10 ++-- doc/src/snippets/printing-qprinter/object.cpp | 10 ++-- doc/src/snippets/printing-qprinter/object.h | 10 ++-- doc/src/snippets/process/process.cpp | 10 ++-- doc/src/snippets/qabstractsliderisnippet.cpp | 10 ++-- doc/src/snippets/qcalendarwidget/main.cpp | 10 ++-- doc/src/snippets/qcolumnview/main.cpp | 10 ++-- .../snippets/qdbusextratypes/qdbusextratypes.cpp | 10 ++-- doc/src/snippets/qdebug/qdebugsnippet.cpp | 10 ++-- doc/src/snippets/qdir-filepaths/main.cpp | 10 ++-- doc/src/snippets/qdir-listfiles/main.cpp | 10 ++-- doc/src/snippets/qdir-namefilters/main.cpp | 10 ++-- doc/src/snippets/qfontdatabase/main.cpp | 10 ++-- doc/src/snippets/qgl-namespace/main.cpp | 10 ++-- doc/src/snippets/qlabel/main.cpp | 10 ++-- doc/src/snippets/qlineargradient/main.cpp | 10 ++-- doc/src/snippets/qlineargradient/paintwidget.cpp | 10 ++-- doc/src/snippets/qlineargradient/paintwidget.h | 10 ++-- doc/src/snippets/qlistview-dnd/main.cpp | 10 ++-- doc/src/snippets/qlistview-dnd/mainwindow.cpp | 10 ++-- doc/src/snippets/qlistview-dnd/mainwindow.h | 10 ++-- doc/src/snippets/qlistview-dnd/model.cpp | 10 ++-- doc/src/snippets/qlistview-dnd/model.h | 10 ++-- doc/src/snippets/qlistview-using/main.cpp | 10 ++-- doc/src/snippets/qlistview-using/mainwindow.cpp | 10 ++-- doc/src/snippets/qlistview-using/mainwindow.h | 10 ++-- doc/src/snippets/qlistview-using/model.cpp | 10 ++-- doc/src/snippets/qlistview-using/model.h | 10 ++-- doc/src/snippets/qlistwidget-dnd/main.cpp | 10 ++-- doc/src/snippets/qlistwidget-dnd/mainwindow.cpp | 10 ++-- doc/src/snippets/qlistwidget-dnd/mainwindow.h | 10 ++-- doc/src/snippets/qlistwidget-using/main.cpp | 10 ++-- doc/src/snippets/qlistwidget-using/mainwindow.cpp | 10 ++-- doc/src/snippets/qlistwidget-using/mainwindow.h | 10 ++-- doc/src/snippets/qmake/delegate.h | 10 ++-- doc/src/snippets/qmake/main.cpp | 10 ++-- doc/src/snippets/qmake/model.cpp | 10 ++-- doc/src/snippets/qmake/model.h | 10 ++-- doc/src/snippets/qmake/paintwidget_mac.cpp | 10 ++-- doc/src/snippets/qmake/paintwidget_unix.cpp | 10 ++-- doc/src/snippets/qmake/paintwidget_win.cpp | 10 ++-- doc/src/snippets/qmake/view.h | 10 ++-- doc/src/snippets/qmetaobject-invokable/main.cpp | 10 ++-- doc/src/snippets/qmetaobject-invokable/window.cpp | 10 ++-- doc/src/snippets/qmetaobject-invokable/window.h | 10 ++-- doc/src/snippets/qprocess-environment/main.cpp | 10 ++-- .../snippets/qprocess/qprocess-simpleexecution.cpp | 10 ++-- doc/src/snippets/qsignalmapper/buttonwidget.cpp | 10 ++-- doc/src/snippets/qsignalmapper/buttonwidget.h | 10 ++-- doc/src/snippets/qsignalmapper/main.cpp | 10 ++-- doc/src/snippets/qsignalmapper/mainwindow.h | 10 ++-- .../qsortfilterproxymodel-details/main.cpp | 10 ++-- doc/src/snippets/qsortfilterproxymodel/main.cpp | 10 ++-- doc/src/snippets/qsplashscreen/main.cpp | 10 ++-- doc/src/snippets/qsplashscreen/mainwindow.cpp | 10 ++-- doc/src/snippets/qsplashscreen/mainwindow.h | 10 ++-- doc/src/snippets/qsql-namespace/main.cpp | 10 ++-- doc/src/snippets/qstack/main.cpp | 10 ++-- doc/src/snippets/qstackedlayout/main.cpp | 10 ++-- doc/src/snippets/qstackedwidget/main.cpp | 10 ++-- doc/src/snippets/qstandarditemmodel/main.cpp | 10 ++-- doc/src/snippets/qstatustipevent/main.cpp | 10 ++-- doc/src/snippets/qstring/main.cpp | 10 ++-- doc/src/snippets/qstringlist/main.cpp | 10 ++-- doc/src/snippets/qstringlistmodel/main.cpp | 10 ++-- doc/src/snippets/qstyleoption/main.cpp | 10 ++-- doc/src/snippets/qstyleplugin/main.cpp | 10 ++-- doc/src/snippets/qsvgwidget/main.cpp | 10 ++-- doc/src/snippets/qt-namespace/main.cpp | 10 ++-- doc/src/snippets/qtablewidget-dnd/main.cpp | 10 ++-- doc/src/snippets/qtablewidget-dnd/mainwindow.cpp | 10 ++-- doc/src/snippets/qtablewidget-dnd/mainwindow.h | 10 ++-- doc/src/snippets/qtablewidget-resizing/main.cpp | 10 ++-- .../snippets/qtablewidget-resizing/mainwindow.cpp | 10 ++-- .../snippets/qtablewidget-resizing/mainwindow.h | 10 ++-- doc/src/snippets/qtablewidget-using/main.cpp | 10 ++-- doc/src/snippets/qtablewidget-using/mainwindow.cpp | 10 ++-- doc/src/snippets/qtablewidget-using/mainwindow.h | 10 ++-- doc/src/snippets/qtcast/qtcast.cpp | 10 ++-- doc/src/snippets/qtcast/qtcast.h | 10 ++-- doc/src/snippets/qtest-namespace/main.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/dragdropmodel.h | 10 ++-- doc/src/snippets/qtreeview-dnd/main.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/mainwindow.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/mainwindow.h | 10 ++-- doc/src/snippets/qtreeview-dnd/treeitem.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/treeitem.h | 10 ++-- doc/src/snippets/qtreeview-dnd/treemodel.cpp | 10 ++-- doc/src/snippets/qtreeview-dnd/treemodel.h | 10 ++-- doc/src/snippets/qtreewidget-using/main.cpp | 10 ++-- doc/src/snippets/qtreewidget-using/mainwindow.cpp | 10 ++-- doc/src/snippets/qtreewidget-using/mainwindow.h | 10 ++-- .../qtreewidgetitemiterator-using/main.cpp | 10 ++-- .../qtreewidgetitemiterator-using/mainwindow.cpp | 10 ++-- .../qtreewidgetitemiterator-using/mainwindow.h | 10 ++-- doc/src/snippets/qtscript/evaluation/main.cpp | 10 ++-- .../snippets/qtscript/registeringobjects/main.cpp | 10 ++-- .../qtscript/registeringobjects/myobject.cpp | 10 ++-- .../qtscript/registeringobjects/myobject.h | 10 ++-- .../snippets/qtscript/registeringvalues/main.cpp | 10 ++-- doc/src/snippets/qtscript/scriptedslot/main.cpp | 10 ++-- doc/src/snippets/quiloader/main.cpp | 10 ++-- doc/src/snippets/quiloader/mywidget.cpp | 10 ++-- doc/src/snippets/quiloader/mywidget.h | 10 ++-- doc/src/snippets/qx11embedcontainer/main.cpp | 10 ++-- doc/src/snippets/qx11embedwidget/embedwidget.cpp | 10 ++-- doc/src/snippets/qx11embedwidget/embedwidget.h | 10 ++-- doc/src/snippets/qx11embedwidget/main.cpp | 10 ++-- doc/src/snippets/qxmlstreamwriter/main.cpp | 10 ++-- doc/src/snippets/reading-selections/main.cpp | 10 ++-- doc/src/snippets/reading-selections/model.cpp | 10 ++-- doc/src/snippets/reading-selections/model.h | 10 ++-- doc/src/snippets/reading-selections/window.cpp | 10 ++-- doc/src/snippets/reading-selections/window.h | 10 ++-- doc/src/snippets/scribe-overview/main.cpp | 10 ++-- doc/src/snippets/separations/finalwidget.cpp | 10 ++-- doc/src/snippets/separations/finalwidget.h | 10 ++-- doc/src/snippets/separations/main.cpp | 10 ++-- doc/src/snippets/separations/screenwidget.cpp | 10 ++-- doc/src/snippets/separations/screenwidget.h | 10 ++-- doc/src/snippets/separations/separations.qdoc | 10 ++-- doc/src/snippets/separations/viewer.cpp | 10 ++-- doc/src/snippets/separations/viewer.h | 10 ++-- doc/src/snippets/settings/settings.cpp | 10 ++-- doc/src/snippets/shareddirmodel/main.cpp | 10 ++-- doc/src/snippets/sharedemployee/employee.cpp | 10 ++-- doc/src/snippets/sharedemployee/employee.h | 10 ++-- doc/src/snippets/sharedemployee/main.cpp | 10 ++-- doc/src/snippets/sharedtablemodel/main.cpp | 10 ++-- doc/src/snippets/sharedtablemodel/model.cpp | 10 ++-- doc/src/snippets/sharedtablemodel/model.h | 10 ++-- doc/src/snippets/signalsandslots/lcdnumber.cpp | 10 ++-- doc/src/snippets/signalsandslots/lcdnumber.h | 10 ++-- .../snippets/signalsandslots/signalsandslots.cpp | 10 ++-- doc/src/snippets/signalsandslots/signalsandslots.h | 10 ++-- doc/src/snippets/simplemodel-use/main.cpp | 10 ++-- doc/src/snippets/splitter/splitter.cpp | 10 ++-- doc/src/snippets/splitterhandle/main.cpp | 10 ++-- doc/src/snippets/splitterhandle/splitter.cpp | 10 ++-- doc/src/snippets/splitterhandle/splitter.h | 10 ++-- doc/src/snippets/sqldatabase/sqldatabase.cpp | 10 ++-- doc/src/snippets/streaming/main.cpp | 10 ++-- doc/src/snippets/stringlistmodel/main.cpp | 10 ++-- doc/src/snippets/stringlistmodel/model.cpp | 10 ++-- doc/src/snippets/stringlistmodel/model.h | 10 ++-- doc/src/snippets/styles/styles.cpp | 10 ++-- doc/src/snippets/textblock-formats/main.cpp | 10 ++-- doc/src/snippets/textblock-fragments/main.cpp | 10 ++-- .../snippets/textblock-fragments/mainwindow.cpp | 10 ++-- doc/src/snippets/textblock-fragments/mainwindow.h | 10 ++-- doc/src/snippets/textblock-fragments/xmlwriter.cpp | 10 ++-- doc/src/snippets/textblock-fragments/xmlwriter.h | 10 ++-- doc/src/snippets/textdocument-blocks/main.cpp | 10 ++-- .../snippets/textdocument-blocks/mainwindow.cpp | 10 ++-- doc/src/snippets/textdocument-blocks/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-blocks/xmlwriter.cpp | 10 ++-- doc/src/snippets/textdocument-blocks/xmlwriter.h | 10 ++-- doc/src/snippets/textdocument-charformats/main.cpp | 10 ++-- doc/src/snippets/textdocument-css/main.cpp | 10 ++-- doc/src/snippets/textdocument-cursors/main.cpp | 10 ++-- doc/src/snippets/textdocument-find/main.cpp | 10 ++-- doc/src/snippets/textdocument-frames/main.cpp | 10 ++-- .../snippets/textdocument-frames/mainwindow.cpp | 10 ++-- doc/src/snippets/textdocument-frames/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-frames/xmlwriter.cpp | 10 ++-- doc/src/snippets/textdocument-frames/xmlwriter.h | 10 ++-- doc/src/snippets/textdocument-imagedrop/main.cpp | 10 ++-- .../snippets/textdocument-imagedrop/textedit.cpp | 10 ++-- doc/src/snippets/textdocument-imagedrop/textedit.h | 10 ++-- doc/src/snippets/textdocument-imageformat/main.cpp | 10 ++-- doc/src/snippets/textdocument-images/main.cpp | 10 ++-- doc/src/snippets/textdocument-listitems/main.cpp | 10 ++-- .../snippets/textdocument-listitems/mainwindow.cpp | 10 ++-- .../snippets/textdocument-listitems/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-lists/main.cpp | 10 ++-- doc/src/snippets/textdocument-lists/mainwindow.cpp | 10 ++-- doc/src/snippets/textdocument-lists/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-printing/main.cpp | 10 ++-- .../snippets/textdocument-printing/mainwindow.cpp | 10 ++-- .../snippets/textdocument-printing/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-resources/main.cpp | 10 ++-- doc/src/snippets/textdocument-selections/main.cpp | 10 ++-- .../textdocument-selections/mainwindow.cpp | 10 ++-- .../snippets/textdocument-selections/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-tables/main.cpp | 10 ++-- .../snippets/textdocument-tables/mainwindow.cpp | 10 ++-- doc/src/snippets/textdocument-tables/mainwindow.h | 10 ++-- doc/src/snippets/textdocument-tables/xmlwriter.cpp | 10 ++-- doc/src/snippets/textdocument-tables/xmlwriter.h | 10 ++-- doc/src/snippets/textdocument-texttable/main.cpp | 10 ++-- doc/src/snippets/textdocumentendsnippet.cpp | 10 ++-- doc/src/snippets/threads/threads.cpp | 10 ++-- doc/src/snippets/threads/threads.h | 10 ++-- doc/src/snippets/timeline/main.cpp | 10 ++-- doc/src/snippets/timers/timers.cpp | 10 ++-- doc/src/snippets/transform/main.cpp | 10 ++-- doc/src/snippets/uitools/calculatorform/main.cpp | 10 ++-- doc/src/snippets/updating-selections/main.cpp | 10 ++-- doc/src/snippets/updating-selections/model.cpp | 10 ++-- doc/src/snippets/updating-selections/model.h | 10 ++-- doc/src/snippets/updating-selections/window.cpp | 10 ++-- doc/src/snippets/updating-selections/window.h | 10 ++-- doc/src/snippets/webkit/simple/main.cpp | 10 ++-- doc/src/snippets/whatsthis/whatsthis.cpp | 10 ++-- doc/src/snippets/widget-mask/main.cpp | 10 ++-- doc/src/snippets/xml/prettyprint/main.cpp | 10 ++-- doc/src/snippets/xml/rsslisting/handler.cpp | 10 ++-- doc/src/snippets/xml/rsslisting/handler.h | 10 ++-- doc/src/snippets/xml/rsslisting/main.cpp | 10 ++-- doc/src/snippets/xml/rsslisting/rsslisting.cpp | 10 ++-- doc/src/snippets/xml/rsslisting/rsslisting.h | 10 ++-- doc/src/snippets/xml/simpleparse/handler.cpp | 10 ++-- doc/src/snippets/xml/simpleparse/handler.h | 10 ++-- doc/src/snippets/xml/simpleparse/main.cpp | 10 ++-- doc/src/sql-driver.qdoc | 10 ++-- doc/src/styles.qdoc | 10 ++-- doc/src/stylesheet.qdoc | 10 ++-- doc/src/templates.qdoc | 10 ++-- doc/src/threads.qdoc | 10 ++-- doc/src/timers.qdoc | 10 ++-- doc/src/tools-list.qdoc | 10 ++-- doc/src/topics.qdoc | 10 ++-- doc/src/trademarks.qdoc | 10 ++-- doc/src/trolltech-webpages.qdoc | 10 ++-- doc/src/tutorials/addressbook-fr.qdoc | 10 ++-- doc/src/tutorials/addressbook.qdoc | 10 ++-- doc/src/tutorials/widgets-tutorial.qdoc | 10 ++-- doc/src/uic.qdoc | 10 ++-- doc/src/unicode.qdoc | 10 ++-- doc/src/unix-signal-handlers.qdoc | 10 ++-- doc/src/wince-customization.qdoc | 10 ++-- doc/src/wince-introduction.qdoc | 10 ++-- doc/src/wince-opengl.qdoc | 10 ++-- doc/src/winsystem.qdoc | 10 ++-- doc/src/xquery-introduction.qdoc | 10 ++-- examples/activeqt/comapp/main.cpp | 10 ++-- examples/activeqt/dotnet/wrapper/lib/networker.cpp | 10 ++-- examples/activeqt/dotnet/wrapper/lib/networker.h | 10 ++-- examples/activeqt/dotnet/wrapper/lib/tools.cpp | 10 ++-- examples/activeqt/dotnet/wrapper/lib/tools.h | 10 ++-- examples/activeqt/dotnet/wrapper/lib/worker.cpp | 10 ++-- examples/activeqt/dotnet/wrapper/lib/worker.h | 10 ++-- examples/activeqt/hierarchy/main.cpp | 10 ++-- examples/activeqt/hierarchy/objects.cpp | 10 ++-- examples/activeqt/hierarchy/objects.h | 10 ++-- examples/activeqt/menus/main.cpp | 10 ++-- examples/activeqt/menus/menus.cpp | 10 ++-- examples/activeqt/menus/menus.h | 10 ++-- examples/activeqt/multiple/ax1.h | 10 ++-- examples/activeqt/multiple/ax2.h | 10 ++-- examples/activeqt/multiple/main.cpp | 10 ++-- examples/activeqt/opengl/glbox.cpp | 10 ++-- examples/activeqt/opengl/glbox.h | 10 ++-- examples/activeqt/opengl/globjwin.cpp | 10 ++-- examples/activeqt/opengl/globjwin.h | 10 ++-- examples/activeqt/opengl/main.cpp | 10 ++-- examples/activeqt/qutlook/addressview.cpp | 10 ++-- examples/activeqt/qutlook/addressview.h | 10 ++-- examples/activeqt/qutlook/main.cpp | 10 ++-- examples/activeqt/simple/main.cpp | 10 ++-- examples/activeqt/webbrowser/main.cpp | 10 ++-- examples/activeqt/webbrowser/webaxwidget.h | 10 ++-- examples/activeqt/wrapper/main.cpp | 10 ++-- .../assistant/simpletextviewer/findfiledialog.cpp | 10 ++-- .../assistant/simpletextviewer/findfiledialog.h | 10 ++-- examples/assistant/simpletextviewer/main.cpp | 10 ++-- examples/assistant/simpletextviewer/mainwindow.cpp | 10 ++-- examples/assistant/simpletextviewer/mainwindow.h | 10 ++-- examples/dbus/complexpingpong/complexping.cpp | 10 ++-- examples/dbus/complexpingpong/complexping.h | 10 ++-- examples/dbus/complexpingpong/complexpong.cpp | 10 ++-- examples/dbus/complexpingpong/complexpong.h | 10 ++-- examples/dbus/complexpingpong/ping-common.h | 10 ++-- examples/dbus/dbus-chat/chat.cpp | 10 ++-- examples/dbus/dbus-chat/chat.h | 10 ++-- examples/dbus/listnames/listnames.cpp | 10 ++-- examples/dbus/pingpong/ping-common.h | 10 ++-- examples/dbus/pingpong/ping.cpp | 10 ++-- examples/dbus/pingpong/pong.cpp | 10 ++-- examples/dbus/pingpong/pong.h | 10 ++-- examples/dbus/remotecontrolledcar/car/car.cpp | 10 ++-- examples/dbus/remotecontrolledcar/car/car.h | 10 ++-- examples/dbus/remotecontrolledcar/car/main.cpp | 10 ++-- .../remotecontrolledcar/controller/controller.cpp | 10 ++-- .../remotecontrolledcar/controller/controller.h | 10 ++-- .../dbus/remotecontrolledcar/controller/main.cpp | 10 ++-- .../designer/calculatorbuilder/calculatorform.cpp | 10 ++-- .../designer/calculatorbuilder/calculatorform.h | 10 ++-- examples/designer/calculatorbuilder/main.cpp | 10 ++-- .../designer/calculatorform/calculatorform.cpp | 10 ++-- examples/designer/calculatorform/calculatorform.h | 10 ++-- examples/designer/calculatorform/main.cpp | 10 ++-- .../containerextension/multipagewidget.cpp | 10 ++-- .../designer/containerextension/multipagewidget.h | 10 ++-- .../multipagewidgetcontainerextension.cpp | 10 ++-- .../multipagewidgetcontainerextension.h | 10 ++-- .../multipagewidgetextensionfactory.cpp | 10 ++-- .../multipagewidgetextensionfactory.h | 10 ++-- .../containerextension/multipagewidgetplugin.cpp | 10 ++-- .../containerextension/multipagewidgetplugin.h | 10 ++-- .../designer/customwidgetplugin/analogclock.cpp | 10 ++-- examples/designer/customwidgetplugin/analogclock.h | 10 ++-- .../customwidgetplugin/customwidgetplugin.cpp | 10 ++-- .../customwidgetplugin/customwidgetplugin.h | 10 ++-- examples/designer/taskmenuextension/tictactoe.cpp | 10 ++-- examples/designer/taskmenuextension/tictactoe.h | 10 ++-- .../designer/taskmenuextension/tictactoedialog.cpp | 10 ++-- .../designer/taskmenuextension/tictactoedialog.h | 10 ++-- .../designer/taskmenuextension/tictactoeplugin.cpp | 10 ++-- .../designer/taskmenuextension/tictactoeplugin.h | 10 ++-- .../taskmenuextension/tictactoetaskmenu.cpp | 10 ++-- .../designer/taskmenuextension/tictactoetaskmenu.h | 10 ++-- examples/designer/worldtimeclockbuilder/main.cpp | 10 ++-- .../worldtimeclockplugin/worldtimeclock.cpp | 10 ++-- .../designer/worldtimeclockplugin/worldtimeclock.h | 10 ++-- .../worldtimeclockplugin/worldtimeclockplugin.cpp | 10 ++-- .../worldtimeclockplugin/worldtimeclockplugin.h | 10 ++-- examples/desktop/screenshot/main.cpp | 10 ++-- examples/desktop/screenshot/screenshot.cpp | 10 ++-- examples/desktop/screenshot/screenshot.h | 10 ++-- examples/desktop/systray/main.cpp | 10 ++-- examples/desktop/systray/window.cpp | 10 ++-- examples/desktop/systray/window.h | 10 ++-- examples/dialogs/classwizard/classwizard.cpp | 10 ++-- examples/dialogs/classwizard/classwizard.h | 10 ++-- examples/dialogs/classwizard/main.cpp | 10 ++-- examples/dialogs/configdialog/configdialog.cpp | 10 ++-- examples/dialogs/configdialog/configdialog.h | 10 ++-- examples/dialogs/configdialog/main.cpp | 10 ++-- examples/dialogs/configdialog/pages.cpp | 10 ++-- examples/dialogs/configdialog/pages.h | 10 ++-- examples/dialogs/extension/finddialog.cpp | 10 ++-- examples/dialogs/extension/finddialog.h | 10 ++-- examples/dialogs/extension/main.cpp | 10 ++-- examples/dialogs/findfiles/main.cpp | 10 ++-- examples/dialogs/findfiles/window.cpp | 10 ++-- examples/dialogs/findfiles/window.h | 10 ++-- examples/dialogs/licensewizard/licensewizard.cpp | 10 ++-- examples/dialogs/licensewizard/licensewizard.h | 10 ++-- examples/dialogs/licensewizard/main.cpp | 10 ++-- examples/dialogs/sipdialog/dialog.cpp | 10 ++-- examples/dialogs/sipdialog/dialog.h | 10 ++-- examples/dialogs/sipdialog/main.cpp | 10 ++-- examples/dialogs/standarddialogs/dialog.cpp | 10 ++-- examples/dialogs/standarddialogs/dialog.h | 10 ++-- examples/dialogs/standarddialogs/main.cpp | 10 ++-- examples/dialogs/tabdialog/main.cpp | 10 ++-- examples/dialogs/tabdialog/tabdialog.cpp | 10 ++-- examples/dialogs/tabdialog/tabdialog.h | 10 ++-- examples/dialogs/trivialwizard/trivialwizard.cpp | 10 ++-- .../draganddrop/delayedencoding/images/example.svg | 10 ++-- examples/draganddrop/delayedencoding/main.cpp | 10 ++-- examples/draganddrop/delayedencoding/mimedata.cpp | 10 ++-- examples/draganddrop/delayedencoding/mimedata.h | 10 ++-- .../draganddrop/delayedencoding/sourcewidget.cpp | 10 ++-- .../draganddrop/delayedencoding/sourcewidget.h | 10 ++-- examples/draganddrop/draggableicons/dragwidget.cpp | 10 ++-- examples/draganddrop/draggableicons/dragwidget.h | 10 ++-- examples/draganddrop/draggableicons/main.cpp | 10 ++-- examples/draganddrop/draggabletext/draglabel.cpp | 10 ++-- examples/draganddrop/draggabletext/draglabel.h | 10 ++-- examples/draganddrop/draggabletext/dragwidget.cpp | 10 ++-- examples/draganddrop/draggabletext/dragwidget.h | 10 ++-- examples/draganddrop/draggabletext/main.cpp | 10 ++-- examples/draganddrop/dropsite/droparea.cpp | 10 ++-- examples/draganddrop/dropsite/droparea.h | 10 ++-- examples/draganddrop/dropsite/dropsitewindow.cpp | 10 ++-- examples/draganddrop/dropsite/dropsitewindow.h | 10 ++-- examples/draganddrop/dropsite/main.cpp | 10 ++-- examples/draganddrop/fridgemagnets/draglabel.cpp | 10 ++-- examples/draganddrop/fridgemagnets/draglabel.h | 10 ++-- examples/draganddrop/fridgemagnets/dragwidget.cpp | 10 ++-- examples/draganddrop/fridgemagnets/dragwidget.h | 10 ++-- examples/draganddrop/fridgemagnets/main.cpp | 10 ++-- examples/draganddrop/puzzle/main.cpp | 10 ++-- examples/draganddrop/puzzle/mainwindow.cpp | 10 ++-- examples/draganddrop/puzzle/mainwindow.h | 10 ++-- examples/draganddrop/puzzle/pieceslist.cpp | 10 ++-- examples/draganddrop/puzzle/pieceslist.h | 10 ++-- examples/draganddrop/puzzle/puzzlewidget.cpp | 10 ++-- examples/draganddrop/puzzle/puzzlewidget.h | 10 ++-- .../basicgraphicslayouts/layoutitem.cpp | 10 ++-- .../graphicsview/basicgraphicslayouts/layoutitem.h | 10 ++-- .../graphicsview/basicgraphicslayouts/main.cpp | 10 ++-- .../graphicsview/basicgraphicslayouts/window.cpp | 10 ++-- .../graphicsview/basicgraphicslayouts/window.h | 10 ++-- examples/graphicsview/collidingmice/main.cpp | 10 ++-- examples/graphicsview/collidingmice/mouse.cpp | 10 ++-- examples/graphicsview/collidingmice/mouse.h | 10 ++-- examples/graphicsview/diagramscene/arrow.cpp | 10 ++-- examples/graphicsview/diagramscene/arrow.h | 10 ++-- examples/graphicsview/diagramscene/diagramitem.cpp | 10 ++-- examples/graphicsview/diagramscene/diagramitem.h | 10 ++-- .../graphicsview/diagramscene/diagramscene.cpp | 10 ++-- examples/graphicsview/diagramscene/diagramscene.h | 10 ++-- .../graphicsview/diagramscene/diagramtextitem.cpp | 10 ++-- .../graphicsview/diagramscene/diagramtextitem.h | 10 ++-- examples/graphicsview/diagramscene/main.cpp | 10 ++-- examples/graphicsview/diagramscene/mainwindow.cpp | 10 ++-- examples/graphicsview/diagramscene/mainwindow.h | 10 ++-- examples/graphicsview/dragdroprobot/coloritem.cpp | 10 ++-- examples/graphicsview/dragdroprobot/coloritem.h | 10 ++-- examples/graphicsview/dragdroprobot/main.cpp | 10 ++-- examples/graphicsview/dragdroprobot/robot.cpp | 10 ++-- examples/graphicsview/dragdroprobot/robot.h | 10 ++-- examples/graphicsview/elasticnodes/edge.cpp | 10 ++-- examples/graphicsview/elasticnodes/edge.h | 10 ++-- examples/graphicsview/elasticnodes/graphwidget.cpp | 10 ++-- examples/graphicsview/elasticnodes/graphwidget.h | 10 ++-- examples/graphicsview/elasticnodes/main.cpp | 10 ++-- examples/graphicsview/elasticnodes/node.cpp | 10 ++-- examples/graphicsview/elasticnodes/node.h | 10 ++-- examples/graphicsview/padnavigator/main.cpp | 10 ++-- examples/graphicsview/padnavigator/panel.cpp | 10 ++-- examples/graphicsview/padnavigator/panel.h | 10 ++-- .../graphicsview/padnavigator/roundrectitem.cpp | 10 ++-- examples/graphicsview/padnavigator/roundrectitem.h | 10 ++-- examples/graphicsview/padnavigator/splashitem.cpp | 10 ++-- examples/graphicsview/padnavigator/splashitem.h | 10 ++-- .../graphicsview/portedasteroids/animateditem.cpp | 10 ++-- .../graphicsview/portedasteroids/animateditem.h | 10 ++-- examples/graphicsview/portedasteroids/ledmeter.cpp | 10 ++-- examples/graphicsview/portedasteroids/ledmeter.h | 10 ++-- examples/graphicsview/portedasteroids/main.cpp | 10 ++-- examples/graphicsview/portedasteroids/sprites.h | 10 ++-- examples/graphicsview/portedasteroids/toplevel.cpp | 10 ++-- examples/graphicsview/portedasteroids/toplevel.h | 10 ++-- examples/graphicsview/portedasteroids/view.cpp | 10 ++-- examples/graphicsview/portedasteroids/view.h | 10 ++-- examples/graphicsview/portedcanvas/blendshadow.cpp | 10 ++-- examples/graphicsview/portedcanvas/canvas.cpp | 10 ++-- examples/graphicsview/portedcanvas/canvas.h | 10 ++-- examples/graphicsview/portedcanvas/main.cpp | 10 ++-- examples/graphicsview/portedcanvas/makeimg.cpp | 10 ++-- examples/help/contextsensitivehelp/helpbrowser.cpp | 10 ++-- examples/help/contextsensitivehelp/helpbrowser.h | 10 ++-- examples/help/contextsensitivehelp/main.cpp | 10 ++-- .../contextsensitivehelp/wateringconfigdialog.cpp | 10 ++-- .../contextsensitivehelp/wateringconfigdialog.h | 10 ++-- examples/help/remotecontrol/main.cpp | 10 ++-- examples/help/remotecontrol/remotecontrol.cpp | 10 ++-- examples/help/remotecontrol/remotecontrol.h | 10 ++-- examples/help/simpletextviewer/assistant.cpp | 10 ++-- examples/help/simpletextviewer/assistant.h | 10 ++-- examples/help/simpletextviewer/findfiledialog.cpp | 10 ++-- examples/help/simpletextviewer/findfiledialog.h | 10 ++-- examples/help/simpletextviewer/main.cpp | 10 ++-- examples/help/simpletextviewer/mainwindow.cpp | 10 ++-- examples/help/simpletextviewer/mainwindow.h | 10 ++-- examples/help/simpletextviewer/textedit.cpp | 10 ++-- examples/help/simpletextviewer/textedit.h | 10 ++-- examples/ipc/localfortuneclient/client.cpp | 10 ++-- examples/ipc/localfortuneclient/client.h | 10 ++-- examples/ipc/localfortuneclient/main.cpp | 10 ++-- examples/ipc/localfortuneserver/main.cpp | 10 ++-- examples/ipc/localfortuneserver/server.cpp | 10 ++-- examples/ipc/localfortuneserver/server.h | 10 ++-- examples/ipc/sharedmemory/dialog.cpp | 10 ++-- examples/ipc/sharedmemory/dialog.h | 10 ++-- examples/ipc/sharedmemory/main.cpp | 10 ++-- examples/itemviews/addressbook/adddialog.cpp | 10 ++-- examples/itemviews/addressbook/adddialog.h | 10 ++-- examples/itemviews/addressbook/addresswidget.cpp | 10 ++-- examples/itemviews/addressbook/addresswidget.h | 10 ++-- examples/itemviews/addressbook/main.cpp | 10 ++-- examples/itemviews/addressbook/mainwindow.cpp | 10 ++-- examples/itemviews/addressbook/mainwindow.h | 10 ++-- examples/itemviews/addressbook/newaddresstab.cpp | 10 ++-- examples/itemviews/addressbook/newaddresstab.h | 10 ++-- examples/itemviews/addressbook/tablemodel.cpp | 10 ++-- examples/itemviews/addressbook/tablemodel.h | 10 ++-- examples/itemviews/basicsortfiltermodel/main.cpp | 10 ++-- examples/itemviews/basicsortfiltermodel/window.cpp | 10 ++-- examples/itemviews/basicsortfiltermodel/window.h | 10 ++-- examples/itemviews/chart/main.cpp | 10 ++-- examples/itemviews/chart/mainwindow.cpp | 10 ++-- examples/itemviews/chart/mainwindow.h | 10 ++-- examples/itemviews/chart/pieview.cpp | 10 ++-- examples/itemviews/chart/pieview.h | 10 ++-- .../coloreditorfactory/colorlisteditor.cpp | 10 ++-- .../itemviews/coloreditorfactory/colorlisteditor.h | 10 ++-- examples/itemviews/coloreditorfactory/main.cpp | 10 ++-- examples/itemviews/coloreditorfactory/window.cpp | 10 ++-- examples/itemviews/coloreditorfactory/window.h | 10 ++-- examples/itemviews/combowidgetmapper/main.cpp | 10 ++-- examples/itemviews/combowidgetmapper/window.cpp | 10 ++-- examples/itemviews/combowidgetmapper/window.h | 10 ++-- examples/itemviews/customsortfiltermodel/main.cpp | 10 ++-- .../mysortfilterproxymodel.cpp | 10 ++-- .../customsortfiltermodel/mysortfilterproxymodel.h | 10 ++-- .../itemviews/customsortfiltermodel/window.cpp | 10 ++-- examples/itemviews/customsortfiltermodel/window.h | 10 ++-- examples/itemviews/dirview/main.cpp | 10 ++-- examples/itemviews/editabletreemodel/main.cpp | 10 ++-- .../itemviews/editabletreemodel/mainwindow.cpp | 10 ++-- examples/itemviews/editabletreemodel/mainwindow.h | 10 ++-- examples/itemviews/editabletreemodel/treeitem.cpp | 10 ++-- examples/itemviews/editabletreemodel/treeitem.h | 10 ++-- examples/itemviews/editabletreemodel/treemodel.cpp | 10 ++-- examples/itemviews/editabletreemodel/treemodel.h | 10 ++-- examples/itemviews/fetchmore/filelistmodel.cpp | 10 ++-- examples/itemviews/fetchmore/filelistmodel.h | 10 ++-- examples/itemviews/fetchmore/main.cpp | 10 ++-- examples/itemviews/fetchmore/window.cpp | 10 ++-- examples/itemviews/fetchmore/window.h | 10 ++-- examples/itemviews/pixelator/imagemodel.cpp | 10 ++-- examples/itemviews/pixelator/imagemodel.h | 10 ++-- examples/itemviews/pixelator/main.cpp | 10 ++-- examples/itemviews/pixelator/mainwindow.cpp | 10 ++-- examples/itemviews/pixelator/mainwindow.h | 10 ++-- examples/itemviews/pixelator/pixeldelegate.cpp | 10 ++-- examples/itemviews/pixelator/pixeldelegate.h | 10 ++-- examples/itemviews/puzzle/main.cpp | 10 ++-- examples/itemviews/puzzle/mainwindow.cpp | 10 ++-- examples/itemviews/puzzle/mainwindow.h | 10 ++-- examples/itemviews/puzzle/piecesmodel.cpp | 10 ++-- examples/itemviews/puzzle/piecesmodel.h | 10 ++-- examples/itemviews/puzzle/puzzlewidget.cpp | 10 ++-- examples/itemviews/puzzle/puzzlewidget.h | 10 ++-- examples/itemviews/simpledommodel/domitem.cpp | 10 ++-- examples/itemviews/simpledommodel/domitem.h | 10 ++-- examples/itemviews/simpledommodel/dommodel.cpp | 10 ++-- examples/itemviews/simpledommodel/dommodel.h | 10 ++-- examples/itemviews/simpledommodel/main.cpp | 10 ++-- examples/itemviews/simpledommodel/mainwindow.cpp | 10 ++-- examples/itemviews/simpledommodel/mainwindow.h | 10 ++-- examples/itemviews/simpletreemodel/main.cpp | 10 ++-- examples/itemviews/simpletreemodel/treeitem.cpp | 10 ++-- examples/itemviews/simpletreemodel/treeitem.h | 10 ++-- examples/itemviews/simpletreemodel/treemodel.cpp | 10 ++-- examples/itemviews/simpletreemodel/treemodel.h | 10 ++-- examples/itemviews/simplewidgetmapper/main.cpp | 10 ++-- examples/itemviews/simplewidgetmapper/window.cpp | 10 ++-- examples/itemviews/simplewidgetmapper/window.h | 10 ++-- examples/itemviews/spinboxdelegate/delegate.cpp | 10 ++-- examples/itemviews/spinboxdelegate/delegate.h | 10 ++-- examples/itemviews/spinboxdelegate/main.cpp | 10 ++-- examples/itemviews/stardelegate/main.cpp | 10 ++-- examples/itemviews/stardelegate/stardelegate.cpp | 10 ++-- examples/itemviews/stardelegate/stardelegate.h | 10 ++-- examples/itemviews/stardelegate/stareditor.cpp | 10 ++-- examples/itemviews/stardelegate/stareditor.h | 10 ++-- examples/itemviews/stardelegate/starrating.cpp | 10 ++-- examples/itemviews/stardelegate/starrating.h | 10 ++-- examples/layouts/basiclayouts/dialog.cpp | 10 ++-- examples/layouts/basiclayouts/dialog.h | 10 ++-- examples/layouts/basiclayouts/main.cpp | 10 ++-- examples/layouts/borderlayout/borderlayout.cpp | 10 ++-- examples/layouts/borderlayout/borderlayout.h | 10 ++-- examples/layouts/borderlayout/main.cpp | 10 ++-- examples/layouts/borderlayout/window.cpp | 10 ++-- examples/layouts/borderlayout/window.h | 10 ++-- examples/layouts/dynamiclayouts/dialog.cpp | 10 ++-- examples/layouts/dynamiclayouts/dialog.h | 10 ++-- examples/layouts/dynamiclayouts/main.cpp | 10 ++-- examples/layouts/flowlayout/flowlayout.cpp | 10 ++-- examples/layouts/flowlayout/flowlayout.h | 10 ++-- examples/layouts/flowlayout/main.cpp | 10 ++-- examples/layouts/flowlayout/window.cpp | 10 ++-- examples/layouts/flowlayout/window.h | 10 ++-- examples/linguist/arrowpad/arrowpad.cpp | 10 ++-- examples/linguist/arrowpad/arrowpad.h | 10 ++-- examples/linguist/arrowpad/main.cpp | 10 ++-- examples/linguist/arrowpad/mainwindow.cpp | 10 ++-- examples/linguist/arrowpad/mainwindow.h | 10 ++-- examples/linguist/hellotr/main.cpp | 10 ++-- examples/linguist/trollprint/main.cpp | 10 ++-- examples/linguist/trollprint/mainwindow.cpp | 10 ++-- examples/linguist/trollprint/mainwindow.h | 10 ++-- examples/linguist/trollprint/printpanel.cpp | 10 ++-- examples/linguist/trollprint/printpanel.h | 10 ++-- examples/mainwindows/application/main.cpp | 10 ++-- examples/mainwindows/application/mainwindow.cpp | 10 ++-- examples/mainwindows/application/mainwindow.h | 10 ++-- examples/mainwindows/dockwidgets/main.cpp | 10 ++-- examples/mainwindows/dockwidgets/mainwindow.cpp | 10 ++-- examples/mainwindows/dockwidgets/mainwindow.h | 10 ++-- examples/mainwindows/mdi/main.cpp | 10 ++-- examples/mainwindows/mdi/mainwindow.cpp | 10 ++-- examples/mainwindows/mdi/mainwindow.h | 10 ++-- examples/mainwindows/mdi/mdichild.cpp | 10 ++-- examples/mainwindows/mdi/mdichild.h | 10 ++-- examples/mainwindows/menus/main.cpp | 10 ++-- examples/mainwindows/menus/mainwindow.cpp | 10 ++-- examples/mainwindows/menus/mainwindow.h | 10 ++-- examples/mainwindows/recentfiles/main.cpp | 10 ++-- examples/mainwindows/recentfiles/mainwindow.cpp | 10 ++-- examples/mainwindows/recentfiles/mainwindow.h | 10 ++-- examples/mainwindows/sdi/main.cpp | 10 ++-- examples/mainwindows/sdi/mainwindow.cpp | 10 ++-- examples/mainwindows/sdi/mainwindow.h | 10 ++-- .../blockingfortuneclient/blockingclient.cpp | 10 ++-- .../network/blockingfortuneclient/blockingclient.h | 10 ++-- .../blockingfortuneclient/fortunethread.cpp | 10 ++-- .../network/blockingfortuneclient/fortunethread.h | 10 ++-- examples/network/blockingfortuneclient/main.cpp | 10 ++-- examples/network/broadcastreceiver/main.cpp | 10 ++-- examples/network/broadcastreceiver/receiver.cpp | 10 ++-- examples/network/broadcastreceiver/receiver.h | 10 ++-- examples/network/broadcastsender/main.cpp | 10 ++-- examples/network/broadcastsender/sender.cpp | 10 ++-- examples/network/broadcastsender/sender.h | 10 ++-- examples/network/download/main.cpp | 10 ++-- .../network/downloadmanager/downloadmanager.cpp | 10 ++-- examples/network/downloadmanager/downloadmanager.h | 10 ++-- examples/network/downloadmanager/main.cpp | 10 ++-- .../network/downloadmanager/textprogressbar.cpp | 10 ++-- examples/network/downloadmanager/textprogressbar.h | 10 ++-- examples/network/fortuneclient/client.cpp | 10 ++-- examples/network/fortuneclient/client.h | 10 ++-- examples/network/fortuneclient/main.cpp | 10 ++-- examples/network/fortuneserver/main.cpp | 10 ++-- examples/network/fortuneserver/server.cpp | 10 ++-- examples/network/fortuneserver/server.h | 10 ++-- examples/network/ftp/ftpwindow.cpp | 10 ++-- examples/network/ftp/ftpwindow.h | 10 ++-- examples/network/ftp/main.cpp | 10 ++-- examples/network/http/httpwindow.cpp | 10 ++-- examples/network/http/httpwindow.h | 10 ++-- examples/network/http/main.cpp | 10 ++-- examples/network/loopback/dialog.cpp | 10 ++-- examples/network/loopback/dialog.h | 10 ++-- examples/network/loopback/main.cpp | 10 ++-- examples/network/network-chat/chatdialog.cpp | 10 ++-- examples/network/network-chat/chatdialog.h | 10 ++-- examples/network/network-chat/client.cpp | 10 ++-- examples/network/network-chat/client.h | 10 ++-- examples/network/network-chat/connection.cpp | 10 ++-- examples/network/network-chat/connection.h | 10 ++-- examples/network/network-chat/main.cpp | 10 ++-- examples/network/network-chat/peermanager.cpp | 10 ++-- examples/network/network-chat/peermanager.h | 10 ++-- examples/network/network-chat/server.cpp | 10 ++-- examples/network/network-chat/server.h | 10 ++-- .../network/securesocketclient/certificateinfo.cpp | 10 ++-- .../network/securesocketclient/certificateinfo.h | 10 ++-- examples/network/securesocketclient/main.cpp | 10 ++-- examples/network/securesocketclient/sslclient.cpp | 10 ++-- examples/network/securesocketclient/sslclient.h | 10 ++-- examples/network/threadedfortuneserver/dialog.cpp | 10 ++-- examples/network/threadedfortuneserver/dialog.h | 10 ++-- .../threadedfortuneserver/fortuneserver.cpp | 10 ++-- .../network/threadedfortuneserver/fortuneserver.h | 10 ++-- .../threadedfortuneserver/fortunethread.cpp | 10 ++-- .../network/threadedfortuneserver/fortunethread.h | 10 ++-- examples/network/threadedfortuneserver/main.cpp | 10 ++-- examples/network/torrent/addtorrentdialog.cpp | 10 ++-- examples/network/torrent/addtorrentdialog.h | 10 ++-- examples/network/torrent/bencodeparser.cpp | 10 ++-- examples/network/torrent/bencodeparser.h | 10 ++-- examples/network/torrent/connectionmanager.cpp | 10 ++-- examples/network/torrent/connectionmanager.h | 10 ++-- examples/network/torrent/filemanager.cpp | 10 ++-- examples/network/torrent/filemanager.h | 10 ++-- examples/network/torrent/main.cpp | 10 ++-- examples/network/torrent/mainwindow.cpp | 10 ++-- examples/network/torrent/mainwindow.h | 10 ++-- examples/network/torrent/metainfo.cpp | 10 ++-- examples/network/torrent/metainfo.h | 10 ++-- examples/network/torrent/peerwireclient.cpp | 10 ++-- examples/network/torrent/peerwireclient.h | 10 ++-- examples/network/torrent/ratecontroller.cpp | 10 ++-- examples/network/torrent/ratecontroller.h | 10 ++-- examples/network/torrent/torrentclient.cpp | 10 ++-- examples/network/torrent/torrentclient.h | 10 ++-- examples/network/torrent/torrentserver.cpp | 10 ++-- examples/network/torrent/torrentserver.h | 10 ++-- examples/network/torrent/trackerclient.cpp | 10 ++-- examples/network/torrent/trackerclient.h | 10 ++-- examples/opengl/2dpainting/glwidget.cpp | 10 ++-- examples/opengl/2dpainting/glwidget.h | 10 ++-- examples/opengl/2dpainting/helper.cpp | 10 ++-- examples/opengl/2dpainting/helper.h | 10 ++-- examples/opengl/2dpainting/main.cpp | 10 ++-- examples/opengl/2dpainting/widget.cpp | 10 ++-- examples/opengl/2dpainting/widget.h | 10 ++-- examples/opengl/2dpainting/window.cpp | 10 ++-- examples/opengl/2dpainting/window.h | 10 ++-- examples/opengl/framebufferobject/glwidget.cpp | 10 ++-- examples/opengl/framebufferobject/glwidget.h | 10 ++-- examples/opengl/framebufferobject/main.cpp | 10 ++-- examples/opengl/framebufferobject2/glwidget.cpp | 10 ++-- examples/opengl/framebufferobject2/glwidget.h | 10 ++-- examples/opengl/framebufferobject2/main.cpp | 10 ++-- examples/opengl/grabber/glwidget.cpp | 10 ++-- examples/opengl/grabber/glwidget.h | 10 ++-- examples/opengl/grabber/main.cpp | 10 ++-- examples/opengl/grabber/mainwindow.cpp | 10 ++-- examples/opengl/grabber/mainwindow.h | 10 ++-- examples/opengl/hellogl/glwidget.cpp | 10 ++-- examples/opengl/hellogl/glwidget.h | 10 ++-- examples/opengl/hellogl/main.cpp | 10 ++-- examples/opengl/hellogl/window.cpp | 10 ++-- examples/opengl/hellogl/window.h | 10 ++-- examples/opengl/hellogl_es/bubble.cpp | 10 ++-- examples/opengl/hellogl_es/bubble.h | 10 ++-- examples/opengl/hellogl_es/cl_helper.h | 10 ++-- examples/opengl/hellogl_es/glwidget.cpp | 10 ++-- examples/opengl/hellogl_es/glwidget.h | 10 ++-- examples/opengl/hellogl_es/main.cpp | 10 ++-- examples/opengl/hellogl_es/mainwindow.cpp | 10 ++-- examples/opengl/hellogl_es/mainwindow.h | 10 ++-- examples/opengl/hellogl_es2/bubble.cpp | 10 ++-- examples/opengl/hellogl_es2/bubble.h | 10 ++-- examples/opengl/hellogl_es2/glwidget.cpp | 10 ++-- examples/opengl/hellogl_es2/glwidget.h | 10 ++-- examples/opengl/hellogl_es2/main.cpp | 10 ++-- examples/opengl/hellogl_es2/mainwindow.cpp | 10 ++-- examples/opengl/hellogl_es2/mainwindow.h | 10 ++-- examples/opengl/overpainting/bubble.cpp | 10 ++-- examples/opengl/overpainting/bubble.h | 10 ++-- examples/opengl/overpainting/glwidget.cpp | 10 ++-- examples/opengl/overpainting/glwidget.h | 10 ++-- examples/opengl/overpainting/main.cpp | 10 ++-- examples/opengl/pbuffers/glwidget.cpp | 10 ++-- examples/opengl/pbuffers/glwidget.h | 10 ++-- examples/opengl/pbuffers/main.cpp | 10 ++-- examples/opengl/pbuffers2/glwidget.cpp | 10 ++-- examples/opengl/pbuffers2/glwidget.h | 10 ++-- examples/opengl/pbuffers2/main.cpp | 10 ++-- examples/opengl/samplebuffers/glwidget.cpp | 10 ++-- examples/opengl/samplebuffers/glwidget.h | 10 ++-- examples/opengl/samplebuffers/main.cpp | 10 ++-- examples/opengl/textures/glwidget.cpp | 10 ++-- examples/opengl/textures/glwidget.h | 10 ++-- examples/opengl/textures/main.cpp | 10 ++-- examples/opengl/textures/window.cpp | 10 ++-- examples/opengl/textures/window.h | 10 ++-- examples/painting/basicdrawing/main.cpp | 10 ++-- examples/painting/basicdrawing/renderarea.cpp | 10 ++-- examples/painting/basicdrawing/renderarea.h | 10 ++-- examples/painting/basicdrawing/window.cpp | 10 ++-- examples/painting/basicdrawing/window.h | 10 ++-- .../painting/concentriccircles/circlewidget.cpp | 10 ++-- examples/painting/concentriccircles/circlewidget.h | 10 ++-- examples/painting/concentriccircles/main.cpp | 10 ++-- examples/painting/concentriccircles/window.cpp | 10 ++-- examples/painting/concentriccircles/window.h | 10 ++-- examples/painting/fontsampler/main.cpp | 10 ++-- examples/painting/fontsampler/mainwindow.cpp | 10 ++-- examples/painting/fontsampler/mainwindow.h | 10 ++-- .../painting/imagecomposition/imagecomposer.cpp | 10 ++-- examples/painting/imagecomposition/imagecomposer.h | 10 ++-- examples/painting/imagecomposition/main.cpp | 10 ++-- examples/painting/painterpaths/main.cpp | 10 ++-- examples/painting/painterpaths/renderarea.cpp | 10 ++-- examples/painting/painterpaths/renderarea.h | 10 ++-- examples/painting/painterpaths/window.cpp | 10 ++-- examples/painting/painterpaths/window.h | 10 ++-- examples/painting/svggenerator/displaywidget.cpp | 10 ++-- examples/painting/svggenerator/displaywidget.h | 10 ++-- examples/painting/svggenerator/main.cpp | 10 ++-- examples/painting/svggenerator/window.cpp | 10 ++-- examples/painting/svggenerator/window.h | 10 ++-- examples/painting/svgviewer/main.cpp | 10 ++-- examples/painting/svgviewer/mainwindow.cpp | 10 ++-- examples/painting/svgviewer/mainwindow.h | 10 ++-- examples/painting/svgviewer/svgview.cpp | 10 ++-- examples/painting/svgviewer/svgview.h | 10 ++-- examples/painting/transformations/main.cpp | 10 ++-- examples/painting/transformations/renderarea.cpp | 10 ++-- examples/painting/transformations/renderarea.h | 10 ++-- examples/painting/transformations/window.cpp | 10 ++-- examples/painting/transformations/window.h | 10 ++-- examples/phonon/capabilities/main.cpp | 10 ++-- examples/phonon/capabilities/window.cpp | 10 ++-- examples/phonon/capabilities/window.h | 10 ++-- examples/phonon/musicplayer/main.cpp | 10 ++-- examples/phonon/musicplayer/mainwindow.cpp | 10 ++-- examples/phonon/musicplayer/mainwindow.h | 10 ++-- examples/qmake/precompile/main.cpp | 10 ++-- examples/qmake/precompile/mydialog.cpp | 10 ++-- examples/qmake/precompile/mydialog.h | 10 ++-- examples/qmake/precompile/myobject.cpp | 10 ++-- examples/qmake/precompile/myobject.h | 10 ++-- examples/qmake/precompile/stable.h | 10 ++-- examples/qmake/precompile/util.cpp | 10 ++-- examples/qmake/tutorial/hello.cpp | 10 ++-- examples/qmake/tutorial/hello.h | 10 ++-- examples/qmake/tutorial/hellounix.cpp | 10 ++-- examples/qmake/tutorial/hellowin.cpp | 10 ++-- examples/qmake/tutorial/main.cpp | 10 ++-- .../qtconcurrent/imagescaling/imagescaling.cpp | 10 ++-- examples/qtconcurrent/imagescaling/imagescaling.h | 10 ++-- examples/qtconcurrent/imagescaling/main.cpp | 10 ++-- examples/qtconcurrent/map/main.cpp | 10 ++-- examples/qtconcurrent/progressdialog/main.cpp | 10 ++-- examples/qtconcurrent/runfunction/main.cpp | 10 ++-- examples/qtconcurrent/wordcount/main.cpp | 10 ++-- examples/qtestlib/tutorial1/testqstring.cpp | 10 ++-- examples/qtestlib/tutorial2/testqstring.cpp | 10 ++-- examples/qtestlib/tutorial3/testgui.cpp | 10 ++-- examples/qtestlib/tutorial4/testgui.cpp | 10 ++-- examples/qtestlib/tutorial5/benchmarking.cpp | 10 ++-- examples/qws/ahigl/qscreenahigl_qws.cpp | 10 ++-- examples/qws/ahigl/qscreenahigl_qws.h | 10 ++-- examples/qws/ahigl/qscreenahiglplugin.cpp | 10 ++-- examples/qws/ahigl/qwindowsurface_ahigl.cpp | 10 ++-- examples/qws/ahigl/qwindowsurface_ahigl_p.h | 10 ++-- examples/qws/dbscreen/dbscreen.cpp | 10 ++-- examples/qws/dbscreen/dbscreen.h | 10 ++-- examples/qws/dbscreen/dbscreendriverplugin.cpp | 10 ++-- examples/qws/framebuffer/main.c | 10 ++-- examples/qws/mousecalibration/calibration.cpp | 10 ++-- examples/qws/mousecalibration/calibration.h | 10 ++-- examples/qws/mousecalibration/main.cpp | 10 ++-- examples/qws/mousecalibration/scribblewidget.cpp | 10 ++-- examples/qws/mousecalibration/scribblewidget.h | 10 ++-- examples/qws/simpledecoration/analogclock.cpp | 10 ++-- examples/qws/simpledecoration/analogclock.h | 10 ++-- examples/qws/simpledecoration/main.cpp | 10 ++-- examples/qws/simpledecoration/mydecoration.cpp | 10 ++-- examples/qws/simpledecoration/mydecoration.h | 10 ++-- examples/qws/svgalib/svgalibpaintdevice.cpp | 10 ++-- examples/qws/svgalib/svgalibpaintdevice.h | 10 ++-- examples/qws/svgalib/svgalibpaintengine.cpp | 10 ++-- examples/qws/svgalib/svgalibpaintengine.h | 10 ++-- examples/qws/svgalib/svgalibplugin.cpp | 10 ++-- examples/qws/svgalib/svgalibscreen.cpp | 10 ++-- examples/qws/svgalib/svgalibscreen.h | 10 ++-- examples/qws/svgalib/svgalibsurface.cpp | 10 ++-- examples/qws/svgalib/svgalibsurface.h | 10 ++-- examples/richtext/calendar/main.cpp | 10 ++-- examples/richtext/calendar/mainwindow.cpp | 10 ++-- examples/richtext/calendar/mainwindow.h | 10 ++-- examples/richtext/orderform/detailsdialog.cpp | 10 ++-- examples/richtext/orderform/detailsdialog.h | 10 ++-- examples/richtext/orderform/main.cpp | 10 ++-- examples/richtext/orderform/mainwindow.cpp | 10 ++-- examples/richtext/orderform/mainwindow.h | 10 ++-- .../richtext/syntaxhighlighter/highlighter.cpp | 10 ++-- examples/richtext/syntaxhighlighter/highlighter.h | 10 ++-- examples/richtext/syntaxhighlighter/main.cpp | 10 ++-- examples/richtext/syntaxhighlighter/mainwindow.cpp | 10 ++-- examples/richtext/syntaxhighlighter/mainwindow.h | 10 ++-- examples/richtext/textobject/main.cpp | 10 ++-- examples/richtext/textobject/svgtextobject.cpp | 10 ++-- examples/richtext/textobject/svgtextobject.h | 10 ++-- examples/richtext/textobject/window.cpp | 10 ++-- examples/richtext/textobject/window.h | 10 ++-- examples/script/calculator/main.cpp | 10 ++-- examples/script/context2d/context2d.cpp | 10 ++-- examples/script/context2d/context2d.h | 10 ++-- examples/script/context2d/domimage.cpp | 10 ++-- examples/script/context2d/domimage.h | 10 ++-- examples/script/context2d/environment.cpp | 10 ++-- examples/script/context2d/environment.h | 10 ++-- examples/script/context2d/main.cpp | 10 ++-- examples/script/context2d/qcontext2dcanvas.cpp | 10 ++-- examples/script/context2d/qcontext2dcanvas.h | 10 ++-- examples/script/context2d/window.cpp | 10 ++-- examples/script/context2d/window.h | 10 ++-- examples/script/customclass/bytearrayclass.cpp | 10 ++-- examples/script/customclass/bytearrayclass.h | 10 ++-- examples/script/customclass/bytearrayprototype.cpp | 10 ++-- examples/script/customclass/bytearrayprototype.h | 10 ++-- examples/script/customclass/main.cpp | 10 ++-- examples/script/defaultprototypes/main.cpp | 10 ++-- examples/script/defaultprototypes/prototypes.cpp | 10 ++-- examples/script/defaultprototypes/prototypes.h | 10 ++-- examples/script/helloscript/main.cpp | 10 ++-- examples/script/marshal/main.cpp | 10 ++-- examples/script/qscript/main.cpp | 10 ++-- examples/script/qsdbg/main.cpp | 10 ++-- examples/script/qsdbg/scriptbreakpointmanager.cpp | 10 ++-- examples/script/qsdbg/scriptbreakpointmanager.h | 10 ++-- examples/script/qsdbg/scriptdebugger.cpp | 10 ++-- examples/script/qsdbg/scriptdebugger.h | 10 ++-- examples/script/qstetrix/main.cpp | 10 ++-- examples/script/qstetrix/tetrixboard.cpp | 10 ++-- examples/script/qstetrix/tetrixboard.h | 10 ++-- examples/sql/cachedtable/main.cpp | 10 ++-- examples/sql/cachedtable/tableeditor.cpp | 10 ++-- examples/sql/cachedtable/tableeditor.h | 10 ++-- examples/sql/connection.h | 10 ++-- examples/sql/drilldown/imageitem.cpp | 10 ++-- examples/sql/drilldown/imageitem.h | 10 ++-- examples/sql/drilldown/informationwindow.cpp | 10 ++-- examples/sql/drilldown/informationwindow.h | 10 ++-- examples/sql/drilldown/main.cpp | 10 ++-- examples/sql/drilldown/view.cpp | 10 ++-- examples/sql/drilldown/view.h | 10 ++-- examples/sql/masterdetail/database.h | 10 ++-- examples/sql/masterdetail/dialog.cpp | 10 ++-- examples/sql/masterdetail/dialog.h | 10 ++-- examples/sql/masterdetail/main.cpp | 10 ++-- examples/sql/masterdetail/mainwindow.cpp | 10 ++-- examples/sql/masterdetail/mainwindow.h | 10 ++-- examples/sql/querymodel/customsqlmodel.cpp | 10 ++-- examples/sql/querymodel/customsqlmodel.h | 10 ++-- examples/sql/querymodel/editablesqlmodel.cpp | 10 ++-- examples/sql/querymodel/editablesqlmodel.h | 10 ++-- examples/sql/querymodel/main.cpp | 10 ++-- .../relationaltablemodel/relationaltablemodel.cpp | 10 ++-- examples/sql/sqlwidgetmapper/main.cpp | 10 ++-- examples/sql/sqlwidgetmapper/window.cpp | 10 ++-- examples/sql/sqlwidgetmapper/window.h | 10 ++-- examples/sql/tablemodel/tablemodel.cpp | 10 ++-- examples/threads/mandelbrot/main.cpp | 10 ++-- examples/threads/mandelbrot/mandelbrotwidget.cpp | 10 ++-- examples/threads/mandelbrot/mandelbrotwidget.h | 10 ++-- examples/threads/mandelbrot/renderthread.cpp | 10 ++-- examples/threads/mandelbrot/renderthread.h | 10 ++-- examples/threads/queuedcustomtype/block.cpp | 10 ++-- examples/threads/queuedcustomtype/block.h | 10 ++-- examples/threads/queuedcustomtype/main.cpp | 10 ++-- examples/threads/queuedcustomtype/renderthread.cpp | 10 ++-- examples/threads/queuedcustomtype/renderthread.h | 10 ++-- examples/threads/queuedcustomtype/window.cpp | 10 ++-- examples/threads/queuedcustomtype/window.h | 10 ++-- examples/threads/semaphores/semaphores.cpp | 10 ++-- examples/threads/waitconditions/waitconditions.cpp | 10 ++-- examples/tools/codecs/main.cpp | 10 ++-- examples/tools/codecs/mainwindow.cpp | 10 ++-- examples/tools/codecs/mainwindow.h | 10 ++-- examples/tools/codecs/previewform.cpp | 10 ++-- examples/tools/codecs/previewform.h | 10 ++-- examples/tools/completer/dirmodel.cpp | 10 ++-- examples/tools/completer/dirmodel.h | 10 ++-- examples/tools/completer/main.cpp | 10 ++-- examples/tools/completer/mainwindow.cpp | 10 ++-- examples/tools/completer/mainwindow.h | 10 ++-- examples/tools/customcompleter/main.cpp | 10 ++-- examples/tools/customcompleter/mainwindow.cpp | 10 ++-- examples/tools/customcompleter/mainwindow.h | 10 ++-- examples/tools/customcompleter/textedit.cpp | 10 ++-- examples/tools/customcompleter/textedit.h | 10 ++-- examples/tools/customtype/main.cpp | 10 ++-- examples/tools/customtype/message.cpp | 10 ++-- examples/tools/customtype/message.h | 10 ++-- examples/tools/customtypesending/main.cpp | 10 ++-- examples/tools/customtypesending/message.cpp | 10 ++-- examples/tools/customtypesending/message.h | 10 ++-- examples/tools/customtypesending/window.cpp | 10 ++-- examples/tools/customtypesending/window.h | 10 ++-- .../tools/echoplugin/echowindow/echointerface.h | 10 ++-- .../tools/echoplugin/echowindow/echowindow.cpp | 10 ++-- examples/tools/echoplugin/echowindow/echowindow.h | 10 ++-- examples/tools/echoplugin/echowindow/main.cpp | 10 ++-- examples/tools/echoplugin/plugin/echoplugin.cpp | 10 ++-- examples/tools/echoplugin/plugin/echoplugin.h | 10 ++-- examples/tools/i18n/languagechooser.cpp | 10 ++-- examples/tools/i18n/languagechooser.h | 10 ++-- examples/tools/i18n/main.cpp | 10 ++-- examples/tools/i18n/mainwindow.cpp | 10 ++-- examples/tools/i18n/mainwindow.h | 10 ++-- examples/tools/plugandpaint/interfaces.h | 10 ++-- examples/tools/plugandpaint/main.cpp | 10 ++-- examples/tools/plugandpaint/mainwindow.cpp | 10 ++-- examples/tools/plugandpaint/mainwindow.h | 10 ++-- examples/tools/plugandpaint/paintarea.cpp | 10 ++-- examples/tools/plugandpaint/paintarea.h | 10 ++-- examples/tools/plugandpaint/plugindialog.cpp | 10 ++-- examples/tools/plugandpaint/plugindialog.h | 10 ++-- .../basictools/basictoolsplugin.cpp | 10 ++-- .../basictools/basictoolsplugin.h | 10 ++-- .../extrafilters/extrafiltersplugin.cpp | 10 ++-- .../extrafilters/extrafiltersplugin.h | 10 ++-- examples/tools/regexp/main.cpp | 10 ++-- examples/tools/regexp/regexpdialog.cpp | 10 ++-- examples/tools/regexp/regexpdialog.h | 10 ++-- examples/tools/settingseditor/locationdialog.cpp | 10 ++-- examples/tools/settingseditor/locationdialog.h | 10 ++-- examples/tools/settingseditor/main.cpp | 10 ++-- examples/tools/settingseditor/mainwindow.cpp | 10 ++-- examples/tools/settingseditor/mainwindow.h | 10 ++-- examples/tools/settingseditor/settingstree.cpp | 10 ++-- examples/tools/settingseditor/settingstree.h | 10 ++-- examples/tools/settingseditor/variantdelegate.cpp | 10 ++-- examples/tools/settingseditor/variantdelegate.h | 10 ++-- examples/tools/styleplugin/plugin/simplestyle.cpp | 10 ++-- examples/tools/styleplugin/plugin/simplestyle.h | 10 ++-- .../tools/styleplugin/plugin/simplestyleplugin.cpp | 10 ++-- .../tools/styleplugin/plugin/simplestyleplugin.h | 10 ++-- examples/tools/styleplugin/stylewindow/main.cpp | 10 ++-- .../tools/styleplugin/stylewindow/stylewindow.cpp | 10 ++-- .../tools/styleplugin/stylewindow/stylewindow.h | 10 ++-- examples/tools/treemodelcompleter/main.cpp | 10 ++-- examples/tools/treemodelcompleter/mainwindow.cpp | 10 ++-- examples/tools/treemodelcompleter/mainwindow.h | 10 ++-- .../treemodelcompleter/treemodelcompleter.cpp | 10 ++-- .../tools/treemodelcompleter/treemodelcompleter.h | 10 ++-- examples/tools/undoframework/commands.cpp | 10 ++-- examples/tools/undoframework/commands.h | 10 ++-- examples/tools/undoframework/diagramitem.cpp | 10 ++-- examples/tools/undoframework/diagramitem.h | 10 ++-- examples/tools/undoframework/diagramscene.cpp | 10 ++-- examples/tools/undoframework/diagramscene.h | 10 ++-- examples/tools/undoframework/main.cpp | 10 ++-- examples/tools/undoframework/mainwindow.cpp | 10 ++-- examples/tools/undoframework/mainwindow.h | 10 ++-- .../tutorials/addressbook-fr/part1/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part1/addressbook.h | 10 ++-- examples/tutorials/addressbook-fr/part1/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part2/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part2/addressbook.h | 10 ++-- examples/tutorials/addressbook-fr/part2/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part3/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part3/addressbook.h | 10 ++-- examples/tutorials/addressbook-fr/part3/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part4/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part4/addressbook.h | 10 ++-- examples/tutorials/addressbook-fr/part4/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part5/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part5/addressbook.h | 10 ++-- .../tutorials/addressbook-fr/part5/finddialog.cpp | 10 ++-- .../tutorials/addressbook-fr/part5/finddialog.h | 10 ++-- examples/tutorials/addressbook-fr/part5/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part6/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part6/addressbook.h | 10 ++-- .../tutorials/addressbook-fr/part6/finddialog.cpp | 10 ++-- .../tutorials/addressbook-fr/part6/finddialog.h | 10 ++-- examples/tutorials/addressbook-fr/part6/main.cpp | 10 ++-- .../tutorials/addressbook-fr/part7/addressbook.cpp | 10 ++-- .../tutorials/addressbook-fr/part7/addressbook.h | 10 ++-- .../tutorials/addressbook-fr/part7/finddialog.cpp | 10 ++-- .../tutorials/addressbook-fr/part7/finddialog.h | 10 ++-- examples/tutorials/addressbook-fr/part7/main.cpp | 10 ++-- .../tutorials/addressbook/part1/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part1/addressbook.h | 10 ++-- examples/tutorials/addressbook/part1/main.cpp | 10 ++-- .../tutorials/addressbook/part2/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part2/addressbook.h | 10 ++-- examples/tutorials/addressbook/part2/main.cpp | 10 ++-- .../tutorials/addressbook/part3/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part3/addressbook.h | 10 ++-- examples/tutorials/addressbook/part3/main.cpp | 10 ++-- .../tutorials/addressbook/part4/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part4/addressbook.h | 10 ++-- examples/tutorials/addressbook/part4/main.cpp | 10 ++-- .../tutorials/addressbook/part5/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part5/addressbook.h | 10 ++-- .../tutorials/addressbook/part5/finddialog.cpp | 10 ++-- examples/tutorials/addressbook/part5/finddialog.h | 10 ++-- examples/tutorials/addressbook/part5/main.cpp | 10 ++-- .../tutorials/addressbook/part6/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part6/addressbook.h | 10 ++-- .../tutorials/addressbook/part6/finddialog.cpp | 10 ++-- examples/tutorials/addressbook/part6/finddialog.h | 10 ++-- examples/tutorials/addressbook/part6/main.cpp | 10 ++-- .../tutorials/addressbook/part7/addressbook.cpp | 10 ++-- examples/tutorials/addressbook/part7/addressbook.h | 10 ++-- .../tutorials/addressbook/part7/finddialog.cpp | 10 ++-- examples/tutorials/addressbook/part7/finddialog.h | 10 ++-- examples/tutorials/addressbook/part7/main.cpp | 10 ++-- .../uitools/multipleinheritance/calculatorform.cpp | 10 ++-- .../uitools/multipleinheritance/calculatorform.h | 10 ++-- examples/uitools/multipleinheritance/main.cpp | 10 ++-- examples/uitools/textfinder/main.cpp | 10 ++-- examples/uitools/textfinder/textfinder.cpp | 10 ++-- examples/uitools/textfinder/textfinder.h | 10 ++-- examples/webkit/formextractor/formextractor.cpp | 10 ++-- examples/webkit/formextractor/formextractor.h | 10 ++-- examples/webkit/formextractor/main.cpp | 10 ++-- examples/webkit/formextractor/mainwindow.cpp | 10 ++-- examples/webkit/formextractor/mainwindow.h | 10 ++-- examples/webkit/previewer/main.cpp | 10 ++-- examples/webkit/previewer/mainwindow.cpp | 10 ++-- examples/webkit/previewer/mainwindow.h | 10 ++-- examples/webkit/previewer/previewer.cpp | 10 ++-- examples/webkit/previewer/previewer.h | 10 ++-- examples/widgets/analogclock/analogclock.cpp | 10 ++-- examples/widgets/analogclock/analogclock.h | 10 ++-- examples/widgets/analogclock/main.cpp | 10 ++-- examples/widgets/calculator/button.cpp | 10 ++-- examples/widgets/calculator/button.h | 10 ++-- examples/widgets/calculator/calculator.cpp | 10 ++-- examples/widgets/calculator/calculator.h | 10 ++-- examples/widgets/calculator/main.cpp | 10 ++-- examples/widgets/calendarwidget/main.cpp | 10 ++-- examples/widgets/calendarwidget/window.cpp | 10 ++-- examples/widgets/calendarwidget/window.h | 10 ++-- examples/widgets/charactermap/characterwidget.cpp | 10 ++-- examples/widgets/charactermap/characterwidget.h | 10 ++-- examples/widgets/charactermap/main.cpp | 10 ++-- examples/widgets/charactermap/mainwindow.cpp | 10 ++-- examples/widgets/charactermap/mainwindow.h | 10 ++-- examples/widgets/codeeditor/codeeditor.cpp | 10 ++-- examples/widgets/codeeditor/codeeditor.h | 10 ++-- examples/widgets/codeeditor/main.cpp | 10 ++-- examples/widgets/digitalclock/digitalclock.cpp | 10 ++-- examples/widgets/digitalclock/digitalclock.h | 10 ++-- examples/widgets/digitalclock/main.cpp | 10 ++-- examples/widgets/groupbox/main.cpp | 10 ++-- examples/widgets/groupbox/window.cpp | 10 ++-- examples/widgets/groupbox/window.h | 10 ++-- examples/widgets/icons/iconpreviewarea.cpp | 10 ++-- examples/widgets/icons/iconpreviewarea.h | 10 ++-- examples/widgets/icons/iconsizespinbox.cpp | 10 ++-- examples/widgets/icons/iconsizespinbox.h | 10 ++-- examples/widgets/icons/imagedelegate.cpp | 10 ++-- examples/widgets/icons/imagedelegate.h | 10 ++-- examples/widgets/icons/main.cpp | 10 ++-- examples/widgets/icons/mainwindow.cpp | 10 ++-- examples/widgets/icons/mainwindow.h | 10 ++-- examples/widgets/imageviewer/imageviewer.cpp | 10 ++-- examples/widgets/imageviewer/imageviewer.h | 10 ++-- examples/widgets/imageviewer/main.cpp | 10 ++-- examples/widgets/lineedits/main.cpp | 10 ++-- examples/widgets/lineedits/window.cpp | 10 ++-- examples/widgets/lineedits/window.h | 10 ++-- examples/widgets/movie/main.cpp | 10 ++-- examples/widgets/movie/movieplayer.cpp | 10 ++-- examples/widgets/movie/movieplayer.h | 10 ++-- examples/widgets/scribble/main.cpp | 10 ++-- examples/widgets/scribble/mainwindow.cpp | 10 ++-- examples/widgets/scribble/mainwindow.h | 10 ++-- examples/widgets/scribble/scribblearea.cpp | 10 ++-- examples/widgets/scribble/scribblearea.h | 10 ++-- examples/widgets/shapedclock/main.cpp | 10 ++-- examples/widgets/shapedclock/shapedclock.cpp | 10 ++-- examples/widgets/shapedclock/shapedclock.h | 10 ++-- examples/widgets/sliders/main.cpp | 10 ++-- examples/widgets/sliders/slidersgroup.cpp | 10 ++-- examples/widgets/sliders/slidersgroup.h | 10 ++-- examples/widgets/sliders/window.cpp | 10 ++-- examples/widgets/sliders/window.h | 10 ++-- examples/widgets/spinboxes/main.cpp | 10 ++-- examples/widgets/spinboxes/window.cpp | 10 ++-- examples/widgets/spinboxes/window.h | 10 ++-- examples/widgets/styles/main.cpp | 10 ++-- examples/widgets/styles/norwegianwoodstyle.cpp | 10 ++-- examples/widgets/styles/norwegianwoodstyle.h | 10 ++-- examples/widgets/styles/widgetgallery.cpp | 10 ++-- examples/widgets/styles/widgetgallery.h | 10 ++-- examples/widgets/stylesheet/main.cpp | 10 ++-- examples/widgets/stylesheet/mainwindow.cpp | 10 ++-- examples/widgets/stylesheet/mainwindow.h | 10 ++-- examples/widgets/stylesheet/stylesheeteditor.cpp | 10 ++-- examples/widgets/stylesheet/stylesheeteditor.h | 10 ++-- examples/widgets/tablet/main.cpp | 10 ++-- examples/widgets/tablet/mainwindow.cpp | 10 ++-- examples/widgets/tablet/mainwindow.h | 10 ++-- examples/widgets/tablet/tabletapplication.cpp | 10 ++-- examples/widgets/tablet/tabletapplication.h | 10 ++-- examples/widgets/tablet/tabletcanvas.cpp | 10 ++-- examples/widgets/tablet/tabletcanvas.h | 10 ++-- examples/widgets/tetrix/main.cpp | 10 ++-- examples/widgets/tetrix/tetrixboard.cpp | 10 ++-- examples/widgets/tetrix/tetrixboard.h | 10 ++-- examples/widgets/tetrix/tetrixpiece.cpp | 10 ++-- examples/widgets/tetrix/tetrixpiece.h | 10 ++-- examples/widgets/tetrix/tetrixwindow.cpp | 10 ++-- examples/widgets/tetrix/tetrixwindow.h | 10 ++-- examples/widgets/tooltips/main.cpp | 10 ++-- examples/widgets/tooltips/shapeitem.cpp | 10 ++-- examples/widgets/tooltips/shapeitem.h | 10 ++-- examples/widgets/tooltips/sortingbox.cpp | 10 ++-- examples/widgets/tooltips/sortingbox.h | 10 ++-- examples/widgets/validators/ledwidget.cpp | 10 ++-- examples/widgets/validators/ledwidget.h | 10 ++-- examples/widgets/validators/localeselector.cpp | 10 ++-- examples/widgets/validators/localeselector.h | 10 ++-- examples/widgets/validators/main.cpp | 10 ++-- examples/widgets/wiggly/dialog.cpp | 10 ++-- examples/widgets/wiggly/dialog.h | 10 ++-- examples/widgets/wiggly/main.cpp | 10 ++-- examples/widgets/wiggly/wigglywidget.cpp | 10 ++-- examples/widgets/wiggly/wigglywidget.h | 10 ++-- examples/widgets/windowflags/controllerwindow.cpp | 10 ++-- examples/widgets/windowflags/controllerwindow.h | 10 ++-- examples/widgets/windowflags/main.cpp | 10 ++-- examples/widgets/windowflags/previewwindow.cpp | 10 ++-- examples/widgets/windowflags/previewwindow.h | 10 ++-- examples/xml/dombookmarks/main.cpp | 10 ++-- examples/xml/dombookmarks/mainwindow.cpp | 10 ++-- examples/xml/dombookmarks/mainwindow.h | 10 ++-- examples/xml/dombookmarks/xbeltree.cpp | 10 ++-- examples/xml/dombookmarks/xbeltree.h | 10 ++-- examples/xml/rsslisting/main.cpp | 10 ++-- examples/xml/rsslisting/rsslisting.cpp | 10 ++-- examples/xml/rsslisting/rsslisting.h | 10 ++-- examples/xml/saxbookmarks/main.cpp | 10 ++-- examples/xml/saxbookmarks/mainwindow.cpp | 10 ++-- examples/xml/saxbookmarks/mainwindow.h | 10 ++-- examples/xml/saxbookmarks/xbelgenerator.cpp | 10 ++-- examples/xml/saxbookmarks/xbelgenerator.h | 10 ++-- examples/xml/saxbookmarks/xbelhandler.cpp | 10 ++-- examples/xml/saxbookmarks/xbelhandler.h | 10 ++-- examples/xml/streambookmarks/main.cpp | 10 ++-- examples/xml/streambookmarks/mainwindow.cpp | 10 ++-- examples/xml/streambookmarks/mainwindow.h | 10 ++-- examples/xml/streambookmarks/xbelreader.cpp | 10 ++-- examples/xml/streambookmarks/xbelreader.h | 10 ++-- examples/xml/streambookmarks/xbelwriter.cpp | 10 ++-- examples/xml/streambookmarks/xbelwriter.h | 10 ++-- examples/xml/xmlstreamlint/main.cpp | 10 ++-- examples/xmlpatterns/filetree/filetree.cpp | 10 ++-- examples/xmlpatterns/filetree/filetree.h | 10 ++-- examples/xmlpatterns/filetree/main.cpp | 10 ++-- examples/xmlpatterns/filetree/mainwindow.cpp | 10 ++-- examples/xmlpatterns/filetree/mainwindow.h | 10 ++-- examples/xmlpatterns/qobjectxmlmodel/main.cpp | 10 ++-- .../xmlpatterns/qobjectxmlmodel/mainwindow.cpp | 10 ++-- examples/xmlpatterns/qobjectxmlmodel/mainwindow.h | 10 ++-- .../qobjectxmlmodel/qobjectxmlmodel.cpp | 10 ++-- .../xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h | 10 ++-- examples/xmlpatterns/recipes/main.cpp | 10 ++-- examples/xmlpatterns/recipes/querymainwindow.cpp | 10 ++-- examples/xmlpatterns/recipes/querymainwindow.h | 10 ++-- .../xmlpatterns/shared/xmlsyntaxhighlighter.cpp | 10 ++-- examples/xmlpatterns/shared/xmlsyntaxhighlighter.h | 10 ++-- examples/xmlpatterns/trafficinfo/main.cpp | 10 ++-- examples/xmlpatterns/trafficinfo/mainwindow.cpp | 10 ++-- examples/xmlpatterns/trafficinfo/mainwindow.h | 10 ++-- examples/xmlpatterns/trafficinfo/stationdialog.cpp | 10 ++-- examples/xmlpatterns/trafficinfo/stationdialog.h | 10 ++-- examples/xmlpatterns/trafficinfo/stationquery.cpp | 10 ++-- examples/xmlpatterns/trafficinfo/stationquery.h | 10 ++-- examples/xmlpatterns/trafficinfo/timequery.cpp | 10 ++-- examples/xmlpatterns/trafficinfo/timequery.h | 10 ++-- .../xmlpatterns/xquery/globalVariables/globals.cpp | 10 ++-- mkspecs/aix-g++-64/qplatformdefs.h | 10 ++-- mkspecs/aix-g++/qplatformdefs.h | 10 ++-- mkspecs/aix-xlc-64/qplatformdefs.h | 10 ++-- mkspecs/aix-xlc/qplatformdefs.h | 10 ++-- mkspecs/cygwin-g++/qplatformdefs.h | 10 ++-- mkspecs/darwin-g++/qplatformdefs.h | 10 ++-- mkspecs/freebsd-g++/qplatformdefs.h | 10 ++-- mkspecs/freebsd-g++34/qplatformdefs.h | 10 ++-- mkspecs/freebsd-g++40/qplatformdefs.h | 10 ++-- mkspecs/freebsd-icc/qplatformdefs.h | 10 ++-- mkspecs/hpux-acc-64/qplatformdefs.h | 10 ++-- mkspecs/hpux-acc-o64/qplatformdefs.h | 10 ++-- mkspecs/hpux-acc/qplatformdefs.h | 10 ++-- mkspecs/hpux-g++-64/qplatformdefs.h | 10 ++-- mkspecs/hpux-g++/qplatformdefs.h | 10 ++-- mkspecs/hpuxi-acc-32/qplatformdefs.h | 10 ++-- mkspecs/hpuxi-acc-64/qplatformdefs.h | 10 ++-- mkspecs/hpuxi-g++-64/qplatformdefs.h | 10 ++-- mkspecs/hurd-g++/qplatformdefs.h | 10 ++-- mkspecs/irix-cc-64/qplatformdefs.h | 10 ++-- mkspecs/irix-cc/qplatformdefs.h | 10 ++-- mkspecs/irix-g++-64/qplatformdefs.h | 10 ++-- mkspecs/irix-g++/qplatformdefs.h | 10 ++-- mkspecs/linux-cxx/qplatformdefs.h | 10 ++-- mkspecs/linux-ecc-64/qplatformdefs.h | 10 ++-- mkspecs/linux-g++-32/qplatformdefs.h | 10 ++-- mkspecs/linux-g++-64/qplatformdefs.h | 10 ++-- mkspecs/linux-g++/qplatformdefs.h | 10 ++-- mkspecs/linux-icc-32/qplatformdefs.h | 10 ++-- mkspecs/linux-icc-64/qplatformdefs.h | 10 ++-- mkspecs/linux-icc/qplatformdefs.h | 10 ++-- mkspecs/linux-kcc/qplatformdefs.h | 10 ++-- mkspecs/linux-llvm/qplatformdefs.h | 10 ++-- mkspecs/linux-lsb-g++/qplatformdefs.h | 10 ++-- mkspecs/linux-pgcc/qplatformdefs.h | 10 ++-- mkspecs/lynxos-g++/qplatformdefs.h | 10 ++-- mkspecs/macx-g++/qplatformdefs.h | 10 ++-- mkspecs/macx-g++42/qplatformdefs.h | 10 ++-- mkspecs/macx-icc/qplatformdefs.h | 10 ++-- mkspecs/macx-llvm/qplatformdefs.h | 10 ++-- mkspecs/macx-pbuilder/qplatformdefs.h | 10 ++-- mkspecs/macx-xcode/qplatformdefs.h | 10 ++-- mkspecs/macx-xlc/qplatformdefs.h | 10 ++-- mkspecs/netbsd-g++/qplatformdefs.h | 10 ++-- mkspecs/openbsd-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/freebsd-generic-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-arm-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-cellon-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-dm7000-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-dm800-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-generic-g++-32/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-generic-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-ipaq-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-lsb-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-mips-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-ppc-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-sharp-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-x86-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-x86_64-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/linux-zylonite-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/macx-generic-g++/qplatformdefs.h | 10 ++-- mkspecs/qws/solaris-generic-g++/qplatformdefs.h | 10 ++-- mkspecs/sco-cc/qplatformdefs.h | 10 ++-- mkspecs/sco-g++/qplatformdefs.h | 10 ++-- mkspecs/solaris-cc-64/qplatformdefs.h | 10 ++-- mkspecs/solaris-cc/qplatformdefs.h | 10 ++-- mkspecs/solaris-g++-64/qplatformdefs.h | 10 ++-- mkspecs/solaris-g++/qplatformdefs.h | 10 ++-- mkspecs/tru64-cxx/qplatformdefs.h | 10 ++-- mkspecs/tru64-g++/qplatformdefs.h | 10 ++-- mkspecs/unixware-cc/qplatformdefs.h | 10 ++-- mkspecs/unixware-g++/qplatformdefs.h | 10 ++-- mkspecs/win32-borland/qplatformdefs.h | 10 ++-- mkspecs/win32-g++/qplatformdefs.h | 10 ++-- mkspecs/win32-icc/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc.net/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc2002/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc2003/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc2005/qplatformdefs.h | 10 ++-- mkspecs/win32-msvc2008/qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- .../wince50standard-sh4-msvc2005/qplatformdefs.h | 10 ++-- .../wince50standard-sh4-msvc2008/qplatformdefs.h | 10 ++-- .../wince50standard-x86-msvc2005/qplatformdefs.h | 10 ++-- .../wince50standard-x86-msvc2008/qplatformdefs.h | 10 ++-- .../qplatformdefs.h | 10 ++-- mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h | 10 ++-- mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h | 10 ++-- mkspecs/wincewm50smart-msvc2005/qplatformdefs.h | 10 ++-- mkspecs/wincewm50smart-msvc2008/qplatformdefs.h | 10 ++-- .../wincewm60professional-msvc2005/qplatformdefs.h | 10 ++-- .../wincewm60professional-msvc2008/qplatformdefs.h | 10 ++-- mkspecs/wincewm60standard-msvc2005/qplatformdefs.h | 10 ++-- mkspecs/wincewm60standard-msvc2008/qplatformdefs.h | 10 ++-- qmake/cachekeys.h | 10 ++-- qmake/generators/mac/pbuilder_pbx.cpp | 10 ++-- qmake/generators/mac/pbuilder_pbx.h | 10 ++-- qmake/generators/makefile.cpp | 10 ++-- qmake/generators/makefile.h | 10 ++-- qmake/generators/makefiledeps.cpp | 10 ++-- qmake/generators/makefiledeps.h | 10 ++-- qmake/generators/metamakefile.cpp | 10 ++-- qmake/generators/metamakefile.h | 10 ++-- qmake/generators/projectgenerator.cpp | 10 ++-- qmake/generators/projectgenerator.h | 10 ++-- qmake/generators/unix/unixmake.cpp | 10 ++-- qmake/generators/unix/unixmake.h | 10 ++-- qmake/generators/unix/unixmake2.cpp | 10 ++-- qmake/generators/win32/borland_bmake.cpp | 10 ++-- qmake/generators/win32/borland_bmake.h | 10 ++-- qmake/generators/win32/mingw_make.cpp | 10 ++-- qmake/generators/win32/mingw_make.h | 10 ++-- qmake/generators/win32/msvc_dsp.cpp | 10 ++-- qmake/generators/win32/msvc_dsp.h | 10 ++-- qmake/generators/win32/msvc_nmake.cpp | 10 ++-- qmake/generators/win32/msvc_nmake.h | 10 ++-- qmake/generators/win32/msvc_objectmodel.cpp | 10 ++-- qmake/generators/win32/msvc_objectmodel.h | 10 ++-- qmake/generators/win32/msvc_vcproj.cpp | 10 ++-- qmake/generators/win32/msvc_vcproj.h | 10 ++-- qmake/generators/win32/winmakefile.cpp | 10 ++-- qmake/generators/win32/winmakefile.h | 10 ++-- qmake/generators/xmloutput.cpp | 10 ++-- qmake/generators/xmloutput.h | 10 ++-- qmake/main.cpp | 10 ++-- qmake/meta.cpp | 10 ++-- qmake/meta.h | 10 ++-- qmake/option.cpp | 10 ++-- qmake/option.h | 10 ++-- qmake/project.cpp | 10 ++-- qmake/project.h | 10 ++-- qmake/property.cpp | 10 ++-- qmake/property.h | 10 ++-- qmake/qmake_pch.h | 10 ++-- src/3rdparty/sha1/sha1.cpp | 10 ++-- src/corelib/arch/arm/qatomic_arm.cpp | 10 ++-- src/corelib/arch/generic/qatomic_generic_unix.cpp | 10 ++-- .../arch/generic/qatomic_generic_windows.cpp | 10 ++-- src/corelib/arch/parisc/qatomic_parisc.cpp | 10 ++-- src/corelib/arch/qatomic_alpha.h | 10 ++-- src/corelib/arch/qatomic_arch.h | 10 ++-- src/corelib/arch/qatomic_arm.h | 10 ++-- src/corelib/arch/qatomic_armv6.h | 10 ++-- src/corelib/arch/qatomic_avr32.h | 10 ++-- src/corelib/arch/qatomic_bfin.h | 10 ++-- src/corelib/arch/qatomic_bootstrap.h | 10 ++-- src/corelib/arch/qatomic_generic.h | 10 ++-- src/corelib/arch/qatomic_i386.h | 10 ++-- src/corelib/arch/qatomic_ia64.h | 10 ++-- src/corelib/arch/qatomic_macosx.h | 10 ++-- src/corelib/arch/qatomic_mips.h | 10 ++-- src/corelib/arch/qatomic_parisc.h | 10 ++-- src/corelib/arch/qatomic_powerpc.h | 10 ++-- src/corelib/arch/qatomic_s390.h | 10 ++-- src/corelib/arch/qatomic_sh.h | 10 ++-- src/corelib/arch/qatomic_sh4a.h | 10 ++-- src/corelib/arch/qatomic_sparc.h | 10 ++-- src/corelib/arch/qatomic_windows.h | 10 ++-- src/corelib/arch/qatomic_windowsce.h | 10 ++-- src/corelib/arch/qatomic_x86_64.h | 10 ++-- src/corelib/arch/sh/qatomic_sh.cpp | 10 ++-- src/corelib/arch/sparc/qatomic_sparc.cpp | 10 ++-- src/corelib/codecs/qfontlaocodec.cpp | 10 ++-- src/corelib/codecs/qfontlaocodec_p.h | 10 ++-- src/corelib/codecs/qiconvcodec.cpp | 10 ++-- src/corelib/codecs/qiconvcodec_p.h | 10 ++-- src/corelib/codecs/qisciicodec.cpp | 10 ++-- src/corelib/codecs/qisciicodec_p.h | 10 ++-- src/corelib/codecs/qlatincodec.cpp | 10 ++-- src/corelib/codecs/qlatincodec_p.h | 10 ++-- src/corelib/codecs/qsimplecodec.cpp | 10 ++-- src/corelib/codecs/qsimplecodec_p.h | 10 ++-- src/corelib/codecs/qtextcodec.cpp | 10 ++-- src/corelib/codecs/qtextcodec.h | 10 ++-- src/corelib/codecs/qtextcodec_p.h | 10 ++-- src/corelib/codecs/qtextcodecplugin.cpp | 10 ++-- src/corelib/codecs/qtextcodecplugin.h | 10 ++-- src/corelib/codecs/qtsciicodec.cpp | 10 ++-- src/corelib/codecs/qtsciicodec_p.h | 10 ++-- src/corelib/codecs/qutfcodec.cpp | 10 ++-- src/corelib/codecs/qutfcodec_p.h | 10 ++-- src/corelib/concurrent/qfuture.cpp | 10 ++-- src/corelib/concurrent/qfuture.h | 10 ++-- src/corelib/concurrent/qfutureinterface.cpp | 10 ++-- src/corelib/concurrent/qfutureinterface.h | 10 ++-- src/corelib/concurrent/qfutureinterface_p.h | 10 ++-- src/corelib/concurrent/qfuturesynchronizer.cpp | 10 ++-- src/corelib/concurrent/qfuturesynchronizer.h | 10 ++-- src/corelib/concurrent/qfuturewatcher.cpp | 10 ++-- src/corelib/concurrent/qfuturewatcher.h | 10 ++-- src/corelib/concurrent/qfuturewatcher_p.h | 10 ++-- src/corelib/concurrent/qrunnable.cpp | 10 ++-- src/corelib/concurrent/qrunnable.h | 10 ++-- src/corelib/concurrent/qtconcurrentcompilertest.h | 10 ++-- src/corelib/concurrent/qtconcurrentexception.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentexception.h | 10 ++-- src/corelib/concurrent/qtconcurrentfilter.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentfilter.h | 10 ++-- src/corelib/concurrent/qtconcurrentfilterkernel.h | 10 ++-- .../concurrent/qtconcurrentfunctionwrappers.h | 10 ++-- .../concurrent/qtconcurrentiteratekernel.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentiteratekernel.h | 10 ++-- src/corelib/concurrent/qtconcurrentmap.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentmap.h | 10 ++-- src/corelib/concurrent/qtconcurrentmapkernel.h | 10 ++-- src/corelib/concurrent/qtconcurrentmedian.h | 10 ++-- src/corelib/concurrent/qtconcurrentreducekernel.h | 10 ++-- src/corelib/concurrent/qtconcurrentresultstore.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentresultstore.h | 10 ++-- src/corelib/concurrent/qtconcurrentrun.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentrun.h | 10 ++-- src/corelib/concurrent/qtconcurrentrunbase.h | 10 ++-- .../concurrent/qtconcurrentstoredfunctioncall.h | 10 ++-- .../concurrent/qtconcurrentthreadengine.cpp | 10 ++-- src/corelib/concurrent/qtconcurrentthreadengine.h | 10 ++-- src/corelib/concurrent/qthreadpool.cpp | 10 ++-- src/corelib/concurrent/qthreadpool.h | 10 ++-- src/corelib/concurrent/qthreadpool_p.h | 10 ++-- src/corelib/global/qconfig-dist.h | 10 ++-- src/corelib/global/qconfig-large.h | 10 ++-- src/corelib/global/qconfig-medium.h | 10 ++-- src/corelib/global/qconfig-minimal.h | 10 ++-- src/corelib/global/qconfig-small.h | 10 ++-- src/corelib/global/qendian.h | 10 ++-- src/corelib/global/qfeatures.h | 10 ++-- src/corelib/global/qglobal.cpp | 10 ++-- src/corelib/global/qglobal.h | 10 ++-- src/corelib/global/qlibraryinfo.cpp | 10 ++-- src/corelib/global/qlibraryinfo.h | 10 ++-- src/corelib/global/qmalloc.cpp | 10 ++-- src/corelib/global/qnamespace.h | 10 ++-- src/corelib/global/qnumeric.cpp | 10 ++-- src/corelib/global/qnumeric.h | 10 ++-- src/corelib/global/qnumeric_p.h | 10 ++-- src/corelib/global/qt_pch.h | 10 ++-- src/corelib/global/qt_windows.h | 10 ++-- src/corelib/io/qabstractfileengine.cpp | 10 ++-- src/corelib/io/qabstractfileengine.h | 10 ++-- src/corelib/io/qabstractfileengine_p.h | 10 ++-- src/corelib/io/qbuffer.cpp | 10 ++-- src/corelib/io/qbuffer.h | 10 ++-- src/corelib/io/qdatastream.cpp | 10 ++-- src/corelib/io/qdatastream.h | 10 ++-- src/corelib/io/qdebug.cpp | 10 ++-- src/corelib/io/qdebug.h | 10 ++-- src/corelib/io/qdir.cpp | 10 ++-- src/corelib/io/qdir.h | 10 ++-- src/corelib/io/qdiriterator.cpp | 10 ++-- src/corelib/io/qdiriterator.h | 10 ++-- src/corelib/io/qfile.cpp | 10 ++-- src/corelib/io/qfile.h | 10 ++-- src/corelib/io/qfile_p.h | 10 ++-- src/corelib/io/qfileinfo.cpp | 10 ++-- src/corelib/io/qfileinfo.h | 10 ++-- src/corelib/io/qfileinfo_p.h | 10 ++-- src/corelib/io/qfilesystemwatcher.cpp | 10 ++-- src/corelib/io/qfilesystemwatcher.h | 10 ++-- src/corelib/io/qfilesystemwatcher_dnotify.cpp | 10 ++-- src/corelib/io/qfilesystemwatcher_dnotify_p.h | 10 ++-- src/corelib/io/qfilesystemwatcher_inotify.cpp | 10 ++-- src/corelib/io/qfilesystemwatcher_inotify_p.h | 10 ++-- src/corelib/io/qfilesystemwatcher_kqueue.cpp | 10 ++-- src/corelib/io/qfilesystemwatcher_kqueue_p.h | 10 ++-- src/corelib/io/qfilesystemwatcher_p.h | 10 ++-- src/corelib/io/qfilesystemwatcher_win.cpp | 10 ++-- src/corelib/io/qfilesystemwatcher_win_p.h | 10 ++-- src/corelib/io/qfsfileengine.cpp | 10 ++-- src/corelib/io/qfsfileengine.h | 10 ++-- src/corelib/io/qfsfileengine_iterator.cpp | 10 ++-- src/corelib/io/qfsfileengine_iterator_p.h | 10 ++-- src/corelib/io/qfsfileengine_iterator_unix.cpp | 10 ++-- src/corelib/io/qfsfileengine_iterator_win.cpp | 10 ++-- src/corelib/io/qfsfileengine_p.h | 10 ++-- src/corelib/io/qfsfileengine_unix.cpp | 10 ++-- src/corelib/io/qfsfileengine_win.cpp | 10 ++-- src/corelib/io/qiodevice.cpp | 10 ++-- src/corelib/io/qiodevice.h | 10 ++-- src/corelib/io/qiodevice_p.h | 10 ++-- src/corelib/io/qprocess.cpp | 10 ++-- src/corelib/io/qprocess.h | 10 ++-- src/corelib/io/qprocess_p.h | 10 ++-- src/corelib/io/qprocess_unix.cpp | 10 ++-- src/corelib/io/qprocess_win.cpp | 10 ++-- src/corelib/io/qresource.cpp | 10 ++-- src/corelib/io/qresource.h | 10 ++-- src/corelib/io/qresource_iterator.cpp | 10 ++-- src/corelib/io/qresource_iterator_p.h | 10 ++-- src/corelib/io/qresource_p.h | 10 ++-- src/corelib/io/qsettings.cpp | 10 ++-- src/corelib/io/qsettings.h | 10 ++-- src/corelib/io/qsettings_mac.cpp | 10 ++-- src/corelib/io/qsettings_p.h | 10 ++-- src/corelib/io/qsettings_win.cpp | 10 ++-- src/corelib/io/qtemporaryfile.cpp | 10 ++-- src/corelib/io/qtemporaryfile.h | 10 ++-- src/corelib/io/qtextstream.cpp | 10 ++-- src/corelib/io/qtextstream.h | 10 ++-- src/corelib/io/qurl.cpp | 10 ++-- src/corelib/io/qurl.h | 10 ++-- src/corelib/io/qwindowspipewriter.cpp | 10 ++-- src/corelib/io/qwindowspipewriter_p.h | 10 ++-- src/corelib/kernel/qabstracteventdispatcher.cpp | 10 ++-- src/corelib/kernel/qabstracteventdispatcher.h | 10 ++-- src/corelib/kernel/qabstracteventdispatcher_p.h | 10 ++-- src/corelib/kernel/qabstractitemmodel.cpp | 10 ++-- src/corelib/kernel/qabstractitemmodel.h | 10 ++-- src/corelib/kernel/qabstractitemmodel_p.h | 10 ++-- src/corelib/kernel/qbasictimer.cpp | 10 ++-- src/corelib/kernel/qbasictimer.h | 10 ++-- src/corelib/kernel/qcore_mac.cpp | 10 ++-- src/corelib/kernel/qcore_mac_p.h | 10 ++-- src/corelib/kernel/qcoreapplication.cpp | 10 ++-- src/corelib/kernel/qcoreapplication.h | 10 ++-- src/corelib/kernel/qcoreapplication_mac.cpp | 10 ++-- src/corelib/kernel/qcoreapplication_p.h | 10 ++-- src/corelib/kernel/qcoreapplication_win.cpp | 10 ++-- src/corelib/kernel/qcorecmdlineargs_p.h | 10 ++-- src/corelib/kernel/qcoreevent.cpp | 10 ++-- src/corelib/kernel/qcoreevent.h | 10 ++-- src/corelib/kernel/qcoreglobaldata.cpp | 10 ++-- src/corelib/kernel/qcoreglobaldata_p.h | 10 ++-- src/corelib/kernel/qcrashhandler.cpp | 10 ++-- src/corelib/kernel/qcrashhandler_p.h | 10 ++-- src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++-- src/corelib/kernel/qeventdispatcher_glib_p.h | 10 ++-- src/corelib/kernel/qeventdispatcher_unix.cpp | 10 ++-- src/corelib/kernel/qeventdispatcher_unix_p.h | 10 ++-- src/corelib/kernel/qeventdispatcher_win.cpp | 10 ++-- src/corelib/kernel/qeventdispatcher_win_p.h | 10 ++-- src/corelib/kernel/qeventloop.cpp | 10 ++-- src/corelib/kernel/qeventloop.h | 10 ++-- src/corelib/kernel/qfunctions_p.h | 10 ++-- src/corelib/kernel/qfunctions_wince.cpp | 10 ++-- src/corelib/kernel/qfunctions_wince.h | 10 ++-- src/corelib/kernel/qmath.h | 10 ++-- src/corelib/kernel/qmetaobject.cpp | 10 ++-- src/corelib/kernel/qmetaobject.h | 10 ++-- src/corelib/kernel/qmetaobject_p.h | 10 ++-- src/corelib/kernel/qmetatype.cpp | 10 ++-- src/corelib/kernel/qmetatype.h | 10 ++-- src/corelib/kernel/qmimedata.cpp | 10 ++-- src/corelib/kernel/qmimedata.h | 10 ++-- src/corelib/kernel/qobject.cpp | 10 ++-- src/corelib/kernel/qobject.h | 10 ++-- src/corelib/kernel/qobject_p.h | 10 ++-- src/corelib/kernel/qobjectcleanuphandler.cpp | 10 ++-- src/corelib/kernel/qobjectcleanuphandler.h | 10 ++-- src/corelib/kernel/qobjectdefs.h | 10 ++-- src/corelib/kernel/qpointer.cpp | 10 ++-- src/corelib/kernel/qpointer.h | 10 ++-- src/corelib/kernel/qsharedmemory.cpp | 10 ++-- src/corelib/kernel/qsharedmemory.h | 10 ++-- src/corelib/kernel/qsharedmemory_p.h | 10 ++-- src/corelib/kernel/qsharedmemory_unix.cpp | 10 ++-- src/corelib/kernel/qsharedmemory_win.cpp | 10 ++-- src/corelib/kernel/qsignalmapper.cpp | 10 ++-- src/corelib/kernel/qsignalmapper.h | 10 ++-- src/corelib/kernel/qsocketnotifier.cpp | 10 ++-- src/corelib/kernel/qsocketnotifier.h | 10 ++-- src/corelib/kernel/qsystemsemaphore.cpp | 10 ++-- src/corelib/kernel/qsystemsemaphore.h | 10 ++-- src/corelib/kernel/qsystemsemaphore_p.h | 10 ++-- src/corelib/kernel/qsystemsemaphore_unix.cpp | 10 ++-- src/corelib/kernel/qsystemsemaphore_win.cpp | 10 ++-- src/corelib/kernel/qtimer.cpp | 10 ++-- src/corelib/kernel/qtimer.h | 10 ++-- src/corelib/kernel/qtranslator.cpp | 10 ++-- src/corelib/kernel/qtranslator.h | 10 ++-- src/corelib/kernel/qtranslator_p.h | 10 ++-- src/corelib/kernel/qvariant.cpp | 10 ++-- src/corelib/kernel/qvariant.h | 10 ++-- src/corelib/kernel/qvariant_p.h | 10 ++-- src/corelib/kernel/qwineventnotifier_p.cpp | 10 ++-- src/corelib/kernel/qwineventnotifier_p.h | 10 ++-- src/corelib/plugin/qfactoryinterface.h | 10 ++-- src/corelib/plugin/qfactoryloader.cpp | 10 ++-- src/corelib/plugin/qfactoryloader_p.h | 10 ++-- src/corelib/plugin/qlibrary.cpp | 10 ++-- src/corelib/plugin/qlibrary.h | 10 ++-- src/corelib/plugin/qlibrary_p.h | 10 ++-- src/corelib/plugin/qlibrary_unix.cpp | 10 ++-- src/corelib/plugin/qlibrary_win.cpp | 10 ++-- src/corelib/plugin/qplugin.h | 10 ++-- src/corelib/plugin/qpluginloader.cpp | 10 ++-- src/corelib/plugin/qpluginloader.h | 10 ++-- src/corelib/plugin/quuid.cpp | 10 ++-- src/corelib/plugin/quuid.h | 10 ++-- src/corelib/thread/qatomic.cpp | 10 ++-- src/corelib/thread/qatomic.h | 10 ++-- src/corelib/thread/qbasicatomic.h | 10 ++-- src/corelib/thread/qmutex.cpp | 10 ++-- src/corelib/thread/qmutex.h | 10 ++-- src/corelib/thread/qmutex_p.h | 10 ++-- src/corelib/thread/qmutex_unix.cpp | 10 ++-- src/corelib/thread/qmutex_win.cpp | 10 ++-- src/corelib/thread/qmutexpool.cpp | 10 ++-- src/corelib/thread/qmutexpool_p.h | 10 ++-- src/corelib/thread/qorderedmutexlocker_p.h | 10 ++-- src/corelib/thread/qreadwritelock.cpp | 10 ++-- src/corelib/thread/qreadwritelock.h | 10 ++-- src/corelib/thread/qreadwritelock_p.h | 10 ++-- src/corelib/thread/qsemaphore.cpp | 10 ++-- src/corelib/thread/qsemaphore.h | 10 ++-- src/corelib/thread/qthread.cpp | 10 ++-- src/corelib/thread/qthread.h | 10 ++-- src/corelib/thread/qthread_p.h | 10 ++-- src/corelib/thread/qthread_unix.cpp | 10 ++-- src/corelib/thread/qthread_win.cpp | 10 ++-- src/corelib/thread/qthreadstorage.cpp | 10 ++-- src/corelib/thread/qthreadstorage.h | 10 ++-- src/corelib/thread/qwaitcondition.h | 10 ++-- src/corelib/thread/qwaitcondition_unix.cpp | 10 ++-- src/corelib/thread/qwaitcondition_win.cpp | 10 ++-- src/corelib/tools/qalgorithms.h | 10 ++-- src/corelib/tools/qbitarray.cpp | 10 ++-- src/corelib/tools/qbitarray.h | 10 ++-- src/corelib/tools/qbytearray.cpp | 10 ++-- src/corelib/tools/qbytearray.h | 10 ++-- src/corelib/tools/qbytearraymatcher.cpp | 10 ++-- src/corelib/tools/qbytearraymatcher.h | 10 ++-- src/corelib/tools/qcache.h | 10 ++-- src/corelib/tools/qchar.cpp | 10 ++-- src/corelib/tools/qchar.h | 10 ++-- src/corelib/tools/qcontainerfwd.h | 10 ++-- src/corelib/tools/qcryptographichash.cpp | 10 ++-- src/corelib/tools/qcryptographichash.h | 10 ++-- src/corelib/tools/qdatetime.cpp | 10 ++-- src/corelib/tools/qdatetime.h | 10 ++-- src/corelib/tools/qdatetime_p.h | 10 ++-- src/corelib/tools/qdumper.cpp | 10 ++-- src/corelib/tools/qharfbuzz.cpp | 10 ++-- src/corelib/tools/qharfbuzz_p.h | 10 ++-- src/corelib/tools/qhash.cpp | 10 ++-- src/corelib/tools/qhash.h | 10 ++-- src/corelib/tools/qiterator.h | 10 ++-- src/corelib/tools/qline.cpp | 10 ++-- src/corelib/tools/qline.h | 10 ++-- src/corelib/tools/qlinkedlist.cpp | 10 ++-- src/corelib/tools/qlinkedlist.h | 10 ++-- src/corelib/tools/qlist.h | 10 ++-- src/corelib/tools/qlistdata.cpp | 10 ++-- src/corelib/tools/qlocale.cpp | 10 ++-- src/corelib/tools/qlocale.h | 10 ++-- src/corelib/tools/qlocale_data_p.h | 10 ++-- src/corelib/tools/qlocale_p.h | 10 ++-- src/corelib/tools/qmap.cpp | 10 ++-- src/corelib/tools/qmap.h | 10 ++-- src/corelib/tools/qpair.h | 10 ++-- src/corelib/tools/qpodlist_p.h | 10 ++-- src/corelib/tools/qpoint.cpp | 10 ++-- src/corelib/tools/qpoint.h | 10 ++-- src/corelib/tools/qqueue.cpp | 10 ++-- src/corelib/tools/qqueue.h | 10 ++-- src/corelib/tools/qrect.cpp | 10 ++-- src/corelib/tools/qrect.h | 10 ++-- src/corelib/tools/qregexp.cpp | 10 ++-- src/corelib/tools/qregexp.h | 10 ++-- src/corelib/tools/qringbuffer_p.h | 10 ++-- src/corelib/tools/qset.h | 10 ++-- src/corelib/tools/qshareddata.cpp | 10 ++-- src/corelib/tools/qshareddata.h | 10 ++-- src/corelib/tools/qsharedpointer.cpp | 10 ++-- src/corelib/tools/qsharedpointer.h | 10 ++-- src/corelib/tools/qsharedpointer_impl.h | 10 ++-- src/corelib/tools/qsize.cpp | 10 ++-- src/corelib/tools/qsize.h | 10 ++-- src/corelib/tools/qstack.cpp | 10 ++-- src/corelib/tools/qstack.h | 10 ++-- src/corelib/tools/qstring.cpp | 10 ++-- src/corelib/tools/qstring.h | 10 ++-- src/corelib/tools/qstringlist.cpp | 10 ++-- src/corelib/tools/qstringlist.h | 10 ++-- src/corelib/tools/qstringmatcher.cpp | 10 ++-- src/corelib/tools/qstringmatcher.h | 10 ++-- src/corelib/tools/qtextboundaryfinder.cpp | 10 ++-- src/corelib/tools/qtextboundaryfinder.h | 10 ++-- src/corelib/tools/qtimeline.cpp | 10 ++-- src/corelib/tools/qtimeline.h | 10 ++-- src/corelib/tools/qtools_p.h | 10 ++-- src/corelib/tools/qunicodetables.cpp | 10 ++-- src/corelib/tools/qunicodetables_p.h | 10 ++-- src/corelib/tools/qvarlengtharray.h | 10 ++-- src/corelib/tools/qvector.cpp | 10 ++-- src/corelib/tools/qvector.h | 10 ++-- src/corelib/tools/qvsnprintf.cpp | 10 ++-- src/corelib/xml/qxmlstream.cpp | 10 ++-- src/corelib/xml/qxmlstream.g | 10 ++-- src/corelib/xml/qxmlstream.h | 10 ++-- src/corelib/xml/qxmlstream_p.h | 10 ++-- src/corelib/xml/qxmlutils.cpp | 10 ++-- src/corelib/xml/qxmlutils_p.h | 10 ++-- src/dbus/qdbus_symbols.cpp | 10 ++-- src/dbus/qdbus_symbols_p.h | 10 ++-- src/dbus/qdbusabstractadaptor.cpp | 10 ++-- src/dbus/qdbusabstractadaptor.h | 10 ++-- src/dbus/qdbusabstractadaptor_p.h | 10 ++-- src/dbus/qdbusabstractinterface.cpp | 10 ++-- src/dbus/qdbusabstractinterface.h | 10 ++-- src/dbus/qdbusabstractinterface_p.h | 10 ++-- src/dbus/qdbusargument.cpp | 10 ++-- src/dbus/qdbusargument.h | 10 ++-- src/dbus/qdbusargument_p.h | 10 ++-- src/dbus/qdbusconnection.cpp | 10 ++-- src/dbus/qdbusconnection.h | 10 ++-- src/dbus/qdbusconnection_p.h | 10 ++-- src/dbus/qdbusconnectioninterface.cpp | 10 ++-- src/dbus/qdbusconnectioninterface.h | 10 ++-- src/dbus/qdbuscontext.cpp | 10 ++-- src/dbus/qdbuscontext.h | 10 ++-- src/dbus/qdbuscontext_p.h | 10 ++-- src/dbus/qdbusdemarshaller.cpp | 10 ++-- src/dbus/qdbuserror.cpp | 10 ++-- src/dbus/qdbuserror.h | 10 ++-- src/dbus/qdbusextratypes.cpp | 10 ++-- src/dbus/qdbusextratypes.h | 10 ++-- src/dbus/qdbusintegrator.cpp | 10 ++-- src/dbus/qdbusintegrator_p.h | 10 ++-- src/dbus/qdbusinterface.cpp | 10 ++-- src/dbus/qdbusinterface.h | 10 ++-- src/dbus/qdbusinterface_p.h | 10 ++-- src/dbus/qdbusinternalfilters.cpp | 10 ++-- src/dbus/qdbusintrospection.cpp | 10 ++-- src/dbus/qdbusintrospection_p.h | 10 ++-- src/dbus/qdbusmacros.h | 10 ++-- src/dbus/qdbusmarshaller.cpp | 10 ++-- src/dbus/qdbusmessage.cpp | 10 ++-- src/dbus/qdbusmessage.h | 10 ++-- src/dbus/qdbusmessage_p.h | 10 ++-- src/dbus/qdbusmetaobject.cpp | 10 ++-- src/dbus/qdbusmetaobject_p.h | 10 ++-- src/dbus/qdbusmetatype.cpp | 10 ++-- src/dbus/qdbusmetatype.h | 10 ++-- src/dbus/qdbusmetatype_p.h | 10 ++-- src/dbus/qdbusmisc.cpp | 10 ++-- src/dbus/qdbuspendingcall.cpp | 10 ++-- src/dbus/qdbuspendingcall.h | 10 ++-- src/dbus/qdbuspendingcall_p.h | 10 ++-- src/dbus/qdbuspendingreply.cpp | 10 ++-- src/dbus/qdbuspendingreply.h | 10 ++-- src/dbus/qdbusreply.cpp | 10 ++-- src/dbus/qdbusreply.h | 10 ++-- src/dbus/qdbusserver.cpp | 10 ++-- src/dbus/qdbusserver.h | 10 ++-- src/dbus/qdbusthread.cpp | 10 ++-- src/dbus/qdbusthreaddebug_p.h | 10 ++-- src/dbus/qdbusutil.cpp | 10 ++-- src/dbus/qdbusutil_p.h | 10 ++-- src/dbus/qdbusxmlgenerator.cpp | 10 ++-- src/dbus/qdbusxmlparser.cpp | 10 ++-- src/dbus/qdbusxmlparser_p.h | 10 ++-- src/gui/accessible/qaccessible.cpp | 10 ++-- src/gui/accessible/qaccessible.h | 10 ++-- src/gui/accessible/qaccessible2.cpp | 10 ++-- src/gui/accessible/qaccessible2.h | 10 ++-- src/gui/accessible/qaccessible_mac.mm | 10 ++-- src/gui/accessible/qaccessible_mac_carbon.cpp | 10 ++-- src/gui/accessible/qaccessible_mac_p.h | 10 ++-- src/gui/accessible/qaccessible_unix.cpp | 10 ++-- src/gui/accessible/qaccessible_win.cpp | 10 ++-- src/gui/accessible/qaccessiblebridge.cpp | 10 ++-- src/gui/accessible/qaccessiblebridge.h | 10 ++-- src/gui/accessible/qaccessibleobject.cpp | 10 ++-- src/gui/accessible/qaccessibleobject.h | 10 ++-- src/gui/accessible/qaccessibleplugin.cpp | 10 ++-- src/gui/accessible/qaccessibleplugin.h | 10 ++-- src/gui/accessible/qaccessiblewidget.cpp | 10 ++-- src/gui/accessible/qaccessiblewidget.h | 10 ++-- src/gui/dialogs/qabstractpagesetupdialog.cpp | 10 ++-- src/gui/dialogs/qabstractpagesetupdialog.h | 10 ++-- src/gui/dialogs/qabstractpagesetupdialog_p.h | 10 ++-- src/gui/dialogs/qabstractprintdialog.cpp | 10 ++-- src/gui/dialogs/qabstractprintdialog.h | 10 ++-- src/gui/dialogs/qabstractprintdialog_p.h | 10 ++-- src/gui/dialogs/qcolordialog.cpp | 10 ++-- src/gui/dialogs/qcolordialog.h | 10 ++-- src/gui/dialogs/qcolordialog_mac.mm | 10 ++-- src/gui/dialogs/qcolordialog_p.h | 10 ++-- src/gui/dialogs/qdialog.cpp | 10 ++-- src/gui/dialogs/qdialog.h | 10 ++-- src/gui/dialogs/qdialog_p.h | 10 ++-- src/gui/dialogs/qdialogsbinarycompat_win.cpp | 10 ++-- src/gui/dialogs/qerrormessage.cpp | 10 ++-- src/gui/dialogs/qerrormessage.h | 10 ++-- src/gui/dialogs/qfiledialog.cpp | 10 ++-- src/gui/dialogs/qfiledialog.h | 10 ++-- src/gui/dialogs/qfiledialog.ui | 10 ++-- src/gui/dialogs/qfiledialog_mac.mm | 10 ++-- src/gui/dialogs/qfiledialog_p.h | 10 ++-- src/gui/dialogs/qfiledialog_win.cpp | 10 ++-- src/gui/dialogs/qfiledialog_wince.ui | 10 ++-- src/gui/dialogs/qfileinfogatherer.cpp | 10 ++-- src/gui/dialogs/qfileinfogatherer_p.h | 10 ++-- src/gui/dialogs/qfilesystemmodel.cpp | 10 ++-- src/gui/dialogs/qfilesystemmodel.h | 10 ++-- src/gui/dialogs/qfilesystemmodel_p.h | 10 ++-- src/gui/dialogs/qfontdialog.cpp | 10 ++-- src/gui/dialogs/qfontdialog.h | 10 ++-- src/gui/dialogs/qfontdialog_mac.mm | 10 ++-- src/gui/dialogs/qfontdialog_p.h | 10 ++-- src/gui/dialogs/qinputdialog.cpp | 10 ++-- src/gui/dialogs/qinputdialog.h | 10 ++-- src/gui/dialogs/qmessagebox.cpp | 10 ++-- src/gui/dialogs/qmessagebox.h | 10 ++-- src/gui/dialogs/qnspanelproxy_mac.mm | 10 ++-- src/gui/dialogs/qpagesetupdialog.cpp | 10 ++-- src/gui/dialogs/qpagesetupdialog.h | 10 ++-- src/gui/dialogs/qpagesetupdialog_mac.mm | 10 ++-- src/gui/dialogs/qpagesetupdialog_unix.cpp | 10 ++-- src/gui/dialogs/qpagesetupdialog_unix_p.h | 10 ++-- src/gui/dialogs/qpagesetupdialog_win.cpp | 10 ++-- src/gui/dialogs/qprintdialog.h | 10 ++-- src/gui/dialogs/qprintdialog_mac.mm | 10 ++-- src/gui/dialogs/qprintdialog_qws.cpp | 10 ++-- src/gui/dialogs/qprintdialog_unix.cpp | 10 ++-- src/gui/dialogs/qprintdialog_win.cpp | 10 ++-- src/gui/dialogs/qprintpreviewdialog.cpp | 10 ++-- src/gui/dialogs/qprintpreviewdialog.h | 10 ++-- src/gui/dialogs/qprogressdialog.cpp | 10 ++-- src/gui/dialogs/qprogressdialog.h | 10 ++-- src/gui/dialogs/qsidebar.cpp | 10 ++-- src/gui/dialogs/qsidebar_p.h | 10 ++-- src/gui/dialogs/qwizard.cpp | 10 ++-- src/gui/dialogs/qwizard.h | 10 ++-- src/gui/dialogs/qwizard_win.cpp | 10 ++-- src/gui/dialogs/qwizard_win_p.h | 10 ++-- src/gui/embedded/qcopchannel_qws.cpp | 10 ++-- src/gui/embedded/qcopchannel_qws.h | 10 ++-- src/gui/embedded/qdecoration_qws.cpp | 10 ++-- src/gui/embedded/qdecoration_qws.h | 10 ++-- src/gui/embedded/qdecorationdefault_qws.cpp | 10 ++-- src/gui/embedded/qdecorationdefault_qws.h | 10 ++-- src/gui/embedded/qdecorationfactory_qws.cpp | 10 ++-- src/gui/embedded/qdecorationfactory_qws.h | 10 ++-- src/gui/embedded/qdecorationplugin_qws.cpp | 10 ++-- src/gui/embedded/qdecorationplugin_qws.h | 10 ++-- src/gui/embedded/qdecorationstyled_qws.cpp | 10 ++-- src/gui/embedded/qdecorationstyled_qws.h | 10 ++-- src/gui/embedded/qdecorationwindows_qws.cpp | 10 ++-- src/gui/embedded/qdecorationwindows_qws.h | 10 ++-- src/gui/embedded/qdirectpainter_qws.cpp | 10 ++-- src/gui/embedded/qdirectpainter_qws.h | 10 ++-- src/gui/embedded/qkbd_qws.cpp | 10 ++-- src/gui/embedded/qkbd_qws.h | 10 ++-- src/gui/embedded/qkbddriverfactory_qws.cpp | 10 ++-- src/gui/embedded/qkbddriverfactory_qws.h | 10 ++-- src/gui/embedded/qkbddriverplugin_qws.cpp | 10 ++-- src/gui/embedded/qkbddriverplugin_qws.h | 10 ++-- src/gui/embedded/qkbdpc101_qws.cpp | 10 ++-- src/gui/embedded/qkbdpc101_qws.h | 10 ++-- src/gui/embedded/qkbdsl5000_qws.cpp | 10 ++-- src/gui/embedded/qkbdsl5000_qws.h | 10 ++-- src/gui/embedded/qkbdtty_qws.cpp | 10 ++-- src/gui/embedded/qkbdtty_qws.h | 10 ++-- src/gui/embedded/qkbdum_qws.cpp | 10 ++-- src/gui/embedded/qkbdum_qws.h | 10 ++-- src/gui/embedded/qkbdusb_qws.cpp | 10 ++-- src/gui/embedded/qkbdusb_qws.h | 10 ++-- src/gui/embedded/qkbdvfb_qws.cpp | 10 ++-- src/gui/embedded/qkbdvfb_qws.h | 10 ++-- src/gui/embedded/qkbdvr41xx_qws.cpp | 10 ++-- src/gui/embedded/qkbdvr41xx_qws.h | 10 ++-- src/gui/embedded/qkbdyopy_qws.cpp | 10 ++-- src/gui/embedded/qkbdyopy_qws.h | 10 ++-- src/gui/embedded/qlock.cpp | 10 ++-- src/gui/embedded/qlock_p.h | 10 ++-- src/gui/embedded/qmouse_qws.cpp | 10 ++-- src/gui/embedded/qmouse_qws.h | 10 ++-- src/gui/embedded/qmousebus_qws.cpp | 10 ++-- src/gui/embedded/qmousebus_qws.h | 10 ++-- src/gui/embedded/qmousedriverfactory_qws.cpp | 10 ++-- src/gui/embedded/qmousedriverfactory_qws.h | 10 ++-- src/gui/embedded/qmousedriverplugin_qws.cpp | 10 ++-- src/gui/embedded/qmousedriverplugin_qws.h | 10 ++-- src/gui/embedded/qmouselinuxtp_qws.cpp | 10 ++-- src/gui/embedded/qmouselinuxtp_qws.h | 10 ++-- src/gui/embedded/qmousepc_qws.cpp | 10 ++-- src/gui/embedded/qmousepc_qws.h | 10 ++-- src/gui/embedded/qmousetslib_qws.cpp | 10 ++-- src/gui/embedded/qmousetslib_qws.h | 10 ++-- src/gui/embedded/qmousevfb_qws.cpp | 10 ++-- src/gui/embedded/qmousevfb_qws.h | 10 ++-- src/gui/embedded/qmousevr41xx_qws.cpp | 10 ++-- src/gui/embedded/qmousevr41xx_qws.h | 10 ++-- src/gui/embedded/qmouseyopy_qws.cpp | 10 ++-- src/gui/embedded/qmouseyopy_qws.h | 10 ++-- src/gui/embedded/qscreen_qws.cpp | 10 ++-- src/gui/embedded/qscreen_qws.h | 10 ++-- src/gui/embedded/qscreendriverfactory_qws.cpp | 10 ++-- src/gui/embedded/qscreendriverfactory_qws.h | 10 ++-- src/gui/embedded/qscreendriverplugin_qws.cpp | 10 ++-- src/gui/embedded/qscreendriverplugin_qws.h | 10 ++-- src/gui/embedded/qscreenlinuxfb_qws.cpp | 10 ++-- src/gui/embedded/qscreenlinuxfb_qws.h | 10 ++-- src/gui/embedded/qscreenmulti_qws.cpp | 10 ++-- src/gui/embedded/qscreenmulti_qws_p.h | 10 ++-- src/gui/embedded/qscreenproxy_qws.cpp | 10 ++-- src/gui/embedded/qscreenproxy_qws.h | 10 ++-- src/gui/embedded/qscreentransformed_qws.cpp | 10 ++-- src/gui/embedded/qscreentransformed_qws.h | 10 ++-- src/gui/embedded/qscreenvfb_qws.cpp | 10 ++-- src/gui/embedded/qscreenvfb_qws.h | 10 ++-- src/gui/embedded/qsoundqss_qws.cpp | 10 ++-- src/gui/embedded/qsoundqss_qws.h | 10 ++-- src/gui/embedded/qtransportauth_qws.cpp | 10 ++-- src/gui/embedded/qtransportauth_qws.h | 10 ++-- src/gui/embedded/qtransportauth_qws_p.h | 10 ++-- src/gui/embedded/qtransportauthdefs_qws.h | 10 ++-- src/gui/embedded/qunixsocket.cpp | 10 ++-- src/gui/embedded/qunixsocket_p.h | 10 ++-- src/gui/embedded/qunixsocketserver.cpp | 10 ++-- src/gui/embedded/qunixsocketserver_p.h | 10 ++-- src/gui/embedded/qvfbhdr.h | 10 ++-- src/gui/embedded/qwindowsystem_p.h | 10 ++-- src/gui/embedded/qwindowsystem_qws.cpp | 10 ++-- src/gui/embedded/qwindowsystem_qws.h | 10 ++-- src/gui/embedded/qwscommand_qws.cpp | 10 ++-- src/gui/embedded/qwscommand_qws_p.h | 10 ++-- src/gui/embedded/qwscursor_qws.cpp | 10 ++-- src/gui/embedded/qwscursor_qws.h | 10 ++-- src/gui/embedded/qwsdisplay_qws.h | 10 ++-- src/gui/embedded/qwsdisplay_qws_p.h | 10 ++-- src/gui/embedded/qwsembedwidget.cpp | 10 ++-- src/gui/embedded/qwsembedwidget.h | 10 ++-- src/gui/embedded/qwsevent_qws.cpp | 10 ++-- src/gui/embedded/qwsevent_qws.h | 10 ++-- src/gui/embedded/qwslock.cpp | 10 ++-- src/gui/embedded/qwslock_p.h | 10 ++-- src/gui/embedded/qwsmanager_p.h | 10 ++-- src/gui/embedded/qwsmanager_qws.cpp | 10 ++-- src/gui/embedded/qwsmanager_qws.h | 10 ++-- src/gui/embedded/qwsproperty_qws.cpp | 10 ++-- src/gui/embedded/qwsproperty_qws.h | 10 ++-- src/gui/embedded/qwsprotocolitem_qws.h | 10 ++-- src/gui/embedded/qwssharedmemory.cpp | 10 ++-- src/gui/embedded/qwssharedmemory_p.h | 10 ++-- src/gui/embedded/qwssignalhandler.cpp | 10 ++-- src/gui/embedded/qwssignalhandler_p.h | 10 ++-- src/gui/embedded/qwssocket_qws.cpp | 10 ++-- src/gui/embedded/qwssocket_qws.h | 10 ++-- src/gui/embedded/qwsutils_qws.h | 10 ++-- src/gui/graphicsview/qgraphicsgridlayout.cpp | 10 ++-- src/gui/graphicsview/qgraphicsgridlayout.h | 10 ++-- src/gui/graphicsview/qgraphicsitem.cpp | 10 ++-- src/gui/graphicsview/qgraphicsitem.h | 10 ++-- src/gui/graphicsview/qgraphicsitem_p.h | 10 ++-- src/gui/graphicsview/qgraphicsitemanimation.cpp | 10 ++-- src/gui/graphicsview/qgraphicsitemanimation.h | 10 ++-- src/gui/graphicsview/qgraphicslayout.cpp | 10 ++-- src/gui/graphicsview/qgraphicslayout.h | 10 ++-- src/gui/graphicsview/qgraphicslayout_p.cpp | 10 ++-- src/gui/graphicsview/qgraphicslayout_p.h | 10 ++-- src/gui/graphicsview/qgraphicslayoutitem.cpp | 10 ++-- src/gui/graphicsview/qgraphicslayoutitem.h | 10 ++-- src/gui/graphicsview/qgraphicslayoutitem_p.h | 10 ++-- src/gui/graphicsview/qgraphicslinearlayout.cpp | 10 ++-- src/gui/graphicsview/qgraphicslinearlayout.h | 10 ++-- src/gui/graphicsview/qgraphicsproxywidget.cpp | 10 ++-- src/gui/graphicsview/qgraphicsproxywidget.h | 10 ++-- src/gui/graphicsview/qgraphicsproxywidget_p.h | 10 ++-- src/gui/graphicsview/qgraphicsscene.cpp | 10 ++-- src/gui/graphicsview/qgraphicsscene.h | 10 ++-- src/gui/graphicsview/qgraphicsscene_bsp.cpp | 10 ++-- src/gui/graphicsview/qgraphicsscene_bsp_p.h | 10 ++-- src/gui/graphicsview/qgraphicsscene_p.h | 10 ++-- src/gui/graphicsview/qgraphicssceneevent.cpp | 10 ++-- src/gui/graphicsview/qgraphicssceneevent.h | 10 ++-- src/gui/graphicsview/qgraphicsview.cpp | 10 ++-- src/gui/graphicsview/qgraphicsview.h | 10 ++-- src/gui/graphicsview/qgraphicsview_p.h | 10 ++-- src/gui/graphicsview/qgraphicswidget.cpp | 10 ++-- src/gui/graphicsview/qgraphicswidget.h | 10 ++-- src/gui/graphicsview/qgraphicswidget_p.cpp | 10 ++-- src/gui/graphicsview/qgraphicswidget_p.h | 10 ++-- src/gui/graphicsview/qgridlayoutengine.cpp | 10 ++-- src/gui/graphicsview/qgridlayoutengine_p.h | 10 ++-- src/gui/image/qbitmap.cpp | 10 ++-- src/gui/image/qbitmap.h | 10 ++-- src/gui/image/qbmphandler.cpp | 10 ++-- src/gui/image/qbmphandler_p.h | 10 ++-- src/gui/image/qicon.cpp | 10 ++-- src/gui/image/qicon.h | 10 ++-- src/gui/image/qiconengine.cpp | 10 ++-- src/gui/image/qiconengine.h | 10 ++-- src/gui/image/qiconengineplugin.cpp | 10 ++-- src/gui/image/qiconengineplugin.h | 10 ++-- src/gui/image/qimage.cpp | 10 ++-- src/gui/image/qimage.h | 10 ++-- src/gui/image/qimage_p.h | 10 ++-- src/gui/image/qimageiohandler.cpp | 10 ++-- src/gui/image/qimageiohandler.h | 10 ++-- src/gui/image/qimagereader.cpp | 10 ++-- src/gui/image/qimagereader.h | 10 ++-- src/gui/image/qimagewriter.cpp | 10 ++-- src/gui/image/qimagewriter.h | 10 ++-- src/gui/image/qmovie.cpp | 10 ++-- src/gui/image/qmovie.h | 10 ++-- src/gui/image/qnativeimage.cpp | 10 ++-- src/gui/image/qnativeimage_p.h | 10 ++-- src/gui/image/qpaintengine_pic.cpp | 10 ++-- src/gui/image/qpaintengine_pic_p.h | 10 ++-- src/gui/image/qpicture.cpp | 10 ++-- src/gui/image/qpicture.h | 10 ++-- src/gui/image/qpicture_p.h | 10 ++-- src/gui/image/qpictureformatplugin.cpp | 10 ++-- src/gui/image/qpictureformatplugin.h | 10 ++-- src/gui/image/qpixmap.cpp | 10 ++-- src/gui/image/qpixmap.h | 10 ++-- src/gui/image/qpixmap_mac.cpp | 10 ++-- src/gui/image/qpixmap_mac_p.h | 10 ++-- src/gui/image/qpixmap_qws.cpp | 10 ++-- src/gui/image/qpixmap_raster.cpp | 10 ++-- src/gui/image/qpixmap_raster_p.h | 10 ++-- src/gui/image/qpixmap_win.cpp | 10 ++-- src/gui/image/qpixmap_x11.cpp | 10 ++-- src/gui/image/qpixmap_x11_p.h | 10 ++-- src/gui/image/qpixmapcache.cpp | 10 ++-- src/gui/image/qpixmapcache.h | 10 ++-- src/gui/image/qpixmapdata.cpp | 10 ++-- src/gui/image/qpixmapdata_p.h | 10 ++-- src/gui/image/qpixmapdatafactory.cpp | 10 ++-- src/gui/image/qpixmapdatafactory_p.h | 10 ++-- src/gui/image/qpixmapfilter.cpp | 10 ++-- src/gui/image/qpixmapfilter_p.h | 10 ++-- src/gui/image/qpnghandler.cpp | 10 ++-- src/gui/image/qpnghandler_p.h | 10 ++-- src/gui/image/qppmhandler.cpp | 10 ++-- src/gui/image/qppmhandler_p.h | 10 ++-- src/gui/image/qxbmhandler.cpp | 10 ++-- src/gui/image/qxbmhandler_p.h | 10 ++-- src/gui/image/qxpmhandler.cpp | 10 ++-- src/gui/image/qxpmhandler_p.h | 10 ++-- src/gui/inputmethod/qinputcontext.cpp | 10 ++-- src/gui/inputmethod/qinputcontext.h | 10 ++-- src/gui/inputmethod/qinputcontext_p.h | 10 ++-- src/gui/inputmethod/qinputcontextfactory.cpp | 10 ++-- src/gui/inputmethod/qinputcontextfactory.h | 10 ++-- src/gui/inputmethod/qinputcontextplugin.cpp | 10 ++-- src/gui/inputmethod/qinputcontextplugin.h | 10 ++-- src/gui/inputmethod/qmacinputcontext_mac.cpp | 10 ++-- src/gui/inputmethod/qmacinputcontext_p.h | 10 ++-- src/gui/inputmethod/qwininputcontext_p.h | 10 ++-- src/gui/inputmethod/qwininputcontext_win.cpp | 10 ++-- src/gui/inputmethod/qwsinputcontext_p.h | 10 ++-- src/gui/inputmethod/qwsinputcontext_qws.cpp | 10 ++-- src/gui/inputmethod/qximinputcontext_p.h | 10 ++-- src/gui/inputmethod/qximinputcontext_x11.cpp | 10 ++-- src/gui/itemviews/qabstractitemdelegate.cpp | 10 ++-- src/gui/itemviews/qabstractitemdelegate.h | 10 ++-- src/gui/itemviews/qabstractitemview.cpp | 10 ++-- src/gui/itemviews/qabstractitemview.h | 10 ++-- src/gui/itemviews/qabstractitemview_p.h | 10 ++-- src/gui/itemviews/qabstractproxymodel.cpp | 10 ++-- src/gui/itemviews/qabstractproxymodel.h | 10 ++-- src/gui/itemviews/qabstractproxymodel_p.h | 10 ++-- src/gui/itemviews/qbsptree.cpp | 10 ++-- src/gui/itemviews/qbsptree_p.h | 10 ++-- src/gui/itemviews/qcolumnview.cpp | 10 ++-- src/gui/itemviews/qcolumnview.h | 10 ++-- src/gui/itemviews/qcolumnview_p.h | 10 ++-- src/gui/itemviews/qcolumnviewgrip.cpp | 10 ++-- src/gui/itemviews/qcolumnviewgrip_p.h | 10 ++-- src/gui/itemviews/qdatawidgetmapper.cpp | 10 ++-- src/gui/itemviews/qdatawidgetmapper.h | 10 ++-- src/gui/itemviews/qdirmodel.cpp | 10 ++-- src/gui/itemviews/qdirmodel.h | 10 ++-- src/gui/itemviews/qfileiconprovider.cpp | 10 ++-- src/gui/itemviews/qfileiconprovider.h | 10 ++-- src/gui/itemviews/qheaderview.cpp | 10 ++-- src/gui/itemviews/qheaderview.h | 10 ++-- src/gui/itemviews/qheaderview_p.h | 10 ++-- src/gui/itemviews/qitemdelegate.cpp | 10 ++-- src/gui/itemviews/qitemdelegate.h | 10 ++-- src/gui/itemviews/qitemeditorfactory.cpp | 10 ++-- src/gui/itemviews/qitemeditorfactory.h | 10 ++-- src/gui/itemviews/qitemeditorfactory_p.h | 10 ++-- src/gui/itemviews/qitemselectionmodel.cpp | 10 ++-- src/gui/itemviews/qitemselectionmodel.h | 10 ++-- src/gui/itemviews/qitemselectionmodel_p.h | 10 ++-- src/gui/itemviews/qlistview.cpp | 10 ++-- src/gui/itemviews/qlistview.h | 10 ++-- src/gui/itemviews/qlistview_p.h | 10 ++-- src/gui/itemviews/qlistwidget.cpp | 10 ++-- src/gui/itemviews/qlistwidget.h | 10 ++-- src/gui/itemviews/qlistwidget_p.h | 10 ++-- src/gui/itemviews/qproxymodel.cpp | 10 ++-- src/gui/itemviews/qproxymodel.h | 10 ++-- src/gui/itemviews/qproxymodel_p.h | 10 ++-- src/gui/itemviews/qsortfilterproxymodel.cpp | 10 ++-- src/gui/itemviews/qsortfilterproxymodel.h | 10 ++-- src/gui/itemviews/qstandarditemmodel.cpp | 10 ++-- src/gui/itemviews/qstandarditemmodel.h | 10 ++-- src/gui/itemviews/qstandarditemmodel_p.h | 10 ++-- src/gui/itemviews/qstringlistmodel.cpp | 10 ++-- src/gui/itemviews/qstringlistmodel.h | 10 ++-- src/gui/itemviews/qstyleditemdelegate.cpp | 10 ++-- src/gui/itemviews/qstyleditemdelegate.h | 10 ++-- src/gui/itemviews/qtableview.cpp | 10 ++-- src/gui/itemviews/qtableview.h | 10 ++-- src/gui/itemviews/qtableview_p.h | 10 ++-- src/gui/itemviews/qtablewidget.cpp | 10 ++-- src/gui/itemviews/qtablewidget.h | 10 ++-- src/gui/itemviews/qtablewidget_p.h | 10 ++-- src/gui/itemviews/qtreeview.cpp | 10 ++-- src/gui/itemviews/qtreeview.h | 10 ++-- src/gui/itemviews/qtreeview_p.h | 10 ++-- src/gui/itemviews/qtreewidget.cpp | 10 ++-- src/gui/itemviews/qtreewidget.h | 10 ++-- src/gui/itemviews/qtreewidget_p.h | 10 ++-- src/gui/itemviews/qtreewidgetitemiterator.cpp | 10 ++-- src/gui/itemviews/qtreewidgetitemiterator.h | 10 ++-- src/gui/itemviews/qtreewidgetitemiterator_p.h | 10 ++-- src/gui/itemviews/qwidgetitemdata_p.h | 10 ++-- src/gui/kernel/qaction.cpp | 10 ++-- src/gui/kernel/qaction.h | 10 ++-- src/gui/kernel/qaction_p.h | 10 ++-- src/gui/kernel/qactiongroup.cpp | 10 ++-- src/gui/kernel/qactiongroup.h | 10 ++-- src/gui/kernel/qapplication.cpp | 10 ++-- src/gui/kernel/qapplication.h | 10 ++-- src/gui/kernel/qapplication_mac.mm | 10 ++-- src/gui/kernel/qapplication_p.h | 10 ++-- src/gui/kernel/qapplication_qws.cpp | 10 ++-- src/gui/kernel/qapplication_win.cpp | 10 ++-- src/gui/kernel/qapplication_x11.cpp | 10 ++-- src/gui/kernel/qboxlayout.cpp | 10 ++-- src/gui/kernel/qboxlayout.h | 10 ++-- src/gui/kernel/qclipboard.cpp | 10 ++-- src/gui/kernel/qclipboard.h | 10 ++-- src/gui/kernel/qclipboard_mac.cpp | 10 ++-- src/gui/kernel/qclipboard_p.h | 10 ++-- src/gui/kernel/qclipboard_qws.cpp | 10 ++-- src/gui/kernel/qclipboard_win.cpp | 10 ++-- src/gui/kernel/qclipboard_x11.cpp | 10 ++-- src/gui/kernel/qcocoaapplication_mac.mm | 10 ++-- src/gui/kernel/qcocoaapplication_mac_p.h | 10 ++-- src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 10 ++-- src/gui/kernel/qcocoaapplicationdelegate_mac_p.h | 10 ++-- src/gui/kernel/qcocoamenuloader_mac.mm | 10 ++-- src/gui/kernel/qcocoamenuloader_mac_p.h | 10 ++-- src/gui/kernel/qcocoapanel_mac.mm | 10 ++-- src/gui/kernel/qcocoapanel_mac_p.h | 10 ++-- src/gui/kernel/qcocoaview_mac.mm | 10 ++-- src/gui/kernel/qcocoaview_mac_p.h | 10 ++-- src/gui/kernel/qcocoawindow_mac.mm | 10 ++-- src/gui/kernel/qcocoawindow_mac_p.h | 10 ++-- src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm | 10 ++-- .../kernel/qcocoawindowcustomthemeframe_mac_p.h | 10 ++-- src/gui/kernel/qcocoawindowdelegate_mac.mm | 10 ++-- src/gui/kernel/qcocoawindowdelegate_mac_p.h | 10 ++-- src/gui/kernel/qcursor.cpp | 10 ++-- src/gui/kernel/qcursor.h | 10 ++-- src/gui/kernel/qcursor_mac.mm | 10 ++-- src/gui/kernel/qcursor_p.h | 10 ++-- src/gui/kernel/qcursor_qws.cpp | 10 ++-- src/gui/kernel/qcursor_win.cpp | 10 ++-- src/gui/kernel/qcursor_x11.cpp | 10 ++-- src/gui/kernel/qdesktopwidget.h | 10 ++-- src/gui/kernel/qdesktopwidget_mac.mm | 10 ++-- src/gui/kernel/qdesktopwidget_mac_p.h | 10 ++-- src/gui/kernel/qdesktopwidget_qws.cpp | 10 ++-- src/gui/kernel/qdesktopwidget_win.cpp | 10 ++-- src/gui/kernel/qdesktopwidget_x11.cpp | 10 ++-- src/gui/kernel/qdnd.cpp | 10 ++-- src/gui/kernel/qdnd_mac.mm | 10 ++-- src/gui/kernel/qdnd_p.h | 10 ++-- src/gui/kernel/qdnd_qws.cpp | 10 ++-- src/gui/kernel/qdnd_win.cpp | 10 ++-- src/gui/kernel/qdnd_x11.cpp | 10 ++-- src/gui/kernel/qdrag.cpp | 10 ++-- src/gui/kernel/qdrag.h | 10 ++-- src/gui/kernel/qevent.cpp | 10 ++-- src/gui/kernel/qevent.h | 10 ++-- src/gui/kernel/qevent_p.h | 10 ++-- src/gui/kernel/qeventdispatcher_glib_qws.cpp | 10 ++-- src/gui/kernel/qeventdispatcher_glib_qws_p.h | 10 ++-- src/gui/kernel/qeventdispatcher_mac.mm | 10 ++-- src/gui/kernel/qeventdispatcher_mac_p.h | 10 ++-- src/gui/kernel/qeventdispatcher_qws.cpp | 10 ++-- src/gui/kernel/qeventdispatcher_qws_p.h | 10 ++-- src/gui/kernel/qeventdispatcher_x11.cpp | 10 ++-- src/gui/kernel/qeventdispatcher_x11_p.h | 10 ++-- src/gui/kernel/qformlayout.cpp | 10 ++-- src/gui/kernel/qformlayout.h | 10 ++-- src/gui/kernel/qgridlayout.cpp | 10 ++-- src/gui/kernel/qgridlayout.h | 10 ++-- src/gui/kernel/qguieventdispatcher_glib.cpp | 10 ++-- src/gui/kernel/qguieventdispatcher_glib_p.h | 10 ++-- src/gui/kernel/qguifunctions_wince.cpp | 10 ++-- src/gui/kernel/qguifunctions_wince.h | 10 ++-- src/gui/kernel/qguivariant.cpp | 10 ++-- src/gui/kernel/qkeymapper.cpp | 10 ++-- src/gui/kernel/qkeymapper_mac.cpp | 10 ++-- src/gui/kernel/qkeymapper_p.h | 10 ++-- src/gui/kernel/qkeymapper_qws.cpp | 10 ++-- src/gui/kernel/qkeymapper_win.cpp | 10 ++-- src/gui/kernel/qkeymapper_x11.cpp | 10 ++-- src/gui/kernel/qkeymapper_x11_p.cpp | 10 ++-- src/gui/kernel/qkeysequence.cpp | 10 ++-- src/gui/kernel/qkeysequence.h | 10 ++-- src/gui/kernel/qkeysequence_p.h | 10 ++-- src/gui/kernel/qlayout.cpp | 10 ++-- src/gui/kernel/qlayout.h | 10 ++-- src/gui/kernel/qlayout_p.h | 10 ++-- src/gui/kernel/qlayoutengine.cpp | 10 ++-- src/gui/kernel/qlayoutengine_p.h | 10 ++-- src/gui/kernel/qlayoutitem.cpp | 10 ++-- src/gui/kernel/qlayoutitem.h | 10 ++-- src/gui/kernel/qmacdefines_mac.h | 10 ++-- src/gui/kernel/qmime.cpp | 10 ++-- src/gui/kernel/qmime.h | 10 ++-- src/gui/kernel/qmime_mac.cpp | 10 ++-- src/gui/kernel/qmime_win.cpp | 10 ++-- src/gui/kernel/qmotifdnd_x11.cpp | 10 ++-- src/gui/kernel/qnsframeview_mac_p.h | 10 ++-- src/gui/kernel/qnsthemeframe_mac_p.h | 10 ++-- src/gui/kernel/qnstitledframe_mac_p.h | 10 ++-- src/gui/kernel/qole_win.cpp | 10 ++-- src/gui/kernel/qpalette.cpp | 10 ++-- src/gui/kernel/qpalette.h | 10 ++-- src/gui/kernel/qsessionmanager.h | 10 ++-- src/gui/kernel/qsessionmanager_qws.cpp | 10 ++-- src/gui/kernel/qshortcut.cpp | 10 ++-- src/gui/kernel/qshortcut.h | 10 ++-- src/gui/kernel/qshortcutmap.cpp | 10 ++-- src/gui/kernel/qshortcutmap_p.h | 10 ++-- src/gui/kernel/qsizepolicy.h | 10 ++-- src/gui/kernel/qsound.cpp | 10 ++-- src/gui/kernel/qsound.h | 10 ++-- src/gui/kernel/qsound_mac.mm | 10 ++-- src/gui/kernel/qsound_p.h | 10 ++-- src/gui/kernel/qsound_qws.cpp | 10 ++-- src/gui/kernel/qsound_win.cpp | 10 ++-- src/gui/kernel/qsound_x11.cpp | 10 ++-- src/gui/kernel/qstackedlayout.cpp | 10 ++-- src/gui/kernel/qstackedlayout.h | 10 ++-- src/gui/kernel/qt_cocoa_helpers_mac.mm | 10 ++-- src/gui/kernel/qt_cocoa_helpers_mac_p.h | 10 ++-- src/gui/kernel/qt_gui_pch.h | 10 ++-- src/gui/kernel/qt_mac.cpp | 10 ++-- src/gui/kernel/qt_mac_p.h | 10 ++-- src/gui/kernel/qt_x11_p.h | 10 ++-- src/gui/kernel/qtooltip.cpp | 10 ++-- src/gui/kernel/qtooltip.h | 10 ++-- src/gui/kernel/qwhatsthis.cpp | 10 ++-- src/gui/kernel/qwhatsthis.h | 10 ++-- src/gui/kernel/qwidget.cpp | 10 ++-- src/gui/kernel/qwidget.h | 10 ++-- src/gui/kernel/qwidget_mac.mm | 10 ++-- src/gui/kernel/qwidget_p.h | 10 ++-- src/gui/kernel/qwidget_qws.cpp | 10 ++-- src/gui/kernel/qwidget_win.cpp | 10 ++-- src/gui/kernel/qwidget_wince.cpp | 10 ++-- src/gui/kernel/qwidget_x11.cpp | 10 ++-- src/gui/kernel/qwidgetaction.cpp | 10 ++-- src/gui/kernel/qwidgetaction.h | 10 ++-- src/gui/kernel/qwidgetaction_p.h | 10 ++-- src/gui/kernel/qwidgetcreate_x11.cpp | 10 ++-- src/gui/kernel/qwindowdefs.h | 10 ++-- src/gui/kernel/qwindowdefs_win.h | 10 ++-- src/gui/kernel/qx11embed_x11.cpp | 10 ++-- src/gui/kernel/qx11embed_x11.h | 10 ++-- src/gui/kernel/qx11info_x11.cpp | 10 ++-- src/gui/kernel/qx11info_x11.h | 10 ++-- src/gui/painting/qbackingstore.cpp | 10 ++-- src/gui/painting/qbackingstore_p.h | 10 ++-- src/gui/painting/qbezier.cpp | 10 ++-- src/gui/painting/qbezier_p.h | 10 ++-- src/gui/painting/qblendfunctions.cpp | 10 ++-- src/gui/painting/qbrush.cpp | 10 ++-- src/gui/painting/qbrush.h | 10 ++-- src/gui/painting/qcolor.cpp | 10 ++-- src/gui/painting/qcolor.h | 10 ++-- src/gui/painting/qcolor_p.cpp | 10 ++-- src/gui/painting/qcolor_p.h | 10 ++-- src/gui/painting/qcolormap.h | 10 ++-- src/gui/painting/qcolormap_mac.cpp | 10 ++-- src/gui/painting/qcolormap_qws.cpp | 10 ++-- src/gui/painting/qcolormap_win.cpp | 10 ++-- src/gui/painting/qcolormap_x11.cpp | 10 ++-- src/gui/painting/qcssutil.cpp | 10 ++-- src/gui/painting/qcssutil_p.h | 10 ++-- src/gui/painting/qcups.cpp | 10 ++-- src/gui/painting/qcups_p.h | 10 ++-- src/gui/painting/qdatabuffer_p.h | 10 ++-- src/gui/painting/qdrawhelper.cpp | 10 ++-- src/gui/painting/qdrawhelper_iwmmxt.cpp | 10 ++-- src/gui/painting/qdrawhelper_mmx.cpp | 10 ++-- src/gui/painting/qdrawhelper_mmx3dnow.cpp | 10 ++-- src/gui/painting/qdrawhelper_mmx_p.h | 10 ++-- src/gui/painting/qdrawhelper_p.h | 10 ++-- src/gui/painting/qdrawhelper_sse.cpp | 10 ++-- src/gui/painting/qdrawhelper_sse2.cpp | 10 ++-- src/gui/painting/qdrawhelper_sse3dnow.cpp | 10 ++-- src/gui/painting/qdrawhelper_sse_p.h | 10 ++-- src/gui/painting/qdrawhelper_x86_p.h | 10 ++-- src/gui/painting/qdrawutil.cpp | 10 ++-- src/gui/painting/qdrawutil.h | 10 ++-- src/gui/painting/qemulationpaintengine.cpp | 10 ++-- src/gui/painting/qemulationpaintengine_p.h | 10 ++-- src/gui/painting/qfixed_p.h | 10 ++-- src/gui/painting/qgraphicssystem.cpp | 10 ++-- src/gui/painting/qgraphicssystem_mac.cpp | 10 ++-- src/gui/painting/qgraphicssystem_mac_p.h | 10 ++-- src/gui/painting/qgraphicssystem_p.h | 10 ++-- src/gui/painting/qgraphicssystem_qws.cpp | 10 ++-- src/gui/painting/qgraphicssystem_qws_p.h | 10 ++-- src/gui/painting/qgraphicssystem_raster.cpp | 10 ++-- src/gui/painting/qgraphicssystem_raster_p.h | 10 ++-- src/gui/painting/qgraphicssystemfactory.cpp | 10 ++-- src/gui/painting/qgraphicssystemfactory_p.h | 10 ++-- src/gui/painting/qgraphicssystemplugin.cpp | 10 ++-- src/gui/painting/qgraphicssystemplugin_p.h | 10 ++-- src/gui/painting/qgrayraster.c | 10 ++-- src/gui/painting/qgrayraster_p.h | 10 ++-- src/gui/painting/qimagescale.cpp | 10 ++-- src/gui/painting/qimagescale_p.h | 10 ++-- src/gui/painting/qmath_p.h | 10 ++-- src/gui/painting/qmatrix.cpp | 10 ++-- src/gui/painting/qmatrix.h | 10 ++-- src/gui/painting/qmemrotate.cpp | 10 ++-- src/gui/painting/qmemrotate_p.h | 10 ++-- src/gui/painting/qoutlinemapper.cpp | 10 ++-- src/gui/painting/qoutlinemapper_p.h | 10 ++-- src/gui/painting/qpaintdevice.h | 10 ++-- src/gui/painting/qpaintdevice_mac.cpp | 10 ++-- src/gui/painting/qpaintdevice_qws.cpp | 10 ++-- src/gui/painting/qpaintdevice_win.cpp | 10 ++-- src/gui/painting/qpaintdevice_x11.cpp | 10 ++-- src/gui/painting/qpaintengine.cpp | 10 ++-- src/gui/painting/qpaintengine.h | 10 ++-- src/gui/painting/qpaintengine_alpha.cpp | 10 ++-- src/gui/painting/qpaintengine_alpha_p.h | 10 ++-- src/gui/painting/qpaintengine_d3d.cpp | 10 ++-- src/gui/painting/qpaintengine_d3d_p.h | 10 ++-- src/gui/painting/qpaintengine_mac.cpp | 10 ++-- src/gui/painting/qpaintengine_mac_p.h | 10 ++-- src/gui/painting/qpaintengine_p.h | 10 ++-- src/gui/painting/qpaintengine_preview.cpp | 10 ++-- src/gui/painting/qpaintengine_preview_p.h | 10 ++-- src/gui/painting/qpaintengine_raster.cpp | 10 ++-- src/gui/painting/qpaintengine_raster_p.h | 10 ++-- src/gui/painting/qpaintengine_x11.cpp | 10 ++-- src/gui/painting/qpaintengine_x11_p.h | 10 ++-- src/gui/painting/qpaintengineex.cpp | 10 ++-- src/gui/painting/qpaintengineex_p.h | 10 ++-- src/gui/painting/qpainter.cpp | 10 ++-- src/gui/painting/qpainter.h | 10 ++-- src/gui/painting/qpainter_p.h | 10 ++-- src/gui/painting/qpainterpath.cpp | 10 ++-- src/gui/painting/qpainterpath.h | 10 ++-- src/gui/painting/qpainterpath_p.h | 10 ++-- src/gui/painting/qpathclipper.cpp | 10 ++-- src/gui/painting/qpathclipper_p.h | 10 ++-- src/gui/painting/qpdf.cpp | 10 ++-- src/gui/painting/qpdf_p.h | 10 ++-- src/gui/painting/qpen.cpp | 10 ++-- src/gui/painting/qpen.h | 10 ++-- src/gui/painting/qpen_p.h | 10 ++-- src/gui/painting/qpolygon.cpp | 10 ++-- src/gui/painting/qpolygon.h | 10 ++-- src/gui/painting/qpolygonclipper_p.h | 10 ++-- src/gui/painting/qprintengine.h | 10 ++-- src/gui/painting/qprintengine_mac.mm | 10 ++-- src/gui/painting/qprintengine_mac_p.h | 10 ++-- src/gui/painting/qprintengine_pdf.cpp | 10 ++-- src/gui/painting/qprintengine_pdf_p.h | 10 ++-- src/gui/painting/qprintengine_ps.cpp | 10 ++-- src/gui/painting/qprintengine_ps_p.h | 10 ++-- src/gui/painting/qprintengine_qws.cpp | 10 ++-- src/gui/painting/qprintengine_qws_p.h | 10 ++-- src/gui/painting/qprintengine_win.cpp | 10 ++-- src/gui/painting/qprintengine_win_p.h | 10 ++-- src/gui/painting/qprinter.cpp | 10 ++-- src/gui/painting/qprinter.h | 10 ++-- src/gui/painting/qprinter_p.h | 10 ++-- src/gui/painting/qprinterinfo.h | 10 ++-- src/gui/painting/qprinterinfo_mac.cpp | 10 ++-- src/gui/painting/qprinterinfo_unix.cpp | 10 ++-- src/gui/painting/qprinterinfo_unix_p.h | 10 ++-- src/gui/painting/qprinterinfo_win.cpp | 10 ++-- src/gui/painting/qrasterdefs_p.h | 10 ++-- src/gui/painting/qrasterizer.cpp | 10 ++-- src/gui/painting/qrasterizer_p.h | 10 ++-- src/gui/painting/qregion.cpp | 10 ++-- src/gui/painting/qregion.h | 10 ++-- src/gui/painting/qregion_mac.cpp | 10 ++-- src/gui/painting/qregion_qws.cpp | 10 ++-- src/gui/painting/qregion_win.cpp | 10 ++-- src/gui/painting/qregion_wince.cpp | 10 ++-- src/gui/painting/qregion_x11.cpp | 10 ++-- src/gui/painting/qrgb.h | 10 ++-- src/gui/painting/qstroker.cpp | 10 ++-- src/gui/painting/qstroker_p.h | 10 ++-- src/gui/painting/qstylepainter.cpp | 10 ++-- src/gui/painting/qstylepainter.h | 10 ++-- src/gui/painting/qtessellator.cpp | 10 ++-- src/gui/painting/qtessellator_p.h | 10 ++-- src/gui/painting/qtextureglyphcache.cpp | 10 ++-- src/gui/painting/qtextureglyphcache_p.h | 10 ++-- src/gui/painting/qtransform.cpp | 10 ++-- src/gui/painting/qtransform.h | 10 ++-- src/gui/painting/qvectorpath_p.h | 10 ++-- src/gui/painting/qwindowsurface.cpp | 10 ++-- src/gui/painting/qwindowsurface_d3d.cpp | 10 ++-- src/gui/painting/qwindowsurface_d3d_p.h | 10 ++-- src/gui/painting/qwindowsurface_mac.cpp | 10 ++-- src/gui/painting/qwindowsurface_mac_p.h | 10 ++-- src/gui/painting/qwindowsurface_p.h | 10 ++-- src/gui/painting/qwindowsurface_qws.cpp | 10 ++-- src/gui/painting/qwindowsurface_qws_p.h | 10 ++-- src/gui/painting/qwindowsurface_raster.cpp | 10 ++-- src/gui/painting/qwindowsurface_raster_p.h | 10 ++-- src/gui/painting/qwindowsurface_x11.cpp | 10 ++-- src/gui/painting/qwindowsurface_x11_p.h | 10 ++-- src/gui/painting/qwmatrix.h | 10 ++-- src/gui/styles/gtksymbols.cpp | 10 ++-- src/gui/styles/gtksymbols_p.h | 10 ++-- src/gui/styles/qcdestyle.cpp | 10 ++-- src/gui/styles/qcdestyle.h | 10 ++-- src/gui/styles/qcleanlooksstyle.cpp | 10 ++-- src/gui/styles/qcleanlooksstyle.h | 10 ++-- src/gui/styles/qcleanlooksstyle_p.h | 10 ++-- src/gui/styles/qcommonstyle.cpp | 10 ++-- src/gui/styles/qcommonstyle.h | 10 ++-- src/gui/styles/qcommonstyle_p.h | 10 ++-- src/gui/styles/qcommonstylepixmaps_p.h | 10 ++-- src/gui/styles/qgtkpainter.cpp | 10 ++-- src/gui/styles/qgtkpainter_p.h | 10 ++-- src/gui/styles/qgtkstyle.cpp | 10 ++-- src/gui/styles/qgtkstyle.h | 10 ++-- src/gui/styles/qmacstyle_mac.h | 10 ++-- src/gui/styles/qmacstyle_mac.mm | 10 ++-- src/gui/styles/qmacstylepixmaps_mac_p.h | 10 ++-- src/gui/styles/qmotifstyle.cpp | 10 ++-- src/gui/styles/qmotifstyle.h | 10 ++-- src/gui/styles/qmotifstyle_p.h | 10 ++-- src/gui/styles/qplastiquestyle.cpp | 10 ++-- src/gui/styles/qplastiquestyle.h | 10 ++-- src/gui/styles/qstyle.cpp | 10 ++-- src/gui/styles/qstyle.h | 10 ++-- src/gui/styles/qstyle_p.h | 10 ++-- src/gui/styles/qstylefactory.cpp | 10 ++-- src/gui/styles/qstylefactory.h | 10 ++-- src/gui/styles/qstyleoption.cpp | 10 ++-- src/gui/styles/qstyleoption.h | 10 ++-- src/gui/styles/qstyleplugin.cpp | 10 ++-- src/gui/styles/qstyleplugin.h | 10 ++-- src/gui/styles/qstylesheetstyle.cpp | 10 ++-- src/gui/styles/qstylesheetstyle_default.cpp | 10 ++-- src/gui/styles/qstylesheetstyle_p.h | 10 ++-- src/gui/styles/qwindowscestyle.cpp | 10 ++-- src/gui/styles/qwindowscestyle.h | 10 ++-- src/gui/styles/qwindowscestyle_p.h | 10 ++-- src/gui/styles/qwindowsmobilestyle.cpp | 10 ++-- src/gui/styles/qwindowsmobilestyle.h | 10 ++-- src/gui/styles/qwindowsmobilestyle_p.h | 10 ++-- src/gui/styles/qwindowsstyle.cpp | 10 ++-- src/gui/styles/qwindowsstyle.h | 10 ++-- src/gui/styles/qwindowsstyle_p.h | 10 ++-- src/gui/styles/qwindowsvistastyle.cpp | 10 ++-- src/gui/styles/qwindowsvistastyle.h | 10 ++-- src/gui/styles/qwindowsvistastyle_p.h | 10 ++-- src/gui/styles/qwindowsxpstyle.cpp | 10 ++-- src/gui/styles/qwindowsxpstyle.h | 10 ++-- src/gui/styles/qwindowsxpstyle_p.h | 10 ++-- src/gui/text/qabstractfontengine_p.h | 10 ++-- src/gui/text/qabstractfontengine_qws.cpp | 10 ++-- src/gui/text/qabstractfontengine_qws.h | 10 ++-- src/gui/text/qabstracttextdocumentlayout.cpp | 10 ++-- src/gui/text/qabstracttextdocumentlayout.h | 10 ++-- src/gui/text/qabstracttextdocumentlayout_p.h | 10 ++-- src/gui/text/qcssparser.cpp | 10 ++-- src/gui/text/qcssparser_p.h | 10 ++-- src/gui/text/qcssscanner.cpp | 10 ++-- src/gui/text/qfont.cpp | 10 ++-- src/gui/text/qfont.h | 10 ++-- src/gui/text/qfont_mac.cpp | 10 ++-- src/gui/text/qfont_p.h | 10 ++-- src/gui/text/qfont_qws.cpp | 10 ++-- src/gui/text/qfont_win.cpp | 10 ++-- src/gui/text/qfont_x11.cpp | 10 ++-- src/gui/text/qfontdatabase.cpp | 10 ++-- src/gui/text/qfontdatabase.h | 10 ++-- src/gui/text/qfontdatabase_mac.cpp | 10 ++-- src/gui/text/qfontdatabase_qws.cpp | 10 ++-- src/gui/text/qfontdatabase_win.cpp | 10 ++-- src/gui/text/qfontdatabase_x11.cpp | 10 ++-- src/gui/text/qfontengine.cpp | 10 ++-- src/gui/text/qfontengine_ft.cpp | 10 ++-- src/gui/text/qfontengine_ft_p.h | 10 ++-- src/gui/text/qfontengine_mac.mm | 10 ++-- src/gui/text/qfontengine_p.h | 10 ++-- src/gui/text/qfontengine_qpf.cpp | 10 ++-- src/gui/text/qfontengine_qpf_p.h | 10 ++-- src/gui/text/qfontengine_qws.cpp | 10 ++-- src/gui/text/qfontengine_win.cpp | 10 ++-- src/gui/text/qfontengine_win_p.h | 10 ++-- src/gui/text/qfontengine_x11.cpp | 10 ++-- src/gui/text/qfontengine_x11_p.h | 10 ++-- src/gui/text/qfontengineglyphcache_p.h | 10 ++-- src/gui/text/qfontinfo.h | 10 ++-- src/gui/text/qfontmetrics.cpp | 10 ++-- src/gui/text/qfontmetrics.h | 10 ++-- src/gui/text/qfontsubset.cpp | 10 ++-- src/gui/text/qfontsubset_p.h | 10 ++-- src/gui/text/qfragmentmap.cpp | 10 ++-- src/gui/text/qfragmentmap_p.h | 10 ++-- src/gui/text/qpfutil.cpp | 10 ++-- src/gui/text/qsyntaxhighlighter.cpp | 10 ++-- src/gui/text/qsyntaxhighlighter.h | 10 ++-- src/gui/text/qtextcontrol.cpp | 10 ++-- src/gui/text/qtextcontrol_p.h | 10 ++-- src/gui/text/qtextcontrol_p_p.h | 10 ++-- src/gui/text/qtextcursor.cpp | 10 ++-- src/gui/text/qtextcursor.h | 10 ++-- src/gui/text/qtextcursor_p.h | 10 ++-- src/gui/text/qtextdocument.cpp | 10 ++-- src/gui/text/qtextdocument.h | 10 ++-- src/gui/text/qtextdocument_p.cpp | 10 ++-- src/gui/text/qtextdocument_p.h | 10 ++-- src/gui/text/qtextdocumentfragment.cpp | 10 ++-- src/gui/text/qtextdocumentfragment.h | 10 ++-- src/gui/text/qtextdocumentfragment_p.h | 10 ++-- src/gui/text/qtextdocumentlayout.cpp | 10 ++-- src/gui/text/qtextdocumentlayout_p.h | 10 ++-- src/gui/text/qtextdocumentwriter.cpp | 10 ++-- src/gui/text/qtextdocumentwriter.h | 10 ++-- src/gui/text/qtextengine.cpp | 10 ++-- src/gui/text/qtextengine_mac.cpp | 10 ++-- src/gui/text/qtextengine_p.h | 10 ++-- src/gui/text/qtextformat.cpp | 10 ++-- src/gui/text/qtextformat.h | 10 ++-- src/gui/text/qtextformat_p.h | 10 ++-- src/gui/text/qtexthtmlparser.cpp | 10 ++-- src/gui/text/qtexthtmlparser_p.h | 10 ++-- src/gui/text/qtextimagehandler.cpp | 10 ++-- src/gui/text/qtextimagehandler_p.h | 10 ++-- src/gui/text/qtextlayout.cpp | 10 ++-- src/gui/text/qtextlayout.h | 10 ++-- src/gui/text/qtextlist.cpp | 10 ++-- src/gui/text/qtextlist.h | 10 ++-- src/gui/text/qtextobject.cpp | 10 ++-- src/gui/text/qtextobject.h | 10 ++-- src/gui/text/qtextobject_p.h | 10 ++-- src/gui/text/qtextodfwriter.cpp | 10 ++-- src/gui/text/qtextodfwriter_p.h | 10 ++-- src/gui/text/qtextoption.cpp | 10 ++-- src/gui/text/qtextoption.h | 10 ++-- src/gui/text/qtexttable.cpp | 10 ++-- src/gui/text/qtexttable.h | 10 ++-- src/gui/text/qtexttable_p.h | 10 ++-- src/gui/text/qzip.cpp | 10 ++-- src/gui/text/qzipreader_p.h | 10 ++-- src/gui/text/qzipwriter_p.h | 10 ++-- src/gui/util/qcompleter.cpp | 10 ++-- src/gui/util/qcompleter.h | 10 ++-- src/gui/util/qcompleter_p.h | 10 ++-- src/gui/util/qdesktopservices.cpp | 10 ++-- src/gui/util/qdesktopservices.h | 10 ++-- src/gui/util/qdesktopservices_mac.cpp | 10 ++-- src/gui/util/qdesktopservices_qws.cpp | 10 ++-- src/gui/util/qdesktopservices_win.cpp | 10 ++-- src/gui/util/qdesktopservices_x11.cpp | 10 ++-- src/gui/util/qsystemtrayicon.cpp | 10 ++-- src/gui/util/qsystemtrayicon.h | 10 ++-- src/gui/util/qsystemtrayicon_mac.mm | 10 ++-- src/gui/util/qsystemtrayicon_p.h | 10 ++-- src/gui/util/qsystemtrayicon_qws.cpp | 10 ++-- src/gui/util/qsystemtrayicon_win.cpp | 10 ++-- src/gui/util/qsystemtrayicon_x11.cpp | 10 ++-- src/gui/util/qundogroup.cpp | 10 ++-- src/gui/util/qundogroup.h | 10 ++-- src/gui/util/qundostack.cpp | 10 ++-- src/gui/util/qundostack.h | 10 ++-- src/gui/util/qundostack_p.h | 10 ++-- src/gui/util/qundoview.cpp | 10 ++-- src/gui/util/qundoview.h | 10 ++-- src/gui/widgets/qabstractbutton.cpp | 10 ++-- src/gui/widgets/qabstractbutton.h | 10 ++-- src/gui/widgets/qabstractbutton_p.h | 10 ++-- src/gui/widgets/qabstractscrollarea.cpp | 10 ++-- src/gui/widgets/qabstractscrollarea.h | 10 ++-- src/gui/widgets/qabstractscrollarea_p.h | 10 ++-- src/gui/widgets/qabstractslider.cpp | 10 ++-- src/gui/widgets/qabstractslider.h | 10 ++-- src/gui/widgets/qabstractslider_p.h | 10 ++-- src/gui/widgets/qabstractspinbox.cpp | 10 ++-- src/gui/widgets/qabstractspinbox.h | 10 ++-- src/gui/widgets/qabstractspinbox_p.h | 10 ++-- src/gui/widgets/qbuttongroup.cpp | 10 ++-- src/gui/widgets/qbuttongroup.h | 10 ++-- src/gui/widgets/qcalendartextnavigator_p.h | 10 ++-- src/gui/widgets/qcalendarwidget.cpp | 10 ++-- src/gui/widgets/qcalendarwidget.h | 10 ++-- src/gui/widgets/qcheckbox.cpp | 10 ++-- src/gui/widgets/qcheckbox.h | 10 ++-- src/gui/widgets/qcocoamenu_mac.mm | 60 +++++++++++----------- src/gui/widgets/qcocoamenu_mac_p.h | 10 ++-- src/gui/widgets/qcocoatoolbardelegate_mac.mm | 10 ++-- src/gui/widgets/qcocoatoolbardelegate_mac_p.h | 10 ++-- src/gui/widgets/qcombobox.cpp | 10 ++-- src/gui/widgets/qcombobox.h | 10 ++-- src/gui/widgets/qcombobox_p.h | 10 ++-- src/gui/widgets/qcommandlinkbutton.cpp | 10 ++-- src/gui/widgets/qcommandlinkbutton.h | 10 ++-- src/gui/widgets/qdatetimeedit.cpp | 10 ++-- src/gui/widgets/qdatetimeedit.h | 10 ++-- src/gui/widgets/qdatetimeedit_p.h | 10 ++-- src/gui/widgets/qdial.cpp | 10 ++-- src/gui/widgets/qdial.h | 10 ++-- src/gui/widgets/qdialogbuttonbox.cpp | 10 ++-- src/gui/widgets/qdialogbuttonbox.h | 10 ++-- src/gui/widgets/qdockarealayout.cpp | 10 ++-- src/gui/widgets/qdockarealayout_p.h | 10 ++-- src/gui/widgets/qdockwidget.cpp | 10 ++-- src/gui/widgets/qdockwidget.h | 10 ++-- src/gui/widgets/qdockwidget_p.h | 10 ++-- src/gui/widgets/qeffects.cpp | 10 ++-- src/gui/widgets/qeffects_p.h | 10 ++-- src/gui/widgets/qfocusframe.cpp | 10 ++-- src/gui/widgets/qfocusframe.h | 10 ++-- src/gui/widgets/qfontcombobox.cpp | 10 ++-- src/gui/widgets/qfontcombobox.h | 10 ++-- src/gui/widgets/qframe.cpp | 10 ++-- src/gui/widgets/qframe.h | 10 ++-- src/gui/widgets/qframe_p.h | 10 ++-- src/gui/widgets/qgroupbox.cpp | 10 ++-- src/gui/widgets/qgroupbox.h | 10 ++-- src/gui/widgets/qlabel.cpp | 10 ++-- src/gui/widgets/qlabel.h | 10 ++-- src/gui/widgets/qlabel_p.h | 10 ++-- src/gui/widgets/qlcdnumber.cpp | 10 ++-- src/gui/widgets/qlcdnumber.h | 10 ++-- src/gui/widgets/qlineedit.cpp | 10 ++-- src/gui/widgets/qlineedit.h | 10 ++-- src/gui/widgets/qlineedit_p.h | 10 ++-- src/gui/widgets/qmaccocoaviewcontainer_mac.h | 10 ++-- src/gui/widgets/qmaccocoaviewcontainer_mac.mm | 10 ++-- src/gui/widgets/qmacnativewidget_mac.h | 10 ++-- src/gui/widgets/qmacnativewidget_mac.mm | 10 ++-- src/gui/widgets/qmainwindow.cpp | 10 ++-- src/gui/widgets/qmainwindow.h | 10 ++-- src/gui/widgets/qmainwindowlayout.cpp | 10 ++-- src/gui/widgets/qmainwindowlayout_p.h | 10 ++-- src/gui/widgets/qmdiarea.cpp | 10 ++-- src/gui/widgets/qmdiarea.h | 10 ++-- src/gui/widgets/qmdiarea_p.h | 10 ++-- src/gui/widgets/qmdisubwindow.cpp | 10 ++-- src/gui/widgets/qmdisubwindow.h | 10 ++-- src/gui/widgets/qmdisubwindow_p.h | 10 ++-- src/gui/widgets/qmenu.cpp | 10 ++-- src/gui/widgets/qmenu.h | 10 ++-- src/gui/widgets/qmenu_mac.mm | 10 ++-- src/gui/widgets/qmenu_p.h | 10 ++-- src/gui/widgets/qmenu_wince.cpp | 10 ++-- src/gui/widgets/qmenu_wince_resource_p.h | 10 ++-- src/gui/widgets/qmenubar.cpp | 10 ++-- src/gui/widgets/qmenubar.h | 10 ++-- src/gui/widgets/qmenubar_p.h | 10 ++-- src/gui/widgets/qmenudata.cpp | 10 ++-- src/gui/widgets/qmenudata.h | 10 ++-- src/gui/widgets/qplaintextedit.cpp | 10 ++-- src/gui/widgets/qplaintextedit.h | 10 ++-- src/gui/widgets/qplaintextedit_p.h | 10 ++-- src/gui/widgets/qprintpreviewwidget.cpp | 10 ++-- src/gui/widgets/qprintpreviewwidget.h | 10 ++-- src/gui/widgets/qprogressbar.cpp | 10 ++-- src/gui/widgets/qprogressbar.h | 10 ++-- src/gui/widgets/qpushbutton.cpp | 10 ++-- src/gui/widgets/qpushbutton.h | 10 ++-- src/gui/widgets/qpushbutton_p.h | 10 ++-- src/gui/widgets/qradiobutton.cpp | 10 ++-- src/gui/widgets/qradiobutton.h | 10 ++-- src/gui/widgets/qrubberband.cpp | 10 ++-- src/gui/widgets/qrubberband.h | 10 ++-- src/gui/widgets/qscrollarea.cpp | 10 ++-- src/gui/widgets/qscrollarea.h | 10 ++-- src/gui/widgets/qscrollarea_p.h | 10 ++-- src/gui/widgets/qscrollbar.cpp | 10 ++-- src/gui/widgets/qscrollbar.h | 10 ++-- src/gui/widgets/qsizegrip.cpp | 10 ++-- src/gui/widgets/qsizegrip.h | 10 ++-- src/gui/widgets/qslider.cpp | 10 ++-- src/gui/widgets/qslider.h | 10 ++-- src/gui/widgets/qspinbox.cpp | 10 ++-- src/gui/widgets/qspinbox.h | 10 ++-- src/gui/widgets/qsplashscreen.cpp | 10 ++-- src/gui/widgets/qsplashscreen.h | 10 ++-- src/gui/widgets/qsplitter.cpp | 10 ++-- src/gui/widgets/qsplitter.h | 10 ++-- src/gui/widgets/qsplitter_p.h | 10 ++-- src/gui/widgets/qstackedwidget.cpp | 10 ++-- src/gui/widgets/qstackedwidget.h | 10 ++-- src/gui/widgets/qstatusbar.cpp | 10 ++-- src/gui/widgets/qstatusbar.h | 10 ++-- src/gui/widgets/qtabbar.cpp | 10 ++-- src/gui/widgets/qtabbar.h | 10 ++-- src/gui/widgets/qtabbar_p.h | 10 ++-- src/gui/widgets/qtabwidget.cpp | 10 ++-- src/gui/widgets/qtabwidget.h | 10 ++-- src/gui/widgets/qtextbrowser.cpp | 10 ++-- src/gui/widgets/qtextbrowser.h | 10 ++-- src/gui/widgets/qtextedit.cpp | 10 ++-- src/gui/widgets/qtextedit.h | 10 ++-- src/gui/widgets/qtextedit_p.h | 10 ++-- src/gui/widgets/qtoolbar.cpp | 10 ++-- src/gui/widgets/qtoolbar.h | 10 ++-- src/gui/widgets/qtoolbar_p.h | 10 ++-- src/gui/widgets/qtoolbararealayout.cpp | 10 ++-- src/gui/widgets/qtoolbararealayout_p.h | 10 ++-- src/gui/widgets/qtoolbarextension.cpp | 10 ++-- src/gui/widgets/qtoolbarextension_p.h | 10 ++-- src/gui/widgets/qtoolbarlayout.cpp | 10 ++-- src/gui/widgets/qtoolbarlayout_p.h | 10 ++-- src/gui/widgets/qtoolbarseparator.cpp | 10 ++-- src/gui/widgets/qtoolbarseparator_p.h | 10 ++-- src/gui/widgets/qtoolbox.cpp | 10 ++-- src/gui/widgets/qtoolbox.h | 10 ++-- src/gui/widgets/qtoolbutton.cpp | 10 ++-- src/gui/widgets/qtoolbutton.h | 10 ++-- src/gui/widgets/qvalidator.cpp | 10 ++-- src/gui/widgets/qvalidator.h | 10 ++-- src/gui/widgets/qwidgetanimator.cpp | 10 ++-- src/gui/widgets/qwidgetanimator_p.h | 10 ++-- src/gui/widgets/qwidgetresizehandler.cpp | 10 ++-- src/gui/widgets/qwidgetresizehandler_p.h | 10 ++-- src/gui/widgets/qworkspace.cpp | 10 ++-- src/gui/widgets/qworkspace.h | 10 ++-- src/network/access/qabstractnetworkcache.cpp | 10 ++-- src/network/access/qabstractnetworkcache.h | 10 ++-- src/network/access/qabstractnetworkcache_p.h | 10 ++-- src/network/access/qftp.cpp | 10 ++-- src/network/access/qftp.h | 10 ++-- src/network/access/qhttp.cpp | 10 ++-- src/network/access/qhttp.h | 10 ++-- src/network/access/qhttpnetworkconnection.cpp | 10 ++-- src/network/access/qhttpnetworkconnection_p.h | 10 ++-- src/network/access/qnetworkaccessbackend.cpp | 10 ++-- src/network/access/qnetworkaccessbackend_p.h | 10 ++-- src/network/access/qnetworkaccesscache.cpp | 10 ++-- src/network/access/qnetworkaccesscache_p.h | 10 ++-- src/network/access/qnetworkaccesscachebackend.cpp | 10 ++-- src/network/access/qnetworkaccesscachebackend_p.h | 10 ++-- src/network/access/qnetworkaccessdatabackend.cpp | 10 ++-- src/network/access/qnetworkaccessdatabackend_p.h | 10 ++-- .../access/qnetworkaccessdebugpipebackend.cpp | 10 ++-- .../access/qnetworkaccessdebugpipebackend_p.h | 10 ++-- src/network/access/qnetworkaccessfilebackend.cpp | 10 ++-- src/network/access/qnetworkaccessfilebackend_p.h | 10 ++-- src/network/access/qnetworkaccessftpbackend.cpp | 10 ++-- src/network/access/qnetworkaccessftpbackend_p.h | 10 ++-- src/network/access/qnetworkaccesshttpbackend.cpp | 10 ++-- src/network/access/qnetworkaccesshttpbackend_p.h | 10 ++-- src/network/access/qnetworkaccessmanager.cpp | 10 ++-- src/network/access/qnetworkaccessmanager.h | 10 ++-- src/network/access/qnetworkaccessmanager_p.h | 10 ++-- src/network/access/qnetworkcookie.cpp | 10 ++-- src/network/access/qnetworkcookie.h | 10 ++-- src/network/access/qnetworkcookie_p.h | 10 ++-- src/network/access/qnetworkdiskcache.cpp | 10 ++-- src/network/access/qnetworkdiskcache.h | 10 ++-- src/network/access/qnetworkdiskcache_p.h | 10 ++-- src/network/access/qnetworkreply.cpp | 10 ++-- src/network/access/qnetworkreply.h | 10 ++-- src/network/access/qnetworkreply_p.h | 10 ++-- src/network/access/qnetworkreplyimpl.cpp | 10 ++-- src/network/access/qnetworkreplyimpl_p.h | 10 ++-- src/network/access/qnetworkrequest.cpp | 10 ++-- src/network/access/qnetworkrequest.h | 10 ++-- src/network/access/qnetworkrequest_p.h | 10 ++-- src/network/kernel/qauthenticator.cpp | 10 ++-- src/network/kernel/qauthenticator.h | 10 ++-- src/network/kernel/qauthenticator_p.h | 10 ++-- src/network/kernel/qhostaddress.cpp | 10 ++-- src/network/kernel/qhostaddress.h | 10 ++-- src/network/kernel/qhostaddress_p.h | 10 ++-- src/network/kernel/qhostinfo.cpp | 10 ++-- src/network/kernel/qhostinfo.h | 10 ++-- src/network/kernel/qhostinfo_p.h | 10 ++-- src/network/kernel/qhostinfo_unix.cpp | 10 ++-- src/network/kernel/qhostinfo_win.cpp | 10 ++-- src/network/kernel/qnetworkinterface.cpp | 10 ++-- src/network/kernel/qnetworkinterface.h | 10 ++-- src/network/kernel/qnetworkinterface_p.h | 10 ++-- src/network/kernel/qnetworkinterface_unix.cpp | 10 ++-- src/network/kernel/qnetworkinterface_win.cpp | 10 ++-- src/network/kernel/qnetworkinterface_win_p.h | 10 ++-- src/network/kernel/qnetworkproxy.cpp | 10 ++-- src/network/kernel/qnetworkproxy.h | 10 ++-- src/network/kernel/qnetworkproxy_generic.cpp | 10 ++-- src/network/kernel/qnetworkproxy_mac.cpp | 10 ++-- src/network/kernel/qnetworkproxy_win.cpp | 10 ++-- src/network/kernel/qurlinfo.cpp | 10 ++-- src/network/kernel/qurlinfo.h | 10 ++-- src/network/socket/qabstractsocket.cpp | 10 ++-- src/network/socket/qabstractsocket.h | 10 ++-- src/network/socket/qabstractsocket_p.h | 10 ++-- src/network/socket/qabstractsocketengine.cpp | 10 ++-- src/network/socket/qabstractsocketengine_p.h | 10 ++-- src/network/socket/qhttpsocketengine.cpp | 10 ++-- src/network/socket/qhttpsocketengine_p.h | 10 ++-- src/network/socket/qlocalserver.cpp | 10 ++-- src/network/socket/qlocalserver.h | 10 ++-- src/network/socket/qlocalserver_p.h | 10 ++-- src/network/socket/qlocalserver_tcp.cpp | 10 ++-- src/network/socket/qlocalserver_unix.cpp | 10 ++-- src/network/socket/qlocalserver_win.cpp | 10 ++-- src/network/socket/qlocalsocket.cpp | 10 ++-- src/network/socket/qlocalsocket.h | 10 ++-- src/network/socket/qlocalsocket_p.h | 10 ++-- src/network/socket/qlocalsocket_tcp.cpp | 10 ++-- src/network/socket/qlocalsocket_unix.cpp | 10 ++-- src/network/socket/qlocalsocket_win.cpp | 10 ++-- src/network/socket/qnativesocketengine.cpp | 10 ++-- src/network/socket/qnativesocketengine_p.h | 10 ++-- src/network/socket/qnativesocketengine_unix.cpp | 10 ++-- src/network/socket/qnativesocketengine_win.cpp | 10 ++-- src/network/socket/qsocks5socketengine.cpp | 10 ++-- src/network/socket/qsocks5socketengine_p.h | 10 ++-- src/network/socket/qtcpserver.cpp | 10 ++-- src/network/socket/qtcpserver.h | 10 ++-- src/network/socket/qtcpsocket.cpp | 10 ++-- src/network/socket/qtcpsocket.h | 10 ++-- src/network/socket/qtcpsocket_p.h | 10 ++-- src/network/socket/qudpsocket.cpp | 10 ++-- src/network/socket/qudpsocket.h | 10 ++-- src/network/ssl/qssl.cpp | 10 ++-- src/network/ssl/qssl.h | 10 ++-- src/network/ssl/qsslcertificate.cpp | 10 ++-- src/network/ssl/qsslcertificate.h | 10 ++-- src/network/ssl/qsslcertificate_p.h | 10 ++-- src/network/ssl/qsslcipher.cpp | 10 ++-- src/network/ssl/qsslcipher.h | 10 ++-- src/network/ssl/qsslcipher_p.h | 10 ++-- src/network/ssl/qsslconfiguration.cpp | 10 ++-- src/network/ssl/qsslconfiguration.h | 10 ++-- src/network/ssl/qsslconfiguration_p.h | 10 ++-- src/network/ssl/qsslerror.cpp | 10 ++-- src/network/ssl/qsslerror.h | 10 ++-- src/network/ssl/qsslkey.cpp | 10 ++-- src/network/ssl/qsslkey.h | 10 ++-- src/network/ssl/qsslkey_p.h | 10 ++-- src/network/ssl/qsslsocket.cpp | 10 ++-- src/network/ssl/qsslsocket.h | 10 ++-- src/network/ssl/qsslsocket_openssl.cpp | 10 ++-- src/network/ssl/qsslsocket_openssl_p.h | 10 ++-- src/network/ssl/qsslsocket_openssl_symbols.cpp | 10 ++-- src/network/ssl/qsslsocket_openssl_symbols_p.h | 10 ++-- src/network/ssl/qsslsocket_p.h | 10 ++-- src/opengl/gl2paintengineex/glgc_shader_source.h | 10 ++-- src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp | 10 ++-- src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h | 10 ++-- src/opengl/gl2paintengineex/qglgradientcache.cpp | 10 ++-- src/opengl/gl2paintengineex/qglgradientcache_p.h | 10 ++-- .../gl2paintengineex/qglpexshadermanager.cpp | 10 ++-- .../gl2paintengineex/qglpexshadermanager_p.h | 10 ++-- src/opengl/gl2paintengineex/qglshader.cpp | 10 ++-- src/opengl/gl2paintengineex/qglshader_p.h | 10 ++-- .../gl2paintengineex/qpaintengineex_opengl2.cpp | 10 ++-- .../gl2paintengineex/qpaintengineex_opengl2_p.h | 10 ++-- src/opengl/qegl.cpp | 10 ++-- src/opengl/qegl_p.h | 10 ++-- src/opengl/qegl_qws.cpp | 10 ++-- src/opengl/qegl_wince.cpp | 10 ++-- src/opengl/qegl_x11egl.cpp | 10 ++-- src/opengl/qgl.cpp | 10 ++-- src/opengl/qgl.h | 10 ++-- src/opengl/qgl_cl_p.h | 10 ++-- src/opengl/qgl_egl.cpp | 10 ++-- src/opengl/qgl_egl_p.h | 10 ++-- src/opengl/qgl_mac.mm | 10 ++-- src/opengl/qgl_p.h | 10 ++-- src/opengl/qgl_qws.cpp | 10 ++-- src/opengl/qgl_win.cpp | 10 ++-- src/opengl/qgl_wince.cpp | 10 ++-- src/opengl/qgl_x11.cpp | 10 ++-- src/opengl/qgl_x11egl.cpp | 10 ++-- src/opengl/qglcolormap.cpp | 10 ++-- src/opengl/qglcolormap.h | 10 ++-- src/opengl/qglextensions.cpp | 10 ++-- src/opengl/qglextensions_p.h | 10 ++-- src/opengl/qglframebufferobject.cpp | 10 ++-- src/opengl/qglframebufferobject.h | 10 ++-- src/opengl/qglpaintdevice_qws.cpp | 10 ++-- src/opengl/qglpaintdevice_qws_p.h | 10 ++-- src/opengl/qglpixelbuffer.cpp | 10 ++-- src/opengl/qglpixelbuffer.h | 10 ++-- src/opengl/qglpixelbuffer_egl.cpp | 10 ++-- src/opengl/qglpixelbuffer_mac.mm | 10 ++-- src/opengl/qglpixelbuffer_p.h | 10 ++-- src/opengl/qglpixelbuffer_win.cpp | 10 ++-- src/opengl/qglpixelbuffer_x11.cpp | 10 ++-- src/opengl/qglpixmapfilter.cpp | 10 ++-- src/opengl/qglpixmapfilter_p.h | 10 ++-- src/opengl/qglscreen_qws.cpp | 10 ++-- src/opengl/qglscreen_qws.h | 10 ++-- src/opengl/qglwindowsurface_qws.cpp | 10 ++-- src/opengl/qglwindowsurface_qws_p.h | 10 ++-- src/opengl/qgraphicssystem_gl.cpp | 10 ++-- src/opengl/qgraphicssystem_gl_p.h | 10 ++-- src/opengl/qpaintengine_opengl.cpp | 10 ++-- src/opengl/qpaintengine_opengl_p.h | 10 ++-- src/opengl/qpixmapdata_gl.cpp | 10 ++-- src/opengl/qpixmapdata_gl_p.h | 10 ++-- src/opengl/qwindowsurface_gl.cpp | 10 ++-- src/opengl/qwindowsurface_gl_p.h | 10 ++-- src/opengl/util/fragmentprograms_p.h | 10 ++-- src/opengl/util/generator.cpp | 10 ++-- src/plugins/accessible/compat/main.cpp | 10 ++-- src/plugins/accessible/compat/q3complexwidgets.cpp | 10 ++-- src/plugins/accessible/compat/q3complexwidgets.h | 10 ++-- src/plugins/accessible/compat/q3simplewidgets.cpp | 10 ++-- src/plugins/accessible/compat/q3simplewidgets.h | 10 ++-- .../accessible/compat/qaccessiblecompat.cpp | 10 ++-- src/plugins/accessible/compat/qaccessiblecompat.h | 10 ++-- src/plugins/accessible/widgets/complexwidgets.cpp | 10 ++-- src/plugins/accessible/widgets/complexwidgets.h | 10 ++-- src/plugins/accessible/widgets/main.cpp | 10 ++-- src/plugins/accessible/widgets/qaccessiblemenu.cpp | 10 ++-- src/plugins/accessible/widgets/qaccessiblemenu.h | 10 ++-- .../accessible/widgets/qaccessiblewidgets.cpp | 10 ++-- .../accessible/widgets/qaccessiblewidgets.h | 10 ++-- src/plugins/accessible/widgets/rangecontrols.cpp | 10 ++-- src/plugins/accessible/widgets/rangecontrols.h | 10 ++-- src/plugins/accessible/widgets/simplewidgets.cpp | 10 ++-- src/plugins/accessible/widgets/simplewidgets.h | 10 ++-- src/plugins/codecs/cn/main.cpp | 10 ++-- src/plugins/codecs/cn/qgb18030codec.cpp | 10 ++-- src/plugins/codecs/cn/qgb18030codec.h | 10 ++-- src/plugins/codecs/jp/main.cpp | 10 ++-- src/plugins/codecs/jp/qeucjpcodec.cpp | 10 ++-- src/plugins/codecs/jp/qeucjpcodec.h | 10 ++-- src/plugins/codecs/jp/qfontjpcodec.cpp | 10 ++-- src/plugins/codecs/jp/qfontjpcodec.h | 10 ++-- src/plugins/codecs/jp/qjiscodec.cpp | 10 ++-- src/plugins/codecs/jp/qjiscodec.h | 10 ++-- src/plugins/codecs/jp/qjpunicode.cpp | 10 ++-- src/plugins/codecs/jp/qjpunicode.h | 10 ++-- src/plugins/codecs/jp/qsjiscodec.cpp | 10 ++-- src/plugins/codecs/jp/qsjiscodec.h | 10 ++-- src/plugins/codecs/kr/cp949codetbl.h | 10 ++-- src/plugins/codecs/kr/main.cpp | 10 ++-- src/plugins/codecs/kr/qeuckrcodec.cpp | 10 ++-- src/plugins/codecs/kr/qeuckrcodec.h | 10 ++-- src/plugins/codecs/tw/main.cpp | 10 ++-- src/plugins/codecs/tw/qbig5codec.cpp | 10 ++-- src/plugins/codecs/tw/qbig5codec.h | 10 ++-- src/plugins/decorations/default/main.cpp | 10 ++-- src/plugins/decorations/styled/main.cpp | 10 ++-- src/plugins/decorations/windows/main.cpp | 10 ++-- src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp | 10 ++-- src/plugins/gfxdrivers/ahi/qscreenahi_qws.h | 10 ++-- src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp | 10 ++-- .../gfxdrivers/directfb/qdirectfbkeyboard.cpp | 10 ++-- .../gfxdrivers/directfb/qdirectfbkeyboard.h | 10 ++-- src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp | 10 ++-- src/plugins/gfxdrivers/directfb/qdirectfbmouse.h | 10 ++-- .../gfxdrivers/directfb/qdirectfbpaintdevice.cpp | 10 ++-- .../gfxdrivers/directfb/qdirectfbpaintdevice.h | 10 ++-- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 10 ++-- .../gfxdrivers/directfb/qdirectfbpaintengine.h | 10 ++-- .../gfxdrivers/directfb/qdirectfbpixmap.cpp | 10 ++-- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h | 10 ++-- .../gfxdrivers/directfb/qdirectfbscreen.cpp | 10 ++-- src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 10 ++-- .../gfxdrivers/directfb/qdirectfbscreenplugin.cpp | 10 ++-- .../gfxdrivers/directfb/qdirectfbsurface.cpp | 10 ++-- src/plugins/gfxdrivers/directfb/qdirectfbsurface.h | 10 ++-- src/plugins/gfxdrivers/hybrid/hybridplugin.cpp | 10 ++-- src/plugins/gfxdrivers/hybrid/hybridscreen.cpp | 10 ++-- src/plugins/gfxdrivers/hybrid/hybridscreen.h | 10 ++-- src/plugins/gfxdrivers/hybrid/hybridsurface.cpp | 10 ++-- src/plugins/gfxdrivers/hybrid/hybridsurface.h | 10 ++-- src/plugins/gfxdrivers/linuxfb/main.cpp | 10 ++-- .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c | 10 ++-- .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h | 10 ++-- .../gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h | 10 ++-- .../gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c | 10 ++-- .../powervr/pvreglscreen/pvreglscreen.cpp | 10 ++-- .../gfxdrivers/powervr/pvreglscreen/pvreglscreen.h | 10 ++-- .../powervr/pvreglscreen/pvreglscreenplugin.cpp | 10 ++-- .../powervr/pvreglscreen/pvreglwindowsurface.cpp | 10 ++-- .../powervr/pvreglscreen/pvreglwindowsurface.h | 10 ++-- src/plugins/gfxdrivers/qvfb/main.cpp | 10 ++-- src/plugins/gfxdrivers/transformed/main.cpp | 10 ++-- src/plugins/gfxdrivers/vnc/main.cpp | 10 ++-- src/plugins/gfxdrivers/vnc/qscreenvnc_p.h | 10 ++-- src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp | 10 ++-- src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h | 10 ++-- src/plugins/graphicssystems/opengl/main.cpp | 10 ++-- src/plugins/iconengines/svgiconengine/main.cpp | 10 ++-- .../iconengines/svgiconengine/qsvgiconengine.cpp | 10 ++-- .../iconengines/svgiconengine/qsvgiconengine.h | 10 ++-- src/plugins/imageformats/gif/main.cpp | 10 ++-- src/plugins/imageformats/gif/qgifhandler.cpp | 10 ++-- src/plugins/imageformats/gif/qgifhandler.h | 10 ++-- src/plugins/imageformats/ico/main.cpp | 10 ++-- src/plugins/imageformats/ico/qicohandler.cpp | 10 ++-- src/plugins/imageformats/ico/qicohandler.h | 10 ++-- src/plugins/imageformats/jpeg/main.cpp | 10 ++-- src/plugins/imageformats/jpeg/qjpeghandler.cpp | 10 ++-- src/plugins/imageformats/jpeg/qjpeghandler.h | 10 ++-- src/plugins/imageformats/mng/main.cpp | 10 ++-- src/plugins/imageformats/mng/qmnghandler.cpp | 10 ++-- src/plugins/imageformats/mng/qmnghandler.h | 10 ++-- src/plugins/imageformats/svg/main.cpp | 10 ++-- src/plugins/imageformats/svg/qsvgiohandler.cpp | 10 ++-- src/plugins/imageformats/svg/qsvgiohandler.h | 10 ++-- src/plugins/imageformats/tiff/main.cpp | 10 ++-- src/plugins/imageformats/tiff/qtiffhandler.cpp | 10 ++-- src/plugins/imageformats/tiff/qtiffhandler.h | 10 ++-- .../inputmethods/imsw-multi/qmultiinputcontext.cpp | 10 ++-- .../inputmethods/imsw-multi/qmultiinputcontext.h | 10 ++-- .../imsw-multi/qmultiinputcontextplugin.cpp | 10 ++-- .../imsw-multi/qmultiinputcontextplugin.h | 10 ++-- .../kbddrivers/linuxis/linuxiskbddriverplugin.cpp | 10 ++-- .../kbddrivers/linuxis/linuxiskbddriverplugin.h | 10 ++-- .../kbddrivers/linuxis/linuxiskbdhandler.cpp | 10 ++-- src/plugins/kbddrivers/linuxis/linuxiskbdhandler.h | 10 ++-- src/plugins/kbddrivers/sl5000/main.cpp | 10 ++-- src/plugins/kbddrivers/usb/main.cpp | 10 ++-- src/plugins/kbddrivers/vr41xx/main.cpp | 10 ++-- src/plugins/kbddrivers/yopy/main.cpp | 10 ++-- src/plugins/mousedrivers/bus/main.cpp | 10 ++-- .../linuxis/linuxismousedriverplugin.cpp | 10 ++-- .../linuxis/linuxismousedriverplugin.h | 10 ++-- .../mousedrivers/linuxis/linuxismousehandler.cpp | 10 ++-- .../mousedrivers/linuxis/linuxismousehandler.h | 10 ++-- src/plugins/mousedrivers/linuxtp/main.cpp | 10 ++-- src/plugins/mousedrivers/pc/main.cpp | 10 ++-- src/plugins/mousedrivers/tslib/main.cpp | 10 ++-- src/plugins/mousedrivers/vr41xx/main.cpp | 10 ++-- src/plugins/mousedrivers/yopy/main.cpp | 10 ++-- src/plugins/script/qtdbus/main.cpp | 10 ++-- src/plugins/script/qtdbus/main.h | 10 ++-- src/plugins/sqldrivers/db2/main.cpp | 10 ++-- src/plugins/sqldrivers/ibase/main.cpp | 10 ++-- src/plugins/sqldrivers/mysql/main.cpp | 10 ++-- src/plugins/sqldrivers/oci/main.cpp | 10 ++-- src/plugins/sqldrivers/odbc/main.cpp | 10 ++-- src/plugins/sqldrivers/psql/main.cpp | 10 ++-- src/plugins/sqldrivers/sqlite/smain.cpp | 10 ++-- src/plugins/sqldrivers/sqlite2/smain.cpp | 10 ++-- src/plugins/sqldrivers/tds/main.cpp | 10 ++-- src/qt3support/canvas/q3canvas.cpp | 10 ++-- src/qt3support/canvas/q3canvas.h | 10 ++-- src/qt3support/dialogs/q3filedialog.cpp | 10 ++-- src/qt3support/dialogs/q3filedialog.h | 10 ++-- src/qt3support/dialogs/q3filedialog_mac.cpp | 10 ++-- src/qt3support/dialogs/q3filedialog_win.cpp | 10 ++-- src/qt3support/dialogs/q3progressdialog.cpp | 10 ++-- src/qt3support/dialogs/q3progressdialog.h | 10 ++-- src/qt3support/dialogs/q3tabdialog.cpp | 10 ++-- src/qt3support/dialogs/q3tabdialog.h | 10 ++-- src/qt3support/dialogs/q3wizard.cpp | 10 ++-- src/qt3support/dialogs/q3wizard.h | 10 ++-- src/qt3support/itemviews/q3iconview.cpp | 10 ++-- src/qt3support/itemviews/q3iconview.h | 10 ++-- src/qt3support/itemviews/q3listbox.cpp | 10 ++-- src/qt3support/itemviews/q3listbox.h | 10 ++-- src/qt3support/itemviews/q3listview.cpp | 10 ++-- src/qt3support/itemviews/q3listview.h | 10 ++-- src/qt3support/itemviews/q3table.cpp | 10 ++-- src/qt3support/itemviews/q3table.h | 10 ++-- src/qt3support/network/q3dns.cpp | 10 ++-- src/qt3support/network/q3dns.h | 10 ++-- src/qt3support/network/q3ftp.cpp | 10 ++-- src/qt3support/network/q3ftp.h | 10 ++-- src/qt3support/network/q3http.cpp | 10 ++-- src/qt3support/network/q3http.h | 10 ++-- src/qt3support/network/q3localfs.cpp | 10 ++-- src/qt3support/network/q3localfs.h | 10 ++-- src/qt3support/network/q3network.cpp | 10 ++-- src/qt3support/network/q3network.h | 10 ++-- src/qt3support/network/q3networkprotocol.cpp | 10 ++-- src/qt3support/network/q3networkprotocol.h | 10 ++-- src/qt3support/network/q3serversocket.cpp | 10 ++-- src/qt3support/network/q3serversocket.h | 10 ++-- src/qt3support/network/q3socket.cpp | 10 ++-- src/qt3support/network/q3socket.h | 10 ++-- src/qt3support/network/q3socketdevice.cpp | 10 ++-- src/qt3support/network/q3socketdevice.h | 10 ++-- src/qt3support/network/q3socketdevice_unix.cpp | 10 ++-- src/qt3support/network/q3socketdevice_win.cpp | 10 ++-- src/qt3support/network/q3url.cpp | 10 ++-- src/qt3support/network/q3url.h | 10 ++-- src/qt3support/network/q3urloperator.cpp | 10 ++-- src/qt3support/network/q3urloperator.h | 10 ++-- src/qt3support/other/q3accel.cpp | 10 ++-- src/qt3support/other/q3accel.h | 10 ++-- src/qt3support/other/q3boxlayout.cpp | 10 ++-- src/qt3support/other/q3boxlayout.h | 10 ++-- src/qt3support/other/q3dragobject.cpp | 10 ++-- src/qt3support/other/q3dragobject.h | 10 ++-- src/qt3support/other/q3dropsite.cpp | 10 ++-- src/qt3support/other/q3dropsite.h | 10 ++-- src/qt3support/other/q3gridlayout.h | 10 ++-- src/qt3support/other/q3membuf.cpp | 10 ++-- src/qt3support/other/q3membuf_p.h | 10 ++-- src/qt3support/other/q3mimefactory.cpp | 10 ++-- src/qt3support/other/q3mimefactory.h | 10 ++-- src/qt3support/other/q3polygonscanner.cpp | 10 ++-- src/qt3support/other/q3polygonscanner.h | 10 ++-- src/qt3support/other/q3process.cpp | 10 ++-- src/qt3support/other/q3process.h | 10 ++-- src/qt3support/other/q3process_unix.cpp | 10 ++-- src/qt3support/other/q3process_win.cpp | 10 ++-- src/qt3support/other/qiconset.h | 10 ++-- src/qt3support/other/qt_compat_pch.h | 10 ++-- src/qt3support/painting/q3paintdevicemetrics.cpp | 10 ++-- src/qt3support/painting/q3paintdevicemetrics.h | 10 ++-- src/qt3support/painting/q3paintengine_svg.cpp | 10 ++-- src/qt3support/painting/q3paintengine_svg_p.h | 10 ++-- src/qt3support/painting/q3painter.cpp | 10 ++-- src/qt3support/painting/q3painter.h | 10 ++-- src/qt3support/painting/q3picture.cpp | 10 ++-- src/qt3support/painting/q3picture.h | 10 ++-- src/qt3support/painting/q3pointarray.cpp | 10 ++-- src/qt3support/painting/q3pointarray.h | 10 ++-- src/qt3support/sql/q3databrowser.cpp | 10 ++-- src/qt3support/sql/q3databrowser.h | 10 ++-- src/qt3support/sql/q3datatable.cpp | 10 ++-- src/qt3support/sql/q3datatable.h | 10 ++-- src/qt3support/sql/q3dataview.cpp | 10 ++-- src/qt3support/sql/q3dataview.h | 10 ++-- src/qt3support/sql/q3editorfactory.cpp | 10 ++-- src/qt3support/sql/q3editorfactory.h | 10 ++-- src/qt3support/sql/q3sqlcursor.cpp | 10 ++-- src/qt3support/sql/q3sqlcursor.h | 10 ++-- src/qt3support/sql/q3sqleditorfactory.cpp | 10 ++-- src/qt3support/sql/q3sqleditorfactory.h | 10 ++-- src/qt3support/sql/q3sqlfieldinfo.h | 10 ++-- src/qt3support/sql/q3sqlform.cpp | 10 ++-- src/qt3support/sql/q3sqlform.h | 10 ++-- src/qt3support/sql/q3sqlmanager_p.cpp | 10 ++-- src/qt3support/sql/q3sqlmanager_p.h | 10 ++-- src/qt3support/sql/q3sqlpropertymap.cpp | 10 ++-- src/qt3support/sql/q3sqlpropertymap.h | 10 ++-- src/qt3support/sql/q3sqlrecordinfo.h | 10 ++-- src/qt3support/sql/q3sqlselectcursor.cpp | 10 ++-- src/qt3support/sql/q3sqlselectcursor.h | 10 ++-- src/qt3support/text/q3multilineedit.cpp | 10 ++-- src/qt3support/text/q3multilineedit.h | 10 ++-- src/qt3support/text/q3richtext.cpp | 10 ++-- src/qt3support/text/q3richtext_p.cpp | 10 ++-- src/qt3support/text/q3richtext_p.h | 10 ++-- src/qt3support/text/q3simplerichtext.cpp | 10 ++-- src/qt3support/text/q3simplerichtext.h | 10 ++-- src/qt3support/text/q3stylesheet.cpp | 10 ++-- src/qt3support/text/q3stylesheet.h | 10 ++-- src/qt3support/text/q3syntaxhighlighter.cpp | 10 ++-- src/qt3support/text/q3syntaxhighlighter.h | 10 ++-- src/qt3support/text/q3syntaxhighlighter_p.h | 10 ++-- src/qt3support/text/q3textbrowser.cpp | 10 ++-- src/qt3support/text/q3textbrowser.h | 10 ++-- src/qt3support/text/q3textedit.cpp | 10 ++-- src/qt3support/text/q3textedit.h | 10 ++-- src/qt3support/text/q3textstream.cpp | 10 ++-- src/qt3support/text/q3textstream.h | 10 ++-- src/qt3support/text/q3textview.cpp | 10 ++-- src/qt3support/text/q3textview.h | 10 ++-- src/qt3support/tools/q3asciicache.h | 10 ++-- src/qt3support/tools/q3asciidict.h | 10 ++-- src/qt3support/tools/q3cache.h | 10 ++-- src/qt3support/tools/q3cleanuphandler.h | 10 ++-- src/qt3support/tools/q3cstring.cpp | 10 ++-- src/qt3support/tools/q3cstring.h | 10 ++-- src/qt3support/tools/q3deepcopy.cpp | 10 ++-- src/qt3support/tools/q3deepcopy.h | 10 ++-- src/qt3support/tools/q3dict.h | 10 ++-- src/qt3support/tools/q3garray.cpp | 10 ++-- src/qt3support/tools/q3garray.h | 10 ++-- src/qt3support/tools/q3gcache.cpp | 10 ++-- src/qt3support/tools/q3gcache.h | 10 ++-- src/qt3support/tools/q3gdict.cpp | 10 ++-- src/qt3support/tools/q3gdict.h | 10 ++-- src/qt3support/tools/q3glist.cpp | 10 ++-- src/qt3support/tools/q3glist.h | 10 ++-- src/qt3support/tools/q3gvector.cpp | 10 ++-- src/qt3support/tools/q3gvector.h | 10 ++-- src/qt3support/tools/q3intcache.h | 10 ++-- src/qt3support/tools/q3intdict.h | 10 ++-- src/qt3support/tools/q3memarray.h | 10 ++-- src/qt3support/tools/q3objectdict.h | 10 ++-- src/qt3support/tools/q3ptrcollection.cpp | 10 ++-- src/qt3support/tools/q3ptrcollection.h | 10 ++-- src/qt3support/tools/q3ptrdict.h | 10 ++-- src/qt3support/tools/q3ptrlist.h | 10 ++-- src/qt3support/tools/q3ptrqueue.h | 10 ++-- src/qt3support/tools/q3ptrstack.h | 10 ++-- src/qt3support/tools/q3ptrvector.h | 10 ++-- src/qt3support/tools/q3semaphore.cpp | 10 ++-- src/qt3support/tools/q3semaphore.h | 10 ++-- src/qt3support/tools/q3shared.cpp | 10 ++-- src/qt3support/tools/q3shared.h | 10 ++-- src/qt3support/tools/q3signal.cpp | 10 ++-- src/qt3support/tools/q3signal.h | 10 ++-- src/qt3support/tools/q3sortedlist.h | 10 ++-- src/qt3support/tools/q3strlist.h | 10 ++-- src/qt3support/tools/q3strvec.h | 10 ++-- src/qt3support/tools/q3tl.h | 10 ++-- src/qt3support/tools/q3valuelist.h | 10 ++-- src/qt3support/tools/q3valuestack.h | 10 ++-- src/qt3support/tools/q3valuevector.h | 10 ++-- src/qt3support/widgets/q3action.cpp | 10 ++-- src/qt3support/widgets/q3action.h | 10 ++-- src/qt3support/widgets/q3button.cpp | 10 ++-- src/qt3support/widgets/q3button.h | 10 ++-- src/qt3support/widgets/q3buttongroup.cpp | 10 ++-- src/qt3support/widgets/q3buttongroup.h | 10 ++-- src/qt3support/widgets/q3combobox.cpp | 10 ++-- src/qt3support/widgets/q3combobox.h | 10 ++-- src/qt3support/widgets/q3datetimeedit.cpp | 10 ++-- src/qt3support/widgets/q3datetimeedit.h | 10 ++-- src/qt3support/widgets/q3dockarea.cpp | 10 ++-- src/qt3support/widgets/q3dockarea.h | 10 ++-- src/qt3support/widgets/q3dockwindow.cpp | 10 ++-- src/qt3support/widgets/q3dockwindow.h | 10 ++-- src/qt3support/widgets/q3frame.cpp | 10 ++-- src/qt3support/widgets/q3frame.h | 10 ++-- src/qt3support/widgets/q3grid.cpp | 10 ++-- src/qt3support/widgets/q3grid.h | 10 ++-- src/qt3support/widgets/q3gridview.cpp | 10 ++-- src/qt3support/widgets/q3gridview.h | 10 ++-- src/qt3support/widgets/q3groupbox.cpp | 10 ++-- src/qt3support/widgets/q3groupbox.h | 10 ++-- src/qt3support/widgets/q3hbox.cpp | 10 ++-- src/qt3support/widgets/q3hbox.h | 10 ++-- src/qt3support/widgets/q3header.cpp | 10 ++-- src/qt3support/widgets/q3header.h | 10 ++-- src/qt3support/widgets/q3hgroupbox.cpp | 10 ++-- src/qt3support/widgets/q3hgroupbox.h | 10 ++-- src/qt3support/widgets/q3mainwindow.cpp | 10 ++-- src/qt3support/widgets/q3mainwindow.h | 10 ++-- src/qt3support/widgets/q3mainwindow_p.h | 10 ++-- src/qt3support/widgets/q3popupmenu.cpp | 10 ++-- src/qt3support/widgets/q3popupmenu.h | 10 ++-- src/qt3support/widgets/q3progressbar.cpp | 10 ++-- src/qt3support/widgets/q3progressbar.h | 10 ++-- src/qt3support/widgets/q3rangecontrol.cpp | 10 ++-- src/qt3support/widgets/q3rangecontrol.h | 10 ++-- src/qt3support/widgets/q3scrollview.cpp | 10 ++-- src/qt3support/widgets/q3scrollview.h | 10 ++-- src/qt3support/widgets/q3spinwidget.cpp | 10 ++-- src/qt3support/widgets/q3titlebar.cpp | 10 ++-- src/qt3support/widgets/q3titlebar_p.h | 10 ++-- src/qt3support/widgets/q3toolbar.cpp | 10 ++-- src/qt3support/widgets/q3toolbar.h | 10 ++-- src/qt3support/widgets/q3vbox.cpp | 10 ++-- src/qt3support/widgets/q3vbox.h | 10 ++-- src/qt3support/widgets/q3vgroupbox.cpp | 10 ++-- src/qt3support/widgets/q3vgroupbox.h | 10 ++-- src/qt3support/widgets/q3whatsthis.cpp | 10 ++-- src/qt3support/widgets/q3whatsthis.h | 10 ++-- src/qt3support/widgets/q3widgetstack.cpp | 10 ++-- src/qt3support/widgets/q3widgetstack.h | 10 ++-- src/script/qscript.g | 30 +++++------ src/script/qscriptable.cpp | 10 ++-- src/script/qscriptable.h | 10 ++-- src/script/qscriptable_p.h | 10 ++-- src/script/qscriptarray_p.h | 10 ++-- src/script/qscriptasm.cpp | 10 ++-- src/script/qscriptasm_p.h | 10 ++-- src/script/qscriptast.cpp | 10 ++-- src/script/qscriptast_p.h | 10 ++-- src/script/qscriptastfwd_p.h | 10 ++-- src/script/qscriptastvisitor.cpp | 10 ++-- src/script/qscriptastvisitor_p.h | 10 ++-- src/script/qscriptbuffer_p.h | 10 ++-- src/script/qscriptclass.cpp | 10 ++-- src/script/qscriptclass.h | 10 ++-- src/script/qscriptclass_p.h | 10 ++-- src/script/qscriptclassdata.cpp | 10 ++-- src/script/qscriptclassdata_p.h | 10 ++-- src/script/qscriptclassinfo_p.h | 10 ++-- src/script/qscriptclasspropertyiterator.cpp | 10 ++-- src/script/qscriptclasspropertyiterator.h | 10 ++-- src/script/qscriptclasspropertyiterator_p.h | 10 ++-- src/script/qscriptcompiler.cpp | 10 ++-- src/script/qscriptcompiler_p.h | 10 ++-- src/script/qscriptcontext.cpp | 10 ++-- src/script/qscriptcontext.h | 10 ++-- src/script/qscriptcontext_p.cpp | 10 ++-- src/script/qscriptcontext_p.h | 10 ++-- src/script/qscriptcontextfwd_p.h | 10 ++-- src/script/qscriptcontextinfo.cpp | 10 ++-- src/script/qscriptcontextinfo.h | 10 ++-- src/script/qscriptcontextinfo_p.h | 10 ++-- src/script/qscriptecmaarray.cpp | 10 ++-- src/script/qscriptecmaarray_p.h | 10 ++-- src/script/qscriptecmaboolean.cpp | 10 ++-- src/script/qscriptecmaboolean_p.h | 10 ++-- src/script/qscriptecmacore.cpp | 10 ++-- src/script/qscriptecmacore_p.h | 10 ++-- src/script/qscriptecmadate.cpp | 10 ++-- src/script/qscriptecmadate_p.h | 10 ++-- src/script/qscriptecmaerror.cpp | 10 ++-- src/script/qscriptecmaerror_p.h | 10 ++-- src/script/qscriptecmafunction.cpp | 10 ++-- src/script/qscriptecmafunction_p.h | 10 ++-- src/script/qscriptecmaglobal.cpp | 10 ++-- src/script/qscriptecmaglobal_p.h | 10 ++-- src/script/qscriptecmamath.cpp | 10 ++-- src/script/qscriptecmamath_p.h | 10 ++-- src/script/qscriptecmanumber.cpp | 10 ++-- src/script/qscriptecmanumber_p.h | 10 ++-- src/script/qscriptecmaobject.cpp | 10 ++-- src/script/qscriptecmaobject_p.h | 10 ++-- src/script/qscriptecmaregexp.cpp | 10 ++-- src/script/qscriptecmaregexp_p.h | 10 ++-- src/script/qscriptecmastring.cpp | 10 ++-- src/script/qscriptecmastring_p.h | 10 ++-- src/script/qscriptengine.cpp | 10 ++-- src/script/qscriptengine.h | 10 ++-- src/script/qscriptengine_p.cpp | 10 ++-- src/script/qscriptengine_p.h | 10 ++-- src/script/qscriptengineagent.cpp | 10 ++-- src/script/qscriptengineagent.h | 10 ++-- src/script/qscriptengineagent_p.h | 10 ++-- src/script/qscriptenginefwd_p.h | 10 ++-- src/script/qscriptextensioninterface.h | 10 ++-- src/script/qscriptextensionplugin.cpp | 10 ++-- src/script/qscriptextensionplugin.h | 10 ++-- src/script/qscriptextenumeration.cpp | 10 ++-- src/script/qscriptextenumeration_p.h | 10 ++-- src/script/qscriptextqobject.cpp | 10 ++-- src/script/qscriptextqobject_p.h | 10 ++-- src/script/qscriptextvariant.cpp | 10 ++-- src/script/qscriptextvariant_p.h | 10 ++-- src/script/qscriptfunction.cpp | 10 ++-- src/script/qscriptfunction_p.h | 10 ++-- src/script/qscriptgc_p.h | 10 ++-- src/script/qscriptglobals_p.h | 10 ++-- src/script/qscriptgrammar.cpp | 10 ++-- src/script/qscriptgrammar_p.h | 10 ++-- src/script/qscriptlexer.cpp | 10 ++-- src/script/qscriptlexer_p.h | 10 ++-- src/script/qscriptmember_p.h | 10 ++-- src/script/qscriptmemberfwd_p.h | 10 ++-- src/script/qscriptmemorypool_p.h | 10 ++-- src/script/qscriptnameid_p.h | 10 ++-- src/script/qscriptnodepool_p.h | 10 ++-- src/script/qscriptobject_p.h | 10 ++-- src/script/qscriptobjectdata_p.h | 10 ++-- src/script/qscriptobjectfwd_p.h | 10 ++-- src/script/qscriptparser.cpp | 10 ++-- src/script/qscriptparser_p.h | 10 ++-- src/script/qscriptprettypretty.cpp | 10 ++-- src/script/qscriptprettypretty_p.h | 10 ++-- src/script/qscriptrepository_p.h | 10 ++-- src/script/qscriptstring.cpp | 10 ++-- src/script/qscriptstring.h | 10 ++-- src/script/qscriptstring_p.h | 10 ++-- src/script/qscriptsyntaxchecker.cpp | 10 ++-- src/script/qscriptsyntaxchecker_p.h | 10 ++-- src/script/qscriptsyntaxcheckresult_p.h | 10 ++-- src/script/qscriptvalue.cpp | 10 ++-- src/script/qscriptvalue.h | 10 ++-- src/script/qscriptvalue_p.h | 10 ++-- src/script/qscriptvaluefwd_p.h | 10 ++-- src/script/qscriptvalueimpl.cpp | 10 ++-- src/script/qscriptvalueimpl_p.h | 10 ++-- src/script/qscriptvalueimplfwd_p.h | 10 ++-- src/script/qscriptvalueiterator.cpp | 10 ++-- src/script/qscriptvalueiterator.h | 10 ++-- src/script/qscriptvalueiterator_p.h | 10 ++-- src/script/qscriptvalueiteratorimpl.cpp | 10 ++-- src/script/qscriptvalueiteratorimpl_p.h | 10 ++-- src/script/qscriptxmlgenerator.cpp | 10 ++-- src/script/qscriptxmlgenerator_p.h | 10 ++-- .../debugging/qscriptbreakpointdata.cpp | 10 ++-- .../debugging/qscriptbreakpointdata_p.h | 10 ++-- .../debugging/qscriptbreakpointsmodel.cpp | 10 ++-- .../debugging/qscriptbreakpointsmodel_p.h | 10 ++-- .../debugging/qscriptbreakpointswidget.cpp | 10 ++-- .../debugging/qscriptbreakpointswidget_p.h | 10 ++-- .../qscriptbreakpointswidgetinterface.cpp | 10 ++-- .../qscriptbreakpointswidgetinterface_p.h | 10 ++-- .../qscriptbreakpointswidgetinterface_p_p.h | 10 ++-- .../qscriptcompletionproviderinterface_p.h | 10 ++-- .../debugging/qscriptcompletiontask.cpp | 10 ++-- .../debugging/qscriptcompletiontask_p.h | 10 ++-- .../debugging/qscriptcompletiontaskinterface.cpp | 10 ++-- .../debugging/qscriptcompletiontaskinterface_p.h | 10 ++-- .../debugging/qscriptcompletiontaskinterface_p_p.h | 10 ++-- src/scripttools/debugging/qscriptdebugger.cpp | 10 ++-- src/scripttools/debugging/qscriptdebugger_p.h | 10 ++-- src/scripttools/debugging/qscriptdebuggeragent.cpp | 10 ++-- src/scripttools/debugging/qscriptdebuggeragent_p.h | 10 ++-- .../debugging/qscriptdebuggeragent_p_p.h | 10 ++-- .../debugging/qscriptdebuggerbackend.cpp | 10 ++-- .../debugging/qscriptdebuggerbackend_p.h | 10 ++-- .../debugging/qscriptdebuggerbackend_p_p.h | 10 ++-- .../debugging/qscriptdebuggercodefinderwidget.cpp | 10 ++-- .../debugging/qscriptdebuggercodefinderwidget_p.h | 10 ++-- .../qscriptdebuggercodefinderwidgetinterface.cpp | 10 ++-- .../qscriptdebuggercodefinderwidgetinterface_p.h | 10 ++-- .../qscriptdebuggercodefinderwidgetinterface_p_p.h | 10 ++-- .../debugging/qscriptdebuggercodeview.cpp | 10 ++-- .../debugging/qscriptdebuggercodeview_p.h | 10 ++-- .../debugging/qscriptdebuggercodeviewinterface.cpp | 10 ++-- .../debugging/qscriptdebuggercodeviewinterface_p.h | 10 ++-- .../qscriptdebuggercodeviewinterface_p_p.h | 10 ++-- .../debugging/qscriptdebuggercodewidget.cpp | 10 ++-- .../debugging/qscriptdebuggercodewidget_p.h | 10 ++-- .../qscriptdebuggercodewidgetinterface.cpp | 10 ++-- .../qscriptdebuggercodewidgetinterface_p.h | 10 ++-- .../qscriptdebuggercodewidgetinterface_p_p.h | 10 ++-- .../debugging/qscriptdebuggercommand.cpp | 10 ++-- .../debugging/qscriptdebuggercommand_p.h | 10 ++-- .../debugging/qscriptdebuggercommandexecutor.cpp | 10 ++-- .../debugging/qscriptdebuggercommandexecutor_p.h | 10 ++-- .../qscriptdebuggercommandschedulerfrontend.cpp | 10 ++-- .../qscriptdebuggercommandschedulerfrontend_p.h | 10 ++-- .../qscriptdebuggercommandschedulerinterface_p.h | 10 ++-- .../qscriptdebuggercommandschedulerjob.cpp | 10 ++-- .../qscriptdebuggercommandschedulerjob_p.h | 10 ++-- .../qscriptdebuggercommandschedulerjob_p_p.h | 10 ++-- .../debugging/qscriptdebuggerconsole.cpp | 10 ++-- .../debugging/qscriptdebuggerconsole_p.h | 10 ++-- .../debugging/qscriptdebuggerconsolecommand.cpp | 10 ++-- .../debugging/qscriptdebuggerconsolecommand_p.h | 10 ++-- .../debugging/qscriptdebuggerconsolecommand_p_p.h | 10 ++-- .../qscriptdebuggerconsolecommandgroupdata.cpp | 10 ++-- .../qscriptdebuggerconsolecommandgroupdata_p.h | 10 ++-- .../debugging/qscriptdebuggerconsolecommandjob.cpp | 10 ++-- .../debugging/qscriptdebuggerconsolecommandjob_p.h | 10 ++-- .../qscriptdebuggerconsolecommandjob_p_p.h | 10 ++-- .../qscriptdebuggerconsolecommandmanager.cpp | 10 ++-- .../qscriptdebuggerconsolecommandmanager_p.h | 10 ++-- .../qscriptdebuggerconsoleglobalobject.cpp | 10 ++-- .../qscriptdebuggerconsoleglobalobject_p.h | 10 ++-- .../qscriptdebuggerconsolehistorianinterface_p.h | 10 ++-- .../debugging/qscriptdebuggerconsolewidget.cpp | 10 ++-- .../debugging/qscriptdebuggerconsolewidget_p.h | 10 ++-- .../qscriptdebuggerconsolewidgetinterface.cpp | 10 ++-- .../qscriptdebuggerconsolewidgetinterface_p.h | 10 ++-- .../qscriptdebuggerconsolewidgetinterface_p_p.h | 10 ++-- src/scripttools/debugging/qscriptdebuggerevent.cpp | 10 ++-- src/scripttools/debugging/qscriptdebuggerevent_p.h | 10 ++-- .../qscriptdebuggereventhandlerinterface_p.h | 10 ++-- .../debugging/qscriptdebuggerfrontend.cpp | 10 ++-- .../debugging/qscriptdebuggerfrontend_p.h | 10 ++-- .../debugging/qscriptdebuggerfrontend_p_p.h | 10 ++-- src/scripttools/debugging/qscriptdebuggerjob.cpp | 10 ++-- src/scripttools/debugging/qscriptdebuggerjob_p.h | 10 ++-- src/scripttools/debugging/qscriptdebuggerjob_p_p.h | 10 ++-- .../qscriptdebuggerjobschedulerinterface_p.h | 10 ++-- .../debugging/qscriptdebuggerlocalsmodel.cpp | 10 ++-- .../debugging/qscriptdebuggerlocalsmodel_p.h | 10 ++-- .../debugging/qscriptdebuggerlocalswidget.cpp | 10 ++-- .../debugging/qscriptdebuggerlocalswidget_p.h | 10 ++-- .../qscriptdebuggerlocalswidgetinterface.cpp | 10 ++-- .../qscriptdebuggerlocalswidgetinterface_p.h | 10 ++-- .../qscriptdebuggerlocalswidgetinterface_p_p.h | 10 ++-- .../qscriptdebuggerobjectsnapshotdelta_p.h | 10 ++-- .../debugging/qscriptdebuggerresponse.cpp | 10 ++-- .../debugging/qscriptdebuggerresponse_p.h | 10 ++-- .../qscriptdebuggerresponsehandlerinterface_p.h | 10 ++-- .../qscriptdebuggerscriptedconsolecommand.cpp | 10 ++-- .../qscriptdebuggerscriptedconsolecommand_p.h | 10 ++-- .../debugging/qscriptdebuggerscriptsmodel.cpp | 10 ++-- .../debugging/qscriptdebuggerscriptsmodel_p.h | 10 ++-- .../debugging/qscriptdebuggerscriptswidget.cpp | 10 ++-- .../debugging/qscriptdebuggerscriptswidget_p.h | 10 ++-- .../qscriptdebuggerscriptswidgetinterface.cpp | 10 ++-- .../qscriptdebuggerscriptswidgetinterface_p.h | 10 ++-- .../qscriptdebuggerscriptswidgetinterface_p_p.h | 10 ++-- .../debugging/qscriptdebuggerstackmodel.cpp | 10 ++-- .../debugging/qscriptdebuggerstackmodel_p.h | 10 ++-- .../debugging/qscriptdebuggerstackwidget.cpp | 10 ++-- .../debugging/qscriptdebuggerstackwidget_p.h | 10 ++-- .../qscriptdebuggerstackwidgetinterface.cpp | 10 ++-- .../qscriptdebuggerstackwidgetinterface_p.h | 10 ++-- .../qscriptdebuggerstackwidgetinterface_p_p.h | 10 ++-- src/scripttools/debugging/qscriptdebuggervalue.cpp | 10 ++-- src/scripttools/debugging/qscriptdebuggervalue_p.h | 10 ++-- .../debugging/qscriptdebuggervalueproperty.cpp | 10 ++-- .../debugging/qscriptdebuggervalueproperty_p.h | 10 ++-- .../qscriptdebuggerwidgetfactoryinterface_p.h | 10 ++-- .../debugging/qscriptdebugoutputwidget.cpp | 10 ++-- .../debugging/qscriptdebugoutputwidget_p.h | 10 ++-- .../qscriptdebugoutputwidgetinterface.cpp | 10 ++-- .../qscriptdebugoutputwidgetinterface_p.h | 10 ++-- .../qscriptdebugoutputwidgetinterface_p_p.h | 10 ++-- src/scripttools/debugging/qscriptedit.cpp | 10 ++-- src/scripttools/debugging/qscriptedit_p.h | 10 ++-- .../debugging/qscriptenginedebugger.cpp | 10 ++-- src/scripttools/debugging/qscriptenginedebugger.h | 10 ++-- .../debugging/qscriptenginedebuggerfrontend.cpp | 10 ++-- .../debugging/qscriptenginedebuggerfrontend_p.h | 10 ++-- .../debugging/qscripterrorlogwidget.cpp | 10 ++-- .../debugging/qscripterrorlogwidget_p.h | 10 ++-- .../debugging/qscripterrorlogwidgetinterface.cpp | 10 ++-- .../debugging/qscripterrorlogwidgetinterface_p.h | 10 ++-- .../debugging/qscripterrorlogwidgetinterface_p_p.h | 10 ++-- .../debugging/qscriptmessagehandlerinterface_p.h | 10 ++-- .../debugging/qscriptobjectsnapshot.cpp | 10 ++-- .../debugging/qscriptobjectsnapshot_p.h | 10 ++-- src/scripttools/debugging/qscriptscriptdata.cpp | 10 ++-- src/scripttools/debugging/qscriptscriptdata_p.h | 10 ++-- .../debugging/qscriptstdmessagehandler.cpp | 10 ++-- .../debugging/qscriptstdmessagehandler_p.h | 10 ++-- .../debugging/qscriptsyntaxhighlighter.cpp | 10 ++-- .../debugging/qscriptsyntaxhighlighter_p.h | 10 ++-- .../debugging/qscripttooltipproviderinterface_p.h | 10 ++-- src/scripttools/debugging/qscriptvalueproperty.cpp | 10 ++-- src/scripttools/debugging/qscriptvalueproperty_p.h | 10 ++-- src/scripttools/debugging/qscriptxmlparser.cpp | 10 ++-- src/scripttools/debugging/qscriptxmlparser_p.h | 10 ++-- src/sql/drivers/db2/qsql_db2.cpp | 10 ++-- src/sql/drivers/db2/qsql_db2.h | 10 ++-- src/sql/drivers/ibase/qsql_ibase.cpp | 10 ++-- src/sql/drivers/ibase/qsql_ibase.h | 10 ++-- src/sql/drivers/mysql/qsql_mysql.cpp | 10 ++-- src/sql/drivers/mysql/qsql_mysql.h | 10 ++-- src/sql/drivers/oci/qsql_oci.cpp | 10 ++-- src/sql/drivers/oci/qsql_oci.h | 10 ++-- src/sql/drivers/odbc/qsql_odbc.cpp | 10 ++-- src/sql/drivers/odbc/qsql_odbc.h | 10 ++-- src/sql/drivers/psql/qsql_psql.cpp | 10 ++-- src/sql/drivers/psql/qsql_psql.h | 10 ++-- src/sql/drivers/sqlite/qsql_sqlite.cpp | 10 ++-- src/sql/drivers/sqlite/qsql_sqlite.h | 10 ++-- src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 10 ++-- src/sql/drivers/sqlite2/qsql_sqlite2.h | 10 ++-- src/sql/drivers/tds/qsql_tds.cpp | 10 ++-- src/sql/drivers/tds/qsql_tds.h | 10 ++-- src/sql/kernel/qsql.h | 10 ++-- src/sql/kernel/qsqlcachedresult.cpp | 10 ++-- src/sql/kernel/qsqlcachedresult_p.h | 10 ++-- src/sql/kernel/qsqldatabase.cpp | 10 ++-- src/sql/kernel/qsqldatabase.h | 10 ++-- src/sql/kernel/qsqldriver.cpp | 10 ++-- src/sql/kernel/qsqldriver.h | 10 ++-- src/sql/kernel/qsqldriverplugin.cpp | 10 ++-- src/sql/kernel/qsqldriverplugin.h | 10 ++-- src/sql/kernel/qsqlerror.cpp | 10 ++-- src/sql/kernel/qsqlerror.h | 10 ++-- src/sql/kernel/qsqlfield.cpp | 10 ++-- src/sql/kernel/qsqlfield.h | 10 ++-- src/sql/kernel/qsqlindex.cpp | 10 ++-- src/sql/kernel/qsqlindex.h | 10 ++-- src/sql/kernel/qsqlnulldriver_p.h | 10 ++-- src/sql/kernel/qsqlquery.cpp | 10 ++-- src/sql/kernel/qsqlquery.h | 10 ++-- src/sql/kernel/qsqlrecord.cpp | 10 ++-- src/sql/kernel/qsqlrecord.h | 10 ++-- src/sql/kernel/qsqlresult.cpp | 10 ++-- src/sql/kernel/qsqlresult.h | 10 ++-- src/sql/models/qsqlquerymodel.cpp | 10 ++-- src/sql/models/qsqlquerymodel.h | 10 ++-- src/sql/models/qsqlquerymodel_p.h | 10 ++-- src/sql/models/qsqlrelationaldelegate.cpp | 10 ++-- src/sql/models/qsqlrelationaldelegate.h | 10 ++-- src/sql/models/qsqlrelationaltablemodel.cpp | 10 ++-- src/sql/models/qsqlrelationaltablemodel.h | 10 ++-- src/sql/models/qsqltablemodel.cpp | 10 ++-- src/sql/models/qsqltablemodel.h | 10 ++-- src/sql/models/qsqltablemodel_p.h | 10 ++-- src/svg/qgraphicssvgitem.cpp | 10 ++-- src/svg/qgraphicssvgitem.h | 10 ++-- src/svg/qsvgfont.cpp | 10 ++-- src/svg/qsvgfont_p.h | 10 ++-- src/svg/qsvggenerator.cpp | 10 ++-- src/svg/qsvggenerator.h | 10 ++-- src/svg/qsvggraphics.cpp | 10 ++-- src/svg/qsvggraphics_p.h | 10 ++-- src/svg/qsvghandler.cpp | 10 ++-- src/svg/qsvghandler_p.h | 10 ++-- src/svg/qsvgnode.cpp | 10 ++-- src/svg/qsvgnode_p.h | 10 ++-- src/svg/qsvgrenderer.cpp | 10 ++-- src/svg/qsvgrenderer.h | 10 ++-- src/svg/qsvgstructure.cpp | 10 ++-- src/svg/qsvgstructure_p.h | 10 ++-- src/svg/qsvgstyle.cpp | 10 ++-- src/svg/qsvgstyle_p.h | 10 ++-- src/svg/qsvgtinydocument.cpp | 10 ++-- src/svg/qsvgtinydocument_p.h | 10 ++-- src/svg/qsvgwidget.cpp | 10 ++-- src/svg/qsvgwidget.h | 10 ++-- src/testlib/qabstracttestlogger.cpp | 10 ++-- src/testlib/qabstracttestlogger_p.h | 10 ++-- src/testlib/qasciikey.cpp | 10 ++-- src/testlib/qbenchmark.cpp | 10 ++-- src/testlib/qbenchmark.h | 10 ++-- src/testlib/qbenchmark_p.h | 10 ++-- src/testlib/qbenchmarkevent.cpp | 10 ++-- src/testlib/qbenchmarkevent_p.h | 10 ++-- src/testlib/qbenchmarkmeasurement.cpp | 10 ++-- src/testlib/qbenchmarkmeasurement_p.h | 10 ++-- src/testlib/qbenchmarkvalgrind.cpp | 10 ++-- src/testlib/qbenchmarkvalgrind_p.h | 10 ++-- src/testlib/qplaintestlogger.cpp | 10 ++-- src/testlib/qplaintestlogger_p.h | 10 ++-- src/testlib/qsignaldumper.cpp | 10 ++-- src/testlib/qsignaldumper_p.h | 10 ++-- src/testlib/qsignalspy.h | 10 ++-- src/testlib/qtest.h | 10 ++-- src/testlib/qtest_global.h | 10 ++-- src/testlib/qtest_gui.h | 10 ++-- src/testlib/qtestaccessible.h | 10 ++-- src/testlib/qtestassert.h | 10 ++-- src/testlib/qtestcase.cpp | 10 ++-- src/testlib/qtestcase.h | 10 ++-- src/testlib/qtestdata.cpp | 10 ++-- src/testlib/qtestdata.h | 10 ++-- src/testlib/qtestevent.h | 10 ++-- src/testlib/qtesteventloop.h | 10 ++-- src/testlib/qtestkeyboard.h | 10 ++-- src/testlib/qtestlog.cpp | 10 ++-- src/testlib/qtestlog_p.h | 10 ++-- src/testlib/qtestmouse.h | 10 ++-- src/testlib/qtestresult.cpp | 10 ++-- src/testlib/qtestresult_p.h | 10 ++-- src/testlib/qtestspontaneevent.h | 10 ++-- src/testlib/qtestsystem.h | 10 ++-- src/testlib/qtesttable.cpp | 10 ++-- src/testlib/qtesttable_p.h | 10 ++-- src/testlib/qxmltestlogger.cpp | 10 ++-- src/testlib/qxmltestlogger_p.h | 10 ++-- src/tools/idc/main.cpp | 10 ++-- src/tools/moc/generator.cpp | 10 ++-- src/tools/moc/generator.h | 10 ++-- src/tools/moc/keywords.cpp | 10 ++-- src/tools/moc/main.cpp | 10 ++-- src/tools/moc/moc.cpp | 10 ++-- src/tools/moc/moc.h | 10 ++-- src/tools/moc/mwerks_mac.cpp | 10 ++-- src/tools/moc/mwerks_mac.h | 10 ++-- src/tools/moc/outputrevision.h | 10 ++-- src/tools/moc/parser.cpp | 10 ++-- src/tools/moc/parser.h | 10 ++-- src/tools/moc/ppkeywords.cpp | 10 ++-- src/tools/moc/preprocessor.cpp | 10 ++-- src/tools/moc/preprocessor.h | 10 ++-- src/tools/moc/symbols.h | 10 ++-- src/tools/moc/token.cpp | 10 ++-- src/tools/moc/token.h | 10 ++-- src/tools/moc/util/generate_keywords.cpp | 10 ++-- src/tools/moc/util/licenseheader.txt | 10 ++-- src/tools/moc/utils.h | 10 ++-- src/tools/rcc/main.cpp | 10 ++-- src/tools/rcc/rcc.cpp | 10 ++-- src/tools/rcc/rcc.h | 10 ++-- src/tools/uic/cpp/cppextractimages.cpp | 10 ++-- src/tools/uic/cpp/cppextractimages.h | 10 ++-- src/tools/uic/cpp/cppwritedeclaration.cpp | 10 ++-- src/tools/uic/cpp/cppwritedeclaration.h | 10 ++-- src/tools/uic/cpp/cppwriteicondata.cpp | 10 ++-- src/tools/uic/cpp/cppwriteicondata.h | 10 ++-- src/tools/uic/cpp/cppwriteicondeclaration.cpp | 10 ++-- src/tools/uic/cpp/cppwriteicondeclaration.h | 10 ++-- src/tools/uic/cpp/cppwriteiconinitialization.cpp | 10 ++-- src/tools/uic/cpp/cppwriteiconinitialization.h | 10 ++-- src/tools/uic/cpp/cppwriteincludes.cpp | 10 ++-- src/tools/uic/cpp/cppwriteincludes.h | 10 ++-- src/tools/uic/cpp/cppwriteinitialization.cpp | 10 ++-- src/tools/uic/cpp/cppwriteinitialization.h | 10 ++-- src/tools/uic/customwidgetsinfo.cpp | 10 ++-- src/tools/uic/customwidgetsinfo.h | 10 ++-- src/tools/uic/databaseinfo.cpp | 10 ++-- src/tools/uic/databaseinfo.h | 10 ++-- src/tools/uic/driver.cpp | 10 ++-- src/tools/uic/driver.h | 10 ++-- src/tools/uic/globaldefs.h | 10 ++-- src/tools/uic/main.cpp | 10 ++-- src/tools/uic/option.h | 10 ++-- src/tools/uic/treewalker.cpp | 10 ++-- src/tools/uic/treewalker.h | 10 ++-- src/tools/uic/ui4.cpp | 10 ++-- src/tools/uic/ui4.h | 10 ++-- src/tools/uic/uic.cpp | 10 ++-- src/tools/uic/uic.h | 10 ++-- src/tools/uic/utils.h | 10 ++-- src/tools/uic/validator.cpp | 10 ++-- src/tools/uic/validator.h | 10 ++-- src/tools/uic3/converter.cpp | 10 ++-- src/tools/uic3/deps.cpp | 10 ++-- src/tools/uic3/domtool.cpp | 10 ++-- src/tools/uic3/domtool.h | 10 ++-- src/tools/uic3/embed.cpp | 10 ++-- src/tools/uic3/form.cpp | 10 ++-- src/tools/uic3/main.cpp | 10 ++-- src/tools/uic3/object.cpp | 10 ++-- src/tools/uic3/parser.cpp | 10 ++-- src/tools/uic3/parser.h | 10 ++-- src/tools/uic3/qt3to4.cpp | 10 ++-- src/tools/uic3/qt3to4.h | 10 ++-- src/tools/uic3/subclassing.cpp | 10 ++-- src/tools/uic3/ui3reader.cpp | 10 ++-- src/tools/uic3/ui3reader.h | 10 ++-- src/tools/uic3/uic.cpp | 10 ++-- src/tools/uic3/uic.h | 10 ++-- src/tools/uic3/widgetinfo.cpp | 10 ++-- src/tools/uic3/widgetinfo.h | 10 ++-- src/xml/dom/qdom.cpp | 10 ++-- src/xml/dom/qdom.h | 10 ++-- src/xml/sax/qxml.cpp | 10 ++-- src/xml/sax/qxml.h | 10 ++-- src/xml/stream/qxmlstream.h | 10 ++-- src/xmlpatterns/Mainpage.dox | 10 ++-- src/xmlpatterns/acceltree/qacceliterators.cpp | 10 ++-- src/xmlpatterns/acceltree/qacceliterators_p.h | 10 ++-- src/xmlpatterns/acceltree/qacceltree.cpp | 10 ++-- src/xmlpatterns/acceltree/qacceltree_p.h | 10 ++-- src/xmlpatterns/acceltree/qacceltreebuilder.cpp | 10 ++-- src/xmlpatterns/acceltree/qacceltreebuilder_p.h | 10 ++-- .../acceltree/qacceltreeresourceloader.cpp | 10 ++-- .../acceltree/qacceltreeresourceloader_p.h | 10 ++-- .../acceltree/qcompressedwhitespace.cpp | 10 ++-- .../acceltree/qcompressedwhitespace_p.h | 10 ++-- src/xmlpatterns/api/qabstractmessagehandler.cpp | 10 ++-- src/xmlpatterns/api/qabstractmessagehandler.h | 10 ++-- src/xmlpatterns/api/qabstracturiresolver.cpp | 10 ++-- src/xmlpatterns/api/qabstracturiresolver.h | 10 ++-- .../api/qabstractxmlforwarditerator.cpp | 10 ++-- .../api/qabstractxmlforwarditerator_p.h | 10 ++-- src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 10 ++-- src/xmlpatterns/api/qabstractxmlnodemodel.h | 10 ++-- src/xmlpatterns/api/qabstractxmlnodemodel_p.h | 10 ++-- src/xmlpatterns/api/qabstractxmlreceiver.cpp | 10 ++-- src/xmlpatterns/api/qabstractxmlreceiver.h | 10 ++-- src/xmlpatterns/api/qabstractxmlreceiver_p.h | 10 ++-- src/xmlpatterns/api/qdeviceresourceloader_p.h | 10 ++-- src/xmlpatterns/api/qiodevicedelegate.cpp | 10 ++-- src/xmlpatterns/api/qiodevicedelegate_p.h | 10 ++-- src/xmlpatterns/api/qnetworkaccessdelegator.cpp | 10 ++-- src/xmlpatterns/api/qnetworkaccessdelegator_p.h | 10 ++-- src/xmlpatterns/api/qreferencecountedvalue_p.h | 10 ++-- src/xmlpatterns/api/qresourcedelegator.cpp | 10 ++-- src/xmlpatterns/api/qresourcedelegator_p.h | 10 ++-- src/xmlpatterns/api/qsimplexmlnodemodel.cpp | 10 ++-- src/xmlpatterns/api/qsimplexmlnodemodel.h | 10 ++-- src/xmlpatterns/api/qsourcelocation.cpp | 10 ++-- src/xmlpatterns/api/qsourcelocation.h | 10 ++-- src/xmlpatterns/api/quriloader.cpp | 10 ++-- src/xmlpatterns/api/quriloader_p.h | 10 ++-- src/xmlpatterns/api/qvariableloader.cpp | 10 ++-- src/xmlpatterns/api/qvariableloader_p.h | 10 ++-- src/xmlpatterns/api/qxmlformatter.cpp | 10 ++-- src/xmlpatterns/api/qxmlformatter.h | 10 ++-- src/xmlpatterns/api/qxmlname.cpp | 10 ++-- src/xmlpatterns/api/qxmlname.h | 10 ++-- src/xmlpatterns/api/qxmlnamepool.cpp | 10 ++-- src/xmlpatterns/api/qxmlnamepool.h | 10 ++-- src/xmlpatterns/api/qxmlquery.cpp | 10 ++-- src/xmlpatterns/api/qxmlquery.h | 10 ++-- src/xmlpatterns/api/qxmlquery_p.h | 10 ++-- src/xmlpatterns/api/qxmlresultitems.cpp | 10 ++-- src/xmlpatterns/api/qxmlresultitems.h | 10 ++-- src/xmlpatterns/api/qxmlresultitems_p.h | 10 ++-- src/xmlpatterns/api/qxmlserializer.cpp | 10 ++-- src/xmlpatterns/api/qxmlserializer.h | 10 ++-- src/xmlpatterns/api/qxmlserializer_p.h | 10 ++-- src/xmlpatterns/data/qabstractdatetime.cpp | 10 ++-- src/xmlpatterns/data/qabstractdatetime_p.h | 10 ++-- src/xmlpatterns/data/qabstractduration.cpp | 10 ++-- src/xmlpatterns/data/qabstractduration_p.h | 10 ++-- src/xmlpatterns/data/qabstractfloat.cpp | 10 ++-- src/xmlpatterns/data/qabstractfloat_p.h | 10 ++-- src/xmlpatterns/data/qabstractfloatcasters.cpp | 10 ++-- src/xmlpatterns/data/qabstractfloatcasters_p.h | 10 ++-- .../data/qabstractfloatmathematician.cpp | 10 ++-- .../data/qabstractfloatmathematician_p.h | 10 ++-- src/xmlpatterns/data/qanyuri.cpp | 10 ++-- src/xmlpatterns/data/qanyuri_p.h | 10 ++-- src/xmlpatterns/data/qatomiccaster.cpp | 10 ++-- src/xmlpatterns/data/qatomiccaster_p.h | 10 ++-- src/xmlpatterns/data/qatomiccasters.cpp | 10 ++-- src/xmlpatterns/data/qatomiccasters_p.h | 10 ++-- src/xmlpatterns/data/qatomiccomparator.cpp | 10 ++-- src/xmlpatterns/data/qatomiccomparator_p.h | 10 ++-- src/xmlpatterns/data/qatomiccomparators.cpp | 10 ++-- src/xmlpatterns/data/qatomiccomparators_p.h | 10 ++-- src/xmlpatterns/data/qatomicmathematician.cpp | 10 ++-- src/xmlpatterns/data/qatomicmathematician_p.h | 10 ++-- src/xmlpatterns/data/qatomicmathematicians.cpp | 10 ++-- src/xmlpatterns/data/qatomicmathematicians_p.h | 10 ++-- src/xmlpatterns/data/qatomicstring.cpp | 10 ++-- src/xmlpatterns/data/qatomicstring_p.h | 10 ++-- src/xmlpatterns/data/qatomicvalue.cpp | 10 ++-- src/xmlpatterns/data/qbase64binary.cpp | 10 ++-- src/xmlpatterns/data/qbase64binary_p.h | 10 ++-- src/xmlpatterns/data/qboolean.cpp | 10 ++-- src/xmlpatterns/data/qboolean_p.h | 10 ++-- src/xmlpatterns/data/qcommonvalues.cpp | 10 ++-- src/xmlpatterns/data/qcommonvalues_p.h | 10 ++-- src/xmlpatterns/data/qdate.cpp | 10 ++-- src/xmlpatterns/data/qdate_p.h | 10 ++-- src/xmlpatterns/data/qdaytimeduration.cpp | 10 ++-- src/xmlpatterns/data/qdaytimeduration_p.h | 10 ++-- src/xmlpatterns/data/qdecimal.cpp | 10 ++-- src/xmlpatterns/data/qdecimal_p.h | 10 ++-- src/xmlpatterns/data/qderivedinteger_p.h | 10 ++-- src/xmlpatterns/data/qderivedstring_p.h | 10 ++-- src/xmlpatterns/data/qduration.cpp | 10 ++-- src/xmlpatterns/data/qduration_p.h | 10 ++-- src/xmlpatterns/data/qgday.cpp | 10 ++-- src/xmlpatterns/data/qgday_p.h | 10 ++-- src/xmlpatterns/data/qgmonth.cpp | 10 ++-- src/xmlpatterns/data/qgmonth_p.h | 10 ++-- src/xmlpatterns/data/qgmonthday.cpp | 10 ++-- src/xmlpatterns/data/qgmonthday_p.h | 10 ++-- src/xmlpatterns/data/qgyear.cpp | 10 ++-- src/xmlpatterns/data/qgyear_p.h | 10 ++-- src/xmlpatterns/data/qgyearmonth.cpp | 10 ++-- src/xmlpatterns/data/qgyearmonth_p.h | 10 ++-- src/xmlpatterns/data/qhexbinary.cpp | 10 ++-- src/xmlpatterns/data/qhexbinary_p.h | 10 ++-- src/xmlpatterns/data/qinteger.cpp | 10 ++-- src/xmlpatterns/data/qinteger_p.h | 10 ++-- src/xmlpatterns/data/qitem.cpp | 10 ++-- src/xmlpatterns/data/qitem_p.h | 10 ++-- src/xmlpatterns/data/qnodebuilder.cpp | 10 ++-- src/xmlpatterns/data/qnodebuilder_p.h | 10 ++-- src/xmlpatterns/data/qnodemodel.cpp | 10 ++-- src/xmlpatterns/data/qqnamevalue.cpp | 10 ++-- src/xmlpatterns/data/qqnamevalue_p.h | 10 ++-- src/xmlpatterns/data/qresourceloader.cpp | 10 ++-- src/xmlpatterns/data/qresourceloader_p.h | 10 ++-- src/xmlpatterns/data/qschemadatetime.cpp | 10 ++-- src/xmlpatterns/data/qschemadatetime_p.h | 10 ++-- src/xmlpatterns/data/qschemanumeric.cpp | 10 ++-- src/xmlpatterns/data/qschemanumeric_p.h | 10 ++-- src/xmlpatterns/data/qschematime.cpp | 10 ++-- src/xmlpatterns/data/qschematime_p.h | 10 ++-- src/xmlpatterns/data/qsequencereceiver.cpp | 10 ++-- src/xmlpatterns/data/qsequencereceiver_p.h | 10 ++-- src/xmlpatterns/data/qsorttuple.cpp | 10 ++-- src/xmlpatterns/data/qsorttuple_p.h | 10 ++-- src/xmlpatterns/data/quntypedatomic.cpp | 10 ++-- src/xmlpatterns/data/quntypedatomic_p.h | 10 ++-- src/xmlpatterns/data/qvalidationerror.cpp | 10 ++-- src/xmlpatterns/data/qvalidationerror_p.h | 10 ++-- src/xmlpatterns/data/qyearmonthduration.cpp | 10 ++-- src/xmlpatterns/data/qyearmonthduration_p.h | 10 ++-- src/xmlpatterns/documentationGroups.dox | 10 ++-- .../environment/createReportContext.xsl | 20 ++++---- .../environment/qcurrentitemcontext.cpp | 10 ++-- .../environment/qcurrentitemcontext_p.h | 10 ++-- .../environment/qdelegatingdynamiccontext.cpp | 10 ++-- .../environment/qdelegatingdynamiccontext_p.h | 10 ++-- .../environment/qdelegatingstaticcontext.cpp | 10 ++-- .../environment/qdelegatingstaticcontext_p.h | 10 ++-- src/xmlpatterns/environment/qdynamiccontext.cpp | 10 ++-- src/xmlpatterns/environment/qdynamiccontext_p.h | 10 ++-- src/xmlpatterns/environment/qfocus.cpp | 10 ++-- src/xmlpatterns/environment/qfocus_p.h | 10 ++-- .../environment/qgenericdynamiccontext.cpp | 10 ++-- .../environment/qgenericdynamiccontext_p.h | 10 ++-- .../environment/qgenericstaticcontext.cpp | 10 ++-- .../environment/qgenericstaticcontext_p.h | 10 ++-- .../environment/qreceiverdynamiccontext.cpp | 10 ++-- .../environment/qreceiverdynamiccontext_p.h | 10 ++-- src/xmlpatterns/environment/qreportcontext.cpp | 10 ++-- src/xmlpatterns/environment/qreportcontext_p.h | 10 ++-- src/xmlpatterns/environment/qstackcontextbase.cpp | 10 ++-- src/xmlpatterns/environment/qstackcontextbase_p.h | 10 ++-- .../environment/qstaticbaseuricontext.cpp | 10 ++-- .../environment/qstaticbaseuricontext_p.h | 10 ++-- .../environment/qstaticcompatibilitycontext.cpp | 10 ++-- .../environment/qstaticcompatibilitycontext_p.h | 10 ++-- src/xmlpatterns/environment/qstaticcontext.cpp | 10 ++-- src/xmlpatterns/environment/qstaticcontext_p.h | 10 ++-- .../environment/qstaticcurrentcontext.cpp | 10 ++-- .../environment/qstaticcurrentcontext_p.h | 10 ++-- .../environment/qstaticfocuscontext.cpp | 10 ++-- .../environment/qstaticfocuscontext_p.h | 10 ++-- .../environment/qstaticnamespacecontext.cpp | 10 ++-- .../environment/qstaticnamespacecontext_p.h | 10 ++-- src/xmlpatterns/expr/qandexpression.cpp | 10 ++-- src/xmlpatterns/expr/qandexpression_p.h | 10 ++-- src/xmlpatterns/expr/qapplytemplate.cpp | 10 ++-- src/xmlpatterns/expr/qapplytemplate_p.h | 10 ++-- src/xmlpatterns/expr/qargumentreference.cpp | 10 ++-- src/xmlpatterns/expr/qargumentreference_p.h | 10 ++-- src/xmlpatterns/expr/qarithmeticexpression.cpp | 10 ++-- src/xmlpatterns/expr/qarithmeticexpression_p.h | 10 ++-- src/xmlpatterns/expr/qattributeconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qattributeconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qattributenamevalidator.cpp | 10 ++-- src/xmlpatterns/expr/qattributenamevalidator_p.h | 10 ++-- src/xmlpatterns/expr/qaxisstep.cpp | 10 ++-- src/xmlpatterns/expr/qaxisstep_p.h | 10 ++-- src/xmlpatterns/expr/qcachecells_p.h | 10 ++-- src/xmlpatterns/expr/qcallsite.cpp | 10 ++-- src/xmlpatterns/expr/qcallsite_p.h | 10 ++-- src/xmlpatterns/expr/qcalltargetdescription.cpp | 10 ++-- src/xmlpatterns/expr/qcalltargetdescription_p.h | 10 ++-- src/xmlpatterns/expr/qcalltemplate.cpp | 10 ++-- src/xmlpatterns/expr/qcalltemplate_p.h | 10 ++-- src/xmlpatterns/expr/qcastableas.cpp | 10 ++-- src/xmlpatterns/expr/qcastableas_p.h | 10 ++-- src/xmlpatterns/expr/qcastas.cpp | 10 ++-- src/xmlpatterns/expr/qcastas_p.h | 10 ++-- src/xmlpatterns/expr/qcastingplatform.cpp | 10 ++-- src/xmlpatterns/expr/qcastingplatform_p.h | 10 ++-- src/xmlpatterns/expr/qcollationchecker.cpp | 10 ++-- src/xmlpatterns/expr/qcollationchecker_p.h | 10 ++-- src/xmlpatterns/expr/qcombinenodes.cpp | 10 ++-- src/xmlpatterns/expr/qcombinenodes_p.h | 10 ++-- src/xmlpatterns/expr/qcommentconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qcommentconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qcomparisonplatform.cpp | 10 ++-- src/xmlpatterns/expr/qcomparisonplatform_p.h | 10 ++-- .../expr/qcomputednamespaceconstructor.cpp | 10 ++-- .../expr/qcomputednamespaceconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qcontextitem.cpp | 10 ++-- src/xmlpatterns/expr/qcontextitem_p.h | 10 ++-- src/xmlpatterns/expr/qcopyof.cpp | 10 ++-- src/xmlpatterns/expr/qcopyof_p.h | 10 ++-- src/xmlpatterns/expr/qcurrentitemstore.cpp | 10 ++-- src/xmlpatterns/expr/qcurrentitemstore_p.h | 10 ++-- src/xmlpatterns/expr/qdocumentconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qdocumentconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qdocumentcontentvalidator.cpp | 10 ++-- src/xmlpatterns/expr/qdocumentcontentvalidator_p.h | 10 ++-- src/xmlpatterns/expr/qdynamiccontextstore.cpp | 10 ++-- src/xmlpatterns/expr/qdynamiccontextstore_p.h | 10 ++-- src/xmlpatterns/expr/qelementconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qelementconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qemptycontainer.cpp | 10 ++-- src/xmlpatterns/expr/qemptycontainer_p.h | 10 ++-- src/xmlpatterns/expr/qemptysequence.cpp | 10 ++-- src/xmlpatterns/expr/qemptysequence_p.h | 10 ++-- src/xmlpatterns/expr/qevaluationcache.cpp | 10 ++-- src/xmlpatterns/expr/qevaluationcache_p.h | 10 ++-- src/xmlpatterns/expr/qexpression.cpp | 10 ++-- src/xmlpatterns/expr/qexpression_p.h | 10 ++-- src/xmlpatterns/expr/qexpressiondispatch_p.h | 10 ++-- src/xmlpatterns/expr/qexpressionfactory.cpp | 10 ++-- src/xmlpatterns/expr/qexpressionfactory_p.h | 10 ++-- src/xmlpatterns/expr/qexpressionsequence.cpp | 10 ++-- src/xmlpatterns/expr/qexpressionsequence_p.h | 10 ++-- .../expr/qexpressionvariablereference.cpp | 10 ++-- .../expr/qexpressionvariablereference_p.h | 10 ++-- src/xmlpatterns/expr/qexternalvariableloader.cpp | 10 ++-- src/xmlpatterns/expr/qexternalvariableloader_p.h | 10 ++-- .../expr/qexternalvariablereference.cpp | 10 ++-- .../expr/qexternalvariablereference_p.h | 10 ++-- src/xmlpatterns/expr/qfirstitempredicate.cpp | 10 ++-- src/xmlpatterns/expr/qfirstitempredicate_p.h | 10 ++-- src/xmlpatterns/expr/qforclause.cpp | 10 ++-- src/xmlpatterns/expr/qforclause_p.h | 10 ++-- src/xmlpatterns/expr/qgeneralcomparison.cpp | 10 ++-- src/xmlpatterns/expr/qgeneralcomparison_p.h | 10 ++-- src/xmlpatterns/expr/qgenericpredicate.cpp | 10 ++-- src/xmlpatterns/expr/qgenericpredicate_p.h | 10 ++-- src/xmlpatterns/expr/qifthenclause.cpp | 10 ++-- src/xmlpatterns/expr/qifthenclause_p.h | 10 ++-- src/xmlpatterns/expr/qinstanceof.cpp | 10 ++-- src/xmlpatterns/expr/qinstanceof_p.h | 10 ++-- src/xmlpatterns/expr/qletclause.cpp | 10 ++-- src/xmlpatterns/expr/qletclause_p.h | 10 ++-- src/xmlpatterns/expr/qliteral.cpp | 10 ++-- src/xmlpatterns/expr/qliteral_p.h | 10 ++-- src/xmlpatterns/expr/qliteralsequence.cpp | 10 ++-- src/xmlpatterns/expr/qliteralsequence_p.h | 10 ++-- src/xmlpatterns/expr/qnamespaceconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qnamespaceconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qncnameconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qncnameconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qnodecomparison.cpp | 10 ++-- src/xmlpatterns/expr/qnodecomparison_p.h | 10 ++-- src/xmlpatterns/expr/qnodesort.cpp | 10 ++-- src/xmlpatterns/expr/qnodesort_p.h | 10 ++-- src/xmlpatterns/expr/qoperandsiterator_p.h | 10 ++-- src/xmlpatterns/expr/qoptimizationpasses.cpp | 10 ++-- src/xmlpatterns/expr/qoptimizationpasses_p.h | 10 ++-- src/xmlpatterns/expr/qoptimizerblocks.cpp | 10 ++-- src/xmlpatterns/expr/qoptimizerblocks_p.h | 10 ++-- src/xmlpatterns/expr/qoptimizerframework.cpp | 10 ++-- src/xmlpatterns/expr/qoptimizerframework_p.h | 10 ++-- src/xmlpatterns/expr/qorderby.cpp | 10 ++-- src/xmlpatterns/expr/qorderby_p.h | 10 ++-- src/xmlpatterns/expr/qorexpression.cpp | 10 ++-- src/xmlpatterns/expr/qorexpression_p.h | 10 ++-- src/xmlpatterns/expr/qpaircontainer.cpp | 10 ++-- src/xmlpatterns/expr/qpaircontainer_p.h | 10 ++-- src/xmlpatterns/expr/qparentnodeaxis.cpp | 10 ++-- src/xmlpatterns/expr/qparentnodeaxis_p.h | 10 ++-- src/xmlpatterns/expr/qpath.cpp | 10 ++-- src/xmlpatterns/expr/qpath_p.h | 10 ++-- .../expr/qpositionalvariablereference.cpp | 10 ++-- .../expr/qpositionalvariablereference_p.h | 10 ++-- .../expr/qprocessinginstructionconstructor.cpp | 10 ++-- .../expr/qprocessinginstructionconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qqnameconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qqnameconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qquantifiedexpression.cpp | 10 ++-- src/xmlpatterns/expr/qquantifiedexpression_p.h | 10 ++-- src/xmlpatterns/expr/qrangeexpression.cpp | 10 ++-- src/xmlpatterns/expr/qrangeexpression_p.h | 10 ++-- src/xmlpatterns/expr/qrangevariablereference.cpp | 10 ++-- src/xmlpatterns/expr/qrangevariablereference_p.h | 10 ++-- src/xmlpatterns/expr/qreturnorderby.cpp | 10 ++-- src/xmlpatterns/expr/qreturnorderby_p.h | 10 ++-- src/xmlpatterns/expr/qsimplecontentconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qsimplecontentconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qsinglecontainer.cpp | 10 ++-- src/xmlpatterns/expr/qsinglecontainer_p.h | 10 ++-- src/xmlpatterns/expr/qsourcelocationreflection.cpp | 10 ++-- src/xmlpatterns/expr/qsourcelocationreflection_p.h | 10 ++-- src/xmlpatterns/expr/qstaticbaseuristore.cpp | 10 ++-- src/xmlpatterns/expr/qstaticbaseuristore_p.h | 10 ++-- src/xmlpatterns/expr/qstaticcompatibilitystore.cpp | 10 ++-- src/xmlpatterns/expr/qstaticcompatibilitystore_p.h | 10 ++-- src/xmlpatterns/expr/qtemplate.cpp | 10 ++-- src/xmlpatterns/expr/qtemplate_p.h | 10 ++-- src/xmlpatterns/expr/qtemplateinvoker.cpp | 10 ++-- src/xmlpatterns/expr/qtemplateinvoker_p.h | 10 ++-- src/xmlpatterns/expr/qtemplatemode.cpp | 10 ++-- src/xmlpatterns/expr/qtemplatemode_p.h | 10 ++-- .../expr/qtemplateparameterreference.cpp | 10 ++-- .../expr/qtemplateparameterreference_p.h | 10 ++-- src/xmlpatterns/expr/qtemplatepattern_p.h | 10 ++-- src/xmlpatterns/expr/qtextnodeconstructor.cpp | 10 ++-- src/xmlpatterns/expr/qtextnodeconstructor_p.h | 10 ++-- src/xmlpatterns/expr/qtreatas.cpp | 10 ++-- src/xmlpatterns/expr/qtreatas_p.h | 10 ++-- src/xmlpatterns/expr/qtriplecontainer.cpp | 10 ++-- src/xmlpatterns/expr/qtriplecontainer_p.h | 10 ++-- src/xmlpatterns/expr/qtruthpredicate.cpp | 10 ++-- src/xmlpatterns/expr/qtruthpredicate_p.h | 10 ++-- src/xmlpatterns/expr/qunaryexpression.cpp | 10 ++-- src/xmlpatterns/expr/qunaryexpression_p.h | 10 ++-- src/xmlpatterns/expr/qunlimitedcontainer.cpp | 10 ++-- src/xmlpatterns/expr/qunlimitedcontainer_p.h | 10 ++-- .../expr/qunresolvedvariablereference.cpp | 10 ++-- .../expr/qunresolvedvariablereference_p.h | 10 ++-- src/xmlpatterns/expr/quserfunction.cpp | 10 ++-- src/xmlpatterns/expr/quserfunction_p.h | 10 ++-- src/xmlpatterns/expr/quserfunctioncallsite.cpp | 10 ++-- src/xmlpatterns/expr/quserfunctioncallsite_p.h | 10 ++-- src/xmlpatterns/expr/qvalidate.cpp | 10 ++-- src/xmlpatterns/expr/qvalidate_p.h | 10 ++-- src/xmlpatterns/expr/qvaluecomparison.cpp | 10 ++-- src/xmlpatterns/expr/qvaluecomparison_p.h | 10 ++-- src/xmlpatterns/expr/qvariabledeclaration.cpp | 10 ++-- src/xmlpatterns/expr/qvariabledeclaration_p.h | 10 ++-- src/xmlpatterns/expr/qvariablereference.cpp | 10 ++-- src/xmlpatterns/expr/qvariablereference_p.h | 10 ++-- src/xmlpatterns/expr/qwithparam_p.h | 10 ++-- .../expr/qxsltsimplecontentconstructor.cpp | 10 ++-- .../expr/qxsltsimplecontentconstructor_p.h | 10 ++-- .../functions/qabstractfunctionfactory.cpp | 10 ++-- .../functions/qabstractfunctionfactory_p.h | 10 ++-- src/xmlpatterns/functions/qaccessorfns.cpp | 10 ++-- src/xmlpatterns/functions/qaccessorfns_p.h | 10 ++-- src/xmlpatterns/functions/qaggregatefns.cpp | 10 ++-- src/xmlpatterns/functions/qaggregatefns_p.h | 10 ++-- src/xmlpatterns/functions/qaggregator.cpp | 10 ++-- src/xmlpatterns/functions/qaggregator_p.h | 10 ++-- src/xmlpatterns/functions/qassemblestringfns.cpp | 10 ++-- src/xmlpatterns/functions/qassemblestringfns_p.h | 10 ++-- src/xmlpatterns/functions/qbooleanfns.cpp | 10 ++-- src/xmlpatterns/functions/qbooleanfns_p.h | 10 ++-- src/xmlpatterns/functions/qcomparescaseaware.cpp | 10 ++-- src/xmlpatterns/functions/qcomparescaseaware_p.h | 10 ++-- src/xmlpatterns/functions/qcomparestringfns.cpp | 10 ++-- src/xmlpatterns/functions/qcomparestringfns_p.h | 10 ++-- src/xmlpatterns/functions/qcomparingaggregator.cpp | 10 ++-- src/xmlpatterns/functions/qcomparingaggregator_p.h | 10 ++-- .../functions/qconstructorfunctionsfactory.cpp | 10 ++-- .../functions/qconstructorfunctionsfactory_p.h | 10 ++-- src/xmlpatterns/functions/qcontextfns.cpp | 10 ++-- src/xmlpatterns/functions/qcontextfns_p.h | 10 ++-- src/xmlpatterns/functions/qcontextnodechecker.cpp | 10 ++-- src/xmlpatterns/functions/qcontextnodechecker_p.h | 10 ++-- src/xmlpatterns/functions/qcurrentfn.cpp | 10 ++-- src/xmlpatterns/functions/qcurrentfn_p.h | 10 ++-- src/xmlpatterns/functions/qdatetimefn.cpp | 10 ++-- src/xmlpatterns/functions/qdatetimefn_p.h | 10 ++-- src/xmlpatterns/functions/qdatetimefns.cpp | 10 ++-- src/xmlpatterns/functions/qdatetimefns_p.h | 10 ++-- src/xmlpatterns/functions/qdeepequalfn.cpp | 10 ++-- src/xmlpatterns/functions/qdeepequalfn_p.h | 10 ++-- src/xmlpatterns/functions/qdocumentfn.cpp | 10 ++-- src/xmlpatterns/functions/qdocumentfn_p.h | 10 ++-- src/xmlpatterns/functions/qelementavailablefn.cpp | 10 ++-- src/xmlpatterns/functions/qelementavailablefn_p.h | 10 ++-- src/xmlpatterns/functions/qerrorfn.cpp | 10 ++-- src/xmlpatterns/functions/qerrorfn_p.h | 10 ++-- src/xmlpatterns/functions/qfunctionargument.cpp | 10 ++-- src/xmlpatterns/functions/qfunctionargument_p.h | 10 ++-- src/xmlpatterns/functions/qfunctionavailablefn.cpp | 10 ++-- src/xmlpatterns/functions/qfunctionavailablefn_p.h | 10 ++-- src/xmlpatterns/functions/qfunctioncall.cpp | 10 ++-- src/xmlpatterns/functions/qfunctioncall_p.h | 10 ++-- src/xmlpatterns/functions/qfunctionfactory.cpp | 10 ++-- src/xmlpatterns/functions/qfunctionfactory_p.h | 10 ++-- .../functions/qfunctionfactorycollection.cpp | 10 ++-- .../functions/qfunctionfactorycollection_p.h | 10 ++-- src/xmlpatterns/functions/qfunctionsignature.cpp | 10 ++-- src/xmlpatterns/functions/qfunctionsignature_p.h | 10 ++-- src/xmlpatterns/functions/qgenerateidfn.cpp | 10 ++-- src/xmlpatterns/functions/qgenerateidfn_p.h | 10 ++-- src/xmlpatterns/functions/qnodefns.cpp | 10 ++-- src/xmlpatterns/functions/qnodefns_p.h | 10 ++-- src/xmlpatterns/functions/qnumericfns.cpp | 10 ++-- src/xmlpatterns/functions/qnumericfns_p.h | 10 ++-- src/xmlpatterns/functions/qpatternmatchingfns.cpp | 10 ++-- src/xmlpatterns/functions/qpatternmatchingfns_p.h | 10 ++-- src/xmlpatterns/functions/qpatternplatform.cpp | 10 ++-- src/xmlpatterns/functions/qpatternplatform_p.h | 10 ++-- src/xmlpatterns/functions/qqnamefns.cpp | 10 ++-- src/xmlpatterns/functions/qqnamefns_p.h | 10 ++-- src/xmlpatterns/functions/qresolveurifn.cpp | 10 ++-- src/xmlpatterns/functions/qresolveurifn_p.h | 10 ++-- src/xmlpatterns/functions/qsequencefns.cpp | 10 ++-- src/xmlpatterns/functions/qsequencefns_p.h | 10 ++-- .../functions/qsequencegeneratingfns.cpp | 10 ++-- .../functions/qsequencegeneratingfns_p.h | 10 ++-- .../functions/qstaticbaseuricontainer_p.h | 10 ++-- .../functions/qstaticnamespacescontainer.cpp | 10 ++-- .../functions/qstaticnamespacescontainer_p.h | 10 ++-- src/xmlpatterns/functions/qstringvaluefns.cpp | 10 ++-- src/xmlpatterns/functions/qstringvaluefns_p.h | 10 ++-- src/xmlpatterns/functions/qsubstringfns.cpp | 10 ++-- src/xmlpatterns/functions/qsubstringfns_p.h | 10 ++-- src/xmlpatterns/functions/qsystempropertyfn.cpp | 10 ++-- src/xmlpatterns/functions/qsystempropertyfn_p.h | 10 ++-- src/xmlpatterns/functions/qtimezonefns.cpp | 10 ++-- src/xmlpatterns/functions/qtimezonefns_p.h | 10 ++-- src/xmlpatterns/functions/qtracefn.cpp | 10 ++-- src/xmlpatterns/functions/qtracefn_p.h | 10 ++-- src/xmlpatterns/functions/qtypeavailablefn.cpp | 10 ++-- src/xmlpatterns/functions/qtypeavailablefn_p.h | 10 ++-- .../functions/qunparsedentitypublicidfn.cpp | 10 ++-- .../functions/qunparsedentitypublicidfn_p.h | 10 ++-- src/xmlpatterns/functions/qunparsedentityurifn.cpp | 10 ++-- src/xmlpatterns/functions/qunparsedentityurifn_p.h | 10 ++-- .../functions/qunparsedtextavailablefn.cpp | 10 ++-- .../functions/qunparsedtextavailablefn_p.h | 10 ++-- src/xmlpatterns/functions/qunparsedtextfn.cpp | 10 ++-- src/xmlpatterns/functions/qunparsedtextfn_p.h | 10 ++-- .../functions/qxpath10corefunctions.cpp | 10 ++-- .../functions/qxpath10corefunctions_p.h | 10 ++-- .../functions/qxpath20corefunctions.cpp | 10 ++-- .../functions/qxpath20corefunctions_p.h | 10 ++-- src/xmlpatterns/functions/qxslt20corefunctions.cpp | 10 ++-- src/xmlpatterns/functions/qxslt20corefunctions_p.h | 10 ++-- src/xmlpatterns/iterators/qcachingiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qcachingiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qdeduplicateiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qdeduplicateiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qdistinctiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qdistinctiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qemptyiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qexceptiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qexceptiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qindexofiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qindexofiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qinsertioniterator.cpp | 10 ++-- src/xmlpatterns/iterators/qinsertioniterator_p.h | 10 ++-- src/xmlpatterns/iterators/qintersectiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qintersectiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qitemmappingiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qrangeiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qrangeiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qremovaliterator.cpp | 10 ++-- src/xmlpatterns/iterators/qremovaliterator_p.h | 10 ++-- .../iterators/qsequencemappingiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qsingletoniterator_p.h | 10 ++-- src/xmlpatterns/iterators/qsubsequenceiterator.cpp | 10 ++-- src/xmlpatterns/iterators/qsubsequenceiterator_p.h | 10 ++-- .../iterators/qtocodepointsiterator.cpp | 10 ++-- .../iterators/qtocodepointsiterator_p.h | 10 ++-- src/xmlpatterns/iterators/qunioniterator.cpp | 10 ++-- src/xmlpatterns/iterators/qunioniterator_p.h | 10 ++-- src/xmlpatterns/janitors/qargumentconverter.cpp | 10 ++-- src/xmlpatterns/janitors/qargumentconverter_p.h | 10 ++-- src/xmlpatterns/janitors/qatomizer.cpp | 10 ++-- src/xmlpatterns/janitors/qatomizer_p.h | 10 ++-- src/xmlpatterns/janitors/qcardinalityverifier.cpp | 10 ++-- src/xmlpatterns/janitors/qcardinalityverifier_p.h | 10 ++-- src/xmlpatterns/janitors/qebvextractor.cpp | 10 ++-- src/xmlpatterns/janitors/qebvextractor_p.h | 10 ++-- src/xmlpatterns/janitors/qitemverifier.cpp | 10 ++-- src/xmlpatterns/janitors/qitemverifier_p.h | 10 ++-- .../janitors/quntypedatomicconverter.cpp | 10 ++-- .../janitors/quntypedatomicconverter_p.h | 10 ++-- src/xmlpatterns/parser/TokenLookup.gperf | 10 ++-- src/xmlpatterns/parser/qmaintainingreader.cpp | 10 ++-- src/xmlpatterns/parser/qmaintainingreader_p.h | 10 ++-- src/xmlpatterns/parser/qparsercontext.cpp | 10 ++-- src/xmlpatterns/parser/qparsercontext_p.h | 10 ++-- src/xmlpatterns/parser/qquerytransformparser.cpp | 20 ++++---- src/xmlpatterns/parser/qquerytransformparser_p.h | 10 ++-- src/xmlpatterns/parser/qtokenizer_p.h | 10 ++-- src/xmlpatterns/parser/qtokenrevealer.cpp | 10 ++-- src/xmlpatterns/parser/qtokenrevealer_p.h | 10 ++-- src/xmlpatterns/parser/qtokensource.cpp | 10 ++-- src/xmlpatterns/parser/qtokensource_p.h | 10 ++-- src/xmlpatterns/parser/querytransformparser.ypp | 20 ++++---- src/xmlpatterns/parser/qxquerytokenizer.cpp | 10 ++-- src/xmlpatterns/parser/qxquerytokenizer_p.h | 10 ++-- src/xmlpatterns/parser/qxslttokenizer.cpp | 10 ++-- src/xmlpatterns/parser/qxslttokenizer_p.h | 10 ++-- src/xmlpatterns/parser/qxslttokenlookup.cpp | 10 ++-- src/xmlpatterns/parser/qxslttokenlookup.xml | 10 ++-- src/xmlpatterns/parser/qxslttokenlookup_p.h | 10 ++-- src/xmlpatterns/parser/trolltechHeader.txt | 10 ++-- src/xmlpatterns/projection/qdocumentprojector.cpp | 10 ++-- src/xmlpatterns/projection/qdocumentprojector_p.h | 10 ++-- .../projection/qprojectedexpression_p.h | 10 ++-- src/xmlpatterns/qtokenautomaton/exampleFile.xml | 10 ++-- src/xmlpatterns/type/qabstractnodetest.cpp | 10 ++-- src/xmlpatterns/type/qabstractnodetest_p.h | 10 ++-- src/xmlpatterns/type/qanyitemtype.cpp | 10 ++-- src/xmlpatterns/type/qanyitemtype_p.h | 10 ++-- src/xmlpatterns/type/qanynodetype.cpp | 10 ++-- src/xmlpatterns/type/qanynodetype_p.h | 10 ++-- src/xmlpatterns/type/qanysimpletype.cpp | 10 ++-- src/xmlpatterns/type/qanysimpletype_p.h | 10 ++-- src/xmlpatterns/type/qanytype.cpp | 10 ++-- src/xmlpatterns/type/qanytype_p.h | 10 ++-- src/xmlpatterns/type/qatomiccasterlocator.cpp | 10 ++-- src/xmlpatterns/type/qatomiccasterlocator_p.h | 10 ++-- src/xmlpatterns/type/qatomiccasterlocators.cpp | 10 ++-- src/xmlpatterns/type/qatomiccasterlocators_p.h | 10 ++-- src/xmlpatterns/type/qatomiccomparatorlocator.cpp | 10 ++-- src/xmlpatterns/type/qatomiccomparatorlocator_p.h | 10 ++-- src/xmlpatterns/type/qatomiccomparatorlocators.cpp | 10 ++-- src/xmlpatterns/type/qatomiccomparatorlocators_p.h | 10 ++-- .../type/qatomicmathematicianlocator.cpp | 10 ++-- .../type/qatomicmathematicianlocator_p.h | 10 ++-- .../type/qatomicmathematicianlocators.cpp | 10 ++-- .../type/qatomicmathematicianlocators_p.h | 10 ++-- src/xmlpatterns/type/qatomictype.cpp | 10 ++-- src/xmlpatterns/type/qatomictype_p.h | 10 ++-- src/xmlpatterns/type/qatomictypedispatch_p.h | 10 ++-- src/xmlpatterns/type/qbasictypesfactory.cpp | 10 ++-- src/xmlpatterns/type/qbasictypesfactory_p.h | 10 ++-- src/xmlpatterns/type/qbuiltinatomictype.cpp | 10 ++-- src/xmlpatterns/type/qbuiltinatomictype_p.h | 10 ++-- src/xmlpatterns/type/qbuiltinatomictypes.cpp | 10 ++-- src/xmlpatterns/type/qbuiltinatomictypes_p.h | 10 ++-- src/xmlpatterns/type/qbuiltinnodetype.cpp | 10 ++-- src/xmlpatterns/type/qbuiltinnodetype_p.h | 10 ++-- src/xmlpatterns/type/qbuiltintypes.cpp | 10 ++-- src/xmlpatterns/type/qbuiltintypes_p.h | 10 ++-- src/xmlpatterns/type/qcardinality.cpp | 10 ++-- src/xmlpatterns/type/qcardinality_p.h | 10 ++-- src/xmlpatterns/type/qcommonsequencetypes.cpp | 10 ++-- src/xmlpatterns/type/qcommonsequencetypes_p.h | 10 ++-- src/xmlpatterns/type/qebvtype.cpp | 10 ++-- src/xmlpatterns/type/qebvtype_p.h | 10 ++-- src/xmlpatterns/type/qemptysequencetype.cpp | 10 ++-- src/xmlpatterns/type/qemptysequencetype_p.h | 10 ++-- src/xmlpatterns/type/qgenericsequencetype.cpp | 10 ++-- src/xmlpatterns/type/qgenericsequencetype_p.h | 10 ++-- src/xmlpatterns/type/qitemtype.cpp | 10 ++-- src/xmlpatterns/type/qitemtype_p.h | 10 ++-- src/xmlpatterns/type/qlocalnametest.cpp | 10 ++-- src/xmlpatterns/type/qlocalnametest_p.h | 10 ++-- src/xmlpatterns/type/qmultiitemtype.cpp | 10 ++-- src/xmlpatterns/type/qmultiitemtype_p.h | 10 ++-- src/xmlpatterns/type/qnamespacenametest.cpp | 10 ++-- src/xmlpatterns/type/qnamespacenametest_p.h | 10 ++-- src/xmlpatterns/type/qnonetype.cpp | 10 ++-- src/xmlpatterns/type/qnonetype_p.h | 10 ++-- src/xmlpatterns/type/qnumerictype.cpp | 10 ++-- src/xmlpatterns/type/qnumerictype_p.h | 10 ++-- src/xmlpatterns/type/qprimitives_p.h | 10 ++-- src/xmlpatterns/type/qqnametest.cpp | 10 ++-- src/xmlpatterns/type/qqnametest_p.h | 10 ++-- src/xmlpatterns/type/qschemacomponent.cpp | 10 ++-- src/xmlpatterns/type/qschemacomponent_p.h | 10 ++-- src/xmlpatterns/type/qschematype.cpp | 10 ++-- src/xmlpatterns/type/qschematype_p.h | 10 ++-- src/xmlpatterns/type/qschematypefactory.cpp | 10 ++-- src/xmlpatterns/type/qschematypefactory_p.h | 10 ++-- src/xmlpatterns/type/qsequencetype.cpp | 10 ++-- src/xmlpatterns/type/qsequencetype_p.h | 10 ++-- src/xmlpatterns/type/qtypechecker.cpp | 10 ++-- src/xmlpatterns/type/qtypechecker_p.h | 10 ++-- src/xmlpatterns/type/quntyped.cpp | 10 ++-- src/xmlpatterns/type/quntyped_p.h | 10 ++-- src/xmlpatterns/type/qxsltnodetest.cpp | 10 ++-- src/xmlpatterns/type/qxsltnodetest_p.h | 10 ++-- src/xmlpatterns/utils/qautoptr.cpp | 10 ++-- src/xmlpatterns/utils/qautoptr_p.h | 10 ++-- src/xmlpatterns/utils/qcommonnamespaces_p.h | 10 ++-- src/xmlpatterns/utils/qcppcastinghelper_p.h | 10 ++-- src/xmlpatterns/utils/qdebug_p.h | 10 ++-- .../utils/qdelegatingnamespaceresolver.cpp | 10 ++-- .../utils/qdelegatingnamespaceresolver_p.h | 10 ++-- .../utils/qgenericnamespaceresolver.cpp | 10 ++-- .../utils/qgenericnamespaceresolver_p.h | 10 ++-- src/xmlpatterns/utils/qnamepool.cpp | 10 ++-- src/xmlpatterns/utils/qnamepool_p.h | 10 ++-- src/xmlpatterns/utils/qnamespacebinding_p.h | 10 ++-- src/xmlpatterns/utils/qnamespaceresolver.cpp | 10 ++-- src/xmlpatterns/utils/qnamespaceresolver_p.h | 10 ++-- src/xmlpatterns/utils/qnodenamespaceresolver.cpp | 10 ++-- src/xmlpatterns/utils/qnodenamespaceresolver_p.h | 10 ++-- src/xmlpatterns/utils/qoutputvalidator.cpp | 10 ++-- src/xmlpatterns/utils/qoutputvalidator_p.h | 10 ++-- src/xmlpatterns/utils/qpatternistlocale.cpp | 10 ++-- src/xmlpatterns/utils/qpatternistlocale_p.h | 10 ++-- src/xmlpatterns/utils/qxpathhelper.cpp | 10 ++-- src/xmlpatterns/utils/qxpathhelper_p.h | 10 ++-- tests/arthur/common/framework.cpp | 10 ++-- tests/arthur/common/framework.h | 10 ++-- tests/arthur/common/paintcommands.cpp | 10 ++-- tests/arthur/common/paintcommands.h | 10 ++-- tests/arthur/common/qengines.cpp | 10 ++-- tests/arthur/common/qengines.h | 10 ++-- tests/arthur/common/xmldata.cpp | 10 ++-- tests/arthur/common/xmldata.h | 10 ++-- tests/arthur/datagenerator/datagenerator.cpp | 10 ++-- tests/arthur/datagenerator/datagenerator.h | 10 ++-- tests/arthur/datagenerator/main.cpp | 10 ++-- tests/arthur/datagenerator/xmlgenerator.cpp | 10 ++-- tests/arthur/datagenerator/xmlgenerator.h | 10 ++-- tests/arthur/htmlgenerator/htmlgenerator.cpp | 10 ++-- tests/arthur/htmlgenerator/htmlgenerator.h | 10 ++-- tests/arthur/htmlgenerator/main.cpp | 10 ++-- tests/arthur/lance/interactivewidget.cpp | 10 ++-- tests/arthur/lance/interactivewidget.h | 10 ++-- tests/arthur/lance/main.cpp | 10 ++-- tests/arthur/lance/widgets.h | 10 ++-- tests/arthur/performancediff/main.cpp | 10 ++-- tests/arthur/performancediff/performancediff.cpp | 10 ++-- tests/arthur/performancediff/performancediff.h | 10 ++-- tests/arthur/shower/main.cpp | 10 ++-- tests/arthur/shower/shower.cpp | 10 ++-- tests/arthur/shower/shower.h | 10 ++-- tests/auto/atwrapper/atWrapper.cpp | 10 ++-- tests/auto/atwrapper/atWrapper.h | 10 ++-- tests/auto/atwrapper/atWrapperAutotest.cpp | 10 ++-- tests/auto/bic/qbic.cpp | 10 ++-- tests/auto/bic/qbic.h | 10 ++-- tests/auto/bic/tst_bic.cpp | 10 ++-- tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp | 10 ++-- tests/auto/collections/tst_collections.cpp | 10 ++-- tests/auto/compile/baseclass.cpp | 10 ++-- tests/auto/compile/baseclass.h | 10 ++-- tests/auto/compile/derivedclass.cpp | 10 ++-- tests/auto/compile/derivedclass.h | 10 ++-- tests/auto/compile/tst_compile.cpp | 10 ++-- tests/auto/compilerwarnings/test.cpp | 10 ++-- .../auto/compilerwarnings/tst_compilerwarnings.cpp | 10 ++-- tests/auto/exceptionsafety/tst_exceptionsafety.cpp | 10 ++-- tests/auto/headers/tst_headers.cpp | 10 ++-- tests/auto/languagechange/tst_languagechange.cpp | 10 ++-- tests/auto/macgui/guitest.cpp | 10 ++-- tests/auto/macgui/guitest.h | 10 ++-- tests/auto/macgui/tst_gui.cpp | 10 ++-- tests/auto/macplist/app/main.cpp | 10 ++-- tests/auto/macplist/tst_macplist.cpp | 10 ++-- tests/auto/mediaobject/qtesthelper.h | 10 ++-- tests/auto/mediaobject/tst_mediaobject.cpp | 10 ++-- tests/auto/mediaobject_wince_ds9/dummy.cpp | 10 ++-- .../moc/Test.framework/Headers/testinterface.h | 10 ++-- tests/auto/moc/assign-namespace.h | 10 ++-- tests/auto/moc/backslash-newlines.h | 10 ++-- tests/auto/moc/c-comments.h | 10 ++-- tests/auto/moc/cstyle-enums.h | 10 ++-- tests/auto/moc/dir-in-include-path.h | 10 ++-- tests/auto/moc/escapes-in-string-literals.h | 10 ++-- tests/auto/moc/extraqualification.h | 10 ++-- tests/auto/moc/forgotten-qinterface.h | 10 ++-- tests/auto/moc/gadgetwithnoenums.h | 10 ++-- tests/auto/moc/interface-from-framework.h | 10 ++-- tests/auto/moc/macro-on-cmdline.h | 10 ++-- tests/auto/moc/namespaced-flags.h | 10 ++-- tests/auto/moc/no-keywords.h | 10 ++-- tests/auto/moc/oldstyle-casts.h | 10 ++-- tests/auto/moc/os9-newlines.h | 32 +++++++++++- tests/auto/moc/parse-boost.h | 10 ++-- tests/auto/moc/pure-virtual-signals.h | 10 ++-- tests/auto/moc/qinvokable.h | 10 ++-- tests/auto/moc/qprivateslots.h | 10 ++-- tests/auto/moc/single_function_keyword.h | 10 ++-- tests/auto/moc/slots-with-void-template.h | 10 ++-- tests/auto/moc/task189996.h | 10 ++-- tests/auto/moc/task192552.h | 10 ++-- tests/auto/moc/task234909.h | 10 ++-- tests/auto/moc/task240368.h | 10 ++-- tests/auto/moc/task87883.h | 10 ++-- tests/auto/moc/template-gtgt.h | 10 ++-- tests/auto/moc/testproject/Plugin/Plugin.h | 10 ++-- tests/auto/moc/trigraphs.h | 10 ++-- tests/auto/moc/tst_moc.cpp | 10 ++-- tests/auto/moc/using-namespaces.h | 10 ++-- .../auto/moc/warn-on-multiple-qobject-subclasses.h | 10 ++-- tests/auto/moc/warn-on-property-without-read.h | 10 ++-- tests/auto/moc/win-newlines.h | 60 +++++++++++----------- tests/auto/modeltest/modeltest.cpp | 10 ++-- tests/auto/modeltest/modeltest.h | 10 ++-- tests/auto/modeltest/tst_modeltest.cpp | 10 ++-- tests/auto/network-settings.h | 10 ++-- .../tst_patternistexamplefiletree.cpp | 10 ++-- .../patternistexamples/tst_patternistexamples.cpp | 10 ++-- .../patternistheaders/tst_patternistheaders.cpp | 10 ++-- tests/auto/q3accel/tst_q3accel.cpp | 10 ++-- tests/auto/q3action/tst_q3action.cpp | 10 ++-- tests/auto/q3actiongroup/tst_q3actiongroup.cpp | 10 ++-- tests/auto/q3buttongroup/clickLock/main.cpp | 10 ++-- tests/auto/q3buttongroup/tst_q3buttongroup.cpp | 10 ++-- tests/auto/q3canvas/tst_q3canvas.cpp | 10 ++-- tests/auto/q3checklistitem/tst_q3checklistitem.cpp | 10 ++-- tests/auto/q3combobox/tst_q3combobox.cpp | 10 ++-- tests/auto/q3cstring/tst_q3cstring.cpp | 10 ++-- tests/auto/q3databrowser/tst_q3databrowser.cpp | 10 ++-- tests/auto/q3dateedit/tst_q3dateedit.cpp | 10 ++-- tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp | 10 ++-- tests/auto/q3deepcopy/tst_q3deepcopy.cpp | 10 ++-- tests/auto/q3dict/tst_q3dict.cpp | 10 ++-- tests/auto/q3dns/tst_q3dns.cpp | 10 ++-- tests/auto/q3dockwindow/tst_q3dockwindow.cpp | 10 ++-- tests/auto/q3filedialog/tst_q3filedialog.cpp | 10 ++-- tests/auto/q3frame/tst_q3frame.cpp | 10 ++-- tests/auto/q3groupbox/tst_q3groupbox.cpp | 10 ++-- tests/auto/q3hbox/tst_q3hbox.cpp | 10 ++-- tests/auto/q3header/tst_q3header.cpp | 10 ++-- tests/auto/q3iconview/tst_q3iconview.cpp | 10 ++-- tests/auto/q3listbox/tst_qlistbox.cpp | 10 ++-- tests/auto/q3listview/tst_q3listview.cpp | 10 ++-- .../tst_q3listviewitemiterator.cpp | 10 ++-- tests/auto/q3mainwindow/tst_q3mainwindow.cpp | 10 ++-- tests/auto/q3popupmenu/tst_q3popupmenu.cpp | 10 ++-- tests/auto/q3process/cat/main.cpp | 10 ++-- tests/auto/q3process/echo/main.cpp | 10 ++-- tests/auto/q3process/tst_q3process.cpp | 10 ++-- tests/auto/q3progressbar/tst_q3progressbar.cpp | 10 ++-- .../auto/q3progressdialog/tst_q3progressdialog.cpp | 10 ++-- tests/auto/q3ptrlist/tst_q3ptrlist.cpp | 10 ++-- tests/auto/q3richtext/tst_q3richtext.cpp | 10 ++-- tests/auto/q3scrollview/tst_qscrollview.cpp | 10 ++-- tests/auto/q3semaphore/tst_q3semaphore.cpp | 10 ++-- tests/auto/q3serversocket/tst_q3serversocket.cpp | 10 ++-- tests/auto/q3socket/tst_qsocket.cpp | 10 ++-- tests/auto/q3socketdevice/tst_q3socketdevice.cpp | 10 ++-- tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp | 10 ++-- .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 10 ++-- tests/auto/q3stylesheet/tst_q3stylesheet.cpp | 10 ++-- tests/auto/q3tabdialog/tst_q3tabdialog.cpp | 10 ++-- tests/auto/q3table/tst_q3table.cpp | 10 ++-- tests/auto/q3textbrowser/tst_q3textbrowser.cpp | 10 ++-- tests/auto/q3textedit/tst_q3textedit.cpp | 10 ++-- tests/auto/q3textstream/tst_q3textstream.cpp | 10 ++-- tests/auto/q3timeedit/tst_q3timeedit.cpp | 10 ++-- tests/auto/q3toolbar/tst_q3toolbar.cpp | 10 ++-- tests/auto/q3uridrag/tst_q3uridrag.cpp | 10 ++-- tests/auto/q3urloperator/tst_q3urloperator.cpp | 10 ++-- tests/auto/q3valuelist/tst_q3valuelist.cpp | 10 ++-- tests/auto/q3valuevector/tst_q3valuevector.cpp | 10 ++-- tests/auto/q3widgetstack/tst_q3widgetstack.cpp | 10 ++-- tests/auto/q_func_info/tst_q_func_info.cpp | 10 ++-- tests/auto/qabstractbutton/tst_qabstractbutton.cpp | 10 ++-- .../qabstractitemmodel/tst_qabstractitemmodel.cpp | 10 ++-- .../qabstractitemview/tst_qabstractitemview.cpp | 10 ++-- .../tst_qabstractmessagehandler.cpp | 10 ++-- .../tst_qabstractnetworkcache.cpp | 10 ++-- .../tst_qabstractprintdialog.cpp | 10 ++-- .../tst_qabstractproxymodel.cpp | 10 ++-- .../tst_qabstractscrollarea.cpp | 10 ++-- tests/auto/qabstractslider/tst_qabstractslider.cpp | 10 ++-- tests/auto/qabstractsocket/tst_qabstractsocket.cpp | 10 ++-- .../auto/qabstractspinbox/tst_qabstractspinbox.cpp | 10 ++-- .../tst_qabstracttextdocumentlayout.cpp | 10 ++-- tests/auto/qabstracturiresolver/TestURIResolver.h | 10 ++-- .../tst_qabstracturiresolver.cpp | 10 ++-- .../tst_qabstractxmlforwarditerator.cpp | 10 ++-- tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 10 ++-- tests/auto/qabstractxmlnodemodel/LoadingModel.h | 10 ++-- tests/auto/qabstractxmlnodemodel/TestNodeModel.h | 10 ++-- .../tst_qabstractxmlnodemodel.cpp | 10 ++-- .../qabstractxmlreceiver/TestAbstractXmlReceiver.h | 10 ++-- .../tst_qabstractxmlreceiver.cpp | 10 ++-- tests/auto/qaccessibility/tst_qaccessibility.cpp | 10 ++-- .../qaccessibility_mac/tst_qaccessibility_mac.cpp | 10 ++-- tests/auto/qaction/tst_qaction.cpp | 10 ++-- tests/auto/qactiongroup/tst_qactiongroup.cpp | 10 ++-- tests/auto/qalgorithms/tst_qalgorithms.cpp | 10 ++-- .../qapplication/desktopsettingsaware/main.cpp | 10 ++-- tests/auto/qapplication/tst_qapplication.cpp | 10 ++-- tests/auto/qapplication/wincmdline/main.cpp | 10 ++-- .../tst_qapplicationargumentparser.cpp | 10 ++-- tests/auto/qatomicint/tst_qatomicint.cpp | 10 ++-- tests/auto/qatomicpointer/tst_qatomicpointer.cpp | 10 ++-- tests/auto/qautoptr/tst_qautoptr.cpp | 10 ++-- tests/auto/qbitarray/tst_qbitarray.cpp | 10 ++-- tests/auto/qboxlayout/tst_qboxlayout.cpp | 10 ++-- tests/auto/qbrush/tst_qbrush.cpp | 10 ++-- tests/auto/qbuffer/tst_qbuffer.cpp | 10 ++-- tests/auto/qbuttongroup/tst_qbuttongroup.cpp | 10 ++-- tests/auto/qbytearray/tst_qbytearray.cpp | 10 ++-- tests/auto/qcache/tst_qcache.cpp | 10 ++-- tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp | 10 ++-- tests/auto/qchar/tst_qchar.cpp | 10 ++-- tests/auto/qcheckbox/tst_qcheckbox.cpp | 10 ++-- tests/auto/qclipboard/copier/main.cpp | 10 ++-- tests/auto/qclipboard/paster/main.cpp | 10 ++-- tests/auto/qclipboard/tst_qclipboard.cpp | 10 ++-- tests/auto/qcolor/tst_qcolor.cpp | 10 ++-- tests/auto/qcolordialog/tst_qcolordialog.cpp | 10 ++-- tests/auto/qcolumnview/tst_qcolumnview.cpp | 10 ++-- tests/auto/qcombobox/tst_qcombobox.cpp | 10 ++-- .../qcommandlinkbutton/tst_qcommandlinkbutton.cpp | 10 ++-- tests/auto/qcompleter/tst_qcompleter.cpp | 10 ++-- tests/auto/qcomplextext/bidireorderstring.h | 10 ++-- tests/auto/qcomplextext/tst_qcomplextext.cpp | 10 ++-- tests/auto/qcopchannel/testSend/main.cpp | 10 ++-- tests/auto/qcopchannel/tst_qcopchannel.cpp | 10 ++-- .../auto/qcoreapplication/tst_qcoreapplication.cpp | 10 ++-- .../qcryptographichash/tst_qcryptographichash.cpp | 10 ++-- tests/auto/qcssparser/tst_cssparser.cpp | 10 ++-- tests/auto/qdatastream/tst_qdatastream.cpp | 10 ++-- .../qdatawidgetmapper/tst_qdatawidgetmapper.cpp | 10 ++-- tests/auto/qdate/tst_qdate.cpp | 10 ++-- tests/auto/qdatetime/tst_qdatetime.cpp | 10 ++-- tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp | 10 ++-- .../tst_qdbusabstractadaptor.cpp | 10 ++-- tests/auto/qdbusconnection/tst_qdbusconnection.cpp | 10 ++-- tests/auto/qdbuscontext/tst_qdbuscontext.cpp | 10 ++-- tests/auto/qdbusinterface/tst_qdbusinterface.cpp | 10 ++-- tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 10 ++-- tests/auto/qdbusmarshall/common.h | 10 ++-- tests/auto/qdbusmarshall/dummy.cpp | 10 ++-- tests/auto/qdbusmarshall/qpong/qpong.cpp | 10 ++-- tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp | 10 ++-- tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp | 10 ++-- tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp | 10 ++-- .../auto/qdbuspendingcall/tst_qdbuspendingcall.cpp | 10 ++-- .../qdbuspendingreply/tst_qdbuspendingreply.cpp | 10 ++-- tests/auto/qdbusperformance/server/server.cpp | 10 ++-- tests/auto/qdbusperformance/serverobject.h | 10 ++-- .../auto/qdbusperformance/tst_qdbusperformance.cpp | 10 ++-- tests/auto/qdbusreply/tst_qdbusreply.cpp | 10 ++-- tests/auto/qdbusserver/server.cpp | 10 ++-- tests/auto/qdbusserver/tst_qdbusserver.cpp | 10 ++-- tests/auto/qdbusthreading/tst_qdbusthreading.cpp | 10 ++-- tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp | 10 ++-- tests/auto/qdebug/tst_qdebug.cpp | 10 ++-- .../auto/qdesktopservices/tst_qdesktopservices.cpp | 10 ++-- tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp | 10 ++-- tests/auto/qdial/tst_qdial.cpp | 10 ++-- tests/auto/qdialog/tst_qdialog.cpp | 10 ++-- .../auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 10 ++-- tests/auto/qdir/testdir/dir/qrc_qdir.cpp | 10 ++-- tests/auto/qdir/testdir/dir/tst_qdir.cpp | 10 ++-- tests/auto/qdir/tst_qdir.cpp | 10 ++-- .../auto/qdirectpainter/runDirectPainter/main.cpp | 10 ++-- tests/auto/qdirectpainter/tst_qdirectpainter.cpp | 10 ++-- tests/auto/qdiriterator/tst_qdiriterator.cpp | 10 ++-- tests/auto/qdirmodel/tst_qdirmodel.cpp | 10 ++-- tests/auto/qdockwidget/tst_qdockwidget.cpp | 10 ++-- tests/auto/qdom/tst_qdom.cpp | 10 ++-- tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp | 10 ++-- .../auto/qdoublevalidator/tst_qdoublevalidator.cpp | 10 ++-- tests/auto/qdrag/tst_qdrag.cpp | 10 ++-- tests/auto/qerrormessage/tst_qerrormessage.cpp | 10 ++-- tests/auto/qevent/tst_qevent.cpp | 10 ++-- tests/auto/qeventloop/tst_qeventloop.cpp | 10 ++-- .../tst_qexplicitlyshareddatapointer.cpp | 10 ++-- tests/auto/qfile/stdinprocess/main.cpp | 10 ++-- tests/auto/qfile/tst_qfile.cpp | 10 ++-- tests/auto/qfiledialog/tst_qfiledialog.cpp | 10 ++-- .../qfileiconprovider/tst_qfileiconprovider.cpp | 10 ++-- tests/auto/qfileinfo/tst_qfileinfo.cpp | 10 ++-- .../auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 10 ++-- .../qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 10 ++-- tests/auto/qflags/tst_qflags.cpp | 10 ++-- tests/auto/qfocusevent/tst_qfocusevent.cpp | 10 ++-- tests/auto/qfocusframe/tst_qfocusframe.cpp | 10 ++-- tests/auto/qfont/tst_qfont.cpp | 10 ++-- tests/auto/qfontcombobox/tst_qfontcombobox.cpp | 10 ++-- tests/auto/qfontdatabase/tst_qfontdatabase.cpp | 10 ++-- tests/auto/qfontdialog/tst_qfontdialog.cpp | 10 ++-- tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 10 ++-- tests/auto/qformlayout/tst_qformlayout.cpp | 10 ++-- tests/auto/qftp/tst_qftp.cpp | 10 ++-- tests/auto/qfuture/tst_qfuture.cpp | 10 ++-- tests/auto/qfuture/versioncheck.h | 10 ++-- tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp | 10 ++-- tests/auto/qgetputenv/tst_qgetputenv.cpp | 10 ++-- tests/auto/qgl/tst_qgl.cpp | 10 ++-- tests/auto/qglobal/tst_qglobal.cpp | 10 ++-- .../tst_qgraphicsgridlayout.cpp | 10 ++-- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 10 ++-- .../tst_qgraphicsitemanimation.cpp | 10 ++-- tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp | 10 ++-- .../tst_qgraphicslayoutitem.cpp | 10 ++-- .../tst_qgraphicslinearlayout.cpp | 10 ++-- .../tst_qgraphicspixmapitem.cpp | 10 ++-- .../tst_qgraphicspolygonitem.cpp | 10 ++-- .../tst_qgraphicsproxywidget.cpp | 10 ++-- tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 10 ++-- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 10 ++-- tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp | 10 ++-- tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 10 ++-- tests/auto/qgridlayout/tst_qgridlayout.cpp | 10 ++-- tests/auto/qgroupbox/tst_qgroupbox.cpp | 10 ++-- tests/auto/qguivariant/tst_qguivariant.cpp | 10 ++-- tests/auto/qhash/tst_qhash.cpp | 10 ++-- tests/auto/qheaderview/tst_qheaderview.cpp | 10 ++-- .../qhelpcontentmodel/tst_qhelpcontentmodel.cpp | 10 ++-- tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp | 10 ++-- tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp | 10 ++-- tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp | 10 ++-- .../auto/qhelpprojectdata/tst_qhelpprojectdata.cpp | 10 ++-- tests/auto/qhostaddress/tst_qhostaddress.cpp | 10 ++-- tests/auto/qhostinfo/tst_qhostinfo.cpp | 10 ++-- tests/auto/qhttp/dummyserver.h | 10 ++-- tests/auto/qhttp/tst_qhttp.cpp | 10 ++-- .../tst_qhttpnetworkconnection.cpp | 10 ++-- .../qhttpnetworkreply/tst_qhttpnetworkreply.cpp | 10 ++-- .../qhttpsocketengine/tst_qhttpsocketengine.cpp | 10 ++-- .../auto/qicoimageformat/tst_qticoimageformat.cpp | 10 ++-- tests/auto/qicon/tst_qicon.cpp | 10 ++-- tests/auto/qimage/tst_qimage.cpp | 10 ++-- tests/auto/qimageiohandler/tst_qimageiohandler.cpp | 10 ++-- tests/auto/qimagereader/tst_qimagereader.cpp | 10 ++-- tests/auto/qimagewriter/tst_qimagewriter.cpp | 10 ++-- tests/auto/qinputdialog/tst_qinputdialog.cpp | 10 ++-- tests/auto/qintvalidator/tst_qintvalidator.cpp | 10 ++-- tests/auto/qiodevice/tst_qiodevice.cpp | 10 ++-- tests/auto/qitemdelegate/tst_qitemdelegate.cpp | 10 ++-- .../qitemeditorfactory/tst_qitemeditorfactory.cpp | 10 ++-- tests/auto/qitemmodel/modelstotest.cpp | 10 ++-- tests/auto/qitemmodel/tst_qitemmodel.cpp | 10 ++-- .../tst_qitemselectionmodel.cpp | 10 ++-- tests/auto/qitemview/tst_qitemview.cpp | 10 ++-- tests/auto/qitemview/viewstotest.cpp | 10 ++-- tests/auto/qkeyevent/tst_qkeyevent.cpp | 10 ++-- tests/auto/qkeysequence/tst_qkeysequence.cpp | 10 ++-- tests/auto/qlabel/tst_qlabel.cpp | 10 ++-- tests/auto/qlayout/tst_qlayout.cpp | 10 ++-- tests/auto/qlcdnumber/tst_qlcdnumber.cpp | 10 ++-- tests/auto/qlibrary/tst_qlibrary.cpp | 10 ++-- tests/auto/qline/tst_qline.cpp | 10 ++-- tests/auto/qlineedit/tst_qlineedit.cpp | 10 ++-- tests/auto/qlist/tst_qlist.cpp | 10 ++-- tests/auto/qlistview/tst_qlistview.cpp | 10 ++-- tests/auto/qlistwidget/tst_qlistwidget.cpp | 10 ++-- tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp | 10 ++-- tests/auto/qlocale/tst_qlocale.cpp | 10 ++-- tests/auto/qlocalsocket/example/client/main.cpp | 10 ++-- tests/auto/qlocalsocket/example/server/main.cpp | 10 ++-- tests/auto/qlocalsocket/lackey/main.cpp | 10 ++-- tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 10 ++-- tests/auto/qmacstyle/tst_qmacstyle.cpp | 10 ++-- tests/auto/qmainwindow/tst_qmainwindow.cpp | 10 ++-- tests/auto/qmake/testcompiler.cpp | 10 ++-- tests/auto/qmake/testcompiler.h | 10 ++-- tests/auto/qmake/testdata/findDeps/main.cpp | 10 ++-- tests/auto/qmake/testdata/findDeps/object1.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object2.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object3.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object4.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object5.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object6.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object7.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object8.h | 10 ++-- tests/auto/qmake/testdata/findDeps/object9.h | 10 ++-- tests/auto/qmake/testdata/findMocs/main.cpp | 10 ++-- tests/auto/qmake/testdata/findMocs/object1.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object2.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object3.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object4.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object5.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object6.h | 10 ++-- tests/auto/qmake/testdata/findMocs/object7.h | 10 ++-- tests/auto/qmake/testdata/functions/1.cpp | 10 ++-- tests/auto/qmake/testdata/functions/2.cpp | 10 ++-- tests/auto/qmake/testdata/functions/one/1.cpp | 10 ++-- tests/auto/qmake/testdata/functions/one/2.cpp | 10 ++-- .../qmake/testdata/functions/three/wildcard21.cpp | 10 ++-- .../qmake/testdata/functions/three/wildcard22.cpp | 10 ++-- tests/auto/qmake/testdata/functions/two/1.cpp | 10 ++-- tests/auto/qmake/testdata/functions/two/2.cpp | 10 ++-- tests/auto/qmake/testdata/functions/wildcard21.cpp | 10 ++-- tests/auto/qmake/testdata/functions/wildcard22.cpp | 10 ++-- tests/auto/qmake/testdata/include_dir/main.cpp | 10 ++-- .../auto/qmake/testdata/include_dir/test_file.cpp | 10 ++-- tests/auto/qmake/testdata/include_dir/test_file.h | 10 ++-- tests/auto/qmake/testdata/install_depends/main.cpp | 10 ++-- .../qmake/testdata/install_depends/test_file.cpp | 10 ++-- .../qmake/testdata/install_depends/test_file.h | 10 ++-- tests/auto/qmake/testdata/one_space/main.cpp | 10 ++-- tests/auto/qmake/testdata/quotedfilenames/main.cpp | 10 ++-- tests/auto/qmake/testdata/shadow_files/main.cpp | 10 ++-- .../auto/qmake/testdata/shadow_files/test_file.cpp | 10 ++-- tests/auto/qmake/testdata/shadow_files/test_file.h | 10 ++-- tests/auto/qmake/testdata/simple_app/main.cpp | 10 ++-- tests/auto/qmake/testdata/simple_app/test_file.cpp | 10 ++-- tests/auto/qmake/testdata/simple_app/test_file.h | 10 ++-- tests/auto/qmake/testdata/simple_dll/simple.cpp | 10 ++-- tests/auto/qmake/testdata/simple_dll/simple.h | 10 ++-- tests/auto/qmake/testdata/simple_lib/simple.cpp | 10 ++-- tests/auto/qmake/testdata/simple_lib/simple.h | 10 ++-- .../qmake/testdata/subdirs/simple_app/main.cpp | 10 ++-- .../testdata/subdirs/simple_app/test_file.cpp | 10 ++-- .../qmake/testdata/subdirs/simple_app/test_file.h | 10 ++-- .../qmake/testdata/subdirs/simple_dll/simple.cpp | 10 ++-- .../qmake/testdata/subdirs/simple_dll/simple.h | 10 ++-- tests/auto/qmake/tst_qmake.cpp | 10 ++-- tests/auto/qmap/tst_qmap.cpp | 10 ++-- tests/auto/qmdiarea/tst_qmdiarea.cpp | 10 ++-- tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp | 10 ++-- tests/auto/qmenu/tst_qmenu.cpp | 10 ++-- tests/auto/qmenubar/tst_qmenubar.cpp | 10 ++-- tests/auto/qmessagebox/tst_qmessagebox.cpp | 10 ++-- tests/auto/qmetaobject/tst_qmetaobject.cpp | 10 ++-- tests/auto/qmetatype/tst_qmetatype.cpp | 10 ++-- tests/auto/qmouseevent/tst_qmouseevent.cpp | 10 ++-- .../qmouseevent_modal/tst_qmouseevent_modal.cpp | 10 ++-- tests/auto/qmovie/tst_qmovie.cpp | 10 ++-- tests/auto/qmultiscreen/tst_qmultiscreen.cpp | 10 ++-- tests/auto/qmutex/tst_qmutex.cpp | 10 ++-- tests/auto/qmutexlocker/tst_qmutexlocker.cpp | 10 ++-- .../tst_qnativesocketengine.cpp | 10 ++-- .../tst_qnetworkaddressentry.cpp | 10 ++-- .../tst_qnetworkcachemetadata.cpp | 10 ++-- tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp | 10 ++-- .../qnetworkcookiejar/tst_qnetworkcookiejar.cpp | 10 ++-- .../qnetworkdiskcache/tst_qnetworkdiskcache.cpp | 10 ++-- .../qnetworkinterface/tst_qnetworkinterface.cpp | 10 ++-- tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp | 10 ++-- tests/auto/qnetworkreply/echo/main.cpp | 10 ++-- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 10 ++-- tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp | 10 ++-- tests/auto/qnumeric/tst_qnumeric.cpp | 10 ++-- tests/auto/qobject/signalbug.cpp | 10 ++-- tests/auto/qobject/signalbug.h | 10 ++-- tests/auto/qobject/tst_qobject.cpp | 10 ++-- .../qobjectperformance/tst_qobjectperformance.cpp | 10 ++-- tests/auto/qobjectrace/tst_qobjectrace.cpp | 10 ++-- tests/auto/qpaintengine/tst_qpaintengine.cpp | 10 ++-- tests/auto/qpainter/tst_qpainter.cpp | 10 ++-- tests/auto/qpainter/utils/createImages/main.cpp | 10 ++-- tests/auto/qpainterpath/tst_qpainterpath.cpp | 10 ++-- .../tst_qpainterpathstroker.cpp | 10 ++-- tests/auto/qpalette/tst_qpalette.cpp | 10 ++-- tests/auto/qpathclipper/paths.cpp | 10 ++-- tests/auto/qpathclipper/paths.h | 10 ++-- tests/auto/qpathclipper/tst_qpathclipper.cpp | 10 ++-- tests/auto/qpen/tst_qpen.cpp | 10 ++-- tests/auto/qpicture/tst_qpicture.cpp | 10 ++-- tests/auto/qpixmap/tst_qpixmap.cpp | 10 ++-- tests/auto/qpixmapcache/tst_qpixmapcache.cpp | 10 ++-- tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp | 10 ++-- tests/auto/qplaintextedit/tst_qplaintextedit.cpp | 10 ++-- tests/auto/qplugin/debugplugin/main.cpp | 10 ++-- tests/auto/qplugin/releaseplugin/main.cpp | 10 ++-- tests/auto/qplugin/tst_qplugin.cpp | 10 ++-- .../qpluginloader/almostplugin/almostplugin.cpp | 10 ++-- .../auto/qpluginloader/almostplugin/almostplugin.h | 10 ++-- .../auto/qpluginloader/theplugin/plugininterface.h | 10 ++-- tests/auto/qpluginloader/theplugin/theplugin.cpp | 10 ++-- tests/auto/qpluginloader/theplugin/theplugin.h | 10 ++-- tests/auto/qpluginloader/tst_qpluginloader.cpp | 10 ++-- tests/auto/qpoint/tst_qpoint.cpp | 10 ++-- tests/auto/qpointarray/tst_qpointarray.cpp | 10 ++-- tests/auto/qpointer/tst_qpointer.cpp | 10 ++-- tests/auto/qprinter/tst_qprinter.cpp | 10 ++-- tests/auto/qprinterinfo/tst_qprinterinfo.cpp | 10 ++-- tests/auto/qprocess/fileWriterProcess/main.cpp | 10 ++-- tests/auto/qprocess/testDetached/main.cpp | 10 ++-- tests/auto/qprocess/testExitCodes/main.cpp | 10 ++-- tests/auto/qprocess/testGuiProcess/main.cpp | 10 ++-- tests/auto/qprocess/testProcessCrash/main.cpp | 10 ++-- .../qprocess/testProcessDeadWhileReading/main.cpp | 10 ++-- tests/auto/qprocess/testProcessEOF/main.cpp | 10 ++-- tests/auto/qprocess/testProcessEcho/main.cpp | 10 ++-- tests/auto/qprocess/testProcessEcho2/main.cpp | 10 ++-- tests/auto/qprocess/testProcessEcho3/main.cpp | 10 ++-- .../auto/qprocess/testProcessEchoGui/main_win.cpp | 10 ++-- tests/auto/qprocess/testProcessLoopback/main.cpp | 10 ++-- tests/auto/qprocess/testProcessNormal/main.cpp | 10 ++-- tests/auto/qprocess/testProcessOutput/main.cpp | 10 ++-- tests/auto/qprocess/testProcessSpacesArgs/main.cpp | 10 ++-- .../auto/qprocess/testSetWorkingDirectory/main.cpp | 10 ++-- tests/auto/qprocess/testSoftExit/main_unix.cpp | 10 ++-- tests/auto/qprocess/testSoftExit/main_win.cpp | 10 ++-- tests/auto/qprocess/testSpaceInName/main.cpp | 10 ++-- tests/auto/qprocess/tst_qprocess.cpp | 10 ++-- tests/auto/qprogressbar/tst_qprogressbar.cpp | 10 ++-- tests/auto/qprogressdialog/tst_qprogressdialog.cpp | 10 ++-- tests/auto/qpushbutton/tst_qpushbutton.cpp | 10 ++-- tests/auto/qqueue/tst_qqueue.cpp | 10 ++-- tests/auto/qradiobutton/tst_qradiobutton.cpp | 10 ++-- tests/auto/qrand/tst_qrand.cpp | 10 ++-- tests/auto/qreadlocker/tst_qreadlocker.cpp | 10 ++-- tests/auto/qreadwritelock/tst_qreadwritelock.cpp | 10 ++-- tests/auto/qrect/tst_qrect.cpp | 10 ++-- tests/auto/qregexp/tst_qregexp.cpp | 10 ++-- .../auto/qregexpvalidator/tst_qregexpvalidator.cpp | 10 ++-- tests/auto/qregion/tst_qregion.cpp | 10 ++-- tests/auto/qresourceengine/tst_resourceengine.cpp | 10 ++-- tests/auto/qscriptable/tst_qscriptable.cpp | 10 ++-- tests/auto/qscriptclass/tst_qscriptclass.cpp | 10 ++-- tests/auto/qscriptcontext/tst_qscriptcontext.cpp | 10 ++-- .../qscriptcontextinfo/tst_qscriptcontextinfo.cpp | 10 ++-- tests/auto/qscriptengine/tst_qscriptengine.cpp | 10 ++-- .../qscriptengineagent/tst_qscriptengineagent.cpp | 10 ++-- .../tst_qscriptenginedebugger.cpp | 10 ++-- .../qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 10 ++-- tests/auto/qscriptqobject/tst_qscriptqobject.cpp | 10 ++-- tests/auto/qscriptstring/tst_qscriptstring.cpp | 10 ++-- .../qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 10 ++-- tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 10 ++-- .../tst_qscriptvalueiterator.cpp | 10 ++-- tests/auto/qscrollarea/tst_qscrollarea.cpp | 10 ++-- tests/auto/qscrollbar/tst_qscrollbar.cpp | 10 ++-- tests/auto/qsemaphore/tst_qsemaphore.cpp | 10 ++-- tests/auto/qset/tst_qset.cpp | 10 ++-- tests/auto/qsettings/tst_qsettings.cpp | 10 ++-- tests/auto/qsharedmemory/lackey/main.cpp | 10 ++-- .../qsharedmemory/qsystemlock/tst_qsystemlock.cpp | 10 ++-- tests/auto/qsharedmemory/src/qsystemlock.cpp | 10 ++-- tests/auto/qsharedmemory/src/qsystemlock.h | 10 ++-- tests/auto/qsharedmemory/src/qsystemlock_p.h | 10 ++-- tests/auto/qsharedmemory/src/qsystemlock_unix.cpp | 10 ++-- tests/auto/qsharedmemory/src/qsystemlock_win.cpp | 10 ++-- tests/auto/qsharedmemory/tst_qsharedmemory.cpp | 10 ++-- tests/auto/qsharedpointer/externaltests.cpp | 10 ++-- tests/auto/qsharedpointer/externaltests.h | 10 ++-- tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 10 ++-- tests/auto/qshortcut/tst_qshortcut.cpp | 10 ++-- tests/auto/qsidebar/tst_qsidebar.cpp | 10 ++-- tests/auto/qsignalmapper/tst_qsignalmapper.cpp | 10 ++-- tests/auto/qsignalspy/tst_qsignalspy.cpp | 10 ++-- .../auto/qsimplexmlnodemodel/TestSimpleNodeModel.h | 10 ++-- .../tst_qsimplexmlnodemodel.cpp | 10 ++-- tests/auto/qsize/tst_qsize.cpp | 10 ++-- tests/auto/qsizef/tst_qsizef.cpp | 10 ++-- tests/auto/qsizegrip/tst_qsizegrip.cpp | 10 ++-- tests/auto/qslider/tst_qslider.cpp | 10 ++-- tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp | 10 ++-- .../tst_qsocks5socketengine.cpp | 10 ++-- .../tst_qsortfilterproxymodel.cpp | 10 ++-- tests/auto/qsound/tst_qsound.cpp | 10 ++-- tests/auto/qsourcelocation/tst_qsourcelocation.cpp | 10 ++-- tests/auto/qspinbox/tst_qspinbox.cpp | 10 ++-- tests/auto/qsplitter/tst_qsplitter.cpp | 10 ++-- tests/auto/qsql/tst_qsql.cpp | 10 ++-- tests/auto/qsqldatabase/tst_databases.h | 10 ++-- tests/auto/qsqldatabase/tst_qsqldatabase.cpp | 10 ++-- tests/auto/qsqlerror/tst_qsqlerror.cpp | 10 ++-- tests/auto/qsqlfield/tst_qsqlfield.cpp | 10 ++-- tests/auto/qsqlquery/tst_qsqlquery.cpp | 10 ++-- tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp | 10 ++-- tests/auto/qsqlrecord/tst_qsqlrecord.cpp | 10 ++-- .../tst_qsqlrelationaltablemodel.cpp | 10 ++-- tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp | 10 ++-- tests/auto/qsqlthread/tst_qsqlthread.cpp | 10 ++-- tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 10 ++-- tests/auto/qsslcipher/tst_qsslcipher.cpp | 10 ++-- tests/auto/qsslerror/tst_qsslerror.cpp | 10 ++-- tests/auto/qsslkey/tst_qsslkey.cpp | 10 ++-- tests/auto/qsslsocket/tst_qsslsocket.cpp | 10 ++-- tests/auto/qstackedlayout/tst_qstackedlayout.cpp | 10 ++-- tests/auto/qstackedwidget/tst_qstackedwidget.cpp | 10 ++-- tests/auto/qstandarditem/tst_qstandarditem.cpp | 10 ++-- .../qstandarditemmodel/tst_qstandarditemmodel.cpp | 10 ++-- tests/auto/qstatusbar/tst_qstatusbar.cpp | 10 ++-- tests/auto/qstl/tst_qstl.cpp | 10 ++-- tests/auto/qstring/double_data.h | 10 ++-- tests/auto/qstring/tst_qstring.cpp | 10 ++-- tests/auto/qstringlist/tst_qstringlist.cpp | 10 ++-- tests/auto/qstringlistmodel/qmodellistener.h | 10 ++-- .../auto/qstringlistmodel/tst_qstringlistmodel.cpp | 10 ++-- tests/auto/qstringmatcher/tst_qstringmatcher.cpp | 10 ++-- tests/auto/qstyle/tst_qstyle.cpp | 10 ++-- tests/auto/qstyleoption/tst_qstyleoption.cpp | 10 ++-- .../auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | 10 ++-- tests/auto/qsvgdevice/tst_qsvgdevice.cpp | 10 ++-- tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 10 ++-- tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 10 ++-- .../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 10 ++-- tests/auto/qsysinfo/tst_qsysinfo.cpp | 10 ++-- .../auto/qsystemsemaphore/tst_qsystemsemaphore.cpp | 10 ++-- tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp | 10 ++-- tests/auto/qtabbar/tst_qtabbar.cpp | 10 ++-- tests/auto/qtableview/tst_qtableview.cpp | 10 ++-- tests/auto/qtablewidget/tst_qtablewidget.cpp | 10 ++-- tests/auto/qtabwidget/tst_qtabwidget.cpp | 10 ++-- .../qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 10 ++-- .../tst_qtconcurrentiteratekernel.cpp | 10 ++-- tests/auto/qtconcurrentmap/functions.h | 10 ++-- tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp | 10 ++-- tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp | 10 ++-- .../tst_qtconcurrentthreadengine.cpp | 10 ++-- tests/auto/qtcpserver/crashingServer/main.cpp | 10 ++-- tests/auto/qtcpserver/tst_qtcpserver.cpp | 10 ++-- tests/auto/qtcpsocket/stressTest/Test.cpp | 10 ++-- tests/auto/qtcpsocket/stressTest/Test.h | 10 ++-- tests/auto/qtcpsocket/stressTest/main.cpp | 10 ++-- tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 10 ++-- tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp | 10 ++-- tests/auto/qtessellator/XrenderFake.h | 10 ++-- tests/auto/qtessellator/arc.cpp | 10 ++-- tests/auto/qtessellator/arc.h | 10 ++-- tests/auto/qtessellator/dataparser.cpp | 10 ++-- tests/auto/qtessellator/dataparser.h | 10 ++-- tests/auto/qtessellator/oldtessellator.cpp | 10 ++-- tests/auto/qtessellator/oldtessellator.h | 10 ++-- tests/auto/qtessellator/qnum.h | 10 ++-- tests/auto/qtessellator/sample_data.h | 10 ++-- tests/auto/qtessellator/simple.cpp | 10 ++-- tests/auto/qtessellator/simple.h | 10 ++-- tests/auto/qtessellator/testtessellator.cpp | 10 ++-- tests/auto/qtessellator/testtessellator.h | 10 ++-- tests/auto/qtessellator/tst_tessellator.cpp | 10 ++-- tests/auto/qtessellator/utils.cpp | 10 ++-- tests/auto/qtessellator/utils.h | 10 ++-- tests/auto/qtextblock/tst_qtextblock.cpp | 10 ++-- .../tst_qtextboundaryfinder.cpp | 10 ++-- tests/auto/qtextbrowser/tst_qtextbrowser.cpp | 10 ++-- tests/auto/qtextcodec/echo/main.cpp | 10 ++-- tests/auto/qtextcodec/tst_qtextcodec.cpp | 10 ++-- tests/auto/qtextcursor/tst_qtextcursor.cpp | 10 ++-- tests/auto/qtextdocument/common.h | 10 ++-- tests/auto/qtextdocument/tst_qtextdocument.cpp | 10 ++-- .../tst_qtextdocumentfragment.cpp | 10 ++-- .../tst_qtextdocumentlayout.cpp | 10 ++-- tests/auto/qtextedit/tst_qtextedit.cpp | 10 ++-- tests/auto/qtextformat/tst_qtextformat.cpp | 10 ++-- tests/auto/qtextlayout/tst_qtextlayout.cpp | 10 ++-- tests/auto/qtextlist/tst_qtextlist.cpp | 10 ++-- tests/auto/qtextobject/tst_qtextobject.cpp | 10 ++-- tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp | 10 ++-- tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp | 10 ++-- tests/auto/qtextscriptengine/generate/main.cpp | 10 ++-- .../qtextscriptengine/tst_qtextscriptengine.cpp | 10 ++-- .../auto/qtextstream/readAllStdinProcess/main.cpp | 10 ++-- .../auto/qtextstream/readLineStdinProcess/main.cpp | 10 ++-- tests/auto/qtextstream/stdinProcess/main.cpp | 10 ++-- tests/auto/qtextstream/tst_qtextstream.cpp | 10 ++-- tests/auto/qtexttable/tst_qtexttable.cpp | 10 ++-- tests/auto/qthread/tst_qthread.cpp | 10 ++-- tests/auto/qthreadonce/qthreadonce.cpp | 10 ++-- tests/auto/qthreadonce/qthreadonce.h | 10 ++-- tests/auto/qthreadonce/tst_qthreadonce.cpp | 10 ++-- tests/auto/qthreadpool/tst_qthreadpool.cpp | 10 ++-- tests/auto/qthreadstorage/tst_qthreadstorage.cpp | 10 ++-- tests/auto/qtime/tst_qtime.cpp | 10 ++-- tests/auto/qtimeline/tst_qtimeline.cpp | 10 ++-- tests/auto/qtimer/tst_qtimer.cpp | 10 ++-- tests/auto/qtmd5/tst_qtmd5.cpp | 10 ++-- .../qtokenautomaton/tokenizers/basic/basic.cpp | 10 ++-- .../auto/qtokenautomaton/tokenizers/basic/basic.h | 10 ++-- .../tokenizers/basicNamespace/basicNamespace.cpp | 10 ++-- .../tokenizers/basicNamespace/basicNamespace.h | 10 ++-- .../tokenizers/boilerplate/boilerplate.cpp | 10 ++-- .../tokenizers/boilerplate/boilerplate.h | 10 ++-- .../tokenizers/boilerplate/boilerplate.xml | 10 ++-- .../tokenizers/noNamespace/noNamespace.cpp | 10 ++-- .../tokenizers/noNamespace/noNamespace.h | 10 ++-- .../tokenizers/noToString/noToString.cpp | 10 ++-- .../tokenizers/noToString/noToString.h | 10 ++-- .../tokenizers/withNamespace/withNamespace.cpp | 10 ++-- .../tokenizers/withNamespace/withNamespace.h | 10 ++-- tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp | 10 ++-- tests/auto/qtoolbar/tst_qtoolbar.cpp | 10 ++-- tests/auto/qtoolbox/tst_qtoolbox.cpp | 10 ++-- tests/auto/qtoolbutton/tst_qtoolbutton.cpp | 10 ++-- tests/auto/qtooltip/tst_qtooltip.cpp | 10 ++-- tests/auto/qtransform/tst_qtransform.cpp | 10 ++-- .../qtransformedscreen/tst_qtransformedscreen.cpp | 10 ++-- tests/auto/qtranslator/tst_qtranslator.cpp | 10 ++-- tests/auto/qtreeview/tst_qtreeview.cpp | 10 ++-- tests/auto/qtreewidget/tst_qtreewidget.cpp | 10 ++-- .../tst_qtreewidgetitemiterator.cpp | 10 ++-- tests/auto/qtwidgets/mainwindow.cpp | 10 ++-- tests/auto/qtwidgets/mainwindow.h | 10 ++-- tests/auto/qtwidgets/tst_qtwidgets.cpp | 10 ++-- tests/auto/qudpsocket/clientserver/main.cpp | 10 ++-- tests/auto/qudpsocket/tst_qudpsocket.cpp | 10 ++-- tests/auto/qudpsocket/udpServer/main.cpp | 10 ++-- tests/auto/qundogroup/tst_qundogroup.cpp | 10 ++-- tests/auto/qundostack/tst_qundostack.cpp | 10 ++-- tests/auto/qurl/tst_qurl.cpp | 10 ++-- tests/auto/quuid/tst_quuid.cpp | 10 ++-- tests/auto/qvariant/tst_qvariant.cpp | 10 ++-- tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp | 10 ++-- tests/auto/qvector/tst_qvector.cpp | 10 ++-- tests/auto/qwaitcondition/tst_qwaitcondition.cpp | 10 ++-- tests/auto/qwebframe/dummy.cpp | 10 ++-- tests/auto/qwebpage/dummy.cpp | 10 ++-- tests/auto/qwidget/tst_qwidget.cpp | 10 ++-- tests/auto/qwidget/tst_qwidget_mac_helpers.h | 10 ++-- tests/auto/qwidget_window/tst_qwidget_window.cpp | 10 ++-- tests/auto/qwidgetaction/tst_qwidgetaction.cpp | 10 ++-- tests/auto/qwindowsurface/tst_qwindowsurface.cpp | 10 ++-- .../qwineventnotifier/tst_qwineventnotifier.cpp | 10 ++-- tests/auto/qwizard/tst_qwizard.cpp | 10 ++-- tests/auto/qwmatrix/tst_qwmatrix.cpp | 10 ++-- tests/auto/qworkspace/tst_qworkspace.cpp | 10 ++-- tests/auto/qwritelocker/tst_qwritelocker.cpp | 10 ++-- tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp | 10 ++-- tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp | 10 ++-- tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp | 10 ++-- tests/auto/qx11info/tst_qx11info.cpp | 10 ++-- tests/auto/qxml/tst_qxml.cpp | 10 ++-- tests/auto/qxmlformatter/tst_qxmlformatter.cpp | 10 ++-- tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp | 10 ++-- tests/auto/qxmlitem/tst_qxmlitem.cpp | 10 ++-- tests/auto/qxmlname/tst_qxmlname.cpp | 10 ++-- tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp | 10 ++-- .../qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp | 10 ++-- tests/auto/qxmlquery/MessageSilencer.h | 10 ++-- tests/auto/qxmlquery/MessageValidator.cpp | 10 ++-- tests/auto/qxmlquery/MessageValidator.h | 10 ++-- tests/auto/qxmlquery/NetworkOverrider.h | 10 ++-- tests/auto/qxmlquery/PushBaseliner.h | 10 ++-- tests/auto/qxmlquery/TestFundament.cpp | 10 ++-- tests/auto/qxmlquery/TestFundament.h | 10 ++-- tests/auto/qxmlquery/tst_qxmlquery.cpp | 10 ++-- tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp | 10 ++-- tests/auto/qxmlserializer/tst_qxmlserializer.cpp | 10 ++-- tests/auto/qxmlsimplereader/parser/main.cpp | 10 ++-- tests/auto/qxmlsimplereader/parser/parser.cpp | 10 ++-- tests/auto/qxmlsimplereader/parser/parser.h | 10 ++-- .../auto/qxmlsimplereader/tst_qxmlsimplereader.cpp | 10 ++-- tests/auto/qxmlstream/qc14n.h | 10 ++-- tests/auto/qxmlstream/tst_qxmlstream.cpp | 10 ++-- tests/auto/qzip/tst_qzip.cpp | 10 ++-- tests/auto/rcc/tst_rcc.cpp | 10 ++-- tests/auto/selftests/alive/qtestalive.cpp | 10 ++-- tests/auto/selftests/alive/tst_alive.cpp | 10 ++-- tests/auto/selftests/assert/tst_assert.cpp | 10 ++-- .../benchlibcallgrind/tst_benchlibcallgrind.cpp | 10 ++-- .../tst_benchlibeventcounter.cpp | 10 ++-- .../benchliboptions/tst_benchliboptions.cpp | 10 ++-- .../tst_benchlibtickcounter.cpp | 10 ++-- .../benchlibwalltime/tst_benchlibwalltime.cpp | 10 ++-- tests/auto/selftests/cmptest/tst_cmptest.cpp | 10 ++-- .../commandlinedata/tst_commandlinedata.cpp | 10 ++-- tests/auto/selftests/crashes/tst_crashes.cpp | 10 ++-- tests/auto/selftests/datatable/tst_datatable.cpp | 10 ++-- tests/auto/selftests/datetime/tst_datetime.cpp | 10 ++-- .../selftests/differentexec/tst_differentexec.cpp | 10 ++-- tests/auto/selftests/exception/tst_exception.cpp | 10 ++-- tests/auto/selftests/expectfail/tst_expectfail.cpp | 10 ++-- tests/auto/selftests/failinit/tst_failinit.cpp | 10 ++-- .../selftests/failinitdata/tst_failinitdata.cpp | 10 ++-- tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp | 10 ++-- tests/auto/selftests/globaldata/tst_globaldata.cpp | 10 ++-- tests/auto/selftests/maxwarnings/maxwarnings.cpp | 10 ++-- tests/auto/selftests/multiexec/tst_multiexec.cpp | 10 ++-- .../qexecstringlist/tst_qexecstringlist.cpp | 10 ++-- tests/auto/selftests/singleskip/tst_singleskip.cpp | 10 ++-- tests/auto/selftests/skip/tst_skip.cpp | 10 ++-- tests/auto/selftests/skipglobal/tst_skipglobal.cpp | 10 ++-- tests/auto/selftests/skipinit/tst_skipinit.cpp | 10 ++-- .../selftests/skipinitdata/tst_skipinitdata.cpp | 10 ++-- tests/auto/selftests/sleep/tst_sleep.cpp | 10 ++-- tests/auto/selftests/strcmp/tst_strcmp.cpp | 10 ++-- tests/auto/selftests/subtest/tst_subtest.cpp | 10 ++-- tests/auto/selftests/tst_selftests.cpp | 10 ++-- .../waitwithoutgui/tst_waitwithoutgui.cpp | 10 ++-- tests/auto/selftests/warnings/tst_warnings.cpp | 10 ++-- tests/auto/symbols/tst_symbols.cpp | 10 ++-- tests/auto/uic/tst_uic.cpp | 10 ++-- tests/auto/uic3/tst_uic3.cpp | 10 ++-- tests/auto/uiloader/tst_screenshot/main.cpp | 10 ++-- tests/auto/uiloader/uiloader/tst_uiloader.cpp | 10 ++-- tests/auto/uiloader/uiloader/uiloader.cpp | 10 ++-- tests/auto/uiloader/uiloader/uiloader.h | 10 ++-- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 10 ++-- .../test/tst_xmlpatternsdiagnosticsts.cpp | 10 ++-- .../xmlpatternsview/test/tst_xmlpatternsview.cpp | 10 ++-- .../view/FunctionSignaturesView.cpp | 20 ++++---- .../xmlpatternsview/view/FunctionSignaturesView.h | 20 ++++---- tests/auto/xmlpatternsview/view/MainWindow.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/MainWindow.h | 20 ++++---- tests/auto/xmlpatternsview/view/TestCaseView.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/TestCaseView.h | 20 ++++---- tests/auto/xmlpatternsview/view/TestResultView.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/TestResultView.h | 20 ++++---- tests/auto/xmlpatternsview/view/TreeSortFilter.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/TreeSortFilter.h | 20 ++++---- tests/auto/xmlpatternsview/view/UserTestCase.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/UserTestCase.h | 20 ++++---- tests/auto/xmlpatternsview/view/XDTItemItem.cpp | 20 ++++---- tests/auto/xmlpatternsview/view/XDTItemItem.h | 20 ++++---- tests/auto/xmlpatternsview/view/main.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ASTItem.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ASTItem.h | 20 ++++---- .../xmlpatternsxqts/lib/DebugExpressionFactory.cpp | 20 ++++---- .../xmlpatternsxqts/lib/DebugExpressionFactory.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ErrorHandler.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ErrorItem.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ExitCode.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h | 20 ++++---- .../xmlpatternsxqts/lib/ExternalSourceLoader.cpp | 20 ++++---- .../xmlpatternsxqts/lib/ExternalSourceLoader.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/Global.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/Global.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/ResultThreader.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestBaseLine.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestCase.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestCase.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestContainer.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestContainer.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestGroup.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestGroup.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestItem.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestResult.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestResult.h | 20 ++++---- .../auto/xmlpatternsxqts/lib/TestResultHandler.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestResultHandler.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestSuite.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestSuite.h | 20 ++++---- .../auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TreeItem.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TreeItem.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TreeModel.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/TreeModel.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/Worker.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/Worker.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/XMLWriter.h | 20 ++++---- tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp | 20 ++++---- tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h | 20 ++++---- .../xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp | 20 ++++---- .../xmlpatternsxqts/lib/XSLTTestSuiteHandler.h | 20 ++++---- .../lib/docs/XMLIndenterExample.cpp | 10 ++-- .../xmlpatternsxqts/lib/docs/XMLWriterExample.cpp | 10 ++-- .../xmlpatternsxqts/lib/tests/XMLWriterTest.cpp | 20 ++++---- .../auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h | 20 ++++---- tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp | 10 ++-- tests/auto/xmlpatternsxqts/test/tst_suitetest.h | 10 ++-- .../xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp | 10 ++-- .../auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp | 10 ++-- tests/benchmarks/blendbench/main.cpp | 10 ++-- tests/benchmarks/containers-associative/main.cpp | 10 ++-- tests/benchmarks/containers-sequential/main.cpp | 10 ++-- tests/benchmarks/events/main.cpp | 10 ++-- tests/benchmarks/opengl/main.cpp | 10 ++-- tests/benchmarks/qapplication/main.cpp | 10 ++-- tests/benchmarks/qbytearray/main.cpp | 10 ++-- tests/benchmarks/qdiriterator/main.cpp | 10 ++-- .../qdiriterator/qfilesystemiterator.cpp | 10 ++-- .../benchmarks/qdiriterator/qfilesystemiterator.h | 10 ++-- tests/benchmarks/qfile/main.cpp | 10 ++-- .../qgraphicsscene/tst_qgraphicsscene.cpp | 10 ++-- .../qgraphicsview/benchapps/chipTest/chip.cpp | 10 ++-- .../qgraphicsview/benchapps/chipTest/chip.h | 10 ++-- .../qgraphicsview/benchapps/chipTest/main.cpp | 10 ++-- .../benchapps/chipTest/mainwindow.cpp | 10 ++-- .../qgraphicsview/benchapps/chipTest/mainwindow.h | 10 ++-- .../qgraphicsview/benchapps/chipTest/view.cpp | 10 ++-- .../qgraphicsview/benchapps/chipTest/view.h | 10 ++-- .../qgraphicsview/benchapps/moveItems/main.cpp | 10 ++-- .../qgraphicsview/benchapps/scrolltest/main.cpp | 10 ++-- tests/benchmarks/qgraphicsview/chiptester/chip.cpp | 10 ++-- tests/benchmarks/qgraphicsview/chiptester/chip.h | 10 ++-- .../qgraphicsview/chiptester/chiptester.cpp | 10 ++-- .../qgraphicsview/chiptester/chiptester.h | 10 ++-- .../benchmarks/qgraphicsview/tst_qgraphicsview.cpp | 10 ++-- tests/benchmarks/qimagereader/tst_qimagereader.cpp | 10 ++-- tests/benchmarks/qiodevice/main.cpp | 10 ++-- tests/benchmarks/qmetaobject/main.cpp | 10 ++-- tests/benchmarks/qobject/main.cpp | 10 ++-- tests/benchmarks/qobject/object.cpp | 10 ++-- tests/benchmarks/qobject/object.h | 10 ++-- tests/benchmarks/qpainter/tst_qpainter.cpp | 10 ++-- tests/benchmarks/qpixmap/tst_qpixmap.cpp | 10 ++-- tests/benchmarks/qrect/main.cpp | 10 ++-- tests/benchmarks/qregexp/main.cpp | 10 ++-- tests/benchmarks/qregion/main.cpp | 10 ++-- tests/benchmarks/qstringlist/main.cpp | 10 ++-- tests/benchmarks/qstylesheetstyle/main.cpp | 10 ++-- tests/benchmarks/qtemporaryfile/main.cpp | 10 ++-- tests/benchmarks/qtestlib-simple/main.cpp | 10 ++-- tests/benchmarks/qtransform/tst_qtransform.cpp | 10 ++-- tests/benchmarks/qtwidgets/mainwindow.cpp | 10 ++-- tests/benchmarks/qtwidgets/mainwindow.h | 10 ++-- tests/benchmarks/qtwidgets/tst_qtwidgets.cpp | 10 ++-- tests/benchmarks/qvariant/tst_qvariant.cpp | 10 ++-- tests/benchmarks/qwidget/tst_qwidget.cpp | 10 ++-- tests/shared/util.h | 10 ++-- tools/activeqt/dumpcpp/main.cpp | 10 ++-- tools/activeqt/dumpdoc/main.cpp | 10 ++-- tools/activeqt/testcon/ambientproperties.cpp | 10 ++-- tools/activeqt/testcon/ambientproperties.h | 10 ++-- tools/activeqt/testcon/ambientproperties.ui | 10 ++-- tools/activeqt/testcon/changeproperties.cpp | 10 ++-- tools/activeqt/testcon/changeproperties.h | 10 ++-- tools/activeqt/testcon/changeproperties.ui | 10 ++-- tools/activeqt/testcon/controlinfo.cpp | 10 ++-- tools/activeqt/testcon/controlinfo.h | 10 ++-- tools/activeqt/testcon/controlinfo.ui | 10 ++-- tools/activeqt/testcon/docuwindow.cpp | 10 ++-- tools/activeqt/testcon/docuwindow.h | 10 ++-- tools/activeqt/testcon/invokemethod.cpp | 10 ++-- tools/activeqt/testcon/invokemethod.h | 10 ++-- tools/activeqt/testcon/invokemethod.ui | 10 ++-- tools/activeqt/testcon/main.cpp | 10 ++-- tools/activeqt/testcon/mainwindow.cpp | 10 ++-- tools/activeqt/testcon/mainwindow.h | 10 ++-- tools/activeqt/testcon/mainwindow.ui | 10 ++-- tools/assistant/compat/config.cpp | 10 ++-- tools/assistant/compat/config.h | 10 ++-- tools/assistant/compat/docuparser.cpp | 10 ++-- tools/assistant/compat/docuparser.h | 10 ++-- tools/assistant/compat/fontsettingsdialog.cpp | 10 ++-- tools/assistant/compat/fontsettingsdialog.h | 10 ++-- tools/assistant/compat/helpdialog.cpp | 10 ++-- tools/assistant/compat/helpdialog.h | 10 ++-- tools/assistant/compat/helpdialog.ui | 10 ++-- tools/assistant/compat/helpwindow.cpp | 10 ++-- tools/assistant/compat/helpwindow.h | 10 ++-- tools/assistant/compat/index.cpp | 10 ++-- tools/assistant/compat/index.h | 10 ++-- tools/assistant/compat/lib/qassistantclient.cpp | 10 ++-- tools/assistant/compat/lib/qassistantclient.h | 10 ++-- .../assistant/compat/lib/qassistantclient_global.h | 10 ++-- tools/assistant/compat/main.cpp | 10 ++-- tools/assistant/compat/mainwindow.cpp | 10 ++-- tools/assistant/compat/mainwindow.h | 10 ++-- tools/assistant/compat/mainwindow.ui | 10 ++-- tools/assistant/compat/profile.cpp | 10 ++-- tools/assistant/compat/profile.h | 10 ++-- tools/assistant/compat/tabbedbrowser.cpp | 10 ++-- tools/assistant/compat/tabbedbrowser.h | 10 ++-- tools/assistant/compat/tabbedbrowser.ui | 10 ++-- tools/assistant/compat/topicchooser.cpp | 10 ++-- tools/assistant/compat/topicchooser.h | 10 ++-- tools/assistant/compat/topicchooser.ui | 10 ++-- tools/assistant/lib/qhelp_global.h | 10 ++-- tools/assistant/lib/qhelpcollectionhandler.cpp | 10 ++-- tools/assistant/lib/qhelpcollectionhandler_p.h | 10 ++-- tools/assistant/lib/qhelpcontentwidget.cpp | 10 ++-- tools/assistant/lib/qhelpcontentwidget.h | 10 ++-- tools/assistant/lib/qhelpdatainterface.cpp | 10 ++-- tools/assistant/lib/qhelpdatainterface_p.h | 10 ++-- tools/assistant/lib/qhelpdbreader.cpp | 10 ++-- tools/assistant/lib/qhelpdbreader_p.h | 10 ++-- tools/assistant/lib/qhelpengine.cpp | 10 ++-- tools/assistant/lib/qhelpengine.h | 10 ++-- tools/assistant/lib/qhelpengine_p.h | 10 ++-- tools/assistant/lib/qhelpenginecore.cpp | 10 ++-- tools/assistant/lib/qhelpenginecore.h | 10 ++-- tools/assistant/lib/qhelpgenerator.cpp | 10 ++-- tools/assistant/lib/qhelpgenerator_p.h | 10 ++-- tools/assistant/lib/qhelpindexwidget.cpp | 10 ++-- tools/assistant/lib/qhelpindexwidget.h | 10 ++-- tools/assistant/lib/qhelpprojectdata.cpp | 10 ++-- tools/assistant/lib/qhelpprojectdata_p.h | 10 ++-- tools/assistant/lib/qhelpsearchengine.cpp | 10 ++-- tools/assistant/lib/qhelpsearchengine.h | 10 ++-- tools/assistant/lib/qhelpsearchindex_default.cpp | 10 ++-- tools/assistant/lib/qhelpsearchindex_default_p.h | 10 ++-- .../lib/qhelpsearchindexreader_clucene.cpp | 10 ++-- .../lib/qhelpsearchindexreader_clucene_p.h | 10 ++-- .../lib/qhelpsearchindexreader_default.cpp | 10 ++-- .../lib/qhelpsearchindexreader_default_p.h | 10 ++-- .../lib/qhelpsearchindexwriter_clucene.cpp | 10 ++-- .../lib/qhelpsearchindexwriter_clucene_p.h | 10 ++-- .../lib/qhelpsearchindexwriter_default.cpp | 10 ++-- .../lib/qhelpsearchindexwriter_default_p.h | 10 ++-- tools/assistant/lib/qhelpsearchquerywidget.cpp | 10 ++-- tools/assistant/lib/qhelpsearchquerywidget.h | 10 ++-- tools/assistant/lib/qhelpsearchresultwidget.cpp | 10 ++-- tools/assistant/lib/qhelpsearchresultwidget.h | 10 ++-- tools/assistant/tools/assistant/aboutdialog.cpp | 10 ++-- tools/assistant/tools/assistant/aboutdialog.h | 10 ++-- .../assistant/tools/assistant/bookmarkmanager.cpp | 10 ++-- tools/assistant/tools/assistant/bookmarkmanager.h | 10 ++-- tools/assistant/tools/assistant/centralwidget.cpp | 10 ++-- tools/assistant/tools/assistant/centralwidget.h | 10 ++-- tools/assistant/tools/assistant/cmdlineparser.cpp | 10 ++-- tools/assistant/tools/assistant/cmdlineparser.h | 10 ++-- tools/assistant/tools/assistant/contentwindow.cpp | 10 ++-- tools/assistant/tools/assistant/contentwindow.h | 10 ++-- .../assistant/tools/assistant/filternamedialog.cpp | 10 ++-- tools/assistant/tools/assistant/filternamedialog.h | 10 ++-- tools/assistant/tools/assistant/helpviewer.cpp | 10 ++-- tools/assistant/tools/assistant/helpviewer.h | 10 ++-- tools/assistant/tools/assistant/indexwindow.cpp | 10 ++-- tools/assistant/tools/assistant/indexwindow.h | 10 ++-- tools/assistant/tools/assistant/installdialog.cpp | 10 ++-- tools/assistant/tools/assistant/installdialog.h | 10 ++-- tools/assistant/tools/assistant/main.cpp | 10 ++-- tools/assistant/tools/assistant/mainwindow.cpp | 10 ++-- tools/assistant/tools/assistant/mainwindow.h | 10 ++-- .../tools/assistant/preferencesdialog.cpp | 10 ++-- .../assistant/tools/assistant/preferencesdialog.h | 10 ++-- tools/assistant/tools/assistant/qtdocinstaller.cpp | 10 ++-- tools/assistant/tools/assistant/qtdocinstaller.h | 10 ++-- tools/assistant/tools/assistant/remotecontrol.cpp | 10 ++-- tools/assistant/tools/assistant/remotecontrol.h | 10 ++-- .../assistant/tools/assistant/remotecontrol_win.h | 10 ++-- tools/assistant/tools/assistant/searchwidget.cpp | 10 ++-- tools/assistant/tools/assistant/searchwidget.h | 10 ++-- tools/assistant/tools/assistant/topicchooser.cpp | 10 ++-- tools/assistant/tools/assistant/topicchooser.h | 10 ++-- .../assistant/tools/qcollectiongenerator/main.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/adpreader.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/adpreader.h | 10 ++-- .../tools/qhelpconverter/conversionwizard.cpp | 10 ++-- .../tools/qhelpconverter/conversionwizard.h | 10 ++-- tools/assistant/tools/qhelpconverter/filespage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/filespage.h | 10 ++-- .../assistant/tools/qhelpconverter/filterpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/filterpage.h | 10 ++-- .../assistant/tools/qhelpconverter/finishpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/finishpage.h | 10 ++-- .../assistant/tools/qhelpconverter/generalpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/generalpage.h | 10 ++-- .../assistant/tools/qhelpconverter/helpwindow.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/helpwindow.h | 10 ++-- .../tools/qhelpconverter/identifierpage.cpp | 10 ++-- .../tools/qhelpconverter/identifierpage.h | 10 ++-- tools/assistant/tools/qhelpconverter/inputpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/inputpage.h | 10 ++-- tools/assistant/tools/qhelpconverter/main.cpp | 10 ++-- .../assistant/tools/qhelpconverter/outputpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/outputpage.h | 10 ++-- tools/assistant/tools/qhelpconverter/pathpage.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/pathpage.h | 10 ++-- .../assistant/tools/qhelpconverter/qhcpwriter.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/qhcpwriter.h | 10 ++-- tools/assistant/tools/qhelpconverter/qhpwriter.cpp | 10 ++-- tools/assistant/tools/qhelpconverter/qhpwriter.h | 10 ++-- tools/assistant/tools/qhelpgenerator/main.cpp | 10 ++-- tools/assistant/tools/shared/helpgenerator.cpp | 10 ++-- tools/assistant/tools/shared/helpgenerator.h | 10 ++-- tools/checksdk/cesdkhandler.cpp | 10 ++-- tools/checksdk/cesdkhandler.h | 10 ++-- tools/checksdk/main.cpp | 10 ++-- tools/configure/configure_pch.h | 10 ++-- tools/configure/configureapp.cpp | 10 ++-- tools/configure/configureapp.h | 10 ++-- tools/configure/environment.cpp | 10 ++-- tools/configure/environment.h | 10 ++-- tools/configure/main.cpp | 10 ++-- tools/configure/tools.cpp | 10 ++-- tools/configure/tools.h | 10 ++-- tools/designer/data/generate_header.xsl | 10 ++-- tools/designer/data/generate_impl.xsl | 10 ++-- .../src/components/buddyeditor/buddyeditor.cpp | 10 ++-- .../src/components/buddyeditor/buddyeditor.h | 10 ++-- .../components/buddyeditor/buddyeditor_global.h | 10 ++-- .../buddyeditor/buddyeditor_instance.cpp | 10 ++-- .../components/buddyeditor/buddyeditor_plugin.cpp | 10 ++-- .../components/buddyeditor/buddyeditor_plugin.h | 10 ++-- .../components/buddyeditor/buddyeditor_tool.cpp | 10 ++-- .../src/components/buddyeditor/buddyeditor_tool.h | 10 ++-- .../components/formeditor/brushmanagerproxy.cpp | 10 ++-- .../src/components/formeditor/brushmanagerproxy.h | 10 ++-- .../formeditor/default_actionprovider.cpp | 10 ++-- .../components/formeditor/default_actionprovider.h | 10 ++-- .../components/formeditor/default_container.cpp | 10 ++-- .../src/components/formeditor/default_container.h | 10 ++-- .../formeditor/default_layoutdecoration.cpp | 10 ++-- .../formeditor/default_layoutdecoration.h | 10 ++-- .../components/formeditor/deviceprofiledialog.cpp | 10 ++-- .../components/formeditor/deviceprofiledialog.h | 10 ++-- .../src/components/formeditor/dpi_chooser.cpp | 10 ++-- .../src/components/formeditor/dpi_chooser.h | 10 ++-- .../components/formeditor/embeddedoptionspage.cpp | 10 ++-- .../components/formeditor/embeddedoptionspage.h | 10 ++-- .../src/components/formeditor/formeditor.cpp | 10 ++-- .../src/components/formeditor/formeditor.h | 10 ++-- .../src/components/formeditor/formeditor_global.h | 10 ++-- .../formeditor/formeditor_optionspage.cpp | 10 ++-- .../components/formeditor/formeditor_optionspage.h | 10 ++-- .../src/components/formeditor/formwindow.cpp | 10 ++-- .../src/components/formeditor/formwindow.h | 10 ++-- .../components/formeditor/formwindow_dnditem.cpp | 10 ++-- .../src/components/formeditor/formwindow_dnditem.h | 10 ++-- .../formeditor/formwindow_widgetstack.cpp | 10 ++-- .../components/formeditor/formwindow_widgetstack.h | 10 ++-- .../src/components/formeditor/formwindowcursor.cpp | 10 ++-- .../src/components/formeditor/formwindowcursor.h | 10 ++-- .../components/formeditor/formwindowmanager.cpp | 10 ++-- .../src/components/formeditor/formwindowmanager.h | 10 ++-- .../components/formeditor/formwindowsettings.cpp | 10 ++-- .../src/components/formeditor/formwindowsettings.h | 10 ++-- .../components/formeditor/formwindowsettings.ui | 10 ++-- .../src/components/formeditor/iconcache.cpp | 10 ++-- .../designer/src/components/formeditor/iconcache.h | 10 ++-- .../formeditor/itemview_propertysheet.cpp | 10 ++-- .../components/formeditor/itemview_propertysheet.h | 10 ++-- .../components/formeditor/layout_propertysheet.cpp | 10 ++-- .../components/formeditor/layout_propertysheet.h | 10 ++-- .../components/formeditor/line_propertysheet.cpp | 10 ++-- .../src/components/formeditor/line_propertysheet.h | 10 ++-- .../components/formeditor/previewactiongroup.cpp | 10 ++-- .../src/components/formeditor/previewactiongroup.h | 10 ++-- .../components/formeditor/qdesigner_resource.cpp | 10 ++-- .../src/components/formeditor/qdesigner_resource.h | 10 ++-- .../formeditor/qlayoutwidget_propertysheet.cpp | 10 ++-- .../formeditor/qlayoutwidget_propertysheet.h | 10 ++-- .../formeditor/qmainwindow_container.cpp | 10 ++-- .../components/formeditor/qmainwindow_container.h | 10 ++-- .../components/formeditor/qmdiarea_container.cpp | 10 ++-- .../src/components/formeditor/qmdiarea_container.h | 10 ++-- .../src/components/formeditor/qtbrushmanager.cpp | 10 ++-- .../src/components/formeditor/qtbrushmanager.h | 10 ++-- .../components/formeditor/qwizard_container.cpp | 10 ++-- .../src/components/formeditor/qwizard_container.h | 10 ++-- .../components/formeditor/qworkspace_container.cpp | 10 ++-- .../components/formeditor/qworkspace_container.h | 10 ++-- .../components/formeditor/spacer_propertysheet.cpp | 10 ++-- .../components/formeditor/spacer_propertysheet.h | 10 ++-- .../components/formeditor/templateoptionspage.cpp | 10 ++-- .../components/formeditor/templateoptionspage.h | 10 ++-- .../components/formeditor/tool_widgeteditor.cpp | 10 ++-- .../src/components/formeditor/tool_widgeteditor.h | 10 ++-- .../src/components/formeditor/widgetselection.cpp | 10 ++-- .../src/components/formeditor/widgetselection.h | 10 ++-- tools/designer/src/components/lib/lib_pch.h | 10 ++-- .../src/components/lib/qdesigner_components.cpp | 10 ++-- .../components/objectinspector/objectinspector.cpp | 10 ++-- .../components/objectinspector/objectinspector.h | 10 ++-- .../objectinspector/objectinspector_global.h | 10 ++-- .../objectinspector/objectinspectormodel.cpp | 10 ++-- .../objectinspector/objectinspectormodel_p.h | 10 ++-- .../propertyeditor/brushpropertymanager.cpp | 10 ++-- .../propertyeditor/brushpropertymanager.h | 10 ++-- .../src/components/propertyeditor/defs.cpp | 10 ++-- .../designer/src/components/propertyeditor/defs.h | 10 ++-- .../propertyeditor/designerpropertymanager.cpp | 10 ++-- .../propertyeditor/designerpropertymanager.h | 10 ++-- .../src/components/propertyeditor/fontmapping.xml | 10 ++-- .../propertyeditor/fontpropertymanager.cpp | 10 ++-- .../propertyeditor/fontpropertymanager.h | 10 ++-- .../propertyeditor/newdynamicpropertydialog.cpp | 10 ++-- .../propertyeditor/newdynamicpropertydialog.h | 10 ++-- .../components/propertyeditor/paletteeditor.cpp | 10 ++-- .../src/components/propertyeditor/paletteeditor.h | 10 ++-- .../src/components/propertyeditor/paletteeditor.ui | 10 ++-- .../propertyeditor/paletteeditorbutton.cpp | 10 ++-- .../propertyeditor/paletteeditorbutton.h | 10 ++-- .../src/components/propertyeditor/previewframe.cpp | 10 ++-- .../src/components/propertyeditor/previewframe.h | 10 ++-- .../components/propertyeditor/previewwidget.cpp | 10 ++-- .../src/components/propertyeditor/previewwidget.h | 10 ++-- .../src/components/propertyeditor/previewwidget.ui | 10 ++-- .../components/propertyeditor/propertyeditor.cpp | 10 ++-- .../src/components/propertyeditor/propertyeditor.h | 10 ++-- .../propertyeditor/propertyeditor_global.h | 10 ++-- .../propertyeditor/qlonglongvalidator.cpp | 10 ++-- .../components/propertyeditor/qlonglongvalidator.h | 10 ++-- .../components/propertyeditor/stringlisteditor.cpp | 10 ++-- .../components/propertyeditor/stringlisteditor.h | 10 ++-- .../components/propertyeditor/stringlisteditor.ui | 10 ++-- .../propertyeditor/stringlisteditorbutton.cpp | 10 ++-- .../propertyeditor/stringlisteditorbutton.h | 10 ++-- .../components/signalsloteditor/connectdialog.cpp | 10 ++-- .../components/signalsloteditor/connectdialog_p.h | 10 ++-- .../signalsloteditor/signalslot_utils.cpp | 10 ++-- .../signalsloteditor/signalslot_utils_p.h | 10 ++-- .../signalsloteditor/signalsloteditor.cpp | 10 ++-- .../components/signalsloteditor/signalsloteditor.h | 10 ++-- .../signalsloteditor/signalsloteditor_global.h | 10 ++-- .../signalsloteditor/signalsloteditor_instance.cpp | 10 ++-- .../signalsloteditor/signalsloteditor_p.h | 10 ++-- .../signalsloteditor/signalsloteditor_plugin.cpp | 10 ++-- .../signalsloteditor/signalsloteditor_plugin.h | 10 ++-- .../signalsloteditor/signalsloteditor_tool.cpp | 10 ++-- .../signalsloteditor/signalsloteditor_tool.h | 10 ++-- .../signalsloteditor/signalsloteditorwindow.cpp | 10 ++-- .../signalsloteditor/signalsloteditorwindow.h | 10 ++-- .../components/tabordereditor/tabordereditor.cpp | 10 ++-- .../src/components/tabordereditor/tabordereditor.h | 10 ++-- .../tabordereditor/tabordereditor_global.h | 10 ++-- .../tabordereditor/tabordereditor_instance.cpp | 10 ++-- .../tabordereditor/tabordereditor_plugin.cpp | 10 ++-- .../tabordereditor/tabordereditor_plugin.h | 10 ++-- .../tabordereditor/tabordereditor_tool.cpp | 10 ++-- .../tabordereditor/tabordereditor_tool.h | 10 ++-- .../src/components/taskmenu/button_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/button_taskmenu.h | 10 ++-- .../src/components/taskmenu/combobox_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/combobox_taskmenu.h | 10 ++-- .../taskmenu/containerwidget_taskmenu.cpp | 10 ++-- .../components/taskmenu/containerwidget_taskmenu.h | 10 ++-- .../src/components/taskmenu/groupbox_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/groupbox_taskmenu.h | 10 ++-- .../src/components/taskmenu/inplace_editor.cpp | 10 ++-- .../src/components/taskmenu/inplace_editor.h | 10 ++-- .../components/taskmenu/inplace_widget_helper.cpp | 10 ++-- .../components/taskmenu/inplace_widget_helper.h | 10 ++-- .../src/components/taskmenu/itemlisteditor.cpp | 10 ++-- .../src/components/taskmenu/itemlisteditor.h | 10 ++-- .../src/components/taskmenu/itemlisteditor.ui | 10 ++-- .../src/components/taskmenu/label_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/label_taskmenu.h | 10 ++-- .../src/components/taskmenu/layouttaskmenu.cpp | 10 ++-- .../src/components/taskmenu/layouttaskmenu.h | 10 ++-- .../src/components/taskmenu/lineedit_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/lineedit_taskmenu.h | 10 ++-- .../components/taskmenu/listwidget_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/listwidget_taskmenu.h | 10 ++-- .../src/components/taskmenu/listwidgeteditor.cpp | 10 ++-- .../src/components/taskmenu/listwidgeteditor.h | 10 ++-- .../src/components/taskmenu/menutaskmenu.cpp | 10 ++-- .../src/components/taskmenu/menutaskmenu.h | 10 ++-- .../components/taskmenu/tablewidget_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/tablewidget_taskmenu.h | 10 ++-- .../src/components/taskmenu/tablewidgeteditor.cpp | 10 ++-- .../src/components/taskmenu/tablewidgeteditor.h | 10 ++-- .../src/components/taskmenu/tablewidgeteditor.ui | 10 ++-- .../src/components/taskmenu/taskmenu_component.cpp | 10 ++-- .../src/components/taskmenu/taskmenu_component.h | 10 ++-- .../src/components/taskmenu/taskmenu_global.h | 10 ++-- .../src/components/taskmenu/textedit_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/textedit_taskmenu.h | 10 ++-- .../src/components/taskmenu/toolbar_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/toolbar_taskmenu.h | 10 ++-- .../components/taskmenu/treewidget_taskmenu.cpp | 10 ++-- .../src/components/taskmenu/treewidget_taskmenu.h | 10 ++-- .../src/components/taskmenu/treewidgeteditor.cpp | 10 ++-- .../src/components/taskmenu/treewidgeteditor.h | 10 ++-- .../src/components/taskmenu/treewidgeteditor.ui | 10 ++-- .../src/components/widgetbox/widgetbox.cpp | 10 ++-- .../designer/src/components/widgetbox/widgetbox.h | 10 ++-- .../src/components/widgetbox/widgetbox.xml | 10 ++-- .../src/components/widgetbox/widgetbox_dnditem.cpp | 10 ++-- .../src/components/widgetbox/widgetbox_dnditem.h | 10 ++-- .../src/components/widgetbox/widgetbox_global.h | 10 ++-- .../widgetbox/widgetboxcategorylistview.cpp | 10 ++-- .../widgetbox/widgetboxcategorylistview.h | 10 ++-- .../components/widgetbox/widgetboxtreewidget.cpp | 10 ++-- .../src/components/widgetbox/widgetboxtreewidget.h | 10 ++-- tools/designer/src/designer/appfontdialog.cpp | 10 ++-- tools/designer/src/designer/appfontdialog.h | 10 ++-- tools/designer/src/designer/assistantclient.cpp | 10 ++-- tools/designer/src/designer/assistantclient.h | 10 ++-- tools/designer/src/designer/designer_enums.h | 10 ++-- tools/designer/src/designer/main.cpp | 10 ++-- tools/designer/src/designer/mainwindow.cpp | 10 ++-- tools/designer/src/designer/mainwindow.h | 10 ++-- tools/designer/src/designer/newform.cpp | 10 ++-- tools/designer/src/designer/newform.h | 10 ++-- tools/designer/src/designer/preferencesdialog.cpp | 10 ++-- tools/designer/src/designer/preferencesdialog.h | 10 ++-- tools/designer/src/designer/qdesigner.cpp | 10 ++-- tools/designer/src/designer/qdesigner.h | 10 ++-- tools/designer/src/designer/qdesigner_actions.cpp | 10 ++-- tools/designer/src/designer/qdesigner_actions.h | 10 ++-- .../src/designer/qdesigner_appearanceoptions.cpp | 10 ++-- .../src/designer/qdesigner_appearanceoptions.h | 10 ++-- .../designer/src/designer/qdesigner_formwindow.cpp | 10 ++-- tools/designer/src/designer/qdesigner_formwindow.h | 10 ++-- tools/designer/src/designer/qdesigner_pch.h | 10 ++-- tools/designer/src/designer/qdesigner_server.cpp | 10 ++-- tools/designer/src/designer/qdesigner_server.h | 10 ++-- tools/designer/src/designer/qdesigner_settings.cpp | 10 ++-- tools/designer/src/designer/qdesigner_settings.h | 10 ++-- .../designer/src/designer/qdesigner_toolwindow.cpp | 10 ++-- tools/designer/src/designer/qdesigner_toolwindow.h | 10 ++-- .../designer/src/designer/qdesigner_workbench.cpp | 10 ++-- tools/designer/src/designer/qdesigner_workbench.h | 10 ++-- tools/designer/src/designer/saveformastemplate.cpp | 10 ++-- tools/designer/src/designer/saveformastemplate.h | 10 ++-- tools/designer/src/designer/saveformastemplate.ui | 10 ++-- tools/designer/src/designer/versiondialog.cpp | 10 ++-- tools/designer/src/designer/versiondialog.h | 10 ++-- .../src/lib/components/qdesigner_components.h | 10 ++-- .../lib/components/qdesigner_components_global.h | 10 ++-- .../src/lib/extension/default_extensionfactory.cpp | 10 ++-- .../src/lib/extension/default_extensionfactory.h | 10 ++-- tools/designer/src/lib/extension/extension.cpp | 10 ++-- tools/designer/src/lib/extension/extension.h | 10 ++-- .../designer/src/lib/extension/extension_global.h | 10 ++-- .../src/lib/extension/qextensionmanager.cpp | 10 ++-- .../designer/src/lib/extension/qextensionmanager.h | 10 ++-- tools/designer/src/lib/lib_pch.h | 10 ++-- .../designer/src/lib/sdk/abstractactioneditor.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractactioneditor.h | 10 ++-- tools/designer/src/lib/sdk/abstractbrushmanager.h | 10 ++-- tools/designer/src/lib/sdk/abstractdialoggui.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractdialoggui_p.h | 10 ++-- tools/designer/src/lib/sdk/abstractdnditem.h | 10 ++-- tools/designer/src/lib/sdk/abstractformeditor.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractformeditor.h | 10 ++-- .../src/lib/sdk/abstractformeditorplugin.cpp | 10 ++-- .../src/lib/sdk/abstractformeditorplugin.h | 10 ++-- tools/designer/src/lib/sdk/abstractformwindow.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractformwindow.h | 10 ++-- .../src/lib/sdk/abstractformwindowcursor.cpp | 10 ++-- .../src/lib/sdk/abstractformwindowcursor.h | 10 ++-- .../src/lib/sdk/abstractformwindowmanager.cpp | 10 ++-- .../src/lib/sdk/abstractformwindowmanager.h | 10 ++-- .../src/lib/sdk/abstractformwindowtool.cpp | 10 ++-- .../designer/src/lib/sdk/abstractformwindowtool.h | 10 ++-- tools/designer/src/lib/sdk/abstracticoncache.h | 10 ++-- tools/designer/src/lib/sdk/abstractintegration.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractintegration.h | 10 ++-- .../designer/src/lib/sdk/abstractintrospection.cpp | 10 ++-- .../designer/src/lib/sdk/abstractintrospection_p.h | 10 ++-- tools/designer/src/lib/sdk/abstractlanguage.h | 10 ++-- .../designer/src/lib/sdk/abstractmetadatabase.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractmetadatabase.h | 10 ++-- .../designer/src/lib/sdk/abstractnewformwidget.cpp | 10 ++-- .../designer/src/lib/sdk/abstractnewformwidget_p.h | 10 ++-- .../src/lib/sdk/abstractobjectinspector.cpp | 10 ++-- .../designer/src/lib/sdk/abstractobjectinspector.h | 10 ++-- tools/designer/src/lib/sdk/abstractoptionspage_p.h | 10 ++-- .../src/lib/sdk/abstractpromotioninterface.cpp | 10 ++-- .../src/lib/sdk/abstractpromotioninterface.h | 10 ++-- .../src/lib/sdk/abstractpropertyeditor.cpp | 10 ++-- .../designer/src/lib/sdk/abstractpropertyeditor.h | 10 ++-- .../src/lib/sdk/abstractresourcebrowser.cpp | 10 ++-- .../designer/src/lib/sdk/abstractresourcebrowser.h | 10 ++-- tools/designer/src/lib/sdk/abstractsettings_p.h | 10 ++-- tools/designer/src/lib/sdk/abstractwidgetbox.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractwidgetbox.h | 10 ++-- .../src/lib/sdk/abstractwidgetdatabase.cpp | 10 ++-- .../designer/src/lib/sdk/abstractwidgetdatabase.h | 10 ++-- .../designer/src/lib/sdk/abstractwidgetfactory.cpp | 10 ++-- tools/designer/src/lib/sdk/abstractwidgetfactory.h | 10 ++-- tools/designer/src/lib/sdk/dynamicpropertysheet.h | 10 ++-- tools/designer/src/lib/sdk/extrainfo.cpp | 10 ++-- tools/designer/src/lib/sdk/extrainfo.h | 10 ++-- tools/designer/src/lib/sdk/layoutdecoration.h | 10 ++-- tools/designer/src/lib/sdk/membersheet.h | 10 ++-- tools/designer/src/lib/sdk/propertysheet.h | 10 ++-- tools/designer/src/lib/sdk/script.cpp | 10 ++-- tools/designer/src/lib/sdk/script_p.h | 10 ++-- tools/designer/src/lib/sdk/sdk_global.h | 10 ++-- tools/designer/src/lib/sdk/taskmenu.h | 10 ++-- tools/designer/src/lib/shared/actioneditor.cpp | 10 ++-- tools/designer/src/lib/shared/actioneditor_p.h | 10 ++-- tools/designer/src/lib/shared/actionprovider_p.h | 10 ++-- tools/designer/src/lib/shared/actionrepository.cpp | 10 ++-- tools/designer/src/lib/shared/actionrepository_p.h | 10 ++-- tools/designer/src/lib/shared/codedialog.cpp | 10 ++-- tools/designer/src/lib/shared/codedialog_p.h | 10 ++-- tools/designer/src/lib/shared/connectionedit.cpp | 10 ++-- tools/designer/src/lib/shared/connectionedit_p.h | 10 ++-- tools/designer/src/lib/shared/csshighlighter.cpp | 10 ++-- tools/designer/src/lib/shared/csshighlighter_p.h | 10 ++-- tools/designer/src/lib/shared/deviceprofile.cpp | 10 ++-- tools/designer/src/lib/shared/deviceprofile_p.h | 10 ++-- tools/designer/src/lib/shared/dialoggui.cpp | 10 ++-- tools/designer/src/lib/shared/dialoggui_p.h | 10 ++-- tools/designer/src/lib/shared/extensionfactory_p.h | 10 ++-- tools/designer/src/lib/shared/filterwidget.cpp | 10 ++-- tools/designer/src/lib/shared/filterwidget_p.h | 10 ++-- tools/designer/src/lib/shared/formlayoutmenu.cpp | 10 ++-- tools/designer/src/lib/shared/formlayoutmenu_p.h | 10 ++-- tools/designer/src/lib/shared/formwindowbase.cpp | 10 ++-- tools/designer/src/lib/shared/formwindowbase_p.h | 10 ++-- tools/designer/src/lib/shared/grid.cpp | 10 ++-- tools/designer/src/lib/shared/grid_p.h | 10 ++-- tools/designer/src/lib/shared/gridpanel.cpp | 10 ++-- tools/designer/src/lib/shared/gridpanel_p.h | 10 ++-- tools/designer/src/lib/shared/htmlhighlighter.cpp | 10 ++-- tools/designer/src/lib/shared/htmlhighlighter_p.h | 10 ++-- tools/designer/src/lib/shared/iconloader.cpp | 10 ++-- tools/designer/src/lib/shared/iconloader_p.h | 10 ++-- tools/designer/src/lib/shared/iconselector.cpp | 10 ++-- tools/designer/src/lib/shared/iconselector_p.h | 10 ++-- tools/designer/src/lib/shared/invisible_widget.cpp | 10 ++-- tools/designer/src/lib/shared/invisible_widget_p.h | 10 ++-- tools/designer/src/lib/shared/layout.cpp | 10 ++-- tools/designer/src/lib/shared/layout_p.h | 10 ++-- tools/designer/src/lib/shared/layoutinfo.cpp | 10 ++-- tools/designer/src/lib/shared/layoutinfo_p.h | 10 ++-- tools/designer/src/lib/shared/metadatabase.cpp | 10 ++-- tools/designer/src/lib/shared/metadatabase_p.h | 10 ++-- tools/designer/src/lib/shared/morphmenu.cpp | 10 ++-- tools/designer/src/lib/shared/morphmenu_p.h | 10 ++-- tools/designer/src/lib/shared/newactiondialog.cpp | 10 ++-- tools/designer/src/lib/shared/newactiondialog.ui | 10 ++-- tools/designer/src/lib/shared/newactiondialog_p.h | 10 ++-- tools/designer/src/lib/shared/newformwidget.cpp | 10 ++-- tools/designer/src/lib/shared/newformwidget.ui | 10 ++-- tools/designer/src/lib/shared/newformwidget_p.h | 10 ++-- tools/designer/src/lib/shared/orderdialog.cpp | 10 ++-- tools/designer/src/lib/shared/orderdialog.ui | 10 ++-- tools/designer/src/lib/shared/orderdialog_p.h | 10 ++-- tools/designer/src/lib/shared/plaintexteditor.cpp | 10 ++-- tools/designer/src/lib/shared/plaintexteditor_p.h | 10 ++-- tools/designer/src/lib/shared/plugindialog.cpp | 10 ++-- tools/designer/src/lib/shared/plugindialog.ui | 10 ++-- tools/designer/src/lib/shared/plugindialog_p.h | 10 ++-- tools/designer/src/lib/shared/pluginmanager.cpp | 10 ++-- tools/designer/src/lib/shared/pluginmanager_p.h | 10 ++-- .../src/lib/shared/previewconfigurationwidget.cpp | 10 ++-- .../src/lib/shared/previewconfigurationwidget_p.h | 10 ++-- tools/designer/src/lib/shared/previewmanager.cpp | 10 ++-- tools/designer/src/lib/shared/previewmanager_p.h | 10 ++-- tools/designer/src/lib/shared/promotionmodel.cpp | 10 ++-- tools/designer/src/lib/shared/promotionmodel_p.h | 10 ++-- .../designer/src/lib/shared/promotiontaskmenu.cpp | 10 ++-- .../designer/src/lib/shared/promotiontaskmenu_p.h | 10 ++-- tools/designer/src/lib/shared/propertylineedit.cpp | 10 ++-- tools/designer/src/lib/shared/propertylineedit_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_command.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_command2.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_command2_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_command_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_dnditem.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_dnditem_p.h | 10 ++-- .../src/lib/shared/qdesigner_dockwidget.cpp | 10 ++-- .../src/lib/shared/qdesigner_dockwidget_p.h | 10 ++-- .../src/lib/shared/qdesigner_formbuilder.cpp | 10 ++-- .../src/lib/shared/qdesigner_formbuilder_p.h | 10 ++-- .../src/lib/shared/qdesigner_formeditorcommand.cpp | 10 ++-- .../src/lib/shared/qdesigner_formeditorcommand_p.h | 10 ++-- .../src/lib/shared/qdesigner_formwindowcommand.cpp | 10 ++-- .../src/lib/shared/qdesigner_formwindowcommand_p.h | 10 ++-- .../src/lib/shared/qdesigner_formwindowmanager.cpp | 10 ++-- .../src/lib/shared/qdesigner_formwindowmanager_p.h | 10 ++-- .../src/lib/shared/qdesigner_integration.cpp | 10 ++-- .../src/lib/shared/qdesigner_integration_p.h | 10 ++-- .../src/lib/shared/qdesigner_introspection.cpp | 10 ++-- .../src/lib/shared/qdesigner_introspection_p.h | 10 ++-- .../src/lib/shared/qdesigner_membersheet.cpp | 10 ++-- .../src/lib/shared/qdesigner_membersheet_p.h | 10 ++-- tools/designer/src/lib/shared/qdesigner_menu.cpp | 10 ++-- tools/designer/src/lib/shared/qdesigner_menu_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_menubar.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_menubar_p.h | 10 ++-- .../src/lib/shared/qdesigner_objectinspector.cpp | 10 ++-- .../src/lib/shared/qdesigner_objectinspector_p.h | 10 ++-- .../src/lib/shared/qdesigner_promotion.cpp | 10 ++-- .../src/lib/shared/qdesigner_promotion_p.h | 10 ++-- .../src/lib/shared/qdesigner_promotiondialog.cpp | 10 ++-- .../src/lib/shared/qdesigner_promotiondialog_p.h | 10 ++-- .../src/lib/shared/qdesigner_propertycommand.cpp | 10 ++-- .../src/lib/shared/qdesigner_propertycommand_p.h | 10 ++-- .../src/lib/shared/qdesigner_propertyeditor.cpp | 10 ++-- .../src/lib/shared/qdesigner_propertyeditor_p.h | 10 ++-- .../src/lib/shared/qdesigner_propertysheet.cpp | 10 ++-- .../src/lib/shared/qdesigner_propertysheet_p.h | 10 ++-- .../src/lib/shared/qdesigner_qsettings.cpp | 10 ++-- .../src/lib/shared/qdesigner_qsettings_p.h | 10 ++-- .../src/lib/shared/qdesigner_stackedbox.cpp | 10 ++-- .../src/lib/shared/qdesigner_stackedbox_p.h | 10 ++-- .../src/lib/shared/qdesigner_tabwidget.cpp | 10 ++-- .../src/lib/shared/qdesigner_tabwidget_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_taskmenu.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_taskmenu_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_toolbar.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_toolbar_p.h | 10 ++-- .../designer/src/lib/shared/qdesigner_toolbox.cpp | 10 ++-- .../designer/src/lib/shared/qdesigner_toolbox_p.h | 10 ++-- tools/designer/src/lib/shared/qdesigner_utils.cpp | 10 ++-- tools/designer/src/lib/shared/qdesigner_utils_p.h | 10 ++-- tools/designer/src/lib/shared/qdesigner_widget.cpp | 10 ++-- tools/designer/src/lib/shared/qdesigner_widget_p.h | 10 ++-- .../src/lib/shared/qdesigner_widgetbox.cpp | 10 ++-- .../src/lib/shared/qdesigner_widgetbox_p.h | 10 ++-- .../src/lib/shared/qdesigner_widgetitem.cpp | 10 ++-- .../src/lib/shared/qdesigner_widgetitem_p.h | 10 ++-- tools/designer/src/lib/shared/qlayout_widget.cpp | 10 ++-- tools/designer/src/lib/shared/qlayout_widget_p.h | 10 ++-- .../designer/src/lib/shared/qscripthighlighter.cpp | 10 ++-- .../designer/src/lib/shared/qscripthighlighter_p.h | 10 ++-- tools/designer/src/lib/shared/qsimpleresource.cpp | 10 ++-- tools/designer/src/lib/shared/qsimpleresource_p.h | 10 ++-- .../src/lib/shared/qtresourceeditordialog.cpp | 10 ++-- .../src/lib/shared/qtresourceeditordialog_p.h | 10 ++-- tools/designer/src/lib/shared/qtresourcemodel.cpp | 10 ++-- tools/designer/src/lib/shared/qtresourcemodel_p.h | 10 ++-- tools/designer/src/lib/shared/qtresourceview.cpp | 10 ++-- tools/designer/src/lib/shared/qtresourceview_p.h | 10 ++-- tools/designer/src/lib/shared/richtexteditor.cpp | 10 ++-- tools/designer/src/lib/shared/richtexteditor_p.h | 10 ++-- tools/designer/src/lib/shared/scriptcommand.cpp | 10 ++-- tools/designer/src/lib/shared/scriptcommand_p.h | 10 ++-- tools/designer/src/lib/shared/scriptdialog.cpp | 10 ++-- tools/designer/src/lib/shared/scriptdialog_p.h | 10 ++-- .../designer/src/lib/shared/scripterrordialog.cpp | 10 ++-- .../designer/src/lib/shared/scripterrordialog_p.h | 10 ++-- tools/designer/src/lib/shared/shared_enums_p.h | 10 ++-- tools/designer/src/lib/shared/shared_global_p.h | 10 ++-- tools/designer/src/lib/shared/shared_settings.cpp | 10 ++-- tools/designer/src/lib/shared/shared_settings_p.h | 10 ++-- tools/designer/src/lib/shared/sheet_delegate.cpp | 10 ++-- tools/designer/src/lib/shared/sheet_delegate_p.h | 10 ++-- tools/designer/src/lib/shared/signalslotdialog.cpp | 10 ++-- tools/designer/src/lib/shared/signalslotdialog_p.h | 10 ++-- tools/designer/src/lib/shared/spacer_widget.cpp | 10 ++-- tools/designer/src/lib/shared/spacer_widget_p.h | 10 ++-- tools/designer/src/lib/shared/stylesheeteditor.cpp | 10 ++-- tools/designer/src/lib/shared/stylesheeteditor_p.h | 10 ++-- .../designer/src/lib/shared/textpropertyeditor.cpp | 10 ++-- .../designer/src/lib/shared/textpropertyeditor_p.h | 10 ++-- tools/designer/src/lib/shared/widgetdatabase.cpp | 10 ++-- tools/designer/src/lib/shared/widgetdatabase_p.h | 10 ++-- tools/designer/src/lib/shared/widgetfactory.cpp | 10 ++-- tools/designer/src/lib/shared/widgetfactory_p.h | 10 ++-- tools/designer/src/lib/shared/zoomwidget.cpp | 10 ++-- tools/designer/src/lib/shared/zoomwidget_p.h | 10 ++-- .../designer/src/lib/uilib/abstractformbuilder.cpp | 10 ++-- tools/designer/src/lib/uilib/abstractformbuilder.h | 10 ++-- tools/designer/src/lib/uilib/container.h | 10 ++-- tools/designer/src/lib/uilib/customwidget.h | 10 ++-- tools/designer/src/lib/uilib/formbuilder.cpp | 10 ++-- tools/designer/src/lib/uilib/formbuilder.h | 10 ++-- tools/designer/src/lib/uilib/formbuilderextra.cpp | 10 ++-- tools/designer/src/lib/uilib/formbuilderextra_p.h | 10 ++-- tools/designer/src/lib/uilib/formscriptrunner.cpp | 10 ++-- tools/designer/src/lib/uilib/formscriptrunner_p.h | 10 ++-- tools/designer/src/lib/uilib/properties.cpp | 10 ++-- tools/designer/src/lib/uilib/properties_p.h | 10 ++-- .../designer/src/lib/uilib/qdesignerexportwidget.h | 10 ++-- tools/designer/src/lib/uilib/resourcebuilder.cpp | 10 ++-- tools/designer/src/lib/uilib/resourcebuilder_p.h | 10 ++-- tools/designer/src/lib/uilib/textbuilder.cpp | 10 ++-- tools/designer/src/lib/uilib/textbuilder_p.h | 10 ++-- tools/designer/src/lib/uilib/ui4.cpp | 10 ++-- tools/designer/src/lib/uilib/ui4_p.h | 10 ++-- tools/designer/src/lib/uilib/uilib_global.h | 10 ++-- .../src/plugins/activeqt/qaxwidgetextrainfo.cpp | 10 ++-- .../src/plugins/activeqt/qaxwidgetextrainfo.h | 10 ++-- .../src/plugins/activeqt/qaxwidgetplugin.cpp | 10 ++-- .../src/plugins/activeqt/qaxwidgetplugin.h | 10 ++-- .../plugins/activeqt/qaxwidgetpropertysheet.cpp | 10 ++-- .../src/plugins/activeqt/qaxwidgetpropertysheet.h | 10 ++-- .../src/plugins/activeqt/qaxwidgettaskmenu.cpp | 10 ++-- .../src/plugins/activeqt/qaxwidgettaskmenu.h | 10 ++-- .../src/plugins/activeqt/qdesigneraxwidget.cpp | 10 ++-- .../src/plugins/activeqt/qdesigneraxwidget.h | 10 ++-- .../src/plugins/phononwidgets/phononcollection.cpp | 10 ++-- .../src/plugins/phononwidgets/seeksliderplugin.cpp | 10 ++-- .../src/plugins/phononwidgets/seeksliderplugin.h | 10 ++-- .../plugins/phononwidgets/videoplayerplugin.cpp | 10 ++-- .../src/plugins/phononwidgets/videoplayerplugin.h | 10 ++-- .../plugins/phononwidgets/videoplayertaskmenu.cpp | 10 ++-- .../plugins/phononwidgets/videoplayertaskmenu.h | 10 ++-- .../plugins/phononwidgets/volumesliderplugin.cpp | 10 ++-- .../src/plugins/phononwidgets/volumesliderplugin.h | 10 ++-- .../src/plugins/qwebview/qwebview_plugin.cpp | 10 ++-- .../src/plugins/qwebview/qwebview_plugin.h | 10 ++-- tools/designer/src/plugins/tools/view3d/view3d.cpp | 10 ++-- tools/designer/src/plugins/tools/view3d/view3d.h | 10 ++-- .../src/plugins/tools/view3d/view3d_global.h | 10 ++-- .../src/plugins/tools/view3d/view3d_plugin.cpp | 10 ++-- .../src/plugins/tools/view3d/view3d_plugin.h | 10 ++-- .../src/plugins/tools/view3d/view3d_tool.cpp | 10 ++-- .../src/plugins/tools/view3d/view3d_tool.h | 10 ++-- .../widgets/q3iconview/q3iconview_extrainfo.cpp | 10 ++-- .../widgets/q3iconview/q3iconview_extrainfo.h | 10 ++-- .../widgets/q3iconview/q3iconview_plugin.cpp | 10 ++-- .../plugins/widgets/q3iconview/q3iconview_plugin.h | 10 ++-- .../widgets/q3listbox/q3listbox_extrainfo.cpp | 10 ++-- .../widgets/q3listbox/q3listbox_extrainfo.h | 10 ++-- .../plugins/widgets/q3listbox/q3listbox_plugin.cpp | 10 ++-- .../plugins/widgets/q3listbox/q3listbox_plugin.h | 10 ++-- .../widgets/q3listview/q3listview_extrainfo.cpp | 10 ++-- .../widgets/q3listview/q3listview_extrainfo.h | 10 ++-- .../widgets/q3listview/q3listview_plugin.cpp | 10 ++-- .../plugins/widgets/q3listview/q3listview_plugin.h | 10 ++-- .../q3mainwindow/q3mainwindow_container.cpp | 10 ++-- .../widgets/q3mainwindow/q3mainwindow_container.h | 10 ++-- .../widgets/q3mainwindow/q3mainwindow_plugin.cpp | 10 ++-- .../widgets/q3mainwindow/q3mainwindow_plugin.h | 10 ++-- .../plugins/widgets/q3table/q3table_extrainfo.cpp | 10 ++-- .../plugins/widgets/q3table/q3table_extrainfo.h | 10 ++-- .../src/plugins/widgets/q3table/q3table_plugin.cpp | 10 ++-- .../src/plugins/widgets/q3table/q3table_plugin.h | 10 ++-- .../widgets/q3textedit/q3textedit_extrainfo.cpp | 10 ++-- .../widgets/q3textedit/q3textedit_extrainfo.h | 10 ++-- .../widgets/q3textedit/q3textedit_plugin.cpp | 10 ++-- .../plugins/widgets/q3textedit/q3textedit_plugin.h | 10 ++-- .../widgets/q3toolbar/q3toolbar_extrainfo.cpp | 10 ++-- .../widgets/q3toolbar/q3toolbar_extrainfo.h | 10 ++-- .../plugins/widgets/q3toolbar/q3toolbar_plugin.cpp | 10 ++-- .../plugins/widgets/q3toolbar/q3toolbar_plugin.h | 10 ++-- .../plugins/widgets/q3widgets/q3widget_plugins.cpp | 10 ++-- .../plugins/widgets/q3widgets/q3widget_plugins.h | 10 ++-- .../q3widgetstack/q3widgetstack_container.cpp | 10 ++-- .../q3widgetstack/q3widgetstack_container.h | 10 ++-- .../widgets/q3widgetstack/q3widgetstack_plugin.cpp | 10 ++-- .../widgets/q3widgetstack/q3widgetstack_plugin.h | 10 ++-- .../q3widgetstack/qdesigner_q3widgetstack.cpp | 10 ++-- .../q3widgetstack/qdesigner_q3widgetstack_p.h | 10 ++-- .../widgets/q3wizard/q3wizard_container.cpp | 10 ++-- .../plugins/widgets/q3wizard/q3wizard_container.h | 10 ++-- .../plugins/widgets/q3wizard/q3wizard_plugin.cpp | 10 ++-- .../src/plugins/widgets/q3wizard/q3wizard_plugin.h | 10 ++-- .../src/plugins/widgets/qt3supportwidgets.cpp | 10 ++-- tools/designer/src/uitools/quiloader.cpp | 10 ++-- tools/designer/src/uitools/quiloader.h | 10 ++-- tools/designer/src/uitools/quiloader_p.h | 10 ++-- tools/installer/batch/build.bat | 10 ++-- tools/installer/batch/copy.bat | 10 ++-- tools/installer/batch/delete.bat | 10 ++-- tools/installer/batch/env.bat | 10 ++-- tools/installer/batch/extract.bat | 10 ++-- tools/installer/batch/installer.bat | 10 ++-- tools/installer/batch/log.bat | 10 ++-- tools/installer/batch/toupper.bat | 10 ++-- tools/installer/config/config.default.sample | 10 ++-- tools/installer/config/mingw-opensource.conf | 10 ++-- tools/installer/iwmake.bat | 10 ++-- tools/installer/nsis/confirmpage.ini | 10 ++-- tools/installer/nsis/gwdownload.ini | 10 ++-- tools/installer/nsis/gwmirror.ini | 10 ++-- tools/installer/nsis/includes/global.nsh | 10 ++-- tools/installer/nsis/includes/instdir.nsh | 10 ++-- tools/installer/nsis/includes/list.nsh | 10 ++-- tools/installer/nsis/includes/qtcommon.nsh | 10 ++-- tools/installer/nsis/includes/qtenv.nsh | 10 ++-- tools/installer/nsis/includes/system.nsh | 10 ++-- tools/installer/nsis/installer.nsi | 10 ++-- tools/installer/nsis/modules/environment.nsh | 10 ++-- tools/installer/nsis/modules/mingw.nsh | 10 ++-- tools/installer/nsis/modules/opensource.nsh | 10 ++-- tools/installer/nsis/modules/registeruiext.nsh | 10 ++-- tools/installer/nsis/opensource.ini | 10 ++-- tools/linguist/lconvert/main.cpp | 10 ++-- tools/linguist/linguist/batchtranslation.ui | 10 ++-- tools/linguist/linguist/batchtranslationdialog.cpp | 10 ++-- tools/linguist/linguist/batchtranslationdialog.h | 10 ++-- tools/linguist/linguist/errorsview.cpp | 10 ++-- tools/linguist/linguist/errorsview.h | 10 ++-- tools/linguist/linguist/finddialog.cpp | 10 ++-- tools/linguist/linguist/finddialog.h | 10 ++-- tools/linguist/linguist/finddialog.ui | 10 ++-- tools/linguist/linguist/formpreviewview.cpp | 10 ++-- tools/linguist/linguist/formpreviewview.h | 10 ++-- tools/linguist/linguist/main.cpp | 10 ++-- tools/linguist/linguist/mainwindow.cpp | 10 ++-- tools/linguist/linguist/mainwindow.h | 10 ++-- tools/linguist/linguist/mainwindow.ui | 10 ++-- tools/linguist/linguist/messageeditor.cpp | 10 ++-- tools/linguist/linguist/messageeditor.h | 10 ++-- tools/linguist/linguist/messageeditorwidgets.cpp | 10 ++-- tools/linguist/linguist/messageeditorwidgets.h | 10 ++-- tools/linguist/linguist/messagehighlighter.cpp | 10 ++-- tools/linguist/linguist/messagehighlighter.h | 10 ++-- tools/linguist/linguist/messagemodel.cpp | 10 ++-- tools/linguist/linguist/messagemodel.h | 10 ++-- tools/linguist/linguist/phrase.cpp | 10 ++-- tools/linguist/linguist/phrase.h | 10 ++-- tools/linguist/linguist/phrasebookbox.cpp | 10 ++-- tools/linguist/linguist/phrasebookbox.h | 10 ++-- tools/linguist/linguist/phrasebookbox.ui | 10 ++-- tools/linguist/linguist/phrasemodel.cpp | 10 ++-- tools/linguist/linguist/phrasemodel.h | 10 ++-- tools/linguist/linguist/phraseview.cpp | 10 ++-- tools/linguist/linguist/phraseview.h | 10 ++-- tools/linguist/linguist/printout.cpp | 10 ++-- tools/linguist/linguist/printout.h | 10 ++-- tools/linguist/linguist/recentfiles.cpp | 10 ++-- tools/linguist/linguist/recentfiles.h | 10 ++-- tools/linguist/linguist/sourcecodeview.cpp | 10 ++-- tools/linguist/linguist/sourcecodeview.h | 10 ++-- tools/linguist/linguist/statistics.cpp | 10 ++-- tools/linguist/linguist/statistics.h | 10 ++-- tools/linguist/linguist/statistics.ui | 10 ++-- tools/linguist/linguist/translatedialog.cpp | 10 ++-- tools/linguist/linguist/translatedialog.h | 10 ++-- tools/linguist/linguist/translatedialog.ui | 10 ++-- .../linguist/translationsettingsdialog.cpp | 10 ++-- .../linguist/linguist/translationsettingsdialog.h | 10 ++-- tools/linguist/lrelease/main.cpp | 10 ++-- tools/linguist/lupdate/main.cpp | 10 ++-- tools/linguist/shared/abstractproitemvisitor.h | 10 ++-- tools/linguist/shared/cpp.cpp | 10 ++-- tools/linguist/shared/java.cpp | 10 ++-- tools/linguist/shared/numerus.cpp | 10 ++-- tools/linguist/shared/po.cpp | 10 ++-- tools/linguist/shared/profileevaluator.cpp | 10 ++-- tools/linguist/shared/profileevaluator.h | 10 ++-- tools/linguist/shared/proitems.cpp | 10 ++-- tools/linguist/shared/proitems.h | 10 ++-- tools/linguist/shared/proparserutils.h | 10 ++-- tools/linguist/shared/qm.cpp | 10 ++-- tools/linguist/shared/qph.cpp | 10 ++-- tools/linguist/shared/qscript.cpp | 10 ++-- tools/linguist/shared/qscript.g | 10 ++-- tools/linguist/shared/simtexth.cpp | 10 ++-- tools/linguist/shared/simtexth.h | 10 ++-- tools/linguist/shared/translator.cpp | 10 ++-- tools/linguist/shared/translator.h | 10 ++-- tools/linguist/shared/translatormessage.cpp | 10 ++-- tools/linguist/shared/translatormessage.h | 10 ++-- tools/linguist/shared/translatortools.cpp | 10 ++-- tools/linguist/shared/translatortools.h | 10 ++-- tools/linguist/shared/ts.cpp | 10 ++-- tools/linguist/shared/ui.cpp | 10 ++-- tools/linguist/shared/xliff.cpp | 10 ++-- tools/macdeployqt/macchangeqt/main.cpp | 10 ++-- tools/macdeployqt/macdeployqt/main.cpp | 10 ++-- tools/macdeployqt/shared/shared.cpp | 10 ++-- tools/macdeployqt/shared/shared.h | 10 ++-- tools/macdeployqt/tests/tst_deployment_mac.cpp | 10 ++-- tools/makeqpf/main.cpp | 10 ++-- tools/makeqpf/mainwindow.cpp | 10 ++-- tools/makeqpf/mainwindow.h | 10 ++-- tools/makeqpf/qpf2.cpp | 10 ++-- tools/makeqpf/qpf2.h | 10 ++-- tools/pixeltool/main.cpp | 10 ++-- tools/pixeltool/qpixeltool.cpp | 10 ++-- tools/pixeltool/qpixeltool.h | 10 ++-- tools/porting/src/ast.cpp | 10 ++-- tools/porting/src/ast.h | 10 ++-- tools/porting/src/codemodel.cpp | 10 ++-- tools/porting/src/codemodel.h | 10 ++-- tools/porting/src/codemodelattributes.cpp | 10 ++-- tools/porting/src/codemodelattributes.h | 10 ++-- tools/porting/src/codemodelwalker.cpp | 10 ++-- tools/porting/src/codemodelwalker.h | 10 ++-- tools/porting/src/cpplexer.cpp | 10 ++-- tools/porting/src/cpplexer.h | 10 ++-- tools/porting/src/errors.cpp | 10 ++-- tools/porting/src/errors.h | 10 ++-- tools/porting/src/fileporter.cpp | 10 ++-- tools/porting/src/fileporter.h | 10 ++-- tools/porting/src/filewriter.cpp | 10 ++-- tools/porting/src/filewriter.h | 10 ++-- tools/porting/src/list.h | 10 ++-- tools/porting/src/logger.cpp | 10 ++-- tools/porting/src/logger.h | 10 ++-- tools/porting/src/parser.cpp | 10 ++-- tools/porting/src/parser.h | 10 ++-- tools/porting/src/port.cpp | 10 ++-- tools/porting/src/portingrules.cpp | 10 ++-- tools/porting/src/portingrules.h | 10 ++-- tools/porting/src/preprocessorcontrol.cpp | 10 ++-- tools/porting/src/preprocessorcontrol.h | 10 ++-- tools/porting/src/projectporter.cpp | 10 ++-- tools/porting/src/projectporter.h | 10 ++-- tools/porting/src/proparser.cpp | 10 ++-- tools/porting/src/proparser.h | 10 ++-- tools/porting/src/q3porting.xml | 10 ++-- tools/porting/src/qtsimplexml.cpp | 10 ++-- tools/porting/src/qtsimplexml.h | 10 ++-- tools/porting/src/replacetoken.cpp | 10 ++-- tools/porting/src/replacetoken.h | 10 ++-- tools/porting/src/rpp.cpp | 10 ++-- tools/porting/src/rpp.h | 10 ++-- tools/porting/src/rppexpressionbuilder.cpp | 10 ++-- tools/porting/src/rppexpressionbuilder.h | 10 ++-- tools/porting/src/rpplexer.cpp | 10 ++-- tools/porting/src/rpplexer.h | 10 ++-- tools/porting/src/rpptreeevaluator.cpp | 10 ++-- tools/porting/src/rpptreeevaluator.h | 10 ++-- tools/porting/src/rpptreewalker.cpp | 10 ++-- tools/porting/src/rpptreewalker.h | 10 ++-- tools/porting/src/semantic.cpp | 10 ++-- tools/porting/src/semantic.h | 10 ++-- tools/porting/src/smallobject.cpp | 10 ++-- tools/porting/src/smallobject.h | 10 ++-- tools/porting/src/textreplacement.cpp | 10 ++-- tools/porting/src/textreplacement.h | 10 ++-- tools/porting/src/tokenengine.cpp | 10 ++-- tools/porting/src/tokenengine.h | 10 ++-- tools/porting/src/tokenizer.cpp | 10 ++-- tools/porting/src/tokenizer.h | 10 ++-- tools/porting/src/tokenreplacements.cpp | 10 ++-- tools/porting/src/tokenreplacements.h | 10 ++-- tools/porting/src/tokens.h | 10 ++-- tools/porting/src/tokenstreamadapter.h | 10 ++-- tools/porting/src/translationunit.cpp | 10 ++-- tools/porting/src/translationunit.h | 10 ++-- tools/porting/src/treewalker.cpp | 10 ++-- tools/porting/src/treewalker.h | 10 ++-- tools/qconfig/feature.cpp | 10 ++-- tools/qconfig/feature.h | 10 ++-- tools/qconfig/featuretreemodel.cpp | 10 ++-- tools/qconfig/featuretreemodel.h | 10 ++-- tools/qconfig/graphics.h | 10 ++-- tools/qconfig/main.cpp | 10 ++-- tools/qdbus/qdbus/qdbus.cpp | 10 ++-- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp | 10 ++-- tools/qdbus/qdbusviewer/main.cpp | 10 ++-- tools/qdbus/qdbusviewer/propertydialog.cpp | 10 ++-- tools/qdbus/qdbusviewer/propertydialog.h | 10 ++-- tools/qdbus/qdbusviewer/qdbusmodel.cpp | 10 ++-- tools/qdbus/qdbusviewer/qdbusmodel.h | 10 ++-- tools/qdbus/qdbusviewer/qdbusviewer.cpp | 10 ++-- tools/qdbus/qdbusviewer/qdbusviewer.h | 10 ++-- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp | 10 ++-- tools/qdoc3/apigenerator.cpp | 10 ++-- tools/qdoc3/apigenerator.h | 10 ++-- tools/qdoc3/archiveextractor.cpp | 10 ++-- tools/qdoc3/archiveextractor.h | 10 ++-- tools/qdoc3/atom.cpp | 10 ++-- tools/qdoc3/atom.h | 10 ++-- tools/qdoc3/bookgenerator.cpp | 10 ++-- tools/qdoc3/bookgenerator.h | 10 ++-- tools/qdoc3/ccodeparser.cpp | 10 ++-- tools/qdoc3/ccodeparser.h | 10 ++-- tools/qdoc3/codechunk.cpp | 10 ++-- tools/qdoc3/codechunk.h | 10 ++-- tools/qdoc3/codemarker.cpp | 10 ++-- tools/qdoc3/codemarker.h | 10 ++-- tools/qdoc3/codeparser.cpp | 10 ++-- tools/qdoc3/codeparser.h | 10 ++-- tools/qdoc3/command.cpp | 10 ++-- tools/qdoc3/command.h | 10 ++-- tools/qdoc3/config.cpp | 10 ++-- tools/qdoc3/config.h | 10 ++-- tools/qdoc3/cppcodemarker.cpp | 10 ++-- tools/qdoc3/cppcodemarker.h | 10 ++-- tools/qdoc3/cppcodeparser.cpp | 10 ++-- tools/qdoc3/cppcodeparser.h | 10 ++-- tools/qdoc3/cpptoqsconverter.cpp | 10 ++-- tools/qdoc3/cpptoqsconverter.h | 10 ++-- tools/qdoc3/dcfsection.cpp | 10 ++-- tools/qdoc3/dcfsection.h | 10 ++-- tools/qdoc3/doc.cpp | 10 ++-- tools/qdoc3/doc.h | 10 ++-- tools/qdoc3/editdistance.cpp | 10 ++-- tools/qdoc3/editdistance.h | 10 ++-- tools/qdoc3/generator.cpp | 10 ++-- tools/qdoc3/generator.h | 10 ++-- tools/qdoc3/helpprojectwriter.cpp | 10 ++-- tools/qdoc3/helpprojectwriter.h | 10 ++-- tools/qdoc3/htmlgenerator.cpp | 10 ++-- tools/qdoc3/htmlgenerator.h | 10 ++-- tools/qdoc3/jambiapiparser.cpp | 10 ++-- tools/qdoc3/jambiapiparser.h | 10 ++-- tools/qdoc3/javacodemarker.cpp | 10 ++-- tools/qdoc3/javacodemarker.h | 10 ++-- tools/qdoc3/javadocgenerator.cpp | 10 ++-- tools/qdoc3/javadocgenerator.h | 10 ++-- tools/qdoc3/linguistgenerator.cpp | 10 ++-- tools/qdoc3/linguistgenerator.h | 10 ++-- tools/qdoc3/location.cpp | 10 ++-- tools/qdoc3/location.h | 10 ++-- tools/qdoc3/loutgenerator.cpp | 10 ++-- tools/qdoc3/loutgenerator.h | 10 ++-- tools/qdoc3/main.cpp | 10 ++-- tools/qdoc3/mangenerator.cpp | 10 ++-- tools/qdoc3/mangenerator.h | 10 ++-- tools/qdoc3/node.cpp | 10 ++-- tools/qdoc3/node.h | 10 ++-- tools/qdoc3/openedlist.cpp | 10 ++-- tools/qdoc3/openedlist.h | 10 ++-- tools/qdoc3/pagegenerator.cpp | 10 ++-- tools/qdoc3/pagegenerator.h | 10 ++-- tools/qdoc3/plaincodemarker.cpp | 10 ++-- tools/qdoc3/plaincodemarker.h | 10 ++-- tools/qdoc3/polyarchiveextractor.cpp | 10 ++-- tools/qdoc3/polyarchiveextractor.h | 10 ++-- tools/qdoc3/polyuncompressor.cpp | 10 ++-- tools/qdoc3/polyuncompressor.h | 10 ++-- tools/qdoc3/qsakernelparser.cpp | 10 ++-- tools/qdoc3/qsakernelparser.h | 10 ++-- tools/qdoc3/qscodemarker.cpp | 10 ++-- tools/qdoc3/qscodemarker.h | 10 ++-- tools/qdoc3/qscodeparser.cpp | 10 ++-- tools/qdoc3/qscodeparser.h | 10 ++-- tools/qdoc3/quoter.cpp | 10 ++-- tools/qdoc3/quoter.h | 10 ++-- tools/qdoc3/separator.cpp | 10 ++-- tools/qdoc3/separator.h | 10 ++-- tools/qdoc3/sgmlgenerator.cpp | 10 ++-- tools/qdoc3/sgmlgenerator.h | 10 ++-- tools/qdoc3/text.cpp | 10 ++-- tools/qdoc3/text.h | 10 ++-- tools/qdoc3/tokenizer.cpp | 10 ++-- tools/qdoc3/tokenizer.h | 10 ++-- tools/qdoc3/tr.h | 10 ++-- tools/qdoc3/tree.cpp | 10 ++-- tools/qdoc3/tree.h | 10 ++-- tools/qdoc3/uncompressor.cpp | 10 ++-- tools/qdoc3/uncompressor.h | 10 ++-- tools/qdoc3/webxmlgenerator.cpp | 10 ++-- tools/qdoc3/webxmlgenerator.h | 10 ++-- tools/qdoc3/yyindent.cpp | 10 ++-- tools/qev/qev.cpp | 10 ++-- tools/qtconcurrent/codegenerator/example/main.cpp | 10 ++-- .../codegenerator/src/codegenerator.cpp | 10 ++-- .../qtconcurrent/codegenerator/src/codegenerator.h | 10 ++-- tools/qtconcurrent/generaterun/main.cpp | 10 ++-- tools/qtconfig/colorbutton.cpp | 10 ++-- tools/qtconfig/colorbutton.h | 10 ++-- tools/qtconfig/main.cpp | 10 ++-- tools/qtconfig/mainwindow.cpp | 10 ++-- tools/qtconfig/mainwindow.h | 10 ++-- tools/qtconfig/mainwindowbase.cpp | 10 ++-- tools/qtconfig/mainwindowbase.h | 10 ++-- tools/qtconfig/mainwindowbase.ui | 10 ++-- tools/qtconfig/paletteeditoradvanced.cpp | 10 ++-- tools/qtconfig/paletteeditoradvanced.h | 10 ++-- tools/qtconfig/paletteeditoradvancedbase.cpp | 10 ++-- tools/qtconfig/paletteeditoradvancedbase.h | 10 ++-- tools/qtconfig/paletteeditoradvancedbase.ui | 10 ++-- tools/qtconfig/previewframe.cpp | 10 ++-- tools/qtconfig/previewframe.h | 10 ++-- tools/qtconfig/previewwidget.cpp | 10 ++-- tools/qtconfig/previewwidget.h | 10 ++-- tools/qtconfig/previewwidgetbase.cpp | 10 ++-- tools/qtconfig/previewwidgetbase.h | 10 ++-- tools/qtconfig/previewwidgetbase.ui | 10 ++-- tools/qtestlib/updater/main.cpp | 10 ++-- .../qtestlib/wince/cetest/activesyncconnection.cpp | 10 ++-- tools/qtestlib/wince/cetest/activesyncconnection.h | 10 ++-- tools/qtestlib/wince/cetest/deployment.cpp | 10 ++-- tools/qtestlib/wince/cetest/deployment.h | 10 ++-- tools/qtestlib/wince/cetest/main.cpp | 10 ++-- tools/qtestlib/wince/cetest/remoteconnection.cpp | 10 ++-- tools/qtestlib/wince/cetest/remoteconnection.h | 10 ++-- tools/qtestlib/wince/remotelib/commands.cpp | 10 ++-- tools/qtestlib/wince/remotelib/commands.h | 10 ++-- tools/qvfb/config.ui | 10 ++-- tools/qvfb/gammaview.h | 10 ++-- tools/qvfb/main.cpp | 10 ++-- tools/qvfb/qanimationwriter.cpp | 10 ++-- tools/qvfb/qanimationwriter.h | 10 ++-- tools/qvfb/qtopiakeysym.h | 10 ++-- tools/qvfb/qvfb.cpp | 10 ++-- tools/qvfb/qvfb.h | 10 ++-- tools/qvfb/qvfbmmap.cpp | 10 ++-- tools/qvfb/qvfbmmap.h | 10 ++-- tools/qvfb/qvfbprotocol.cpp | 10 ++-- tools/qvfb/qvfbprotocol.h | 10 ++-- tools/qvfb/qvfbratedlg.cpp | 10 ++-- tools/qvfb/qvfbratedlg.h | 10 ++-- tools/qvfb/qvfbshmem.cpp | 10 ++-- tools/qvfb/qvfbshmem.h | 10 ++-- tools/qvfb/qvfbview.cpp | 10 ++-- tools/qvfb/qvfbview.h | 10 ++-- tools/qvfb/qvfbx11view.cpp | 10 ++-- tools/qvfb/qvfbx11view.h | 10 ++-- tools/qvfb/x11keyfaker.cpp | 10 ++-- tools/qvfb/x11keyfaker.h | 10 ++-- tools/shared/deviceskin/deviceskin.cpp | 10 ++-- tools/shared/deviceskin/deviceskin.h | 10 ++-- tools/shared/findwidget/abstractfindwidget.cpp | 10 ++-- tools/shared/findwidget/abstractfindwidget.h | 10 ++-- tools/shared/findwidget/itemviewfindwidget.cpp | 10 ++-- tools/shared/findwidget/itemviewfindwidget.h | 10 ++-- tools/shared/findwidget/texteditfindwidget.cpp | 10 ++-- tools/shared/findwidget/texteditfindwidget.h | 10 ++-- tools/shared/fontpanel/fontpanel.cpp | 10 ++-- tools/shared/fontpanel/fontpanel.h | 10 ++-- tools/shared/qtgradienteditor/qtcolorbutton.cpp | 10 ++-- tools/shared/qtgradienteditor/qtcolorbutton.h | 10 ++-- tools/shared/qtgradienteditor/qtcolorline.cpp | 10 ++-- tools/shared/qtgradienteditor/qtcolorline.h | 10 ++-- tools/shared/qtgradienteditor/qtgradientdialog.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradientdialog.h | 10 ++-- tools/shared/qtgradienteditor/qtgradientdialog.ui | 10 ++-- tools/shared/qtgradienteditor/qtgradienteditor.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradienteditor.h | 10 ++-- tools/shared/qtgradienteditor/qtgradienteditor.ui | 10 ++-- .../shared/qtgradienteditor/qtgradientmanager.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradientmanager.h | 10 ++-- .../qtgradienteditor/qtgradientstopscontroller.cpp | 10 ++-- .../qtgradienteditor/qtgradientstopscontroller.h | 10 ++-- .../qtgradienteditor/qtgradientstopsmodel.cpp | 10 ++-- .../shared/qtgradienteditor/qtgradientstopsmodel.h | 10 ++-- .../qtgradienteditor/qtgradientstopswidget.cpp | 10 ++-- .../qtgradienteditor/qtgradientstopswidget.h | 10 ++-- tools/shared/qtgradienteditor/qtgradientutils.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradientutils.h | 10 ++-- tools/shared/qtgradienteditor/qtgradientview.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradientview.h | 10 ++-- .../qtgradienteditor/qtgradientviewdialog.cpp | 10 ++-- .../shared/qtgradienteditor/qtgradientviewdialog.h | 10 ++-- .../qtgradienteditor/qtgradientviewdialog.ui | 10 ++-- tools/shared/qtgradienteditor/qtgradientwidget.cpp | 10 ++-- tools/shared/qtgradienteditor/qtgradientwidget.h | 10 ++-- .../qtpropertybrowser/qtbuttonpropertybrowser.cpp | 10 ++-- .../qtpropertybrowser/qtbuttonpropertybrowser.h | 10 ++-- tools/shared/qtpropertybrowser/qteditorfactory.cpp | 10 ++-- tools/shared/qtpropertybrowser/qteditorfactory.h | 10 ++-- .../qtgroupboxpropertybrowser.cpp | 10 ++-- .../qtpropertybrowser/qtgroupboxpropertybrowser.h | 10 ++-- .../shared/qtpropertybrowser/qtpropertybrowser.cpp | 10 ++-- tools/shared/qtpropertybrowser/qtpropertybrowser.h | 10 ++-- .../qtpropertybrowser/qtpropertybrowserutils.cpp | 10 ++-- .../qtpropertybrowser/qtpropertybrowserutils_p.h | 10 ++-- .../shared/qtpropertybrowser/qtpropertymanager.cpp | 10 ++-- tools/shared/qtpropertybrowser/qtpropertymanager.h | 10 ++-- .../qtpropertybrowser/qttreepropertybrowser.cpp | 10 ++-- .../qtpropertybrowser/qttreepropertybrowser.h | 10 ++-- .../shared/qtpropertybrowser/qtvariantproperty.cpp | 10 ++-- tools/shared/qtpropertybrowser/qtvariantproperty.h | 10 ++-- tools/shared/qttoolbardialog/qttoolbardialog.cpp | 10 ++-- tools/shared/qttoolbardialog/qttoolbardialog.h | 10 ++-- tools/xmlpatterns/main.cpp | 10 ++-- tools/xmlpatterns/main.h | 10 ++-- tools/xmlpatterns/qapplicationargument.cpp | 10 ++-- tools/xmlpatterns/qapplicationargument_p.h | 10 ++-- tools/xmlpatterns/qapplicationargumentparser.cpp | 10 ++-- tools/xmlpatterns/qapplicationargumentparser_p.h | 10 ++-- tools/xmlpatterns/qcoloringmessagehandler.cpp | 10 ++-- tools/xmlpatterns/qcoloringmessagehandler_p.h | 10 ++-- tools/xmlpatterns/qcoloroutput.cpp | 10 ++-- tools/xmlpatterns/qcoloroutput_p.h | 10 ++-- util/fixnonlatin1/main.cpp | 10 ++-- util/gencmap/gencmap.cpp | 10 ++-- util/install/archive/qarchive.cpp | 10 ++-- util/install/archive/qarchive.h | 10 ++-- util/install/keygen/keyinfo.cpp | 10 ++-- util/install/keygen/keyinfo.h | 10 ++-- util/install/keygen/main.cpp | 10 ++-- util/install/mac/licensedlgimpl.cpp | 10 ++-- util/install/mac/licensedlgimpl.h | 10 ++-- util/install/mac/main.cpp | 10 ++-- util/install/mac/unpackdlgimpl.cpp | 10 ++-- util/install/mac/unpackdlgimpl.h | 10 ++-- util/install/package/main.cpp | 10 ++-- util/install/win/archive.cpp | 10 ++-- util/install/win/archive.h | 10 ++-- util/install/win/dialogs/folderdlgimpl.cpp | 10 ++-- util/install/win/dialogs/folderdlgimpl.h | 10 ++-- util/install/win/environment.cpp | 10 ++-- util/install/win/environment.h | 10 ++-- util/install/win/globalinformation.cpp | 10 ++-- util/install/win/globalinformation.h | 10 ++-- util/install/win/main.cpp | 10 ++-- util/install/win/pages/pages.cpp | 10 ++-- util/install/win/pages/pages.h | 10 ++-- util/install/win/pages/sidedecorationimpl.cpp | 10 ++-- util/install/win/pages/sidedecorationimpl.h | 10 ++-- util/install/win/resource.cpp | 10 ++-- util/install/win/resource.h | 10 ++-- util/install/win/setupwizardimpl.cpp | 10 ++-- util/install/win/setupwizardimpl.h | 10 ++-- util/install/win/setupwizardimpl_config.cpp | 10 ++-- util/install/win/shell.cpp | 10 ++-- util/install/win/shell.h | 10 ++-- util/install/win/uninstaller/uninstaller.cpp | 10 ++-- util/install/win/uninstaller/uninstallimpl.cpp | 10 ++-- util/install/win/uninstaller/uninstallimpl.h | 10 ++-- util/lexgen/configfile.cpp | 10 ++-- util/lexgen/configfile.h | 10 ++-- util/lexgen/generator.cpp | 10 ++-- util/lexgen/generator.h | 10 ++-- util/lexgen/global.h | 10 ++-- util/lexgen/main.cpp | 10 ++-- util/lexgen/nfa.cpp | 10 ++-- util/lexgen/nfa.h | 10 ++-- util/lexgen/re2nfa.cpp | 10 ++-- util/lexgen/re2nfa.h | 10 ++-- util/lexgen/tests/tst_lexgen.cpp | 10 ++-- util/lexgen/tokenizer.cpp | 10 ++-- util/local_database/testlocales/localemodel.cpp | 10 ++-- util/local_database/testlocales/localemodel.h | 10 ++-- util/local_database/testlocales/localewidget.cpp | 10 ++-- util/local_database/testlocales/localewidget.h | 10 ++-- util/local_database/testlocales/main.cpp | 10 ++-- util/normalize/main.cpp | 10 ++-- util/plugintest/main.cpp | 10 ++-- util/qlalr/compress.cpp | 10 ++-- util/qlalr/compress.h | 10 ++-- util/qlalr/cppgenerator.cpp | 10 ++-- util/qlalr/cppgenerator.h | 10 ++-- util/qlalr/dotgraph.cpp | 10 ++-- util/qlalr/dotgraph.h | 10 ++-- util/qlalr/grammar.cpp | 10 ++-- util/qlalr/grammar_p.h | 10 ++-- util/qlalr/lalr.cpp | 10 ++-- util/qlalr/lalr.g | 30 +++++------ util/qlalr/lalr.h | 10 ++-- util/qlalr/main.cpp | 10 ++-- util/qlalr/parsetable.cpp | 10 ++-- util/qlalr/parsetable.h | 10 ++-- util/qlalr/recognizer.cpp | 10 ++-- util/qlalr/recognizer.h | 10 ++-- util/unicode/codecs/big5/main.cpp | 10 ++-- util/unicode/main.cpp | 10 ++-- util/xkbdatagen/main.cpp | 10 ++-- 7110 files changed, 36011 insertions(+), 35981 deletions(-) diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp index 88cd864..d393212 100644 --- a/demos/affine/main.cpp +++ b/demos/affine/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/affine/xform.cpp b/demos/affine/xform.cpp index 059e38e..f1e9a02 100644 --- a/demos/affine/xform.cpp +++ b/demos/affine/xform.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/affine/xform.h b/demos/affine/xform.h index f33e63d..c4c2b3c 100644 --- a/demos/affine/xform.h +++ b/demos/affine/xform.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/arthurplugin/plugin.cpp b/demos/arthurplugin/plugin.cpp index e2bf54e..fa7c8db 100644 --- a/demos/arthurplugin/plugin.cpp +++ b/demos/arthurplugin/plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/bookdelegate.cpp b/demos/books/bookdelegate.cpp index 1322fd6..f114ee8 100644 --- a/demos/books/bookdelegate.cpp +++ b/demos/books/bookdelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/bookdelegate.h b/demos/books/bookdelegate.h index fb32335..90675d4 100644 --- a/demos/books/bookdelegate.h +++ b/demos/books/bookdelegate.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp index e73f727..23d8513 100644 --- a/demos/books/bookwindow.cpp +++ b/demos/books/bookwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/bookwindow.h b/demos/books/bookwindow.h index 3cc69d0..18cfb0c 100644 --- a/demos/books/bookwindow.h +++ b/demos/books/bookwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/initdb.h b/demos/books/initdb.h index f9a94b7..3de37bc 100644 --- a/demos/books/initdb.h +++ b/demos/books/initdb.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/books/main.cpp b/demos/books/main.cpp index f3ae325..b3640a1 100644 --- a/demos/books/main.cpp +++ b/demos/books/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/basic.fsh b/demos/boxes/basic.fsh index 06ef24a..9a6af5e 100644 --- a/demos/boxes/basic.fsh +++ b/demos/boxes/basic.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/basic.vsh b/demos/boxes/basic.vsh index 5a02df2..521da83 100644 --- a/demos/boxes/basic.vsh +++ b/demos/boxes/basic.vsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/dotted.fsh b/demos/boxes/dotted.fsh index 26425f6..cc352e4 100644 --- a/demos/boxes/dotted.fsh +++ b/demos/boxes/dotted.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/fresnel.fsh b/demos/boxes/fresnel.fsh index dd98061..90ce79c 100644 --- a/demos/boxes/fresnel.fsh +++ b/demos/boxes/fresnel.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glass.fsh b/demos/boxes/glass.fsh index 2b59a0a..94c3fe2 100644 --- a/demos/boxes/glass.fsh +++ b/demos/boxes/glass.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp index b2a594e..19a1ff7 100644 --- a/demos/boxes/glbuffers.cpp +++ b/demos/boxes/glbuffers.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h index 88de4e8..eff42de 100644 --- a/demos/boxes/glbuffers.h +++ b/demos/boxes/glbuffers.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glextensions.cpp b/demos/boxes/glextensions.cpp index 59256a8..a70003c 100644 --- a/demos/boxes/glextensions.cpp +++ b/demos/boxes/glextensions.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h index 74617d6..760d13d 100644 --- a/demos/boxes/glextensions.h +++ b/demos/boxes/glextensions.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glshaders.cpp b/demos/boxes/glshaders.cpp index b6999a8..b5f9a28 100644 --- a/demos/boxes/glshaders.cpp +++ b/demos/boxes/glshaders.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/glshaders.h b/demos/boxes/glshaders.h index 2b6209a..db64b7d 100644 --- a/demos/boxes/glshaders.h +++ b/demos/boxes/glshaders.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h index c06ce90..d666cc2 100644 --- a/demos/boxes/gltrianglemesh.h +++ b/demos/boxes/gltrianglemesh.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/granite.fsh b/demos/boxes/granite.fsh index 9b75d1d..3e9803a 100644 --- a/demos/boxes/granite.fsh +++ b/demos/boxes/granite.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp index 10bbde1..900df1c 100644 --- a/demos/boxes/main.cpp +++ b/demos/boxes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/marble.fsh b/demos/boxes/marble.fsh index 62d3c9f..b90af32 100644 --- a/demos/boxes/marble.fsh +++ b/demos/boxes/marble.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp index 0607698..fcf6484 100644 --- a/demos/boxes/qtbox.cpp +++ b/demos/boxes/qtbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h index aae8256..b371c60 100644 --- a/demos/boxes/qtbox.h +++ b/demos/boxes/qtbox.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/reflection.fsh b/demos/boxes/reflection.fsh index d5807ee..5e87195 100644 --- a/demos/boxes/reflection.fsh +++ b/demos/boxes/reflection.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/refraction.fsh b/demos/boxes/refraction.fsh index f91c24d..9f32183 100644 --- a/demos/boxes/refraction.fsh +++ b/demos/boxes/refraction.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/roundedbox.cpp b/demos/boxes/roundedbox.cpp index f238da2..4bf8142 100644 --- a/demos/boxes/roundedbox.cpp +++ b/demos/boxes/roundedbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h index b934ade..2fe0724 100644 --- a/demos/boxes/roundedbox.h +++ b/demos/boxes/roundedbox.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp index 1040e17..590b57a 100644 --- a/demos/boxes/scene.cpp +++ b/demos/boxes/scene.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index 2db9317..e94e782 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/trackball.cpp b/demos/boxes/trackball.cpp index 980f6ed..58cfcd9 100644 --- a/demos/boxes/trackball.cpp +++ b/demos/boxes/trackball.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h index 5e3f40c..3beb95b 100644 --- a/demos/boxes/trackball.h +++ b/demos/boxes/trackball.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/vector.h b/demos/boxes/vector.h index bb24531..511307b 100644 --- a/demos/boxes/vector.h +++ b/demos/boxes/vector.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/boxes/wood.fsh b/demos/boxes/wood.fsh index 35bf7d6..cfa5ff7 100644 --- a/demos/boxes/wood.fsh +++ b/demos/boxes/wood.fsh @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/autosaver.cpp b/demos/browser/autosaver.cpp index 4e945f0..7d06daf 100644 --- a/demos/browser/autosaver.cpp +++ b/demos/browser/autosaver.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/autosaver.h b/demos/browser/autosaver.h index bb340cd..bafe58e 100644 --- a/demos/browser/autosaver.h +++ b/demos/browser/autosaver.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/bookmarks.cpp b/demos/browser/bookmarks.cpp index 8e7823d..6e85695 100644 --- a/demos/browser/bookmarks.cpp +++ b/demos/browser/bookmarks.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/bookmarks.h b/demos/browser/bookmarks.h index fb47b4f..2fcda3a 100644 --- a/demos/browser/bookmarks.h +++ b/demos/browser/bookmarks.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp index 5433022..660f664 100644 --- a/demos/browser/browserapplication.cpp +++ b/demos/browser/browserapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/browserapplication.h b/demos/browser/browserapplication.h index 6887dfd..66b8dcf 100644 --- a/demos/browser/browserapplication.h +++ b/demos/browser/browserapplication.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp index f1dcaef..1b90c4d 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/browsermainwindow.h b/demos/browser/browsermainwindow.h index eaf976c..971a095 100644 --- a/demos/browser/browsermainwindow.h +++ b/demos/browser/browsermainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/chasewidget.cpp b/demos/browser/chasewidget.cpp index 7ebe282..6de863f 100644 --- a/demos/browser/chasewidget.cpp +++ b/demos/browser/chasewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/chasewidget.h b/demos/browser/chasewidget.h index 78968ba..ef7a069 100644 --- a/demos/browser/chasewidget.h +++ b/demos/browser/chasewidget.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/cookiejar.cpp b/demos/browser/cookiejar.cpp index 9e11c8e..f757259 100644 --- a/demos/browser/cookiejar.cpp +++ b/demos/browser/cookiejar.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/cookiejar.h b/demos/browser/cookiejar.h index ffcd4c1..7e975e4 100644 --- a/demos/browser/cookiejar.h +++ b/demos/browser/cookiejar.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/downloadmanager.cpp b/demos/browser/downloadmanager.cpp index af31391..ac219bc 100644 --- a/demos/browser/downloadmanager.cpp +++ b/demos/browser/downloadmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/downloadmanager.h b/demos/browser/downloadmanager.h index 85318da..efbce74 100644 --- a/demos/browser/downloadmanager.h +++ b/demos/browser/downloadmanager.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/edittableview.cpp b/demos/browser/edittableview.cpp index 0d776a7..bb70ce4 100644 --- a/demos/browser/edittableview.cpp +++ b/demos/browser/edittableview.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/edittableview.h b/demos/browser/edittableview.h index 3ae63e0..ac1d886 100644 --- a/demos/browser/edittableview.h +++ b/demos/browser/edittableview.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/edittreeview.cpp b/demos/browser/edittreeview.cpp index 0331ba7..342eb67 100644 --- a/demos/browser/edittreeview.cpp +++ b/demos/browser/edittreeview.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/edittreeview.h b/demos/browser/edittreeview.h index 97b9804..2887cc1 100644 --- a/demos/browser/edittreeview.h +++ b/demos/browser/edittreeview.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/history.cpp b/demos/browser/history.cpp index 80e7372..af665c4 100644 --- a/demos/browser/history.cpp +++ b/demos/browser/history.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/history.h b/demos/browser/history.h index 4f4edcd..7a78a43 100644 --- a/demos/browser/history.h +++ b/demos/browser/history.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/main.cpp b/demos/browser/main.cpp index a59b2fb..e88c2ca 100644 --- a/demos/browser/main.cpp +++ b/demos/browser/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/modelmenu.cpp b/demos/browser/modelmenu.cpp index 9403ef1..ed97bbc 100644 --- a/demos/browser/modelmenu.cpp +++ b/demos/browser/modelmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/modelmenu.h b/demos/browser/modelmenu.h index edd2e04..170873b 100644 --- a/demos/browser/modelmenu.h +++ b/demos/browser/modelmenu.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp index 2e7b2fd..8f2da76 100644 --- a/demos/browser/networkaccessmanager.cpp +++ b/demos/browser/networkaccessmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h index d016e76..daee256 100644 --- a/demos/browser/networkaccessmanager.h +++ b/demos/browser/networkaccessmanager.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp index 8f668e0..d3da369 100644 --- a/demos/browser/searchlineedit.cpp +++ b/demos/browser/searchlineedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/searchlineedit.h b/demos/browser/searchlineedit.h index be17e05..77f318c 100644 --- a/demos/browser/searchlineedit.h +++ b/demos/browser/searchlineedit.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp index 09f4846..d12d878 100644 --- a/demos/browser/settings.cpp +++ b/demos/browser/settings.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/settings.h b/demos/browser/settings.h index a7a0a35..10aa81d 100644 --- a/demos/browser/settings.h +++ b/demos/browser/settings.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/squeezelabel.cpp b/demos/browser/squeezelabel.cpp index 3209e16..a0f9198 100644 --- a/demos/browser/squeezelabel.cpp +++ b/demos/browser/squeezelabel.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/squeezelabel.h b/demos/browser/squeezelabel.h index 2f82240..5db126e 100644 --- a/demos/browser/squeezelabel.h +++ b/demos/browser/squeezelabel.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/tabwidget.cpp b/demos/browser/tabwidget.cpp index 7a2ee40..19935e5 100644 --- a/demos/browser/tabwidget.cpp +++ b/demos/browser/tabwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/tabwidget.h b/demos/browser/tabwidget.h index da3fe42..52e9a3e 100644 --- a/demos/browser/tabwidget.h +++ b/demos/browser/tabwidget.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/toolbarsearch.cpp b/demos/browser/toolbarsearch.cpp index 255b5e9..e83a202 100644 --- a/demos/browser/toolbarsearch.cpp +++ b/demos/browser/toolbarsearch.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/toolbarsearch.h b/demos/browser/toolbarsearch.h index 8e1be8d..90cc7a8 100644 --- a/demos/browser/toolbarsearch.h +++ b/demos/browser/toolbarsearch.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/urllineedit.cpp b/demos/browser/urllineedit.cpp index f7a6345..2c98168 100644 --- a/demos/browser/urllineedit.cpp +++ b/demos/browser/urllineedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/urllineedit.h b/demos/browser/urllineedit.h index 6a718f0..b7e9d07 100644 --- a/demos/browser/urllineedit.h +++ b/demos/browser/urllineedit.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp index 6c4d857..6584300 100644 --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/webview.h b/demos/browser/webview.h index a41bcf3..eb68063 100644 --- a/demos/browser/webview.h +++ b/demos/browser/webview.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/xbel.cpp b/demos/browser/xbel.cpp index a92b649..10d9cea 100644 --- a/demos/browser/xbel.cpp +++ b/demos/browser/xbel.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/browser/xbel.h b/demos/browser/xbel.h index b736d02..a0b43cb 100644 --- a/demos/browser/xbel.h +++ b/demos/browser/xbel.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp index c2b22da..e99bde3 100644 --- a/demos/chip/chip.cpp +++ b/demos/chip/chip.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/chip.h b/demos/chip/chip.h index 9866f80..3357183 100644 --- a/demos/chip/chip.h +++ b/demos/chip/chip.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp index e945026..a3623ac 100644 --- a/demos/chip/main.cpp +++ b/demos/chip/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp index 5222cd4..e9771d7 100644 --- a/demos/chip/mainwindow.cpp +++ b/demos/chip/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h index 5decca8..4988cbe 100644 --- a/demos/chip/mainwindow.h +++ b/demos/chip/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp index f919af3..eedad03 100644 --- a/demos/chip/view.cpp +++ b/demos/chip/view.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/chip/view.h b/demos/chip/view.h index 4987f60..dc8c887 100644 --- a/demos/chip/view.h +++ b/demos/chip/view.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp index b43c66b..34807a7 100644 --- a/demos/composition/composition.cpp +++ b/demos/composition/composition.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/composition/composition.h b/demos/composition/composition.h index 1d504d0..4e3d250 100644 --- a/demos/composition/composition.h +++ b/demos/composition/composition.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp index 74055b2..ff17aca 100644 --- a/demos/composition/main.cpp +++ b/demos/composition/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp index e32fa12..e7c5944 100644 --- a/demos/deform/main.cpp +++ b/demos/deform/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp index 2e1d89a..7ad06fb 100644 --- a/demos/deform/pathdeform.cpp +++ b/demos/deform/pathdeform.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/deform/pathdeform.h b/demos/deform/pathdeform.h index 45edb26..0f39096 100644 --- a/demos/deform/pathdeform.h +++ b/demos/deform/pathdeform.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp index 1bd99c9..0015240 100644 --- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp +++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h index c0af3cf..823bdc5 100644 --- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h +++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp index 80f92d6..97ea090 100644 --- a/demos/embedded/embeddedsvgviewer/main.cpp +++ b/demos/embedded/embeddedsvgviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/demos/embedded/fluidlauncher/demoapplication.cpp index c5abfb9..5e82dd5 100644 --- a/demos/embedded/fluidlauncher/demoapplication.cpp +++ b/demos/embedded/fluidlauncher/demoapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/demos/embedded/fluidlauncher/demoapplication.h index 84ce1d4..59d51c6 100644 --- a/demos/embedded/fluidlauncher/demoapplication.h +++ b/demos/embedded/fluidlauncher/demoapplication.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp index f80e6ca..11dc36c 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.cpp +++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h index 3f4c1fe..b3d99f8 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.h +++ b/demos/embedded/fluidlauncher/fluidlauncher.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/main.cpp b/demos/embedded/fluidlauncher/main.cpp index 05e820e..cf7d986 100644 --- a/demos/embedded/fluidlauncher/main.cpp +++ b/demos/embedded/fluidlauncher/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp index 04bbf05..03dcd7c 100644 --- a/demos/embedded/fluidlauncher/pictureflow.cpp +++ b/demos/embedded/fluidlauncher/pictureflow.cpp @@ -4,11 +4,11 @@ * This is version of the Pictureflow animated image show widget modified by Nokia. * * $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 either Technology Preview License Agreement or the -* Beta Release License Agreement. +* Commercial Usage +* Licensees holding valid Qt Commercial licenses may use this file in +* accordance with the Qt Commercial License Agreement provided with the +* Software or, alternatively, in accordance with the terms contained in +* a written agreement between you and Nokia. * * GNU Lesser General Public License Usage * Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/demos/embedded/fluidlauncher/pictureflow.h index fccc7a3..80523e1 100644 --- a/demos/embedded/fluidlauncher/pictureflow.h +++ b/demos/embedded/fluidlauncher/pictureflow.h @@ -4,11 +4,11 @@ * This is version of the Pictureflow animated image show widget modified by Nokia. * * $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 either Technology Preview License Agreement or the -* Beta Release License Agreement. +* Commercial Usage +* Licensees holding valid Qt Commercial licenses may use this file in +* accordance with the Qt Commercial License Agreement provided with the +* Software or, alternatively, in accordance with the terms contained in +* a written agreement between you and Nokia. * * GNU Lesser General Public License Usage * Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/demos/embedded/fluidlauncher/slideshow.cpp index 8f643b4..2a25c7f 100644 --- a/demos/embedded/fluidlauncher/slideshow.cpp +++ b/demos/embedded/fluidlauncher/slideshow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/fluidlauncher/slideshow.h b/demos/embedded/fluidlauncher/slideshow.h index 27fb87b..bd44594 100644 --- a/demos/embedded/fluidlauncher/slideshow.h +++ b/demos/embedded/fluidlauncher/slideshow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp index 6a7472e..08f8c80 100644 --- a/demos/embedded/styledemo/main.cpp +++ b/demos/embedded/styledemo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/styledemo/stylewidget.cpp b/demos/embedded/styledemo/stylewidget.cpp index 304dd36..d123169 100644 --- a/demos/embedded/styledemo/stylewidget.cpp +++ b/demos/embedded/styledemo/stylewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embedded/styledemo/stylewidget.h b/demos/embedded/styledemo/stylewidget.h index 5ccb418..c89cfb4 100644 --- a/demos/embedded/styledemo/stylewidget.h +++ b/demos/embedded/styledemo/stylewidget.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp index ed2fc76..899565f 100644 --- a/demos/embeddeddialogs/customproxy.cpp +++ b/demos/embeddeddialogs/customproxy.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h index 0a5fbaf..155d739 100644 --- a/demos/embeddeddialogs/customproxy.h +++ b/demos/embeddeddialogs/customproxy.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/demos/embeddeddialogs/embeddeddialog.cpp index 40f361c..a92da81 100644 --- a/demos/embeddeddialogs/embeddeddialog.cpp +++ b/demos/embeddeddialogs/embeddeddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embeddeddialogs/embeddeddialog.h b/demos/embeddeddialogs/embeddeddialog.h index 787196c..657e4dd 100644 --- a/demos/embeddeddialogs/embeddeddialog.h +++ b/demos/embeddeddialogs/embeddeddialog.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp index 4cf7325..a41e4d1 100644 --- a/demos/embeddeddialogs/main.cpp +++ b/demos/embeddeddialogs/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp index 6256ba9..e6c8cf1 100644 --- a/demos/gradients/gradients.cpp +++ b/demos/gradients/gradients.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/gradients/gradients.h b/demos/gradients/gradients.h index 74e8417..3c50b0e 100644 --- a/demos/gradients/gradients.h +++ b/demos/gradients/gradients.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/gradients/main.cpp b/demos/gradients/main.cpp index f880510..54d4b90 100644 --- a/demos/gradients/main.cpp +++ b/demos/gradients/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/interview/main.cpp b/demos/interview/main.cpp index 9682322..97943d2 100644 --- a/demos/interview/main.cpp +++ b/demos/interview/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp index 1d5040c..8b9ce9a 100644 --- a/demos/interview/model.cpp +++ b/demos/interview/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/interview/model.h b/demos/interview/model.h index 96e6aea..49472e6 100644 --- a/demos/interview/model.h +++ b/demos/interview/model.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/macmainwindow/macmainwindow.h b/demos/macmainwindow/macmainwindow.h index b5e4740..f8b65df 100644 --- a/demos/macmainwindow/macmainwindow.h +++ b/demos/macmainwindow/macmainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/macmainwindow/macmainwindow.mm b/demos/macmainwindow/macmainwindow.mm index 156e793..a8bacb9 100644 --- a/demos/macmainwindow/macmainwindow.mm +++ b/demos/macmainwindow/macmainwindow.mm @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/macmainwindow/main.cpp b/demos/macmainwindow/main.cpp index 2b01cfe..a2428cc 100644 --- a/demos/macmainwindow/main.cpp +++ b/demos/macmainwindow/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/colorswatch.cpp b/demos/mainwindow/colorswatch.cpp index ba6a076..95f14f5 100644 --- a/demos/mainwindow/colorswatch.cpp +++ b/demos/mainwindow/colorswatch.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/colorswatch.h b/demos/mainwindow/colorswatch.h index 57c5ac6..eccef38 100644 --- a/demos/mainwindow/colorswatch.h +++ b/demos/mainwindow/colorswatch.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/main.cpp b/demos/mainwindow/main.cpp index 46268b5..3ac3af0 100644 --- a/demos/mainwindow/main.cpp +++ b/demos/mainwindow/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp index 7edaf52..b767c5f 100644 --- a/demos/mainwindow/mainwindow.cpp +++ b/demos/mainwindow/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/mainwindow.h b/demos/mainwindow/mainwindow.h index 9c7f620..59ba753 100644 --- a/demos/mainwindow/mainwindow.h +++ b/demos/mainwindow/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp index 9de1348..40bc3e5 100644 --- a/demos/mainwindow/toolbar.cpp +++ b/demos/mainwindow/toolbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mainwindow/toolbar.h b/demos/mainwindow/toolbar.h index a9b9af2..631e634 100644 --- a/demos/mainwindow/toolbar.h +++ b/demos/mainwindow/toolbar.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp index 279a6c7..8551f28 100644 --- a/demos/mediaplayer/main.cpp +++ b/demos/mediaplayer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp index 5f5a5dc..e16a345 100644 --- a/demos/mediaplayer/mediaplayer.cpp +++ b/demos/mediaplayer/mediaplayer.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/mediaplayer/mediaplayer.h b/demos/mediaplayer/mediaplayer.h index d162435..e22c6dc 100644 --- a/demos/mediaplayer/mediaplayer.h +++ b/demos/mediaplayer/mediaplayer.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp index 613d835..e4e92af 100644 --- a/demos/pathstroke/main.cpp +++ b/demos/pathstroke/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/pathstroke/pathstroke.cpp b/demos/pathstroke/pathstroke.cpp index d079490..a8ea6c3 100644 --- a/demos/pathstroke/pathstroke.cpp +++ b/demos/pathstroke/pathstroke.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/pathstroke/pathstroke.h b/demos/pathstroke/pathstroke.h index 99f17a7..e7c2684 100644 --- a/demos/pathstroke/pathstroke.h +++ b/demos/pathstroke/pathstroke.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index 18343cb..94e44f3 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/colors.h b/demos/qtdemo/colors.h index 58865c6..176346c 100644 --- a/demos/qtdemo/colors.h +++ b/demos/qtdemo/colors.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoitem.cpp b/demos/qtdemo/demoitem.cpp index 0335bd3..1348705 100644 --- a/demos/qtdemo/demoitem.cpp +++ b/demos/qtdemo/demoitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoitem.h b/demos/qtdemo/demoitem.h index e03327b..86769e9 100644 --- a/demos/qtdemo/demoitem.h +++ b/demos/qtdemo/demoitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoitemanimation.cpp b/demos/qtdemo/demoitemanimation.cpp index 92b2d24..54bad7d 100644 --- a/demos/qtdemo/demoitemanimation.cpp +++ b/demos/qtdemo/demoitemanimation.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoitemanimation.h b/demos/qtdemo/demoitemanimation.h index ad89ada..edff773 100644 --- a/demos/qtdemo/demoitemanimation.h +++ b/demos/qtdemo/demoitemanimation.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoscene.cpp b/demos/qtdemo/demoscene.cpp index 29b73d3..d0f79bb 100644 --- a/demos/qtdemo/demoscene.cpp +++ b/demos/qtdemo/demoscene.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demoscene.h b/demos/qtdemo/demoscene.h index e4838c7..1343619 100644 --- a/demos/qtdemo/demoscene.h +++ b/demos/qtdemo/demoscene.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demotextitem.cpp b/demos/qtdemo/demotextitem.cpp index cd549fc..e6c9493 100644 --- a/demos/qtdemo/demotextitem.cpp +++ b/demos/qtdemo/demotextitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/demotextitem.h b/demos/qtdemo/demotextitem.h index 679e3fb..343ff0b 100644 --- a/demos/qtdemo/demotextitem.h +++ b/demos/qtdemo/demotextitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/dockitem.cpp b/demos/qtdemo/dockitem.cpp index 7f26f04..0c06bdc 100644 --- a/demos/qtdemo/dockitem.cpp +++ b/demos/qtdemo/dockitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/dockitem.h b/demos/qtdemo/dockitem.h index 13473a3..f4de234 100644 --- a/demos/qtdemo/dockitem.h +++ b/demos/qtdemo/dockitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp index a568b8c..28d35c3 100644 --- a/demos/qtdemo/examplecontent.cpp +++ b/demos/qtdemo/examplecontent.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/examplecontent.h b/demos/qtdemo/examplecontent.h index 850d64b..b45235b 100644 --- a/demos/qtdemo/examplecontent.h +++ b/demos/qtdemo/examplecontent.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guide.cpp b/demos/qtdemo/guide.cpp index 1f3c355..9ce44c2 100644 --- a/demos/qtdemo/guide.cpp +++ b/demos/qtdemo/guide.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guide.h b/demos/qtdemo/guide.h index 51ce6c3..f8cd563 100644 --- a/demos/qtdemo/guide.h +++ b/demos/qtdemo/guide.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guidecircle.cpp b/demos/qtdemo/guidecircle.cpp index 98328dc..9525a76 100644 --- a/demos/qtdemo/guidecircle.cpp +++ b/demos/qtdemo/guidecircle.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guidecircle.h b/demos/qtdemo/guidecircle.h index 2179527..d8edd65 100644 --- a/demos/qtdemo/guidecircle.h +++ b/demos/qtdemo/guidecircle.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guideline.cpp b/demos/qtdemo/guideline.cpp index ac01339..6f31f21 100644 --- a/demos/qtdemo/guideline.cpp +++ b/demos/qtdemo/guideline.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/guideline.h b/demos/qtdemo/guideline.h index 93daaa8..ddb0a09 100644 --- a/demos/qtdemo/guideline.h +++ b/demos/qtdemo/guideline.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/headingitem.cpp b/demos/qtdemo/headingitem.cpp index 80a255a..4554455 100644 --- a/demos/qtdemo/headingitem.cpp +++ b/demos/qtdemo/headingitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/headingitem.h b/demos/qtdemo/headingitem.h index a5cb997..d708a2d 100644 --- a/demos/qtdemo/headingitem.h +++ b/demos/qtdemo/headingitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/imageitem.cpp b/demos/qtdemo/imageitem.cpp index e556011..0bc514f 100644 --- a/demos/qtdemo/imageitem.cpp +++ b/demos/qtdemo/imageitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/imageitem.h b/demos/qtdemo/imageitem.h index e73079a..251bf2f 100644 --- a/demos/qtdemo/imageitem.h +++ b/demos/qtdemo/imageitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/itemcircleanimation.cpp b/demos/qtdemo/itemcircleanimation.cpp index fff52bb..8bdac18 100644 --- a/demos/qtdemo/itemcircleanimation.cpp +++ b/demos/qtdemo/itemcircleanimation.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/itemcircleanimation.h b/demos/qtdemo/itemcircleanimation.h index 27e399c..1d3a49a 100644 --- a/demos/qtdemo/itemcircleanimation.h +++ b/demos/qtdemo/itemcircleanimation.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/letteritem.cpp b/demos/qtdemo/letteritem.cpp index 7b814b1..d4145e2 100644 --- a/demos/qtdemo/letteritem.cpp +++ b/demos/qtdemo/letteritem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/letteritem.h b/demos/qtdemo/letteritem.h index 8c3f16e..7f4619e 100644 --- a/demos/qtdemo/letteritem.h +++ b/demos/qtdemo/letteritem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/main.cpp b/demos/qtdemo/main.cpp index bf2028d..67b765b 100644 --- a/demos/qtdemo/main.cpp +++ b/demos/qtdemo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index 8723823..7996876 100644 --- a/demos/qtdemo/mainwindow.cpp +++ b/demos/qtdemo/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h index 388a392..0a5a591 100644 --- a/demos/qtdemo/mainwindow.h +++ b/demos/qtdemo/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/menucontent.cpp b/demos/qtdemo/menucontent.cpp index a74cfe4..fb00d85 100644 --- a/demos/qtdemo/menucontent.cpp +++ b/demos/qtdemo/menucontent.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/menucontent.h b/demos/qtdemo/menucontent.h index 737492d..3348243 100644 --- a/demos/qtdemo/menucontent.h +++ b/demos/qtdemo/menucontent.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index bfa2e3f..8df9eca 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h index 3a12c54..32dbb62 100644 --- a/demos/qtdemo/menumanager.h +++ b/demos/qtdemo/menumanager.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/scanitem.cpp b/demos/qtdemo/scanitem.cpp index 0eab840..a045cb0 100644 --- a/demos/qtdemo/scanitem.cpp +++ b/demos/qtdemo/scanitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/scanitem.h b/demos/qtdemo/scanitem.h index b0b5ffc..6bfb722 100644 --- a/demos/qtdemo/scanitem.h +++ b/demos/qtdemo/scanitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/score.cpp b/demos/qtdemo/score.cpp index f45ba0d..dfbfcf2 100644 --- a/demos/qtdemo/score.cpp +++ b/demos/qtdemo/score.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/score.h b/demos/qtdemo/score.h index bfed5d2..b9706b6 100644 --- a/demos/qtdemo/score.h +++ b/demos/qtdemo/score.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/textbutton.cpp b/demos/qtdemo/textbutton.cpp index 96e1a23..e2aae21 100644 --- a/demos/qtdemo/textbutton.cpp +++ b/demos/qtdemo/textbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/qtdemo/textbutton.h b/demos/qtdemo/textbutton.h index b7c91fb..bd7f8dc 100644 --- a/demos/qtdemo/textbutton.h +++ b/demos/qtdemo/textbutton.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/arthurstyle.cpp b/demos/shared/arthurstyle.cpp index 846d2f3..7ebfcf4 100644 --- a/demos/shared/arthurstyle.cpp +++ b/demos/shared/arthurstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/arthurstyle.h b/demos/shared/arthurstyle.h index ec79361..41d3cf9 100644 --- a/demos/shared/arthurstyle.h +++ b/demos/shared/arthurstyle.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/arthurwidgets.cpp b/demos/shared/arthurwidgets.cpp index f9eed99..e57b389 100644 --- a/demos/shared/arthurwidgets.cpp +++ b/demos/shared/arthurwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/arthurwidgets.h b/demos/shared/arthurwidgets.h index 4d55b61..0e940ee 100644 --- a/demos/shared/arthurwidgets.h +++ b/demos/shared/arthurwidgets.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/hoverpoints.cpp b/demos/shared/hoverpoints.cpp index 70062f6..76ce5a3 100644 --- a/demos/shared/hoverpoints.cpp +++ b/demos/shared/hoverpoints.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/shared/hoverpoints.h b/demos/shared/hoverpoints.h index cf8742d..149ec82 100644 --- a/demos/shared/hoverpoints.h +++ b/demos/shared/hoverpoints.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/main.cpp b/demos/spreadsheet/main.cpp index 7a71641..43625c9 100644 --- a/demos/spreadsheet/main.cpp +++ b/demos/spreadsheet/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/printview.cpp b/demos/spreadsheet/printview.cpp index 76c4ae8..1f42222 100644 --- a/demos/spreadsheet/printview.cpp +++ b/demos/spreadsheet/printview.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/printview.h b/demos/spreadsheet/printview.h index 3f2b918..edd683c 100644 --- a/demos/spreadsheet/printview.h +++ b/demos/spreadsheet/printview.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp index 742855e..a48a8bd 100644 --- a/demos/spreadsheet/spreadsheet.cpp +++ b/demos/spreadsheet/spreadsheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheet.h b/demos/spreadsheet/spreadsheet.h index 944433d..1dd5678 100644 --- a/demos/spreadsheet/spreadsheet.h +++ b/demos/spreadsheet/spreadsheet.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/demos/spreadsheet/spreadsheetdelegate.cpp index 465c92f..a33728d 100644 --- a/demos/spreadsheet/spreadsheetdelegate.cpp +++ b/demos/spreadsheet/spreadsheetdelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheetdelegate.h b/demos/spreadsheet/spreadsheetdelegate.h index 3b7b9ac..fa1b4ef 100644 --- a/demos/spreadsheet/spreadsheetdelegate.h +++ b/demos/spreadsheet/spreadsheetdelegate.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/demos/spreadsheet/spreadsheetitem.cpp index 8f94b87..1682402 100644 --- a/demos/spreadsheet/spreadsheetitem.cpp +++ b/demos/spreadsheet/spreadsheetitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/spreadsheet/spreadsheetitem.h b/demos/spreadsheet/spreadsheetitem.h index 5996d73..497195e 100644 --- a/demos/spreadsheet/spreadsheetitem.h +++ b/demos/spreadsheet/spreadsheetitem.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp index f7b24db..749d988 100644 --- a/demos/sqlbrowser/browser.cpp +++ b/demos/sqlbrowser/browser.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/browser.h b/demos/sqlbrowser/browser.h index 787675b..ba16c1c 100644 --- a/demos/sqlbrowser/browser.h +++ b/demos/sqlbrowser/browser.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/connectionwidget.cpp b/demos/sqlbrowser/connectionwidget.cpp index 7df28ac..1822d07 100644 --- a/demos/sqlbrowser/connectionwidget.cpp +++ b/demos/sqlbrowser/connectionwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/connectionwidget.h b/demos/sqlbrowser/connectionwidget.h index 5c48414..786e2eb 100644 --- a/demos/sqlbrowser/connectionwidget.h +++ b/demos/sqlbrowser/connectionwidget.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/main.cpp b/demos/sqlbrowser/main.cpp index b7b7fe5..e632c0b 100644 --- a/demos/sqlbrowser/main.cpp +++ b/demos/sqlbrowser/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/qsqlconnectiondialog.cpp b/demos/sqlbrowser/qsqlconnectiondialog.cpp index a2e3c89..fef12d9 100644 --- a/demos/sqlbrowser/qsqlconnectiondialog.cpp +++ b/demos/sqlbrowser/qsqlconnectiondialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/sqlbrowser/qsqlconnectiondialog.h b/demos/sqlbrowser/qsqlconnectiondialog.h index d5f3456..cd103d6 100644 --- a/demos/sqlbrowser/qsqlconnectiondialog.h +++ b/demos/sqlbrowser/qsqlconnectiondialog.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp index fa38ecb..3574865 100644 --- a/demos/textedit/main.cpp +++ b/demos/textedit/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp index 128cd6a..3d3923e 100644 --- a/demos/textedit/textedit.cpp +++ b/demos/textedit/textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/textedit/textedit.h b/demos/textedit/textedit.h index 1fb09f9..0ffcf45 100644 --- a/demos/textedit/textedit.h +++ b/demos/textedit/textedit.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/commands.cpp b/demos/undo/commands.cpp index 4802e34..c877659 100644 --- a/demos/undo/commands.cpp +++ b/demos/undo/commands.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/commands.h b/demos/undo/commands.h index f98cb6d..a3f39e2 100644 --- a/demos/undo/commands.h +++ b/demos/undo/commands.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/document.cpp b/demos/undo/document.cpp index df435fd..9f42c8e 100644 --- a/demos/undo/document.cpp +++ b/demos/undo/document.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/document.h b/demos/undo/document.h index 0b12ad0..ef05ade 100644 --- a/demos/undo/document.h +++ b/demos/undo/document.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/main.cpp b/demos/undo/main.cpp index f36a6e8..101196b 100644 --- a/demos/undo/main.cpp +++ b/demos/undo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/mainwindow.cpp b/demos/undo/mainwindow.cpp index 409fd14..bd3c435 100644 --- a/demos/undo/mainwindow.cpp +++ b/demos/undo/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/demos/undo/mainwindow.h b/demos/undo/mainwindow.h index 5340e94..9a1bc68 100644 --- a/demos/undo/mainwindow.h +++ b/demos/undo/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the demonstration applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/3rdparty.qdoc b/doc/src/3rdparty.qdoc index a87878e..c314cf1 100644 --- a/doc/src/3rdparty.qdoc +++ b/doc/src/3rdparty.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/accelerators.qdoc b/doc/src/accelerators.qdoc index 538a245..de5a8bf 100644 --- a/doc/src/accelerators.qdoc +++ b/doc/src/accelerators.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/accessible.qdoc b/doc/src/accessible.qdoc index 090da86..1006d83 100644 --- a/doc/src/accessible.qdoc +++ b/doc/src/accessible.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/activeqt-dumpcpp.qdoc b/doc/src/activeqt-dumpcpp.qdoc index 9465a31..27e40ee 100644 --- a/doc/src/activeqt-dumpcpp.qdoc +++ b/doc/src/activeqt-dumpcpp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/activeqt-dumpdoc.qdoc b/doc/src/activeqt-dumpdoc.qdoc index b9156f0..d749e1c 100644 --- a/doc/src/activeqt-dumpdoc.qdoc +++ b/doc/src/activeqt-dumpdoc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/activeqt-idc.qdoc b/doc/src/activeqt-idc.qdoc index c570dcd..e9ed6e5 100644 --- a/doc/src/activeqt-idc.qdoc +++ b/doc/src/activeqt-idc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/activeqt-testcon.qdoc b/doc/src/activeqt-testcon.qdoc index aba0b58..45c92a9 100644 --- a/doc/src/activeqt-testcon.qdoc +++ b/doc/src/activeqt-testcon.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc index ea13e59..7c5a3ea 100644 --- a/doc/src/activeqt.qdoc +++ b/doc/src/activeqt.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/annotated.qdoc b/doc/src/annotated.qdoc index 1950c45..58f96f7 100644 --- a/doc/src/annotated.qdoc +++ b/doc/src/annotated.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/appicon.qdoc b/doc/src/appicon.qdoc index 4d29337..2fc409c 100644 --- a/doc/src/appicon.qdoc +++ b/doc/src/appicon.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/assistant-manual.qdoc b/doc/src/assistant-manual.qdoc index 6a735d2..fcf5731 100644 --- a/doc/src/assistant-manual.qdoc +++ b/doc/src/assistant-manual.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/atomic-operations.qdoc b/doc/src/atomic-operations.qdoc index 5c0973b..33c77a3 100644 --- a/doc/src/atomic-operations.qdoc +++ b/doc/src/atomic-operations.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/bughowto.qdoc b/doc/src/bughowto.qdoc index 2a17a34..000e12e 100644 --- a/doc/src/bughowto.qdoc +++ b/doc/src/bughowto.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc index c25da2b..5530722 100644 --- a/doc/src/classes.qdoc +++ b/doc/src/classes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/codecs.qdoc b/doc/src/codecs.qdoc index eaeed3e..567eb6f 100644 --- a/doc/src/codecs.qdoc +++ b/doc/src/codecs.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/commercialeditions.qdoc b/doc/src/commercialeditions.qdoc index 987468c..c713147 100644 --- a/doc/src/commercialeditions.qdoc +++ b/doc/src/commercialeditions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/compatclasses.qdoc b/doc/src/compatclasses.qdoc index 62bbdb5..83993d5 100644 --- a/doc/src/compatclasses.qdoc +++ b/doc/src/compatclasses.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/containers.qdoc b/doc/src/containers.qdoc index d107277..f6e0c78 100644 --- a/doc/src/containers.qdoc +++ b/doc/src/containers.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/coordsys.qdoc b/doc/src/coordsys.qdoc index 604d233..9979444 100644 --- a/doc/src/coordsys.qdoc +++ b/doc/src/coordsys.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/credits.qdoc b/doc/src/credits.qdoc index 114e28d..cf2033d 100644 --- a/doc/src/credits.qdoc +++ b/doc/src/credits.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/custom-types.qdoc b/doc/src/custom-types.qdoc index 81eecfc..91adc45 100644 --- a/doc/src/custom-types.qdoc +++ b/doc/src/custom-types.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc index 3c651fb..0077198 100644 --- a/doc/src/datastreamformat.qdoc +++ b/doc/src/datastreamformat.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/debug.qdoc b/doc/src/debug.qdoc index da5a82f..e08681c 100644 --- a/doc/src/debug.qdoc +++ b/doc/src/debug.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc index 9cc8df5..3daac2c 100644 --- a/doc/src/demos.qdoc +++ b/doc/src/demos.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/affine.qdoc b/doc/src/demos/affine.qdoc index 25e496e..bb8d11e 100644 --- a/doc/src/demos/affine.qdoc +++ b/doc/src/demos/affine.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/arthurplugin.qdoc b/doc/src/demos/arthurplugin.qdoc index 38c5d3c..f699d64 100644 --- a/doc/src/demos/arthurplugin.qdoc +++ b/doc/src/demos/arthurplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/books.qdoc b/doc/src/demos/books.qdoc index b491b2a..ceea3b4 100644 --- a/doc/src/demos/books.qdoc +++ b/doc/src/demos/books.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/boxes.qdoc b/doc/src/demos/boxes.qdoc index db1155e..817f7ea 100644 --- a/doc/src/demos/boxes.qdoc +++ b/doc/src/demos/boxes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/browser.qdoc b/doc/src/demos/browser.qdoc index 34bb80d..5224af6 100644 --- a/doc/src/demos/browser.qdoc +++ b/doc/src/demos/browser.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/chip.qdoc b/doc/src/demos/chip.qdoc index 9e9b7b4..3987b71 100644 --- a/doc/src/demos/chip.qdoc +++ b/doc/src/demos/chip.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/composition.qdoc b/doc/src/demos/composition.qdoc index 9c2c9d7..c73aa8d 100644 --- a/doc/src/demos/composition.qdoc +++ b/doc/src/demos/composition.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/deform.qdoc b/doc/src/demos/deform.qdoc index 2b94e15..1134346 100644 --- a/doc/src/demos/deform.qdoc +++ b/doc/src/demos/deform.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/embeddeddialogs.qdoc b/doc/src/demos/embeddeddialogs.qdoc index f7d20cc..17237e0 100644 --- a/doc/src/demos/embeddeddialogs.qdoc +++ b/doc/src/demos/embeddeddialogs.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/gradients.qdoc b/doc/src/demos/gradients.qdoc index 3e8575a..9567434 100644 --- a/doc/src/demos/gradients.qdoc +++ b/doc/src/demos/gradients.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/interview.qdoc b/doc/src/demos/interview.qdoc index c32c13c..5a9d455 100644 --- a/doc/src/demos/interview.qdoc +++ b/doc/src/demos/interview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/macmainwindow.qdoc b/doc/src/demos/macmainwindow.qdoc index 3a59275..27dd071 100644 --- a/doc/src/demos/macmainwindow.qdoc +++ b/doc/src/demos/macmainwindow.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/mainwindow.qdoc b/doc/src/demos/mainwindow.qdoc index 58f2b65..921c02e 100644 --- a/doc/src/demos/mainwindow.qdoc +++ b/doc/src/demos/mainwindow.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/demos/mediaplayer.qdoc index 0e66908..d456e3a 100644 --- a/doc/src/demos/mediaplayer.qdoc +++ b/doc/src/demos/mediaplayer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/pathstroke.qdoc b/doc/src/demos/pathstroke.qdoc index 1c817f6..da29970 100644 --- a/doc/src/demos/pathstroke.qdoc +++ b/doc/src/demos/pathstroke.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/spreadsheet.qdoc b/doc/src/demos/spreadsheet.qdoc index 88eb7d6..a6d0443 100644 --- a/doc/src/demos/spreadsheet.qdoc +++ b/doc/src/demos/spreadsheet.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/sqlbrowser.qdoc b/doc/src/demos/sqlbrowser.qdoc index 68c3656..c367939 100644 --- a/doc/src/demos/sqlbrowser.qdoc +++ b/doc/src/demos/sqlbrowser.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/textedit.qdoc b/doc/src/demos/textedit.qdoc index a99fc4a..a286779 100644 --- a/doc/src/demos/textedit.qdoc +++ b/doc/src/demos/textedit.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/demos/undo.qdoc b/doc/src/demos/undo.qdoc index 401986a..7e98cbc 100644 --- a/doc/src/demos/undo.qdoc +++ b/doc/src/demos/undo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc index d9f7c1a..f2f76a9 100644 --- a/doc/src/deployment.qdoc +++ b/doc/src/deployment.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc index e10a5be..36ea941 100644 --- a/doc/src/designer-manual.qdoc +++ b/doc/src/designer-manual.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/desktop-integration.qdoc b/doc/src/desktop-integration.qdoc index e52b8d8..5db3671 100644 --- a/doc/src/desktop-integration.qdoc +++ b/doc/src/desktop-integration.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/developing-on-mac.qdoc b/doc/src/developing-on-mac.qdoc index 00c54b6..e7970fa 100644 --- a/doc/src/developing-on-mac.qdoc +++ b/doc/src/developing-on-mac.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/distributingqt.qdoc b/doc/src/distributingqt.qdoc index 9b88dc4..44ce259 100644 --- a/doc/src/distributingqt.qdoc +++ b/doc/src/distributingqt.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/dnd.qdoc b/doc/src/dnd.qdoc index 119922b..7f58b98 100644 --- a/doc/src/dnd.qdoc +++ b/doc/src/dnd.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/ecmascript.qdoc b/doc/src/ecmascript.qdoc index 303b752..a81b2ba 100644 --- a/doc/src/ecmascript.qdoc +++ b/doc/src/ecmascript.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/editions.qdoc b/doc/src/editions.qdoc index 5d3b35c..03823c8 100644 --- a/doc/src/editions.qdoc +++ b/doc/src/editions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-accel.qdoc b/doc/src/emb-accel.qdoc index 67fe8e6..6fbc622 100644 --- a/doc/src/emb-accel.qdoc +++ b/doc/src/emb-accel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-charinput.qdoc b/doc/src/emb-charinput.qdoc index e38ebe3..20863ac 100644 --- a/doc/src/emb-charinput.qdoc +++ b/doc/src/emb-charinput.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-crosscompiling.qdoc b/doc/src/emb-crosscompiling.qdoc index 54e65c5..e688a77 100644 --- a/doc/src/emb-crosscompiling.qdoc +++ b/doc/src/emb-crosscompiling.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-deployment.qdoc b/doc/src/emb-deployment.qdoc index 2c1ff00..2262a78 100644 --- a/doc/src/emb-deployment.qdoc +++ b/doc/src/emb-deployment.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-differences.qdoc b/doc/src/emb-differences.qdoc index b6fb631..124c22a 100644 --- a/doc/src/emb-differences.qdoc +++ b/doc/src/emb-differences.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-envvars.qdoc b/doc/src/emb-envvars.qdoc index b06c132..f06930e 100644 --- a/doc/src/emb-envvars.qdoc +++ b/doc/src/emb-envvars.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-features.qdoc b/doc/src/emb-features.qdoc index 67f92a5..776572b 100644 --- a/doc/src/emb-features.qdoc +++ b/doc/src/emb-features.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-fonts.qdoc b/doc/src/emb-fonts.qdoc index 3ed23c3..81534e3 100644 --- a/doc/src/emb-fonts.qdoc +++ b/doc/src/emb-fonts.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-framebuffer-howto.qdoc b/doc/src/emb-framebuffer-howto.qdoc index fc86dd9..1b344f6 100644 --- a/doc/src/emb-framebuffer-howto.qdoc +++ b/doc/src/emb-framebuffer-howto.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-install.qdoc b/doc/src/emb-install.qdoc index 11b3f03..3581dd3 100644 --- a/doc/src/emb-install.qdoc +++ b/doc/src/emb-install.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-makeqpf.qdoc b/doc/src/emb-makeqpf.qdoc index ca33eda..863748f 100644 --- a/doc/src/emb-makeqpf.qdoc +++ b/doc/src/emb-makeqpf.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-performance.qdoc b/doc/src/emb-performance.qdoc index 79edf34..f4065b2 100644 --- a/doc/src/emb-performance.qdoc +++ b/doc/src/emb-performance.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-pointer.qdoc b/doc/src/emb-pointer.qdoc index d52abfb..35867ed 100644 --- a/doc/src/emb-pointer.qdoc +++ b/doc/src/emb-pointer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-porting.qdoc b/doc/src/emb-porting.qdoc index 9d6fad6..6f9ac7a 100644 --- a/doc/src/emb-porting.qdoc +++ b/doc/src/emb-porting.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-qvfb.qdoc b/doc/src/emb-qvfb.qdoc index 8b819b6..22570bf 100644 --- a/doc/src/emb-qvfb.qdoc +++ b/doc/src/emb-qvfb.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-running.qdoc b/doc/src/emb-running.qdoc index 9cdf414..a775409 100644 --- a/doc/src/emb-running.qdoc +++ b/doc/src/emb-running.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/emb-vnc.qdoc b/doc/src/emb-vnc.qdoc index 283193c..34e09e2 100644 --- a/doc/src/emb-vnc.qdoc +++ b/doc/src/emb-vnc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/eventsandfilters.qdoc b/doc/src/eventsandfilters.qdoc index 06ca08c..2cd9522 100644 --- a/doc/src/eventsandfilters.qdoc +++ b/doc/src/eventsandfilters.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples-overview.qdoc b/doc/src/examples-overview.qdoc index 549574d..d599f29 100644 --- a/doc/src/examples-overview.qdoc +++ b/doc/src/examples-overview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index e3c2291..36f283a 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/2dpainting.qdoc b/doc/src/examples/2dpainting.qdoc index 31aea59..4e3d046 100644 --- a/doc/src/examples/2dpainting.qdoc +++ b/doc/src/examples/2dpainting.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/comapp.qdoc b/doc/src/examples/activeqt/comapp.qdoc index 05f3fb5..7aa1202 100644 --- a/doc/src/examples/activeqt/comapp.qdoc +++ b/doc/src/examples/activeqt/comapp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/dotnet.qdoc b/doc/src/examples/activeqt/dotnet.qdoc index afe7034..af923da 100644 --- a/doc/src/examples/activeqt/dotnet.qdoc +++ b/doc/src/examples/activeqt/dotnet.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/hierarchy.qdoc b/doc/src/examples/activeqt/hierarchy.qdoc index 868d0ce..02771b9 100644 --- a/doc/src/examples/activeqt/hierarchy.qdoc +++ b/doc/src/examples/activeqt/hierarchy.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/menus.qdoc b/doc/src/examples/activeqt/menus.qdoc index 6ce1625..894377d 100644 --- a/doc/src/examples/activeqt/menus.qdoc +++ b/doc/src/examples/activeqt/menus.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/multiple.qdoc b/doc/src/examples/activeqt/multiple.qdoc index d15371b..107d4b8 100644 --- a/doc/src/examples/activeqt/multiple.qdoc +++ b/doc/src/examples/activeqt/multiple.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/opengl.qdoc b/doc/src/examples/activeqt/opengl.qdoc index 05c9d08..fa9181e 100644 --- a/doc/src/examples/activeqt/opengl.qdoc +++ b/doc/src/examples/activeqt/opengl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/qutlook.qdoc b/doc/src/examples/activeqt/qutlook.qdoc index c29feeb..e20a56a 100644 --- a/doc/src/examples/activeqt/qutlook.qdoc +++ b/doc/src/examples/activeqt/qutlook.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/simple.qdoc b/doc/src/examples/activeqt/simple.qdoc index e79e542..97d316f 100644 --- a/doc/src/examples/activeqt/simple.qdoc +++ b/doc/src/examples/activeqt/simple.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/webbrowser.qdoc b/doc/src/examples/activeqt/webbrowser.qdoc index 46b83f9..0310d41 100644 --- a/doc/src/examples/activeqt/webbrowser.qdoc +++ b/doc/src/examples/activeqt/webbrowser.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/activeqt/wrapper.qdoc b/doc/src/examples/activeqt/wrapper.qdoc index 017da30..b015531 100644 --- a/doc/src/examples/activeqt/wrapper.qdoc +++ b/doc/src/examples/activeqt/wrapper.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/addressbook.qdoc b/doc/src/examples/addressbook.qdoc index fb5c1ea..d6e54da 100644 --- a/doc/src/examples/addressbook.qdoc +++ b/doc/src/examples/addressbook.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/ahigl.qdoc b/doc/src/examples/ahigl.qdoc index d42df66..3154a8c 100644 --- a/doc/src/examples/ahigl.qdoc +++ b/doc/src/examples/ahigl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/analogclock.qdoc b/doc/src/examples/analogclock.qdoc index d5f7273..d38d9df 100644 --- a/doc/src/examples/analogclock.qdoc +++ b/doc/src/examples/analogclock.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/application.qdoc b/doc/src/examples/application.qdoc index 32e8c10..4b6196f 100644 --- a/doc/src/examples/application.qdoc +++ b/doc/src/examples/application.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/arrowpad.qdoc b/doc/src/examples/arrowpad.qdoc index 76b753b..1c2430c 100644 --- a/doc/src/examples/arrowpad.qdoc +++ b/doc/src/examples/arrowpad.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/basicdrawing.qdoc b/doc/src/examples/basicdrawing.qdoc index 5297201..03bf90f 100644 --- a/doc/src/examples/basicdrawing.qdoc +++ b/doc/src/examples/basicdrawing.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/basicgraphicslayouts.qdoc b/doc/src/examples/basicgraphicslayouts.qdoc index 92571af..1d9e99b 100644 --- a/doc/src/examples/basicgraphicslayouts.qdoc +++ b/doc/src/examples/basicgraphicslayouts.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/basiclayouts.qdoc b/doc/src/examples/basiclayouts.qdoc index 0d64b1f..c386d10 100644 --- a/doc/src/examples/basiclayouts.qdoc +++ b/doc/src/examples/basiclayouts.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/basicsortfiltermodel.qdoc b/doc/src/examples/basicsortfiltermodel.qdoc index 557729a..25347ab 100644 --- a/doc/src/examples/basicsortfiltermodel.qdoc +++ b/doc/src/examples/basicsortfiltermodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/blockingfortuneclient.qdoc b/doc/src/examples/blockingfortuneclient.qdoc index 5c9dbe1..e6528a1 100644 --- a/doc/src/examples/blockingfortuneclient.qdoc +++ b/doc/src/examples/blockingfortuneclient.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/borderlayout.qdoc b/doc/src/examples/borderlayout.qdoc index 6275249..a53a420 100644 --- a/doc/src/examples/borderlayout.qdoc +++ b/doc/src/examples/borderlayout.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/broadcastreceiver.qdoc b/doc/src/examples/broadcastreceiver.qdoc index 253b68b..295cece 100644 --- a/doc/src/examples/broadcastreceiver.qdoc +++ b/doc/src/examples/broadcastreceiver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/broadcastsender.qdoc b/doc/src/examples/broadcastsender.qdoc index 05975aa..880091d 100644 --- a/doc/src/examples/broadcastsender.qdoc +++ b/doc/src/examples/broadcastsender.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/cachedtable.qdoc b/doc/src/examples/cachedtable.qdoc index b7f416b..4a03277 100644 --- a/doc/src/examples/cachedtable.qdoc +++ b/doc/src/examples/cachedtable.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/calculator.qdoc b/doc/src/examples/calculator.qdoc index 2cae6ce..7fb2035 100644 --- a/doc/src/examples/calculator.qdoc +++ b/doc/src/examples/calculator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/calculatorbuilder.qdoc b/doc/src/examples/calculatorbuilder.qdoc index c63267e..f429c78 100644 --- a/doc/src/examples/calculatorbuilder.qdoc +++ b/doc/src/examples/calculatorbuilder.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/calculatorform.qdoc b/doc/src/examples/calculatorform.qdoc index a8e891e..6f83397 100644 --- a/doc/src/examples/calculatorform.qdoc +++ b/doc/src/examples/calculatorform.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/calendar.qdoc b/doc/src/examples/calendar.qdoc index e6beef4..0ffe438 100644 --- a/doc/src/examples/calendar.qdoc +++ b/doc/src/examples/calendar.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/calendarwidget.qdoc b/doc/src/examples/calendarwidget.qdoc index f4417c2..23d8e12 100644 --- a/doc/src/examples/calendarwidget.qdoc +++ b/doc/src/examples/calendarwidget.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/capabilitiesexample.qdoc b/doc/src/examples/capabilitiesexample.qdoc index 9d62c71..9ff33e1 100644 --- a/doc/src/examples/capabilitiesexample.qdoc +++ b/doc/src/examples/capabilitiesexample.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/charactermap.qdoc b/doc/src/examples/charactermap.qdoc index 64c00db..2d44561 100644 --- a/doc/src/examples/charactermap.qdoc +++ b/doc/src/examples/charactermap.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/chart.qdoc b/doc/src/examples/chart.qdoc index 22f8a51..7d78f3c 100644 --- a/doc/src/examples/chart.qdoc +++ b/doc/src/examples/chart.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/classwizard.qdoc b/doc/src/examples/classwizard.qdoc index a36edf7..250c4d3 100644 --- a/doc/src/examples/classwizard.qdoc +++ b/doc/src/examples/classwizard.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/codecs.qdoc b/doc/src/examples/codecs.qdoc index cb38cbe..336d2c9 100644 --- a/doc/src/examples/codecs.qdoc +++ b/doc/src/examples/codecs.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/codeeditor.qdoc b/doc/src/examples/codeeditor.qdoc index 669ab45..f102c5e 100644 --- a/doc/src/examples/codeeditor.qdoc +++ b/doc/src/examples/codeeditor.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/collidingmice-example.qdoc b/doc/src/examples/collidingmice-example.qdoc index 657a204..a5ace08 100644 --- a/doc/src/examples/collidingmice-example.qdoc +++ b/doc/src/examples/collidingmice-example.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/coloreditorfactory.qdoc b/doc/src/examples/coloreditorfactory.qdoc index 768bb51..4ab9059 100644 --- a/doc/src/examples/coloreditorfactory.qdoc +++ b/doc/src/examples/coloreditorfactory.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/combowidgetmapper.qdoc b/doc/src/examples/combowidgetmapper.qdoc index cf44bdb..9ab4a30 100644 --- a/doc/src/examples/combowidgetmapper.qdoc +++ b/doc/src/examples/combowidgetmapper.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/completer.qdoc b/doc/src/examples/completer.qdoc index f47ba07..c9716c7 100644 --- a/doc/src/examples/completer.qdoc +++ b/doc/src/examples/completer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc index dd05a41..d7c09f3 100644 --- a/doc/src/examples/complexpingpong.qdoc +++ b/doc/src/examples/complexpingpong.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/concentriccircles.qdoc b/doc/src/examples/concentriccircles.qdoc index 7c36b0d..866d3e1 100644 --- a/doc/src/examples/concentriccircles.qdoc +++ b/doc/src/examples/concentriccircles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/configdialog.qdoc b/doc/src/examples/configdialog.qdoc index afb1c5f..c855582 100644 --- a/doc/src/examples/configdialog.qdoc +++ b/doc/src/examples/configdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/containerextension.qdoc b/doc/src/examples/containerextension.qdoc index a4fbcea..aba305c 100644 --- a/doc/src/examples/containerextension.qdoc +++ b/doc/src/examples/containerextension.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/context2d.qdoc b/doc/src/examples/context2d.qdoc index a45b8bb..162f1f5 100644 --- a/doc/src/examples/context2d.qdoc +++ b/doc/src/examples/context2d.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/customcompleter.qdoc b/doc/src/examples/customcompleter.qdoc index 8d0404a..b3689a8 100644 --- a/doc/src/examples/customcompleter.qdoc +++ b/doc/src/examples/customcompleter.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/customsortfiltermodel.qdoc b/doc/src/examples/customsortfiltermodel.qdoc index 5778581..68ab433 100644 --- a/doc/src/examples/customsortfiltermodel.qdoc +++ b/doc/src/examples/customsortfiltermodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/customtype.qdoc b/doc/src/examples/customtype.qdoc index ffeccc3..a7fdf98 100644 --- a/doc/src/examples/customtype.qdoc +++ b/doc/src/examples/customtype.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/customtypesending.qdoc b/doc/src/examples/customtypesending.qdoc index d335c28..ba2181a 100644 --- a/doc/src/examples/customtypesending.qdoc +++ b/doc/src/examples/customtypesending.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/customwidgetplugin.qdoc b/doc/src/examples/customwidgetplugin.qdoc index 31ad65b..dd69c5b 100644 --- a/doc/src/examples/customwidgetplugin.qdoc +++ b/doc/src/examples/customwidgetplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dbscreen.qdoc b/doc/src/examples/dbscreen.qdoc index 88f6d51..8193796 100644 --- a/doc/src/examples/dbscreen.qdoc +++ b/doc/src/examples/dbscreen.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dbus-chat.qdoc b/doc/src/examples/dbus-chat.qdoc index f062c23..1401d04 100644 --- a/doc/src/examples/dbus-chat.qdoc +++ b/doc/src/examples/dbus-chat.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dbus-listnames.qdoc b/doc/src/examples/dbus-listnames.qdoc index 5b13abe..2faf069 100644 --- a/doc/src/examples/dbus-listnames.qdoc +++ b/doc/src/examples/dbus-listnames.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dbus-remotecontrolledcar.qdoc b/doc/src/examples/dbus-remotecontrolledcar.qdoc index ef31bd2..3d4d648 100644 --- a/doc/src/examples/dbus-remotecontrolledcar.qdoc +++ b/doc/src/examples/dbus-remotecontrolledcar.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/defaultprototypes.qdoc b/doc/src/examples/defaultprototypes.qdoc index dc65902..d1eb91f 100644 --- a/doc/src/examples/defaultprototypes.qdoc +++ b/doc/src/examples/defaultprototypes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/delayedencoding.qdoc b/doc/src/examples/delayedencoding.qdoc index cd1c4ae..f947795 100644 --- a/doc/src/examples/delayedencoding.qdoc +++ b/doc/src/examples/delayedencoding.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index ebf93e2..3ec762f 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/digitalclock.qdoc b/doc/src/examples/digitalclock.qdoc index 0ff4642..b5f262e 100644 --- a/doc/src/examples/digitalclock.qdoc +++ b/doc/src/examples/digitalclock.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dirview.qdoc b/doc/src/examples/dirview.qdoc index 2cbfcfe..41d697b 100644 --- a/doc/src/examples/dirview.qdoc +++ b/doc/src/examples/dirview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dockwidgets.qdoc b/doc/src/examples/dockwidgets.qdoc index bc9f5f1..571eb46 100644 --- a/doc/src/examples/dockwidgets.qdoc +++ b/doc/src/examples/dockwidgets.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dombookmarks.qdoc b/doc/src/examples/dombookmarks.qdoc index f3944ef..093cffd 100644 --- a/doc/src/examples/dombookmarks.qdoc +++ b/doc/src/examples/dombookmarks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/draganddroppuzzle.qdoc b/doc/src/examples/draganddroppuzzle.qdoc index 0e6ed09..888f78d 100644 --- a/doc/src/examples/draganddroppuzzle.qdoc +++ b/doc/src/examples/draganddroppuzzle.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dragdroprobot.qdoc b/doc/src/examples/dragdroprobot.qdoc index d3f97b0..063ca53 100644 --- a/doc/src/examples/dragdroprobot.qdoc +++ b/doc/src/examples/dragdroprobot.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/draggableicons.qdoc b/doc/src/examples/draggableicons.qdoc index 23150f9..b6fb355 100644 --- a/doc/src/examples/draggableicons.qdoc +++ b/doc/src/examples/draggableicons.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/draggabletext.qdoc b/doc/src/examples/draggabletext.qdoc index 4d3d89d..8f7a6b5 100644 --- a/doc/src/examples/draggabletext.qdoc +++ b/doc/src/examples/draggabletext.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc index 344b9e7..8b3d033 100644 --- a/doc/src/examples/drilldown.qdoc +++ b/doc/src/examples/drilldown.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dropsite.qdoc b/doc/src/examples/dropsite.qdoc index 4780b82..08fb47c 100644 --- a/doc/src/examples/dropsite.qdoc +++ b/doc/src/examples/dropsite.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/dynamiclayouts.qdoc b/doc/src/examples/dynamiclayouts.qdoc index 96b791b..1147d70 100644 --- a/doc/src/examples/dynamiclayouts.qdoc +++ b/doc/src/examples/dynamiclayouts.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/echoplugin.qdoc b/doc/src/examples/echoplugin.qdoc index 32ad15b..2928505 100644 --- a/doc/src/examples/echoplugin.qdoc +++ b/doc/src/examples/echoplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc index da01830..5fe9ee0 100644 --- a/doc/src/examples/editabletreemodel.qdoc +++ b/doc/src/examples/editabletreemodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc index 90f2f01..5b04346 100644 --- a/doc/src/examples/elasticnodes.qdoc +++ b/doc/src/examples/elasticnodes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/extension.qdoc b/doc/src/examples/extension.qdoc index 02e0698..4b19397 100644 --- a/doc/src/examples/extension.qdoc +++ b/doc/src/examples/extension.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/filetree.qdoc b/doc/src/examples/filetree.qdoc index e53769c..a0a8667 100644 --- a/doc/src/examples/filetree.qdoc +++ b/doc/src/examples/filetree.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/findfiles.qdoc b/doc/src/examples/findfiles.qdoc index db41f43..dc767e3 100644 --- a/doc/src/examples/findfiles.qdoc +++ b/doc/src/examples/findfiles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/flowlayout.qdoc b/doc/src/examples/flowlayout.qdoc index 557ba39..0eef610 100644 --- a/doc/src/examples/flowlayout.qdoc +++ b/doc/src/examples/flowlayout.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/fontsampler.qdoc b/doc/src/examples/fontsampler.qdoc index 1fbb879..98366fc 100644 --- a/doc/src/examples/fontsampler.qdoc +++ b/doc/src/examples/fontsampler.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/formextractor.qdoc b/doc/src/examples/formextractor.qdoc index b98f5bd..7322dec 100644 --- a/doc/src/examples/formextractor.qdoc +++ b/doc/src/examples/formextractor.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/fortuneclient.qdoc b/doc/src/examples/fortuneclient.qdoc index cbdd164..ec7d675 100644 --- a/doc/src/examples/fortuneclient.qdoc +++ b/doc/src/examples/fortuneclient.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/fortuneserver.qdoc b/doc/src/examples/fortuneserver.qdoc index e6a7f85..9d27ad3 100644 --- a/doc/src/examples/fortuneserver.qdoc +++ b/doc/src/examples/fortuneserver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/framebufferobject.qdoc b/doc/src/examples/framebufferobject.qdoc index 3220641..16ec438 100644 --- a/doc/src/examples/framebufferobject.qdoc +++ b/doc/src/examples/framebufferobject.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/framebufferobject2.qdoc b/doc/src/examples/framebufferobject2.qdoc index 721706a..3c7ab3b 100644 --- a/doc/src/examples/framebufferobject2.qdoc +++ b/doc/src/examples/framebufferobject2.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/fridgemagnets.qdoc b/doc/src/examples/fridgemagnets.qdoc index de95b52..041eb81 100644 --- a/doc/src/examples/fridgemagnets.qdoc +++ b/doc/src/examples/fridgemagnets.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc index 9cc9cd1..e7f0525 100644 --- a/doc/src/examples/ftp.qdoc +++ b/doc/src/examples/ftp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/globalVariables.qdoc b/doc/src/examples/globalVariables.qdoc index e1b83fe..06dd6ee 100644 --- a/doc/src/examples/globalVariables.qdoc +++ b/doc/src/examples/globalVariables.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/grabber.qdoc b/doc/src/examples/grabber.qdoc index efb5b6f..97bb592 100644 --- a/doc/src/examples/grabber.qdoc +++ b/doc/src/examples/grabber.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/groupbox.qdoc b/doc/src/examples/groupbox.qdoc index c5f6a62..7a4b608 100644 --- a/doc/src/examples/groupbox.qdoc +++ b/doc/src/examples/groupbox.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/hellogl.qdoc b/doc/src/examples/hellogl.qdoc index 2fc51a3..098e729 100644 --- a/doc/src/examples/hellogl.qdoc +++ b/doc/src/examples/hellogl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/helloscript.qdoc b/doc/src/examples/helloscript.qdoc index 5662680..699afc1 100644 --- a/doc/src/examples/helloscript.qdoc +++ b/doc/src/examples/helloscript.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/hellotr.qdoc b/doc/src/examples/hellotr.qdoc index 72efd11..0025a13 100644 --- a/doc/src/examples/hellotr.qdoc +++ b/doc/src/examples/hellotr.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/http.qdoc b/doc/src/examples/http.qdoc index 17404a8..f106d4b 100644 --- a/doc/src/examples/http.qdoc +++ b/doc/src/examples/http.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/i18n.qdoc b/doc/src/examples/i18n.qdoc index 68d9153..4713e3a 100644 --- a/doc/src/examples/i18n.qdoc +++ b/doc/src/examples/i18n.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/icons.qdoc b/doc/src/examples/icons.qdoc index 750ef2e..c4387f5 100644 --- a/doc/src/examples/icons.qdoc +++ b/doc/src/examples/icons.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/imagecomposition.qdoc b/doc/src/examples/imagecomposition.qdoc index 8cba805..39a5396 100644 --- a/doc/src/examples/imagecomposition.qdoc +++ b/doc/src/examples/imagecomposition.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/imageviewer.qdoc b/doc/src/examples/imageviewer.qdoc index 6881673..12a7e90 100644 --- a/doc/src/examples/imageviewer.qdoc +++ b/doc/src/examples/imageviewer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/itemviewspuzzle.qdoc b/doc/src/examples/itemviewspuzzle.qdoc index 99ef7d4..99feea9 100644 --- a/doc/src/examples/itemviewspuzzle.qdoc +++ b/doc/src/examples/itemviewspuzzle.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/licensewizard.qdoc b/doc/src/examples/licensewizard.qdoc index a702c06..56aab0b 100644 --- a/doc/src/examples/licensewizard.qdoc +++ b/doc/src/examples/licensewizard.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/lineedits.qdoc b/doc/src/examples/lineedits.qdoc index ee702ae..a6289ac 100644 --- a/doc/src/examples/lineedits.qdoc +++ b/doc/src/examples/lineedits.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/localfortuneclient.qdoc b/doc/src/examples/localfortuneclient.qdoc index b4489b1..e1dd1cb 100644 --- a/doc/src/examples/localfortuneclient.qdoc +++ b/doc/src/examples/localfortuneclient.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/localfortuneserver.qdoc b/doc/src/examples/localfortuneserver.qdoc index 3b2395c..783ec73 100644 --- a/doc/src/examples/localfortuneserver.qdoc +++ b/doc/src/examples/localfortuneserver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/loopback.qdoc b/doc/src/examples/loopback.qdoc index b100f71..98c8a2b 100644 --- a/doc/src/examples/loopback.qdoc +++ b/doc/src/examples/loopback.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc index d2a3ee1..03b097f 100644 --- a/doc/src/examples/mandelbrot.qdoc +++ b/doc/src/examples/mandelbrot.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/masterdetail.qdoc b/doc/src/examples/masterdetail.qdoc index d7dc0e2..add352b 100644 --- a/doc/src/examples/masterdetail.qdoc +++ b/doc/src/examples/masterdetail.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/mdi.qdoc b/doc/src/examples/mdi.qdoc index f97db5e..ae85f7f 100644 --- a/doc/src/examples/mdi.qdoc +++ b/doc/src/examples/mdi.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/menus.qdoc b/doc/src/examples/menus.qdoc index 0500101..8cd62a4 100644 --- a/doc/src/examples/menus.qdoc +++ b/doc/src/examples/menus.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/mousecalibration.qdoc b/doc/src/examples/mousecalibration.qdoc index e271265..007ef3c 100644 --- a/doc/src/examples/mousecalibration.qdoc +++ b/doc/src/examples/mousecalibration.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/movie.qdoc b/doc/src/examples/movie.qdoc index 00e42c6..28f0fba 100644 --- a/doc/src/examples/movie.qdoc +++ b/doc/src/examples/movie.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/multipleinheritance.qdoc b/doc/src/examples/multipleinheritance.qdoc index ff2f00f..e58a41f 100644 --- a/doc/src/examples/multipleinheritance.qdoc +++ b/doc/src/examples/multipleinheritance.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/musicplayerexample.qdoc b/doc/src/examples/musicplayerexample.qdoc index d23c1f1..52d0ef5 100644 --- a/doc/src/examples/musicplayerexample.qdoc +++ b/doc/src/examples/musicplayerexample.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/network-chat.qdoc b/doc/src/examples/network-chat.qdoc index 3caeb9a..ffca6a2 100644 --- a/doc/src/examples/network-chat.qdoc +++ b/doc/src/examples/network-chat.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/orderform.qdoc b/doc/src/examples/orderform.qdoc index f6f2607..b892422 100644 --- a/doc/src/examples/orderform.qdoc +++ b/doc/src/examples/orderform.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/overpainting.qdoc b/doc/src/examples/overpainting.qdoc index e19f54b..78c380c 100644 --- a/doc/src/examples/overpainting.qdoc +++ b/doc/src/examples/overpainting.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/padnavigator.qdoc b/doc/src/examples/padnavigator.qdoc index f43725b..a0678c0 100644 --- a/doc/src/examples/padnavigator.qdoc +++ b/doc/src/examples/padnavigator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/painterpaths.qdoc b/doc/src/examples/painterpaths.qdoc index fd27566..97df3c3 100644 --- a/doc/src/examples/painterpaths.qdoc +++ b/doc/src/examples/painterpaths.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/pbuffers.qdoc b/doc/src/examples/pbuffers.qdoc index 347cf3d..a3dffd8 100644 --- a/doc/src/examples/pbuffers.qdoc +++ b/doc/src/examples/pbuffers.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/pbuffers2.qdoc b/doc/src/examples/pbuffers2.qdoc index 5426852..80b727f 100644 --- a/doc/src/examples/pbuffers2.qdoc +++ b/doc/src/examples/pbuffers2.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/pixelator.qdoc b/doc/src/examples/pixelator.qdoc index 2a8b43d..57a26ec 100644 --- a/doc/src/examples/pixelator.qdoc +++ b/doc/src/examples/pixelator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/plugandpaint.qdoc b/doc/src/examples/plugandpaint.qdoc index 3cdd8a4..e2e83eb 100644 --- a/doc/src/examples/plugandpaint.qdoc +++ b/doc/src/examples/plugandpaint.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/portedasteroids.qdoc b/doc/src/examples/portedasteroids.qdoc index d32732f..83b0cef 100644 --- a/doc/src/examples/portedasteroids.qdoc +++ b/doc/src/examples/portedasteroids.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/portedcanvas.qdoc b/doc/src/examples/portedcanvas.qdoc index 76943df..f33e022 100644 --- a/doc/src/examples/portedcanvas.qdoc +++ b/doc/src/examples/portedcanvas.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/previewer.qdoc b/doc/src/examples/previewer.qdoc index 9cbeec1..6459273 100644 --- a/doc/src/examples/previewer.qdoc +++ b/doc/src/examples/previewer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qobjectxmlmodel.qdoc b/doc/src/examples/qobjectxmlmodel.qdoc index ce1dab6..bdf0bf0 100644 --- a/doc/src/examples/qobjectxmlmodel.qdoc +++ b/doc/src/examples/qobjectxmlmodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtconcurrent-imagescaling.qdoc b/doc/src/examples/qtconcurrent-imagescaling.qdoc index 74b4be0..43fc843 100644 --- a/doc/src/examples/qtconcurrent-imagescaling.qdoc +++ b/doc/src/examples/qtconcurrent-imagescaling.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtconcurrent-map.qdoc b/doc/src/examples/qtconcurrent-map.qdoc index 9f5295d..e0acb92 100644 --- a/doc/src/examples/qtconcurrent-map.qdoc +++ b/doc/src/examples/qtconcurrent-map.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtconcurrent-progressdialog.qdoc b/doc/src/examples/qtconcurrent-progressdialog.qdoc index 41909fb..d0c2252 100644 --- a/doc/src/examples/qtconcurrent-progressdialog.qdoc +++ b/doc/src/examples/qtconcurrent-progressdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtconcurrent-runfunction.qdoc b/doc/src/examples/qtconcurrent-runfunction.qdoc index 5c40552..11cb4cb 100644 --- a/doc/src/examples/qtconcurrent-runfunction.qdoc +++ b/doc/src/examples/qtconcurrent-runfunction.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtconcurrent-wordcount.qdoc b/doc/src/examples/qtconcurrent-wordcount.qdoc index d7d3227..4894c75 100644 --- a/doc/src/examples/qtconcurrent-wordcount.qdoc +++ b/doc/src/examples/qtconcurrent-wordcount.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtscriptcalculator.qdoc b/doc/src/examples/qtscriptcalculator.qdoc index 1d713f8..f97419f 100644 --- a/doc/src/examples/qtscriptcalculator.qdoc +++ b/doc/src/examples/qtscriptcalculator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtscriptcustomclass.qdoc b/doc/src/examples/qtscriptcustomclass.qdoc index f8d85a2..5291529 100644 --- a/doc/src/examples/qtscriptcustomclass.qdoc +++ b/doc/src/examples/qtscriptcustomclass.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qtscripttetrix.qdoc b/doc/src/examples/qtscripttetrix.qdoc index c96db6a..607756c 100644 --- a/doc/src/examples/qtscripttetrix.qdoc +++ b/doc/src/examples/qtscripttetrix.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/querymodel.qdoc b/doc/src/examples/querymodel.qdoc index 296f609..8e37e0b 100644 --- a/doc/src/examples/querymodel.qdoc +++ b/doc/src/examples/querymodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/queuedcustomtype.qdoc b/doc/src/examples/queuedcustomtype.qdoc index bbd1427..4dbacd5 100644 --- a/doc/src/examples/queuedcustomtype.qdoc +++ b/doc/src/examples/queuedcustomtype.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc index 7059043..55fb7b7 100644 --- a/doc/src/examples/qxmlstreambookmarks.qdoc +++ b/doc/src/examples/qxmlstreambookmarks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/recentfiles.qdoc b/doc/src/examples/recentfiles.qdoc index 185cbf1..1d7e237 100644 --- a/doc/src/examples/recentfiles.qdoc +++ b/doc/src/examples/recentfiles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/recipes.qdoc b/doc/src/examples/recipes.qdoc index ba06b7e..4cc3116 100644 --- a/doc/src/examples/recipes.qdoc +++ b/doc/src/examples/recipes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/regexp.qdoc b/doc/src/examples/regexp.qdoc index de6cbfc..4db3b50 100644 --- a/doc/src/examples/regexp.qdoc +++ b/doc/src/examples/regexp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/relationaltablemodel.qdoc b/doc/src/examples/relationaltablemodel.qdoc index 5e944c2..677b078 100644 --- a/doc/src/examples/relationaltablemodel.qdoc +++ b/doc/src/examples/relationaltablemodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/remotecontrol.qdoc b/doc/src/examples/remotecontrol.qdoc index 698ad1f..26827bf 100644 --- a/doc/src/examples/remotecontrol.qdoc +++ b/doc/src/examples/remotecontrol.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/rsslisting.qdoc b/doc/src/examples/rsslisting.qdoc index 73ff68c..e29e784 100644 --- a/doc/src/examples/rsslisting.qdoc +++ b/doc/src/examples/rsslisting.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/samplebuffers.qdoc b/doc/src/examples/samplebuffers.qdoc index 1c8202c..3188e9e 100644 --- a/doc/src/examples/samplebuffers.qdoc +++ b/doc/src/examples/samplebuffers.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/saxbookmarks.qdoc b/doc/src/examples/saxbookmarks.qdoc index 3db87d6..c07e541 100644 --- a/doc/src/examples/saxbookmarks.qdoc +++ b/doc/src/examples/saxbookmarks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/screenshot.qdoc b/doc/src/examples/screenshot.qdoc index b989a32..497eab7 100644 --- a/doc/src/examples/screenshot.qdoc +++ b/doc/src/examples/screenshot.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/scribble.qdoc b/doc/src/examples/scribble.qdoc index 4dc1783..7e9c928 100644 --- a/doc/src/examples/scribble.qdoc +++ b/doc/src/examples/scribble.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/sdi.qdoc b/doc/src/examples/sdi.qdoc index cfe351c..63b776a 100644 --- a/doc/src/examples/sdi.qdoc +++ b/doc/src/examples/sdi.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/securesocketclient.qdoc b/doc/src/examples/securesocketclient.qdoc index e93bf20..d787477 100644 --- a/doc/src/examples/securesocketclient.qdoc +++ b/doc/src/examples/securesocketclient.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/semaphores.qdoc b/doc/src/examples/semaphores.qdoc index a387350..39889d2 100644 --- a/doc/src/examples/semaphores.qdoc +++ b/doc/src/examples/semaphores.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/settingseditor.qdoc b/doc/src/examples/settingseditor.qdoc index 5ce1e49..3116ee8 100644 --- a/doc/src/examples/settingseditor.qdoc +++ b/doc/src/examples/settingseditor.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/shapedclock.qdoc b/doc/src/examples/shapedclock.qdoc index 369553b..4d9d078 100644 --- a/doc/src/examples/shapedclock.qdoc +++ b/doc/src/examples/shapedclock.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/sharedmemory.qdoc b/doc/src/examples/sharedmemory.qdoc index f323977..428883e 100644 --- a/doc/src/examples/sharedmemory.qdoc +++ b/doc/src/examples/sharedmemory.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/simpledecoration.qdoc b/doc/src/examples/simpledecoration.qdoc index fe8700a..14a685f 100644 --- a/doc/src/examples/simpledecoration.qdoc +++ b/doc/src/examples/simpledecoration.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/simpledommodel.qdoc b/doc/src/examples/simpledommodel.qdoc index 8d2d102..23aed52 100644 --- a/doc/src/examples/simpledommodel.qdoc +++ b/doc/src/examples/simpledommodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/simpletextviewer.qdoc b/doc/src/examples/simpletextviewer.qdoc index 2a5e45c0..63c665e 100644 --- a/doc/src/examples/simpletextviewer.qdoc +++ b/doc/src/examples/simpletextviewer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc index 5ddeb46..26de870 100644 --- a/doc/src/examples/simpletreemodel.qdoc +++ b/doc/src/examples/simpletreemodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/simplewidgetmapper.qdoc b/doc/src/examples/simplewidgetmapper.qdoc index 2fdbf25..c6f3bd6 100644 --- a/doc/src/examples/simplewidgetmapper.qdoc +++ b/doc/src/examples/simplewidgetmapper.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/sipdialog.qdoc b/doc/src/examples/sipdialog.qdoc index 817f5e2..6e1a129 100644 --- a/doc/src/examples/sipdialog.qdoc +++ b/doc/src/examples/sipdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/sliders.qdoc b/doc/src/examples/sliders.qdoc index 650fdcb..92eb05b 100644 --- a/doc/src/examples/sliders.qdoc +++ b/doc/src/examples/sliders.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc index 542eebd..b5c838c 100644 --- a/doc/src/examples/spinboxdelegate.qdoc +++ b/doc/src/examples/spinboxdelegate.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/spinboxes.qdoc b/doc/src/examples/spinboxes.qdoc index d8b0daa..049f27a 100644 --- a/doc/src/examples/spinboxes.qdoc +++ b/doc/src/examples/spinboxes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/sqlwidgetmapper.qdoc b/doc/src/examples/sqlwidgetmapper.qdoc index 173aea4..ad52419 100644 --- a/doc/src/examples/sqlwidgetmapper.qdoc +++ b/doc/src/examples/sqlwidgetmapper.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/standarddialogs.qdoc b/doc/src/examples/standarddialogs.qdoc index db533ed..cf32f41 100644 --- a/doc/src/examples/standarddialogs.qdoc +++ b/doc/src/examples/standarddialogs.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/stardelegate.qdoc b/doc/src/examples/stardelegate.qdoc index fde3316..8d4a8f2 100644 --- a/doc/src/examples/stardelegate.qdoc +++ b/doc/src/examples/stardelegate.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/styleplugin.qdoc b/doc/src/examples/styleplugin.qdoc index 0dea7bf..7dc655a 100644 --- a/doc/src/examples/styleplugin.qdoc +++ b/doc/src/examples/styleplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/styles.qdoc b/doc/src/examples/styles.qdoc index b68a310..24867d9 100644 --- a/doc/src/examples/styles.qdoc +++ b/doc/src/examples/styles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/stylesheet.qdoc b/doc/src/examples/stylesheet.qdoc index 811d65c..e6a79c6 100644 --- a/doc/src/examples/stylesheet.qdoc +++ b/doc/src/examples/stylesheet.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc index c94d408..887d764 100644 --- a/doc/src/examples/svgalib.qdoc +++ b/doc/src/examples/svgalib.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/svggenerator.qdoc b/doc/src/examples/svggenerator.qdoc index 32bb89a..22b49b9 100644 --- a/doc/src/examples/svggenerator.qdoc +++ b/doc/src/examples/svggenerator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/svgviewer.qdoc b/doc/src/examples/svgviewer.qdoc index affc85f..1a3d6b6 100644 --- a/doc/src/examples/svgviewer.qdoc +++ b/doc/src/examples/svgviewer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/syntaxhighlighter.qdoc b/doc/src/examples/syntaxhighlighter.qdoc index 7cc9e61..3ea1eb0 100644 --- a/doc/src/examples/syntaxhighlighter.qdoc +++ b/doc/src/examples/syntaxhighlighter.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/systray.qdoc b/doc/src/examples/systray.qdoc index 62bc05c..561854d 100644 --- a/doc/src/examples/systray.qdoc +++ b/doc/src/examples/systray.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/tabdialog.qdoc b/doc/src/examples/tabdialog.qdoc index c9500af..ccb0c31 100644 --- a/doc/src/examples/tabdialog.qdoc +++ b/doc/src/examples/tabdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/tablemodel.qdoc b/doc/src/examples/tablemodel.qdoc index e3d4a22..451b609 100644 --- a/doc/src/examples/tablemodel.qdoc +++ b/doc/src/examples/tablemodel.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/tablet.qdoc b/doc/src/examples/tablet.qdoc index 476bba1..bc9eda4 100644 --- a/doc/src/examples/tablet.qdoc +++ b/doc/src/examples/tablet.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/taskmenuextension.qdoc b/doc/src/examples/taskmenuextension.qdoc index b02da6c..31fa59d 100644 --- a/doc/src/examples/taskmenuextension.qdoc +++ b/doc/src/examples/taskmenuextension.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/tetrix.qdoc b/doc/src/examples/tetrix.qdoc index b9adb98..90c72c8 100644 --- a/doc/src/examples/tetrix.qdoc +++ b/doc/src/examples/tetrix.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc index 2eea15d..c780e35 100644 --- a/doc/src/examples/textfinder.qdoc +++ b/doc/src/examples/textfinder.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/textobject.qdoc b/doc/src/examples/textobject.qdoc index cc5a6b6..2f33284 100644 --- a/doc/src/examples/textobject.qdoc +++ b/doc/src/examples/textobject.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/textures.qdoc b/doc/src/examples/textures.qdoc index 2f0389c3..e2a9505 100644 --- a/doc/src/examples/textures.qdoc +++ b/doc/src/examples/textures.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/threadedfortuneserver.qdoc b/doc/src/examples/threadedfortuneserver.qdoc index d5f2571..2188d39 100644 --- a/doc/src/examples/threadedfortuneserver.qdoc +++ b/doc/src/examples/threadedfortuneserver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/tooltips.qdoc b/doc/src/examples/tooltips.qdoc index 5daa2b2..f11ab90 100644 --- a/doc/src/examples/tooltips.qdoc +++ b/doc/src/examples/tooltips.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/torrent.qdoc b/doc/src/examples/torrent.qdoc index 8805dad..deead65 100644 --- a/doc/src/examples/torrent.qdoc +++ b/doc/src/examples/torrent.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/trafficinfo.qdoc b/doc/src/examples/trafficinfo.qdoc index c9b6890..797a6aa 100644 --- a/doc/src/examples/trafficinfo.qdoc +++ b/doc/src/examples/trafficinfo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index eabb803..e459162 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/treemodelcompleter.qdoc b/doc/src/examples/treemodelcompleter.qdoc index 82e9c24..ee206d0 100644 --- a/doc/src/examples/treemodelcompleter.qdoc +++ b/doc/src/examples/treemodelcompleter.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/trivialwizard.qdoc b/doc/src/examples/trivialwizard.qdoc index 360ea00..9329771 100644 --- a/doc/src/examples/trivialwizard.qdoc +++ b/doc/src/examples/trivialwizard.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/trollprint.qdoc b/doc/src/examples/trollprint.qdoc index 38251ee..2624ce1 100644 --- a/doc/src/examples/trollprint.qdoc +++ b/doc/src/examples/trollprint.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/undoframework.qdoc b/doc/src/examples/undoframework.qdoc index 3d0965f..fc43de5 100644 --- a/doc/src/examples/undoframework.qdoc +++ b/doc/src/examples/undoframework.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/waitconditions.qdoc b/doc/src/examples/waitconditions.qdoc index dce0411..001ea9f 100644 --- a/doc/src/examples/waitconditions.qdoc +++ b/doc/src/examples/waitconditions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/wiggly.qdoc b/doc/src/examples/wiggly.qdoc index 5406c77..5a6353b 100644 --- a/doc/src/examples/wiggly.qdoc +++ b/doc/src/examples/wiggly.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/windowflags.qdoc b/doc/src/examples/windowflags.qdoc index b25206e..c4c5d7f 100644 --- a/doc/src/examples/windowflags.qdoc +++ b/doc/src/examples/windowflags.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/worldtimeclockbuilder.qdoc b/doc/src/examples/worldtimeclockbuilder.qdoc index 644ffdb..012d419 100644 --- a/doc/src/examples/worldtimeclockbuilder.qdoc +++ b/doc/src/examples/worldtimeclockbuilder.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/worldtimeclockplugin.qdoc b/doc/src/examples/worldtimeclockplugin.qdoc index 072b1f0..da9f1b2 100644 --- a/doc/src/examples/worldtimeclockplugin.qdoc +++ b/doc/src/examples/worldtimeclockplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/examples/xmlstreamlint.qdoc b/doc/src/examples/xmlstreamlint.qdoc index 925a7a0..0a997ce 100644 --- a/doc/src/examples/xmlstreamlint.qdoc +++ b/doc/src/examples/xmlstreamlint.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/exportedfunctions.qdoc b/doc/src/exportedfunctions.qdoc index f67950c..02317c5 100644 --- a/doc/src/exportedfunctions.qdoc +++ b/doc/src/exportedfunctions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index f48c3d7..b297cbd 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/focus.qdoc b/doc/src/focus.qdoc index defb3e0..bc6de01 100644 --- a/doc/src/focus.qdoc +++ b/doc/src/focus.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/functions.qdoc b/doc/src/functions.qdoc index 4aa0851..272c5ae 100644 --- a/doc/src/functions.qdoc +++ b/doc/src/functions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-cde.qdoc b/doc/src/gallery-cde.qdoc index 36916a2..4bf300c 100644 --- a/doc/src/gallery-cde.qdoc +++ b/doc/src/gallery-cde.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-cleanlooks.qdoc b/doc/src/gallery-cleanlooks.qdoc index 7ae5385..d8885e5 100644 --- a/doc/src/gallery-cleanlooks.qdoc +++ b/doc/src/gallery-cleanlooks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-macintosh.qdoc b/doc/src/gallery-macintosh.qdoc index 608713d..6c29c04 100644 --- a/doc/src/gallery-macintosh.qdoc +++ b/doc/src/gallery-macintosh.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-motif.qdoc b/doc/src/gallery-motif.qdoc index 79c44b1..dbc5239 100644 --- a/doc/src/gallery-motif.qdoc +++ b/doc/src/gallery-motif.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-plastique.qdoc b/doc/src/gallery-plastique.qdoc index b184ea8..030641e 100644 --- a/doc/src/gallery-plastique.qdoc +++ b/doc/src/gallery-plastique.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-windows.qdoc b/doc/src/gallery-windows.qdoc index 40ba7ce..8cdfe32 100644 --- a/doc/src/gallery-windows.qdoc +++ b/doc/src/gallery-windows.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-windowsvista.qdoc b/doc/src/gallery-windowsvista.qdoc index 1ad8823..8b7dc2e 100644 --- a/doc/src/gallery-windowsvista.qdoc +++ b/doc/src/gallery-windowsvista.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery-windowsxp.qdoc b/doc/src/gallery-windowsxp.qdoc index dcb8e82..0ca4c84 100644 --- a/doc/src/gallery-windowsxp.qdoc +++ b/doc/src/gallery-windowsxp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gallery.qdoc b/doc/src/gallery.qdoc index dc9f732..d35a160 100644 --- a/doc/src/gallery.qdoc +++ b/doc/src/gallery.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/geometry.qdoc b/doc/src/geometry.qdoc index b17aa39..3f9c299 100644 --- a/doc/src/geometry.qdoc +++ b/doc/src/geometry.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/gpl.qdoc b/doc/src/gpl.qdoc index e423171..19224c4 100644 --- a/doc/src/gpl.qdoc +++ b/doc/src/gpl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/graphicsview.qdoc b/doc/src/graphicsview.qdoc index 049b0c3..ece2f1d 100644 --- a/doc/src/graphicsview.qdoc +++ b/doc/src/graphicsview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/groups.qdoc b/doc/src/groups.qdoc index c9cedc4..b1a8f5f9 100644 --- a/doc/src/groups.qdoc +++ b/doc/src/groups.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/guibooks.qdoc b/doc/src/guibooks.qdoc index 888368b..d3d36e5 100644 --- a/doc/src/guibooks.qdoc +++ b/doc/src/guibooks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/hierarchy.qdoc b/doc/src/hierarchy.qdoc index 2b70964..8583150 100644 --- a/doc/src/hierarchy.qdoc +++ b/doc/src/hierarchy.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/how-to-learn-qt.qdoc b/doc/src/how-to-learn-qt.qdoc index 4b16294..7dbdca3 100644 --- a/doc/src/how-to-learn-qt.qdoc +++ b/doc/src/how-to-learn-qt.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/i18n.qdoc b/doc/src/i18n.qdoc index 5018b51..29d7165 100644 --- a/doc/src/i18n.qdoc +++ b/doc/src/i18n.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 49dfafd..e697c95 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc index 925a195..2e5374a 100644 --- a/doc/src/installation.qdoc +++ b/doc/src/installation.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/introtodbus.qdoc b/doc/src/introtodbus.qdoc index 71c65d5..5dfe935 100644 --- a/doc/src/introtodbus.qdoc +++ b/doc/src/introtodbus.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/ipc.qdoc b/doc/src/ipc.qdoc index 97ed22e..af67bcc 100644 --- a/doc/src/ipc.qdoc +++ b/doc/src/ipc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/known-issues.qdoc b/doc/src/known-issues.qdoc index 60fd63d..aa17285 100644 --- a/doc/src/known-issues.qdoc +++ b/doc/src/known-issues.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc index 38163c8..8bf3415 100644 --- a/doc/src/layout.qdoc +++ b/doc/src/layout.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc index b42b882..6e3b650 100644 --- a/doc/src/licenses.qdoc +++ b/doc/src/licenses.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/linguist-manual.qdoc b/doc/src/linguist-manual.qdoc index 92e3bed..1537fe7 100644 --- a/doc/src/linguist-manual.qdoc +++ b/doc/src/linguist-manual.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/mac-differences.qdoc b/doc/src/mac-differences.qdoc index 573e62d..b60beec 100644 --- a/doc/src/mac-differences.qdoc +++ b/doc/src/mac-differences.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/mainclasses.qdoc b/doc/src/mainclasses.qdoc index da041fa..90db3ed 100644 --- a/doc/src/mainclasses.qdoc +++ b/doc/src/mainclasses.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/metaobjects.qdoc b/doc/src/metaobjects.qdoc index 4c91a90..051d2dd 100644 --- a/doc/src/metaobjects.qdoc +++ b/doc/src/metaobjects.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/moc.qdoc b/doc/src/moc.qdoc index b7283c4..5462290 100644 --- a/doc/src/moc.qdoc +++ b/doc/src/moc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/model-view-programming.qdoc b/doc/src/model-view-programming.qdoc index bf0c1c8..f1b8eb0 100644 --- a/doc/src/model-view-programming.qdoc +++ b/doc/src/model-view-programming.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 7372994..aeeb4ce 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/object.qdoc b/doc/src/object.qdoc index 3bd563a..5df678e 100644 --- a/doc/src/object.qdoc +++ b/doc/src/object.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/objecttrees.qdoc b/doc/src/objecttrees.qdoc index 4b868c0..679443e 100644 --- a/doc/src/objecttrees.qdoc +++ b/doc/src/objecttrees.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/opensourceedition.qdoc b/doc/src/opensourceedition.qdoc index d8253d3..05be9bb 100644 --- a/doc/src/opensourceedition.qdoc +++ b/doc/src/opensourceedition.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 8eb4e35..eed0120 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/paintsystem.qdoc b/doc/src/paintsystem.qdoc index 11b9a5b..25b635d 100644 --- a/doc/src/paintsystem.qdoc +++ b/doc/src/paintsystem.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/phonon.qdoc b/doc/src/phonon.qdoc index 9470e61..049e69c 100644 --- a/doc/src/phonon.qdoc +++ b/doc/src/phonon.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc index 6532d1e..04d5dd3 100644 --- a/doc/src/platform-notes.qdoc +++ b/doc/src/platform-notes.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/plugins-howto.qdoc b/doc/src/plugins-howto.qdoc index 2c2b031..5348fef 100644 --- a/doc/src/plugins-howto.qdoc +++ b/doc/src/plugins-howto.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/porting-qsa.qdoc b/doc/src/porting-qsa.qdoc index 0560060..c6b161a 100644 --- a/doc/src/porting-qsa.qdoc +++ b/doc/src/porting-qsa.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/porting4-canvas.qdoc b/doc/src/porting4-canvas.qdoc index dcd1a1e..2b9c023 100644 --- a/doc/src/porting4-canvas.qdoc +++ b/doc/src/porting4-canvas.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/porting4-designer.qdoc b/doc/src/porting4-designer.qdoc index 9ae3c52..7daa6cb 100644 --- a/doc/src/porting4-designer.qdoc +++ b/doc/src/porting4-designer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/porting4-overview.qdoc b/doc/src/porting4-overview.qdoc index b0146a6..9547a01 100644 --- a/doc/src/porting4-overview.qdoc +++ b/doc/src/porting4-overview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc index c8a9e2b..cdfa5b2 100644 --- a/doc/src/porting4.qdoc +++ b/doc/src/porting4.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/printing.qdoc b/doc/src/printing.qdoc index e1c337a..25a35e2 100644 --- a/doc/src/printing.qdoc +++ b/doc/src/printing.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc index 0775b12..c1e7999 100644 --- a/doc/src/properties.qdoc +++ b/doc/src/properties.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3asciicache.qdoc b/doc/src/q3asciicache.qdoc index fbbb21b..1c2b0a6 100644 --- a/doc/src/q3asciicache.qdoc +++ b/doc/src/q3asciicache.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3asciidict.qdoc b/doc/src/q3asciidict.qdoc index 0b5b790..ded2852 100644 --- a/doc/src/q3asciidict.qdoc +++ b/doc/src/q3asciidict.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3cache.qdoc b/doc/src/q3cache.qdoc index a54430f..5f0db26 100644 --- a/doc/src/q3cache.qdoc +++ b/doc/src/q3cache.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3dict.qdoc b/doc/src/q3dict.qdoc index 8a0c5b0..703bcdc 100644 --- a/doc/src/q3dict.qdoc +++ b/doc/src/q3dict.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3intcache.qdoc b/doc/src/q3intcache.qdoc index bba79f1..55c690f 100644 --- a/doc/src/q3intcache.qdoc +++ b/doc/src/q3intcache.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3intdict.qdoc b/doc/src/q3intdict.qdoc index 8f0aabf..cf9f3f0 100644 --- a/doc/src/q3intdict.qdoc +++ b/doc/src/q3intdict.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3memarray.qdoc b/doc/src/q3memarray.qdoc index 5ab7895..60ab692 100644 --- a/doc/src/q3memarray.qdoc +++ b/doc/src/q3memarray.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3popupmenu.qdoc b/doc/src/q3popupmenu.qdoc index 137115e..2354c33 100644 --- a/doc/src/q3popupmenu.qdoc +++ b/doc/src/q3popupmenu.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3ptrdict.qdoc b/doc/src/q3ptrdict.qdoc index a7e3545..9100d3c 100644 --- a/doc/src/q3ptrdict.qdoc +++ b/doc/src/q3ptrdict.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3ptrlist.qdoc b/doc/src/q3ptrlist.qdoc index 7eb4265..5bf0a83 100644 --- a/doc/src/q3ptrlist.qdoc +++ b/doc/src/q3ptrlist.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3ptrqueue.qdoc b/doc/src/q3ptrqueue.qdoc index 8a3ef22..b96250b 100644 --- a/doc/src/q3ptrqueue.qdoc +++ b/doc/src/q3ptrqueue.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3ptrstack.qdoc b/doc/src/q3ptrstack.qdoc index fcece9f..801ffe1 100644 --- a/doc/src/q3ptrstack.qdoc +++ b/doc/src/q3ptrstack.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3ptrvector.qdoc b/doc/src/q3ptrvector.qdoc index b539219..31c033e 100644 --- a/doc/src/q3ptrvector.qdoc +++ b/doc/src/q3ptrvector.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3sqlfieldinfo.qdoc b/doc/src/q3sqlfieldinfo.qdoc index 1b152c0..42d2db7 100644 --- a/doc/src/q3sqlfieldinfo.qdoc +++ b/doc/src/q3sqlfieldinfo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3sqlrecordinfo.qdoc b/doc/src/q3sqlrecordinfo.qdoc index f8f6cd5..bb791cc 100644 --- a/doc/src/q3sqlrecordinfo.qdoc +++ b/doc/src/q3sqlrecordinfo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3valuelist.qdoc b/doc/src/q3valuelist.qdoc index be315c2..91036db 100644 --- a/doc/src/q3valuelist.qdoc +++ b/doc/src/q3valuelist.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3valuestack.qdoc b/doc/src/q3valuestack.qdoc index 40847ab..e165a80 100644 --- a/doc/src/q3valuestack.qdoc +++ b/doc/src/q3valuestack.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/q3valuevector.qdoc b/doc/src/q3valuevector.qdoc index 1af2bf3..afdd302 100644 --- a/doc/src/q3valuevector.qdoc +++ b/doc/src/q3valuevector.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qalgorithms.qdoc b/doc/src/qalgorithms.qdoc index b33c250..a7965c2 100644 --- a/doc/src/qalgorithms.qdoc +++ b/doc/src/qalgorithms.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qaxcontainer.qdoc b/doc/src/qaxcontainer.qdoc index 48c76fc..edb44d5 100644 --- a/doc/src/qaxcontainer.qdoc +++ b/doc/src/qaxcontainer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qaxserver.qdoc b/doc/src/qaxserver.qdoc index f0c317b..fd25ed4 100644 --- a/doc/src/qaxserver.qdoc +++ b/doc/src/qaxserver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qcache.qdoc b/doc/src/qcache.qdoc index 2c68640..dc8d50b 100644 --- a/doc/src/qcache.qdoc +++ b/doc/src/qcache.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qcolormap.qdoc b/doc/src/qcolormap.qdoc index dae4dc7..8ab81c9 100644 --- a/doc/src/qcolormap.qdoc +++ b/doc/src/qcolormap.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qdbusadaptors.qdoc b/doc/src/qdbusadaptors.qdoc index fc487aa..001cb3f 100644 --- a/doc/src/qdbusadaptors.qdoc +++ b/doc/src/qdbusadaptors.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qdesktopwidget.qdoc b/doc/src/qdesktopwidget.qdoc index 5a27fb4..f2577d1 100644 --- a/doc/src/qdesktopwidget.qdoc +++ b/doc/src/qdesktopwidget.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qiterator.qdoc b/doc/src/qiterator.qdoc index b1e95c6..e2df6e7 100644 --- a/doc/src/qiterator.qdoc +++ b/doc/src/qiterator.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc index 39581a2..31ae204 100644 --- a/doc/src/qmake-manual.qdoc +++ b/doc/src/qmake-manual.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index e6a1a36..5575c12 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qpagesetupdialog.qdoc b/doc/src/qpagesetupdialog.qdoc index 66e4b96..05b13de 100644 --- a/doc/src/qpagesetupdialog.qdoc +++ b/doc/src/qpagesetupdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qpaintdevice.qdoc b/doc/src/qpaintdevice.qdoc index be2f4bb..5d2aff7 100644 --- a/doc/src/qpaintdevice.qdoc +++ b/doc/src/qpaintdevice.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qpair.qdoc b/doc/src/qpair.qdoc index c31b7eb..96b038a 100644 --- a/doc/src/qpair.qdoc +++ b/doc/src/qpair.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qpatternistdummy.cpp b/doc/src/qpatternistdummy.cpp index 8bedecb..d8516b2 100644 --- a/doc/src/qpatternistdummy.cpp +++ b/doc/src/qpatternistdummy.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qplugin.qdoc b/doc/src/qplugin.qdoc index 7a93394..41d8577 100644 --- a/doc/src/qplugin.qdoc +++ b/doc/src/qplugin.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qprintdialog.qdoc b/doc/src/qprintdialog.qdoc index a4cd18b..7f1b84b 100644 --- a/doc/src/qprintdialog.qdoc +++ b/doc/src/qprintdialog.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qprinterinfo.qdoc b/doc/src/qprinterinfo.qdoc index ae900e0..4a2ee12 100644 --- a/doc/src/qprinterinfo.qdoc +++ b/doc/src/qprinterinfo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qset.qdoc b/doc/src/qset.qdoc index 7fbf97a..addd5b9 100644 --- a/doc/src/qset.qdoc +++ b/doc/src/qset.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qsignalspy.qdoc b/doc/src/qsignalspy.qdoc index cf9021e..c2d27bd 100644 --- a/doc/src/qsignalspy.qdoc +++ b/doc/src/qsignalspy.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qsizepolicy.qdoc b/doc/src/qsizepolicy.qdoc index d82bb16..2f10f5b 100644 --- a/doc/src/qsizepolicy.qdoc +++ b/doc/src/qsizepolicy.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qsql.qdoc b/doc/src/qsql.qdoc index e98d309..9295828 100644 --- a/doc/src/qsql.qdoc +++ b/doc/src/qsql.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt-conf.qdoc b/doc/src/qt-conf.qdoc index d826600..1ea4e06 100644 --- a/doc/src/qt-conf.qdoc +++ b/doc/src/qt-conf.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt-embedded.qdoc b/doc/src/qt-embedded.qdoc index f0eb096..d69dfcb 100644 --- a/doc/src/qt-embedded.qdoc +++ b/doc/src/qt-embedded.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt3support.qdoc b/doc/src/qt3support.qdoc index 30bc5a3..c3913b5 100644 --- a/doc/src/qt3support.qdoc +++ b/doc/src/qt3support.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt3to4.qdoc b/doc/src/qt3to4.qdoc index 1297424..37def53 100644 --- a/doc/src/qt3to4.qdoc +++ b/doc/src/qt3to4.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-accessibility.qdoc b/doc/src/qt4-accessibility.qdoc index 05a25ee..0a601d3 100644 --- a/doc/src/qt4-accessibility.qdoc +++ b/doc/src/qt4-accessibility.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-arthur.qdoc b/doc/src/qt4-arthur.qdoc index 8a29138..7d14dd2 100644 --- a/doc/src/qt4-arthur.qdoc +++ b/doc/src/qt4-arthur.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-designer.qdoc b/doc/src/qt4-designer.qdoc index 3f90390..d8764aa 100644 --- a/doc/src/qt4-designer.qdoc +++ b/doc/src/qt4-designer.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-interview.qdoc b/doc/src/qt4-interview.qdoc index bceba85..48af5bb 100644 --- a/doc/src/qt4-interview.qdoc +++ b/doc/src/qt4-interview.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index cd66c10..5442c00 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-mainwindow.qdoc b/doc/src/qt4-mainwindow.qdoc index ad5aec2..a26f236 100644 --- a/doc/src/qt4-mainwindow.qdoc +++ b/doc/src/qt4-mainwindow.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-network.qdoc b/doc/src/qt4-network.qdoc index 35418cc..39ba0ac 100644 --- a/doc/src/qt4-network.qdoc +++ b/doc/src/qt4-network.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-scribe.qdoc b/doc/src/qt4-scribe.qdoc index 5061a82..a02c59d 100644 --- a/doc/src/qt4-scribe.qdoc +++ b/doc/src/qt4-scribe.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-sql.qdoc b/doc/src/qt4-sql.qdoc index cb94f54..7ef4089 100644 --- a/doc/src/qt4-sql.qdoc +++ b/doc/src/qt4-sql.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-styles.qdoc b/doc/src/qt4-styles.qdoc index 7e02ecc..1f0c9f1 100644 --- a/doc/src/qt4-styles.qdoc +++ b/doc/src/qt4-styles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-threads.qdoc b/doc/src/qt4-threads.qdoc index 5239bba..228886b 100644 --- a/doc/src/qt4-threads.qdoc +++ b/doc/src/qt4-threads.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qt4-tulip.qdoc b/doc/src/qt4-tulip.qdoc index d1f925e..803b6b9 100644 --- a/doc/src/qt4-tulip.qdoc +++ b/doc/src/qt4-tulip.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtassistant.qdoc b/doc/src/qtassistant.qdoc index 6be92fa..4c1a0c8 100644 --- a/doc/src/qtassistant.qdoc +++ b/doc/src/qtassistant.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtcocoa-known-issues.qdoc b/doc/src/qtcocoa-known-issues.qdoc index eedbd68..95a1d8b 100644 --- a/doc/src/qtcocoa-known-issues.qdoc +++ b/doc/src/qtcocoa-known-issues.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtconfig.qdoc b/doc/src/qtconfig.qdoc index f515aa3..34a54c7 100644 --- a/doc/src/qtconfig.qdoc +++ b/doc/src/qtconfig.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtcore.qdoc b/doc/src/qtcore.qdoc index 71a29b7..57af560 100644 --- a/doc/src/qtcore.qdoc +++ b/doc/src/qtcore.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtdbus.qdoc b/doc/src/qtdbus.qdoc index 37217e9..0d455a6 100644 --- a/doc/src/qtdbus.qdoc +++ b/doc/src/qtdbus.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtdemo.qdoc b/doc/src/qtdemo.qdoc index 7e23f6d..a2a7a0a 100644 --- a/doc/src/qtdemo.qdoc +++ b/doc/src/qtdemo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtdesigner.qdoc b/doc/src/qtdesigner.qdoc index 7e3b619..7a183b7 100644 --- a/doc/src/qtdesigner.qdoc +++ b/doc/src/qtdesigner.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtendian.qdoc b/doc/src/qtendian.qdoc index f4b5bb8..5a4ce8d 100644 --- a/doc/src/qtendian.qdoc +++ b/doc/src/qtendian.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtestevent.qdoc b/doc/src/qtestevent.qdoc index f5edb19..445cb07 100644 --- a/doc/src/qtestevent.qdoc +++ b/doc/src/qtestevent.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtestlib.qdoc b/doc/src/qtestlib.qdoc index 4e93107..27ace3d 100644 --- a/doc/src/qtestlib.qdoc +++ b/doc/src/qtestlib.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtgui.qdoc b/doc/src/qtgui.qdoc index 08b492a..a0ae609 100644 --- a/doc/src/qtgui.qdoc +++ b/doc/src/qtgui.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qthelp.qdoc b/doc/src/qthelp.qdoc index 05bf3e3..e787c3f 100644 --- a/doc/src/qthelp.qdoc +++ b/doc/src/qthelp.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtmac-as-native.qdoc b/doc/src/qtmac-as-native.qdoc index ecbc64c..7f219bd 100644 --- a/doc/src/qtmac-as-native.qdoc +++ b/doc/src/qtmac-as-native.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -49,11 +49,11 @@ ** This file is part 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtmain.qdoc b/doc/src/qtmain.qdoc index a6b234a..74942c9 100644 --- a/doc/src/qtmain.qdoc +++ b/doc/src/qtmain.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtnetwork.qdoc b/doc/src/qtnetwork.qdoc index 2be7457..ccddc70 100644 --- a/doc/src/qtnetwork.qdoc +++ b/doc/src/qtnetwork.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtopengl.qdoc b/doc/src/qtopengl.qdoc index 1052f14..6eb7374 100644 --- a/doc/src/qtopengl.qdoc +++ b/doc/src/qtopengl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtopiacore-architecture.qdoc b/doc/src/qtopiacore-architecture.qdoc index 8ec0136..74f2f74 100644 --- a/doc/src/qtopiacore-architecture.qdoc +++ b/doc/src/qtopiacore-architecture.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtopiacore-displaymanagement.qdoc b/doc/src/qtopiacore-displaymanagement.qdoc index 7cfa91f..c01b555 100644 --- a/doc/src/qtopiacore-displaymanagement.qdoc +++ b/doc/src/qtopiacore-displaymanagement.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtopiacore-opengl.qdoc b/doc/src/qtopiacore-opengl.qdoc index ceaff22..a16532d 100644 --- a/doc/src/qtopiacore-opengl.qdoc +++ b/doc/src/qtopiacore-opengl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtopiacore.qdoc b/doc/src/qtopiacore.qdoc index 43e31eb..04639f0 100644 --- a/doc/src/qtopiacore.qdoc +++ b/doc/src/qtopiacore.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtscript.qdoc b/doc/src/qtscript.qdoc index 4a2bbf6..7bd994f 100644 --- a/doc/src/qtscript.qdoc +++ b/doc/src/qtscript.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtscriptdebugger-manual.qdoc b/doc/src/qtscriptdebugger-manual.qdoc index 3dfe879..ba1c435 100644 --- a/doc/src/qtscriptdebugger-manual.qdoc +++ b/doc/src/qtscriptdebugger-manual.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtscriptextensions.qdoc b/doc/src/qtscriptextensions.qdoc index 2a7d569..b0ca07f 100644 --- a/doc/src/qtscriptextensions.qdoc +++ b/doc/src/qtscriptextensions.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtscripttools.qdoc b/doc/src/qtscripttools.qdoc index 7d4bee1..a0252da 100644 --- a/doc/src/qtscripttools.qdoc +++ b/doc/src/qtscripttools.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtsql.qdoc b/doc/src/qtsql.qdoc index c00410b..ec549cc 100644 --- a/doc/src/qtsql.qdoc +++ b/doc/src/qtsql.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtsvg.qdoc b/doc/src/qtsvg.qdoc index 083c669..b172ad9 100644 --- a/doc/src/qtsvg.qdoc +++ b/doc/src/qtsvg.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qttest.qdoc b/doc/src/qttest.qdoc index 566ff5a..c182c76 100644 --- a/doc/src/qttest.qdoc +++ b/doc/src/qttest.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtuiloader.qdoc b/doc/src/qtuiloader.qdoc index 746738b..db80736 100644 --- a/doc/src/qtuiloader.qdoc +++ b/doc/src/qtuiloader.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtxml.qdoc b/doc/src/qtxml.qdoc index e826403..23e4435 100644 --- a/doc/src/qtxml.qdoc +++ b/doc/src/qtxml.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qtxmlpatterns.qdoc b/doc/src/qtxmlpatterns.qdoc index cb260fc..52c9542 100644 --- a/doc/src/qtxmlpatterns.qdoc +++ b/doc/src/qtxmlpatterns.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qundo.qdoc b/doc/src/qundo.qdoc index 5358c12..2b62ff6 100644 --- a/doc/src/qundo.qdoc +++ b/doc/src/qundo.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qvarlengtharray.qdoc b/doc/src/qvarlengtharray.qdoc index 6513b3e..ead0f86 100644 --- a/doc/src/qvarlengtharray.qdoc +++ b/doc/src/qvarlengtharray.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/qwaitcondition.qdoc b/doc/src/qwaitcondition.qdoc index 4a64cfe..a4aa4ad 100644 --- a/doc/src/qwaitcondition.qdoc +++ b/doc/src/qwaitcondition.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/rcc.qdoc b/doc/src/rcc.qdoc index d67a3bf..6baff68 100644 --- a/doc/src/rcc.qdoc +++ b/doc/src/rcc.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/resources.qdoc b/doc/src/resources.qdoc index 7997b9f..93eeb92 100644 --- a/doc/src/resources.qdoc +++ b/doc/src/resources.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/richtext.qdoc b/doc/src/richtext.qdoc index fbd8adb..174cf39 100644 --- a/doc/src/richtext.qdoc +++ b/doc/src/richtext.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/session.qdoc b/doc/src/session.qdoc index f47c245..4bc1e4a 100644 --- a/doc/src/session.qdoc +++ b/doc/src/session.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/sharedlibrary.qdoc b/doc/src/sharedlibrary.qdoc index 3febb8f..d11216c 100644 --- a/doc/src/sharedlibrary.qdoc +++ b/doc/src/sharedlibrary.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/signalsandslots.qdoc b/doc/src/signalsandslots.qdoc index 5432bd4..70c41b9 100644 --- a/doc/src/signalsandslots.qdoc +++ b/doc/src/signalsandslots.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/accessibilityfactorysnippet.cpp b/doc/src/snippets/accessibilityfactorysnippet.cpp index 1dbc38a..3a2577c 100644 --- a/doc/src/snippets/accessibilityfactorysnippet.cpp +++ b/doc/src/snippets/accessibilityfactorysnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/accessibilitypluginsnippet.cpp b/doc/src/snippets/accessibilitypluginsnippet.cpp index 228f11c..669d1cd 100644 --- a/doc/src/snippets/accessibilitypluginsnippet.cpp +++ b/doc/src/snippets/accessibilitypluginsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/accessibilityslidersnippet.cpp b/doc/src/snippets/accessibilityslidersnippet.cpp index 5c4b7fb..d530301 100644 --- a/doc/src/snippets/accessibilityslidersnippet.cpp +++ b/doc/src/snippets/accessibilityslidersnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/alphachannel.cpp b/doc/src/snippets/alphachannel.cpp index 7783271..55b5342 100644 --- a/doc/src/snippets/alphachannel.cpp +++ b/doc/src/snippets/alphachannel.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brush/brush.cpp b/doc/src/snippets/brush/brush.cpp index c4583c0..3e4bc18 100644 --- a/doc/src/snippets/brush/brush.cpp +++ b/doc/src/snippets/brush/brush.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brush/gradientcreationsnippet.cpp b/doc/src/snippets/brush/gradientcreationsnippet.cpp index a7a50ef..9ef89ae 100644 --- a/doc/src/snippets/brush/gradientcreationsnippet.cpp +++ b/doc/src/snippets/brush/gradientcreationsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brushstyles/main.cpp b/doc/src/snippets/brushstyles/main.cpp index ed32fc3..065eee0 100644 --- a/doc/src/snippets/brushstyles/main.cpp +++ b/doc/src/snippets/brushstyles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brushstyles/renderarea.cpp b/doc/src/snippets/brushstyles/renderarea.cpp index 0be6c71..7789d4c 100644 --- a/doc/src/snippets/brushstyles/renderarea.cpp +++ b/doc/src/snippets/brushstyles/renderarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brushstyles/renderarea.h b/doc/src/snippets/brushstyles/renderarea.h index 5a1df67..20103f9 100644 --- a/doc/src/snippets/brushstyles/renderarea.h +++ b/doc/src/snippets/brushstyles/renderarea.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brushstyles/stylewidget.cpp b/doc/src/snippets/brushstyles/stylewidget.cpp index 21ff711..e565012 100644 --- a/doc/src/snippets/brushstyles/stylewidget.cpp +++ b/doc/src/snippets/brushstyles/stylewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/brushstyles/stylewidget.h b/doc/src/snippets/brushstyles/stylewidget.h index c5c3f02..082ce90 100644 --- a/doc/src/snippets/brushstyles/stylewidget.h +++ b/doc/src/snippets/brushstyles/stylewidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/buffer/buffer.cpp b/doc/src/snippets/buffer/buffer.cpp index 3df2ed0..b0b729e 100644 --- a/doc/src/snippets/buffer/buffer.cpp +++ b/doc/src/snippets/buffer/buffer.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/clipboard/clipwindow.cpp b/doc/src/snippets/clipboard/clipwindow.cpp index e0eb383..fc77d05 100644 --- a/doc/src/snippets/clipboard/clipwindow.cpp +++ b/doc/src/snippets/clipboard/clipwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/clipboard/clipwindow.h b/doc/src/snippets/clipboard/clipwindow.h index ab3b654..898b3e5 100644 --- a/doc/src/snippets/clipboard/clipwindow.h +++ b/doc/src/snippets/clipboard/clipwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/clipboard/main.cpp b/doc/src/snippets/clipboard/main.cpp index 7947ff1..2b80495 100644 --- a/doc/src/snippets/clipboard/main.cpp +++ b/doc/src/snippets/clipboard/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/coordsys/coordsys.cpp b/doc/src/snippets/coordsys/coordsys.cpp index 2fb0744..de20e3a 100644 --- a/doc/src/snippets/coordsys/coordsys.cpp +++ b/doc/src/snippets/coordsys/coordsys.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/customstyle/customstyle.cpp b/doc/src/snippets/customstyle/customstyle.cpp index 0e3d00e..0450c30 100644 --- a/doc/src/snippets/customstyle/customstyle.cpp +++ b/doc/src/snippets/customstyle/customstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/customstyle/customstyle.h b/doc/src/snippets/customstyle/customstyle.h index 238eb6c..d3e0ca7 100644 --- a/doc/src/snippets/customstyle/customstyle.h +++ b/doc/src/snippets/customstyle/customstyle.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/customstyle/main.cpp b/doc/src/snippets/customstyle/main.cpp index a6efacd..0e1c274 100644 --- a/doc/src/snippets/customstyle/main.cpp +++ b/doc/src/snippets/customstyle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/autoconnection/imagedialog.cpp b/doc/src/snippets/designer/autoconnection/imagedialog.cpp index a08650b..050e585 100644 --- a/doc/src/snippets/designer/autoconnection/imagedialog.cpp +++ b/doc/src/snippets/designer/autoconnection/imagedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/autoconnection/imagedialog.h b/doc/src/snippets/designer/autoconnection/imagedialog.h index e99b7f0..1856f3c 100644 --- a/doc/src/snippets/designer/autoconnection/imagedialog.h +++ b/doc/src/snippets/designer/autoconnection/imagedialog.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/autoconnection/main.cpp b/doc/src/snippets/designer/autoconnection/main.cpp index f5c762c..9e1f13b 100644 --- a/doc/src/snippets/designer/autoconnection/main.cpp +++ b/doc/src/snippets/designer/autoconnection/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/imagedialog/main.cpp b/doc/src/snippets/designer/imagedialog/main.cpp index 3613dde..b6577b4 100644 --- a/doc/src/snippets/designer/imagedialog/main.cpp +++ b/doc/src/snippets/designer/imagedialog/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp b/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp index 6386408..2a94821 100644 --- a/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp +++ b/doc/src/snippets/designer/multipleinheritance/imagedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/multipleinheritance/imagedialog.h b/doc/src/snippets/designer/multipleinheritance/imagedialog.h index 81161e7..c1217ad 100644 --- a/doc/src/snippets/designer/multipleinheritance/imagedialog.h +++ b/doc/src/snippets/designer/multipleinheritance/imagedialog.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/multipleinheritance/main.cpp b/doc/src/snippets/designer/multipleinheritance/main.cpp index f5c762c..9e1f13b 100644 --- a/doc/src/snippets/designer/multipleinheritance/main.cpp +++ b/doc/src/snippets/designer/multipleinheritance/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/noautoconnection/imagedialog.cpp b/doc/src/snippets/designer/noautoconnection/imagedialog.cpp index 1529377..b2fb206 100644 --- a/doc/src/snippets/designer/noautoconnection/imagedialog.cpp +++ b/doc/src/snippets/designer/noautoconnection/imagedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/noautoconnection/imagedialog.h b/doc/src/snippets/designer/noautoconnection/imagedialog.h index c67b01e..616a847 100644 --- a/doc/src/snippets/designer/noautoconnection/imagedialog.h +++ b/doc/src/snippets/designer/noautoconnection/imagedialog.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/noautoconnection/main.cpp b/doc/src/snippets/designer/noautoconnection/main.cpp index f5c762c..9e1f13b 100644 --- a/doc/src/snippets/designer/noautoconnection/main.cpp +++ b/doc/src/snippets/designer/noautoconnection/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/singleinheritance/imagedialog.cpp b/doc/src/snippets/designer/singleinheritance/imagedialog.cpp index 2614858..9688e86 100644 --- a/doc/src/snippets/designer/singleinheritance/imagedialog.cpp +++ b/doc/src/snippets/designer/singleinheritance/imagedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/singleinheritance/imagedialog.h b/doc/src/snippets/designer/singleinheritance/imagedialog.h index 08e0c61..55ba940 100644 --- a/doc/src/snippets/designer/singleinheritance/imagedialog.h +++ b/doc/src/snippets/designer/singleinheritance/imagedialog.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/designer/singleinheritance/main.cpp b/doc/src/snippets/designer/singleinheritance/main.cpp index f5c762c..9e1f13b 100644 --- a/doc/src/snippets/designer/singleinheritance/main.cpp +++ b/doc/src/snippets/designer/singleinheritance/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dialogs/dialogs.cpp b/doc/src/snippets/dialogs/dialogs.cpp index 7474e30..ee9628c 100644 --- a/doc/src/snippets/dialogs/dialogs.cpp +++ b/doc/src/snippets/dialogs/dialogs.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dockwidgets/main.cpp b/doc/src/snippets/dockwidgets/main.cpp index 7dfd2f4..793a1bb 100644 --- a/doc/src/snippets/dockwidgets/main.cpp +++ b/doc/src/snippets/dockwidgets/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dockwidgets/mainwindow.cpp b/doc/src/snippets/dockwidgets/mainwindow.cpp index ec80303..69d0ae1 100644 --- a/doc/src/snippets/dockwidgets/mainwindow.cpp +++ b/doc/src/snippets/dockwidgets/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dockwidgets/mainwindow.h b/doc/src/snippets/dockwidgets/mainwindow.h index fffadd4..963ad23 100644 --- a/doc/src/snippets/dockwidgets/mainwindow.h +++ b/doc/src/snippets/dockwidgets/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/draganddrop/dragwidget.cpp b/doc/src/snippets/draganddrop/dragwidget.cpp index 2fe3e53..02587f2 100644 --- a/doc/src/snippets/draganddrop/dragwidget.cpp +++ b/doc/src/snippets/draganddrop/dragwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/draganddrop/dragwidget.h b/doc/src/snippets/draganddrop/dragwidget.h index 07fd091..ac63fad 100644 --- a/doc/src/snippets/draganddrop/dragwidget.h +++ b/doc/src/snippets/draganddrop/dragwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/draganddrop/main.cpp b/doc/src/snippets/draganddrop/main.cpp index 73a8bc6..ac9215a 100644 --- a/doc/src/snippets/draganddrop/main.cpp +++ b/doc/src/snippets/draganddrop/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/draganddrop/mainwindow.cpp b/doc/src/snippets/draganddrop/mainwindow.cpp index 943b075..9224e11 100644 --- a/doc/src/snippets/draganddrop/mainwindow.cpp +++ b/doc/src/snippets/draganddrop/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/draganddrop/mainwindow.h b/doc/src/snippets/draganddrop/mainwindow.h index 789b54a..65a1af9 100644 --- a/doc/src/snippets/draganddrop/mainwindow.h +++ b/doc/src/snippets/draganddrop/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dragging/main.cpp b/doc/src/snippets/dragging/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/dragging/main.cpp +++ b/doc/src/snippets/dragging/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dragging/mainwindow.cpp b/doc/src/snippets/dragging/mainwindow.cpp index 8c79895..dbf54c7 100644 --- a/doc/src/snippets/dragging/mainwindow.cpp +++ b/doc/src/snippets/dragging/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dragging/mainwindow.h b/doc/src/snippets/dragging/mainwindow.h index 6c90e60..9cc1806 100644 --- a/doc/src/snippets/dragging/mainwindow.h +++ b/doc/src/snippets/dragging/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropactions/main.cpp b/doc/src/snippets/dropactions/main.cpp index e10789c..e584f9c 100644 --- a/doc/src/snippets/dropactions/main.cpp +++ b/doc/src/snippets/dropactions/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropactions/window.cpp b/doc/src/snippets/dropactions/window.cpp index c790f9b..990bca5 100644 --- a/doc/src/snippets/dropactions/window.cpp +++ b/doc/src/snippets/dropactions/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropactions/window.h b/doc/src/snippets/dropactions/window.h index 4bbec40..c1a4e21 100644 --- a/doc/src/snippets/dropactions/window.h +++ b/doc/src/snippets/dropactions/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/droparea.cpp b/doc/src/snippets/droparea.cpp index 4888435..7ddf51b 100644 --- a/doc/src/snippets/droparea.cpp +++ b/doc/src/snippets/droparea.cpp @@ -4,11 +4,11 @@ ** Contact: Qt Software Information (qt-info@nokia.com) ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropevents/main.cpp b/doc/src/snippets/dropevents/main.cpp index d71a9af..351cee4 100644 --- a/doc/src/snippets/dropevents/main.cpp +++ b/doc/src/snippets/dropevents/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropevents/window.cpp b/doc/src/snippets/dropevents/window.cpp index 6db6da9..0a22f20 100644 --- a/doc/src/snippets/dropevents/window.cpp +++ b/doc/src/snippets/dropevents/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/dropevents/window.h b/doc/src/snippets/dropevents/window.h index 4bbec40..c1a4e21 100644 --- a/doc/src/snippets/dropevents/window.h +++ b/doc/src/snippets/dropevents/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/droprectangle/main.cpp b/doc/src/snippets/droprectangle/main.cpp index e10789c..e584f9c 100644 --- a/doc/src/snippets/droprectangle/main.cpp +++ b/doc/src/snippets/droprectangle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/droprectangle/window.cpp b/doc/src/snippets/droprectangle/window.cpp index 22859e8..891e4ed 100644 --- a/doc/src/snippets/droprectangle/window.cpp +++ b/doc/src/snippets/droprectangle/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/droprectangle/window.h b/doc/src/snippets/droprectangle/window.h index 8406a88..d756dcb 100644 --- a/doc/src/snippets/droprectangle/window.h +++ b/doc/src/snippets/droprectangle/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/eventfilters/filterobject.cpp b/doc/src/snippets/eventfilters/filterobject.cpp index 64930da..583d87d 100644 --- a/doc/src/snippets/eventfilters/filterobject.cpp +++ b/doc/src/snippets/eventfilters/filterobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/eventfilters/filterobject.h b/doc/src/snippets/eventfilters/filterobject.h index 5998784..f161854 100644 --- a/doc/src/snippets/eventfilters/filterobject.h +++ b/doc/src/snippets/eventfilters/filterobject.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/eventfilters/main.cpp b/doc/src/snippets/eventfilters/main.cpp index dafddc7..f7fb562 100644 --- a/doc/src/snippets/eventfilters/main.cpp +++ b/doc/src/snippets/eventfilters/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/events/events.cpp b/doc/src/snippets/events/events.cpp index e6045e6..8165015 100644 --- a/doc/src/snippets/events/events.cpp +++ b/doc/src/snippets/events/events.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/explicitlysharedemployee/employee.cpp b/doc/src/snippets/explicitlysharedemployee/employee.cpp index e2476f9..421ac6d 100644 --- a/doc/src/snippets/explicitlysharedemployee/employee.cpp +++ b/doc/src/snippets/explicitlysharedemployee/employee.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/explicitlysharedemployee/employee.h b/doc/src/snippets/explicitlysharedemployee/employee.h index 02ef134..19b4b89 100644 --- a/doc/src/snippets/explicitlysharedemployee/employee.h +++ b/doc/src/snippets/explicitlysharedemployee/employee.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/explicitlysharedemployee/main.cpp b/doc/src/snippets/explicitlysharedemployee/main.cpp index c3222bb..7cd5f08 100644 --- a/doc/src/snippets/explicitlysharedemployee/main.cpp +++ b/doc/src/snippets/explicitlysharedemployee/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/file/file.cpp b/doc/src/snippets/file/file.cpp index c4f59a2..ff8ad38 100644 --- a/doc/src/snippets/file/file.cpp +++ b/doc/src/snippets/file/file.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/fileinfo/main.cpp b/doc/src/snippets/fileinfo/main.cpp index f3bd741..7db7008 100644 --- a/doc/src/snippets/fileinfo/main.cpp +++ b/doc/src/snippets/fileinfo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/graphicssceneadditemsnippet.cpp b/doc/src/snippets/graphicssceneadditemsnippet.cpp index e5ef224..c30438b 100644 --- a/doc/src/snippets/graphicssceneadditemsnippet.cpp +++ b/doc/src/snippets/graphicssceneadditemsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/i18n-non-qt-class/main.cpp b/doc/src/snippets/i18n-non-qt-class/main.cpp index 3f402e1..4c8a1a6 100644 --- a/doc/src/snippets/i18n-non-qt-class/main.cpp +++ b/doc/src/snippets/i18n-non-qt-class/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/i18n-non-qt-class/myclass.cpp b/doc/src/snippets/i18n-non-qt-class/myclass.cpp index 2bbe55f..aef144f 100644 --- a/doc/src/snippets/i18n-non-qt-class/myclass.cpp +++ b/doc/src/snippets/i18n-non-qt-class/myclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/i18n-non-qt-class/myclass.h b/doc/src/snippets/i18n-non-qt-class/myclass.h index 41d580e..d3c3187 100644 --- a/doc/src/snippets/i18n-non-qt-class/myclass.h +++ b/doc/src/snippets/i18n-non-qt-class/myclass.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/image/image.cpp b/doc/src/snippets/image/image.cpp index 75d84f6..2245825 100644 --- a/doc/src/snippets/image/image.cpp +++ b/doc/src/snippets/image/image.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/image/supportedformat.cpp b/doc/src/snippets/image/supportedformat.cpp index 2335a94..43a30ee 100644 --- a/doc/src/snippets/image/supportedformat.cpp +++ b/doc/src/snippets/image/supportedformat.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/inherited-slot/button.cpp b/doc/src/snippets/inherited-slot/button.cpp index bbb3e70..6e5aff8 100644 --- a/doc/src/snippets/inherited-slot/button.cpp +++ b/doc/src/snippets/inherited-slot/button.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/inherited-slot/button.h b/doc/src/snippets/inherited-slot/button.h index 7f43ede..098b3f1 100644 --- a/doc/src/snippets/inherited-slot/button.h +++ b/doc/src/snippets/inherited-slot/button.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/inherited-slot/main.cpp b/doc/src/snippets/inherited-slot/main.cpp index 999328b..0c62789 100644 --- a/doc/src/snippets/inherited-slot/main.cpp +++ b/doc/src/snippets/inherited-slot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/itemselection/main.cpp b/doc/src/snippets/itemselection/main.cpp index a337008..b1b872d 100644 --- a/doc/src/snippets/itemselection/main.cpp +++ b/doc/src/snippets/itemselection/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/itemselection/model.cpp b/doc/src/snippets/itemselection/model.cpp index d4ca02b..b5e0a45 100644 --- a/doc/src/snippets/itemselection/model.cpp +++ b/doc/src/snippets/itemselection/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/itemselection/model.h b/doc/src/snippets/itemselection/model.h index 207f83a..d448990 100644 --- a/doc/src/snippets/itemselection/model.h +++ b/doc/src/snippets/itemselection/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/javastyle.cpp b/doc/src/snippets/javastyle.cpp index ab40aaa..9c2d868 100644 --- a/doc/src/snippets/javastyle.cpp +++ b/doc/src/snippets/javastyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/layouts/layouts.cpp b/doc/src/snippets/layouts/layouts.cpp index 551bfc7..6c4162e 100644 --- a/doc/src/snippets/layouts/layouts.cpp +++ b/doc/src/snippets/layouts/layouts.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/mainwindowsnippet.cpp b/doc/src/snippets/mainwindowsnippet.cpp index ab0401d..2927177 100644 --- a/doc/src/snippets/mainwindowsnippet.cpp +++ b/doc/src/snippets/mainwindowsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/matrix/matrix.cpp b/doc/src/snippets/matrix/matrix.cpp index 1ebbcf2..897bf8e 100644 --- a/doc/src/snippets/matrix/matrix.cpp +++ b/doc/src/snippets/matrix/matrix.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/mdiareasnippets.cpp b/doc/src/snippets/mdiareasnippets.cpp index 3eaa750..7de3cd5 100644 --- a/doc/src/snippets/mdiareasnippets.cpp +++ b/doc/src/snippets/mdiareasnippets.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/moc/main.cpp b/doc/src/snippets/moc/main.cpp index 17188fc..aebcee2 100644 --- a/doc/src/snippets/moc/main.cpp +++ b/doc/src/snippets/moc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/moc/myclass1.h b/doc/src/snippets/moc/myclass1.h index c918b04..7808ac3 100644 --- a/doc/src/snippets/moc/myclass1.h +++ b/doc/src/snippets/moc/myclass1.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/moc/myclass2.h b/doc/src/snippets/moc/myclass2.h index 1dd3bf9..0cbeb5b 100644 --- a/doc/src/snippets/moc/myclass2.h +++ b/doc/src/snippets/moc/myclass2.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/moc/myclass3.h b/doc/src/snippets/moc/myclass3.h index 4ba281c..e7639a8 100644 --- a/doc/src/snippets/moc/myclass3.h +++ b/doc/src/snippets/moc/myclass3.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/main.cpp b/doc/src/snippets/modelview-subclasses/main.cpp index 60ba842..727b663 100644 --- a/doc/src/snippets/modelview-subclasses/main.cpp +++ b/doc/src/snippets/modelview-subclasses/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/model.cpp b/doc/src/snippets/modelview-subclasses/model.cpp index 16518c7..b61d018 100644 --- a/doc/src/snippets/modelview-subclasses/model.cpp +++ b/doc/src/snippets/modelview-subclasses/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/model.h b/doc/src/snippets/modelview-subclasses/model.h index 7965f49..9a98950 100644 --- a/doc/src/snippets/modelview-subclasses/model.h +++ b/doc/src/snippets/modelview-subclasses/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/view.cpp b/doc/src/snippets/modelview-subclasses/view.cpp index 7d683ea..dcde217 100644 --- a/doc/src/snippets/modelview-subclasses/view.cpp +++ b/doc/src/snippets/modelview-subclasses/view.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/view.h b/doc/src/snippets/modelview-subclasses/view.h index d6d64bb..961d7dc 100644 --- a/doc/src/snippets/modelview-subclasses/view.h +++ b/doc/src/snippets/modelview-subclasses/view.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/window.cpp b/doc/src/snippets/modelview-subclasses/window.cpp index d87857d..de2aa07 100644 --- a/doc/src/snippets/modelview-subclasses/window.cpp +++ b/doc/src/snippets/modelview-subclasses/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/modelview-subclasses/window.h b/doc/src/snippets/modelview-subclasses/window.h index b4cead0..62e5a89 100644 --- a/doc/src/snippets/modelview-subclasses/window.h +++ b/doc/src/snippets/modelview-subclasses/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/myscrollarea.cpp b/doc/src/snippets/myscrollarea.cpp index 6cb1233..75abb77 100644 --- a/doc/src/snippets/myscrollarea.cpp +++ b/doc/src/snippets/myscrollarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/network/tcpwait.cpp b/doc/src/snippets/network/tcpwait.cpp index fa18d23..cf13801 100644 --- a/doc/src/snippets/network/tcpwait.cpp +++ b/doc/src/snippets/network/tcpwait.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/painterpath/painterpath.cpp b/doc/src/snippets/painterpath/painterpath.cpp index ad4f623..91563c9 100644 --- a/doc/src/snippets/painterpath/painterpath.cpp +++ b/doc/src/snippets/painterpath/painterpath.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/persistentindexes/main.cpp b/doc/src/snippets/persistentindexes/main.cpp index eeca8ac..0dff4b8 100644 --- a/doc/src/snippets/persistentindexes/main.cpp +++ b/doc/src/snippets/persistentindexes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/persistentindexes/mainwindow.cpp b/doc/src/snippets/persistentindexes/mainwindow.cpp index 594881a..bbc7971 100644 --- a/doc/src/snippets/persistentindexes/mainwindow.cpp +++ b/doc/src/snippets/persistentindexes/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/persistentindexes/mainwindow.h b/doc/src/snippets/persistentindexes/mainwindow.h index e0672d5..4474d2c 100644 --- a/doc/src/snippets/persistentindexes/mainwindow.h +++ b/doc/src/snippets/persistentindexes/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/persistentindexes/model.cpp b/doc/src/snippets/persistentindexes/model.cpp index 7158f34..f6c83ff 100644 --- a/doc/src/snippets/persistentindexes/model.cpp +++ b/doc/src/snippets/persistentindexes/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/persistentindexes/model.h b/doc/src/snippets/persistentindexes/model.h index c787c36..0a26aef 100644 --- a/doc/src/snippets/persistentindexes/model.h +++ b/doc/src/snippets/persistentindexes/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/phonon.cpp b/doc/src/snippets/phonon.cpp index e50eabd..23af9e9 100644 --- a/doc/src/snippets/phonon.cpp +++ b/doc/src/snippets/phonon.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp index 07cedbf..4fe2bc4 100644 --- a/doc/src/snippets/picture/picture.cpp +++ b/doc/src/snippets/picture/picture.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/plaintextlayout/main.cpp b/doc/src/snippets/plaintextlayout/main.cpp index 41713dd..40e49ff 100644 --- a/doc/src/snippets/plaintextlayout/main.cpp +++ b/doc/src/snippets/plaintextlayout/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/plaintextlayout/window.cpp b/doc/src/snippets/plaintextlayout/window.cpp index 0e91dc1..d3aea6c 100644 --- a/doc/src/snippets/plaintextlayout/window.cpp +++ b/doc/src/snippets/plaintextlayout/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/plaintextlayout/window.h b/doc/src/snippets/plaintextlayout/window.h index 291250e..7fb419d 100644 --- a/doc/src/snippets/plaintextlayout/window.h +++ b/doc/src/snippets/plaintextlayout/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/pointer/pointer.cpp b/doc/src/snippets/pointer/pointer.cpp index 1be5ef0..81dbc5b 100644 --- a/doc/src/snippets/pointer/pointer.cpp +++ b/doc/src/snippets/pointer/pointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/polygon/polygon.cpp b/doc/src/snippets/polygon/polygon.cpp index b95ac37..0f78522 100644 --- a/doc/src/snippets/polygon/polygon.cpp +++ b/doc/src/snippets/polygon/polygon.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/porting4-dropevents/main.cpp b/doc/src/snippets/porting4-dropevents/main.cpp index a54e0b7..53c3e7d 100644 --- a/doc/src/snippets/porting4-dropevents/main.cpp +++ b/doc/src/snippets/porting4-dropevents/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/porting4-dropevents/window.cpp b/doc/src/snippets/porting4-dropevents/window.cpp index 853687a..b0debc5 100644 --- a/doc/src/snippets/porting4-dropevents/window.cpp +++ b/doc/src/snippets/porting4-dropevents/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/porting4-dropevents/window.h b/doc/src/snippets/porting4-dropevents/window.h index 4aebb8c..97fd21a 100644 --- a/doc/src/snippets/porting4-dropevents/window.h +++ b/doc/src/snippets/porting4-dropevents/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/printing-qprinter/main.cpp b/doc/src/snippets/printing-qprinter/main.cpp index 2289ae4..847dc4a 100644 --- a/doc/src/snippets/printing-qprinter/main.cpp +++ b/doc/src/snippets/printing-qprinter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/printing-qprinter/object.cpp b/doc/src/snippets/printing-qprinter/object.cpp index e6bab28..25bf17d 100644 --- a/doc/src/snippets/printing-qprinter/object.cpp +++ b/doc/src/snippets/printing-qprinter/object.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/printing-qprinter/object.h b/doc/src/snippets/printing-qprinter/object.h index 3f5021e..d55e815 100644 --- a/doc/src/snippets/printing-qprinter/object.h +++ b/doc/src/snippets/printing-qprinter/object.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/process/process.cpp b/doc/src/snippets/process/process.cpp index 2d6ce10..6b2704a 100644 --- a/doc/src/snippets/process/process.cpp +++ b/doc/src/snippets/process/process.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp index b545c1d..c5fe549 100644 --- a/doc/src/snippets/qabstractsliderisnippet.cpp +++ b/doc/src/snippets/qabstractsliderisnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qcalendarwidget/main.cpp b/doc/src/snippets/qcalendarwidget/main.cpp index b1dfaa5..1b17b5c 100644 --- a/doc/src/snippets/qcalendarwidget/main.cpp +++ b/doc/src/snippets/qcalendarwidget/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qcolumnview/main.cpp b/doc/src/snippets/qcolumnview/main.cpp index e882b4f..f610e31 100644 --- a/doc/src/snippets/qcolumnview/main.cpp +++ b/doc/src/snippets/qcolumnview/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp b/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp index 7a27ce0..a19a7f0 100644 --- a/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp +++ b/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qdebug/qdebugsnippet.cpp b/doc/src/snippets/qdebug/qdebugsnippet.cpp index b713f21..0ffc999 100644 --- a/doc/src/snippets/qdebug/qdebugsnippet.cpp +++ b/doc/src/snippets/qdebug/qdebugsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qdir-filepaths/main.cpp b/doc/src/snippets/qdir-filepaths/main.cpp index b8a348c..47e0954 100644 --- a/doc/src/snippets/qdir-filepaths/main.cpp +++ b/doc/src/snippets/qdir-filepaths/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qdir-listfiles/main.cpp b/doc/src/snippets/qdir-listfiles/main.cpp index 003ca28..fe24412 100644 --- a/doc/src/snippets/qdir-listfiles/main.cpp +++ b/doc/src/snippets/qdir-listfiles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qdir-namefilters/main.cpp b/doc/src/snippets/qdir-namefilters/main.cpp index acaf8a5..7576203 100644 --- a/doc/src/snippets/qdir-namefilters/main.cpp +++ b/doc/src/snippets/qdir-namefilters/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qfontdatabase/main.cpp b/doc/src/snippets/qfontdatabase/main.cpp index 4c2cace..a034902 100644 --- a/doc/src/snippets/qfontdatabase/main.cpp +++ b/doc/src/snippets/qfontdatabase/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qgl-namespace/main.cpp b/doc/src/snippets/qgl-namespace/main.cpp index 45392f7..e99b66f 100644 --- a/doc/src/snippets/qgl-namespace/main.cpp +++ b/doc/src/snippets/qgl-namespace/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlabel/main.cpp b/doc/src/snippets/qlabel/main.cpp index 9d53af9..a482d6e 100644 --- a/doc/src/snippets/qlabel/main.cpp +++ b/doc/src/snippets/qlabel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlineargradient/main.cpp b/doc/src/snippets/qlineargradient/main.cpp index 69384c4..1b90d5c 100644 --- a/doc/src/snippets/qlineargradient/main.cpp +++ b/doc/src/snippets/qlineargradient/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlineargradient/paintwidget.cpp b/doc/src/snippets/qlineargradient/paintwidget.cpp index 79d77c6..3f4a4b0 100644 --- a/doc/src/snippets/qlineargradient/paintwidget.cpp +++ b/doc/src/snippets/qlineargradient/paintwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlineargradient/paintwidget.h b/doc/src/snippets/qlineargradient/paintwidget.h index 642f1c3..63d4a63 100644 --- a/doc/src/snippets/qlineargradient/paintwidget.h +++ b/doc/src/snippets/qlineargradient/paintwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-dnd/main.cpp b/doc/src/snippets/qlistview-dnd/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qlistview-dnd/main.cpp +++ b/doc/src/snippets/qlistview-dnd/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-dnd/mainwindow.cpp b/doc/src/snippets/qlistview-dnd/mainwindow.cpp index 99f9069..d14b337 100644 --- a/doc/src/snippets/qlistview-dnd/mainwindow.cpp +++ b/doc/src/snippets/qlistview-dnd/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-dnd/mainwindow.h b/doc/src/snippets/qlistview-dnd/mainwindow.h index 44477f6..c63b057 100644 --- a/doc/src/snippets/qlistview-dnd/mainwindow.h +++ b/doc/src/snippets/qlistview-dnd/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-dnd/model.cpp b/doc/src/snippets/qlistview-dnd/model.cpp index b8182b7..0609ea9 100644 --- a/doc/src/snippets/qlistview-dnd/model.cpp +++ b/doc/src/snippets/qlistview-dnd/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-dnd/model.h b/doc/src/snippets/qlistview-dnd/model.h index 60c8408..1da02f5 100644 --- a/doc/src/snippets/qlistview-dnd/model.h +++ b/doc/src/snippets/qlistview-dnd/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-using/main.cpp b/doc/src/snippets/qlistview-using/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qlistview-using/main.cpp +++ b/doc/src/snippets/qlistview-using/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-using/mainwindow.cpp b/doc/src/snippets/qlistview-using/mainwindow.cpp index 0573d43..c292367 100644 --- a/doc/src/snippets/qlistview-using/mainwindow.cpp +++ b/doc/src/snippets/qlistview-using/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-using/mainwindow.h b/doc/src/snippets/qlistview-using/mainwindow.h index a0c2f17..71ed160 100644 --- a/doc/src/snippets/qlistview-using/mainwindow.h +++ b/doc/src/snippets/qlistview-using/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-using/model.cpp b/doc/src/snippets/qlistview-using/model.cpp index e54ed56..c8f0502 100644 --- a/doc/src/snippets/qlistview-using/model.cpp +++ b/doc/src/snippets/qlistview-using/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistview-using/model.h b/doc/src/snippets/qlistview-using/model.h index a0bde47..084779e 100644 --- a/doc/src/snippets/qlistview-using/model.h +++ b/doc/src/snippets/qlistview-using/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-dnd/main.cpp b/doc/src/snippets/qlistwidget-dnd/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qlistwidget-dnd/main.cpp +++ b/doc/src/snippets/qlistwidget-dnd/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp b/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp index 30a42f9..235f954 100644 --- a/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp +++ b/doc/src/snippets/qlistwidget-dnd/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-dnd/mainwindow.h b/doc/src/snippets/qlistwidget-dnd/mainwindow.h index 5f763e2..9439d81 100644 --- a/doc/src/snippets/qlistwidget-dnd/mainwindow.h +++ b/doc/src/snippets/qlistwidget-dnd/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-using/main.cpp b/doc/src/snippets/qlistwidget-using/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qlistwidget-using/main.cpp +++ b/doc/src/snippets/qlistwidget-using/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.cpp b/doc/src/snippets/qlistwidget-using/mainwindow.cpp index bf5fe0b..2839c78 100644 --- a/doc/src/snippets/qlistwidget-using/mainwindow.cpp +++ b/doc/src/snippets/qlistwidget-using/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.h b/doc/src/snippets/qlistwidget-using/mainwindow.h index 64c4765..05ca5d3 100644 --- a/doc/src/snippets/qlistwidget-using/mainwindow.h +++ b/doc/src/snippets/qlistwidget-using/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/delegate.h b/doc/src/snippets/qmake/delegate.h index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/delegate.h +++ b/doc/src/snippets/qmake/delegate.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/main.cpp b/doc/src/snippets/qmake/main.cpp index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/main.cpp +++ b/doc/src/snippets/qmake/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/model.cpp b/doc/src/snippets/qmake/model.cpp index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/model.cpp +++ b/doc/src/snippets/qmake/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/model.h b/doc/src/snippets/qmake/model.h index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/model.h +++ b/doc/src/snippets/qmake/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/paintwidget_mac.cpp b/doc/src/snippets/qmake/paintwidget_mac.cpp index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/paintwidget_mac.cpp +++ b/doc/src/snippets/qmake/paintwidget_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/paintwidget_unix.cpp b/doc/src/snippets/qmake/paintwidget_unix.cpp index ada3e52..a931af4 100644 --- a/doc/src/snippets/qmake/paintwidget_unix.cpp +++ b/doc/src/snippets/qmake/paintwidget_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/paintwidget_win.cpp b/doc/src/snippets/qmake/paintwidget_win.cpp index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/paintwidget_win.cpp +++ b/doc/src/snippets/qmake/paintwidget_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmake/view.h b/doc/src/snippets/qmake/view.h index d9f14fe..f5765d2 100644 --- a/doc/src/snippets/qmake/view.h +++ b/doc/src/snippets/qmake/view.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmetaobject-invokable/main.cpp b/doc/src/snippets/qmetaobject-invokable/main.cpp index dfd7e4d..27bfeff 100644 --- a/doc/src/snippets/qmetaobject-invokable/main.cpp +++ b/doc/src/snippets/qmetaobject-invokable/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmetaobject-invokable/window.cpp b/doc/src/snippets/qmetaobject-invokable/window.cpp index c676708..122a7a5 100644 --- a/doc/src/snippets/qmetaobject-invokable/window.cpp +++ b/doc/src/snippets/qmetaobject-invokable/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qmetaobject-invokable/window.h b/doc/src/snippets/qmetaobject-invokable/window.h index 2fd833a..06370fc 100644 --- a/doc/src/snippets/qmetaobject-invokable/window.h +++ b/doc/src/snippets/qmetaobject-invokable/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qprocess-environment/main.cpp b/doc/src/snippets/qprocess-environment/main.cpp index bce3578..c054449 100644 --- a/doc/src/snippets/qprocess-environment/main.cpp +++ b/doc/src/snippets/qprocess-environment/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp b/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp index 4d4eda7..0e30e96 100644 --- a/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp +++ b/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsignalmapper/buttonwidget.cpp b/doc/src/snippets/qsignalmapper/buttonwidget.cpp index ae92b3a..d339010 100644 --- a/doc/src/snippets/qsignalmapper/buttonwidget.cpp +++ b/doc/src/snippets/qsignalmapper/buttonwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsignalmapper/buttonwidget.h b/doc/src/snippets/qsignalmapper/buttonwidget.h index 652f414..74aff2c 100644 --- a/doc/src/snippets/qsignalmapper/buttonwidget.h +++ b/doc/src/snippets/qsignalmapper/buttonwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsignalmapper/main.cpp b/doc/src/snippets/qsignalmapper/main.cpp index 39fdbd2..ce04578 100644 --- a/doc/src/snippets/qsignalmapper/main.cpp +++ b/doc/src/snippets/qsignalmapper/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsignalmapper/mainwindow.h b/doc/src/snippets/qsignalmapper/mainwindow.h index b8f5376..e3ea6c1 100644 --- a/doc/src/snippets/qsignalmapper/mainwindow.h +++ b/doc/src/snippets/qsignalmapper/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsortfilterproxymodel-details/main.cpp b/doc/src/snippets/qsortfilterproxymodel-details/main.cpp index 6952499..ca71256 100644 --- a/doc/src/snippets/qsortfilterproxymodel-details/main.cpp +++ b/doc/src/snippets/qsortfilterproxymodel-details/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsortfilterproxymodel/main.cpp b/doc/src/snippets/qsortfilterproxymodel/main.cpp index a587bcb..bba7b4a 100644 --- a/doc/src/snippets/qsortfilterproxymodel/main.cpp +++ b/doc/src/snippets/qsortfilterproxymodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsplashscreen/main.cpp b/doc/src/snippets/qsplashscreen/main.cpp index 6a66349..260eddf 100644 --- a/doc/src/snippets/qsplashscreen/main.cpp +++ b/doc/src/snippets/qsplashscreen/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsplashscreen/mainwindow.cpp b/doc/src/snippets/qsplashscreen/mainwindow.cpp index a26ab62..e456fda 100644 --- a/doc/src/snippets/qsplashscreen/mainwindow.cpp +++ b/doc/src/snippets/qsplashscreen/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsplashscreen/mainwindow.h b/doc/src/snippets/qsplashscreen/mainwindow.h index e77322e..3430829 100644 --- a/doc/src/snippets/qsplashscreen/mainwindow.h +++ b/doc/src/snippets/qsplashscreen/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsql-namespace/main.cpp b/doc/src/snippets/qsql-namespace/main.cpp index 9ed2b4d..ba48632 100644 --- a/doc/src/snippets/qsql-namespace/main.cpp +++ b/doc/src/snippets/qsql-namespace/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstack/main.cpp b/doc/src/snippets/qstack/main.cpp index 6fa0a41..51fc245 100644 --- a/doc/src/snippets/qstack/main.cpp +++ b/doc/src/snippets/qstack/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstackedlayout/main.cpp b/doc/src/snippets/qstackedlayout/main.cpp index 94ff644..f35880f 100644 --- a/doc/src/snippets/qstackedlayout/main.cpp +++ b/doc/src/snippets/qstackedlayout/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstackedwidget/main.cpp b/doc/src/snippets/qstackedwidget/main.cpp index 301c06d..9502bbf 100644 --- a/doc/src/snippets/qstackedwidget/main.cpp +++ b/doc/src/snippets/qstackedwidget/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstandarditemmodel/main.cpp b/doc/src/snippets/qstandarditemmodel/main.cpp index 1d9696e..0f28a92 100644 --- a/doc/src/snippets/qstandarditemmodel/main.cpp +++ b/doc/src/snippets/qstandarditemmodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstatustipevent/main.cpp b/doc/src/snippets/qstatustipevent/main.cpp index e1d971b..4775a76 100644 --- a/doc/src/snippets/qstatustipevent/main.cpp +++ b/doc/src/snippets/qstatustipevent/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp index 150044b..38c4dd8 100644 --- a/doc/src/snippets/qstring/main.cpp +++ b/doc/src/snippets/qstring/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstringlist/main.cpp b/doc/src/snippets/qstringlist/main.cpp index b0def5b..c48b94a 100644 --- a/doc/src/snippets/qstringlist/main.cpp +++ b/doc/src/snippets/qstringlist/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstringlistmodel/main.cpp b/doc/src/snippets/qstringlistmodel/main.cpp index 020dd8c1..dce31be 100644 --- a/doc/src/snippets/qstringlistmodel/main.cpp +++ b/doc/src/snippets/qstringlistmodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstyleoption/main.cpp b/doc/src/snippets/qstyleoption/main.cpp index f7b21a1..697c382 100644 --- a/doc/src/snippets/qstyleoption/main.cpp +++ b/doc/src/snippets/qstyleoption/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qstyleplugin/main.cpp b/doc/src/snippets/qstyleplugin/main.cpp index 04584b4..50bf003 100644 --- a/doc/src/snippets/qstyleplugin/main.cpp +++ b/doc/src/snippets/qstyleplugin/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qsvgwidget/main.cpp b/doc/src/snippets/qsvgwidget/main.cpp index b0ab95e..41e1c19 100644 --- a/doc/src/snippets/qsvgwidget/main.cpp +++ b/doc/src/snippets/qsvgwidget/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qt-namespace/main.cpp b/doc/src/snippets/qt-namespace/main.cpp index 5b3d422..0e12f0c 100644 --- a/doc/src/snippets/qt-namespace/main.cpp +++ b/doc/src/snippets/qt-namespace/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-dnd/main.cpp b/doc/src/snippets/qtablewidget-dnd/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtablewidget-dnd/main.cpp +++ b/doc/src/snippets/qtablewidget-dnd/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp index 3b8f359..60cf8dd 100644 --- a/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp +++ b/doc/src/snippets/qtablewidget-dnd/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-dnd/mainwindow.h b/doc/src/snippets/qtablewidget-dnd/mainwindow.h index 5c955a7..d12eab9 100644 --- a/doc/src/snippets/qtablewidget-dnd/mainwindow.h +++ b/doc/src/snippets/qtablewidget-dnd/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-resizing/main.cpp b/doc/src/snippets/qtablewidget-resizing/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtablewidget-resizing/main.cpp +++ b/doc/src/snippets/qtablewidget-resizing/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp b/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp index 7920998..2eb03f2 100644 --- a/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp +++ b/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-resizing/mainwindow.h b/doc/src/snippets/qtablewidget-resizing/mainwindow.h index 5472372..ec933fb 100644 --- a/doc/src/snippets/qtablewidget-resizing/mainwindow.h +++ b/doc/src/snippets/qtablewidget-resizing/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-using/main.cpp b/doc/src/snippets/qtablewidget-using/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtablewidget-using/main.cpp +++ b/doc/src/snippets/qtablewidget-using/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-using/mainwindow.cpp b/doc/src/snippets/qtablewidget-using/mainwindow.cpp index b16ef70..c98573f 100644 --- a/doc/src/snippets/qtablewidget-using/mainwindow.cpp +++ b/doc/src/snippets/qtablewidget-using/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtablewidget-using/mainwindow.h b/doc/src/snippets/qtablewidget-using/mainwindow.h index fb18e33..6073f51 100644 --- a/doc/src/snippets/qtablewidget-using/mainwindow.h +++ b/doc/src/snippets/qtablewidget-using/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtcast/qtcast.cpp b/doc/src/snippets/qtcast/qtcast.cpp index 2294bb7..f77e31d 100644 --- a/doc/src/snippets/qtcast/qtcast.cpp +++ b/doc/src/snippets/qtcast/qtcast.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtcast/qtcast.h b/doc/src/snippets/qtcast/qtcast.h index ee43b14..e08a36e 100644 --- a/doc/src/snippets/qtcast/qtcast.h +++ b/doc/src/snippets/qtcast/qtcast.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtest-namespace/main.cpp b/doc/src/snippets/qtest-namespace/main.cpp index 51d6560..1cf09da 100644 --- a/doc/src/snippets/qtest-namespace/main.cpp +++ b/doc/src/snippets/qtest-namespace/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp index a02f373..acd9ba2 100644 --- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp +++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.h b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h index b8cef91..a5a5a94 100644 --- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.h +++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/main.cpp b/doc/src/snippets/qtreeview-dnd/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtreeview-dnd/main.cpp +++ b/doc/src/snippets/qtreeview-dnd/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.cpp b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp index f98333f..6e97905 100644 --- a/doc/src/snippets/qtreeview-dnd/mainwindow.cpp +++ b/doc/src/snippets/qtreeview-dnd/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/mainwindow.h b/doc/src/snippets/qtreeview-dnd/mainwindow.h index ca0d947..2b9f60e 100644 --- a/doc/src/snippets/qtreeview-dnd/mainwindow.h +++ b/doc/src/snippets/qtreeview-dnd/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.cpp b/doc/src/snippets/qtreeview-dnd/treeitem.cpp index 99ce09a..e8442fa 100644 --- a/doc/src/snippets/qtreeview-dnd/treeitem.cpp +++ b/doc/src/snippets/qtreeview-dnd/treeitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/treeitem.h b/doc/src/snippets/qtreeview-dnd/treeitem.h index 84116ba..f14e704 100644 --- a/doc/src/snippets/qtreeview-dnd/treeitem.h +++ b/doc/src/snippets/qtreeview-dnd/treeitem.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.cpp b/doc/src/snippets/qtreeview-dnd/treemodel.cpp index 0fd0682..476f50e 100644 --- a/doc/src/snippets/qtreeview-dnd/treemodel.cpp +++ b/doc/src/snippets/qtreeview-dnd/treemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreeview-dnd/treemodel.h b/doc/src/snippets/qtreeview-dnd/treemodel.h index e0a45b3..cb249c0 100644 --- a/doc/src/snippets/qtreeview-dnd/treemodel.h +++ b/doc/src/snippets/qtreeview-dnd/treemodel.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidget-using/main.cpp b/doc/src/snippets/qtreewidget-using/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtreewidget-using/main.cpp +++ b/doc/src/snippets/qtreewidget-using/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidget-using/mainwindow.cpp b/doc/src/snippets/qtreewidget-using/mainwindow.cpp index 68ab54b..490be79 100644 --- a/doc/src/snippets/qtreewidget-using/mainwindow.cpp +++ b/doc/src/snippets/qtreewidget-using/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidget-using/mainwindow.h b/doc/src/snippets/qtreewidget-using/mainwindow.h index 4ffb9f3..a7927e3 100644 --- a/doc/src/snippets/qtreewidget-using/mainwindow.h +++ b/doc/src/snippets/qtreewidget-using/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp b/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp index 19c7c20..4a7670d 100644 --- a/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp +++ b/doc/src/snippets/qtreewidgetitemiterator-using/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp index d3f3c39..faf09365 100644 --- a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp +++ b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h index 4ffb9f3..a7927e3 100644 --- a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h +++ b/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/evaluation/main.cpp b/doc/src/snippets/qtscript/evaluation/main.cpp index a80ef7e..dbd916a 100644 --- a/doc/src/snippets/qtscript/evaluation/main.cpp +++ b/doc/src/snippets/qtscript/evaluation/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/registeringobjects/main.cpp b/doc/src/snippets/qtscript/registeringobjects/main.cpp index 88f37b6..c47b824 100644 --- a/doc/src/snippets/qtscript/registeringobjects/main.cpp +++ b/doc/src/snippets/qtscript/registeringobjects/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/registeringobjects/myobject.cpp b/doc/src/snippets/qtscript/registeringobjects/myobject.cpp index ac3ed68..3308879 100644 --- a/doc/src/snippets/qtscript/registeringobjects/myobject.cpp +++ b/doc/src/snippets/qtscript/registeringobjects/myobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/registeringobjects/myobject.h b/doc/src/snippets/qtscript/registeringobjects/myobject.h index 82706c3..2736862 100644 --- a/doc/src/snippets/qtscript/registeringobjects/myobject.h +++ b/doc/src/snippets/qtscript/registeringobjects/myobject.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/registeringvalues/main.cpp b/doc/src/snippets/qtscript/registeringvalues/main.cpp index d9c9c74..81d7e0f 100644 --- a/doc/src/snippets/qtscript/registeringvalues/main.cpp +++ b/doc/src/snippets/qtscript/registeringvalues/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qtscript/scriptedslot/main.cpp b/doc/src/snippets/qtscript/scriptedslot/main.cpp index a84a802..ddc68ae 100644 --- a/doc/src/snippets/qtscript/scriptedslot/main.cpp +++ b/doc/src/snippets/qtscript/scriptedslot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/quiloader/main.cpp b/doc/src/snippets/quiloader/main.cpp index fadf1d4..6652f66 100644 --- a/doc/src/snippets/quiloader/main.cpp +++ b/doc/src/snippets/quiloader/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/quiloader/mywidget.cpp b/doc/src/snippets/quiloader/mywidget.cpp index f01d26f..9778a67 100644 --- a/doc/src/snippets/quiloader/mywidget.cpp +++ b/doc/src/snippets/quiloader/mywidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/quiloader/mywidget.h b/doc/src/snippets/quiloader/mywidget.h index dd998bd..ca8fe41 100644 --- a/doc/src/snippets/quiloader/mywidget.h +++ b/doc/src/snippets/quiloader/mywidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qx11embedcontainer/main.cpp b/doc/src/snippets/qx11embedcontainer/main.cpp index 3fbab39..2f91dab 100644 --- a/doc/src/snippets/qx11embedcontainer/main.cpp +++ b/doc/src/snippets/qx11embedcontainer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qx11embedwidget/embedwidget.cpp b/doc/src/snippets/qx11embedwidget/embedwidget.cpp index e3ea1c9..1076c52 100644 --- a/doc/src/snippets/qx11embedwidget/embedwidget.cpp +++ b/doc/src/snippets/qx11embedwidget/embedwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qx11embedwidget/embedwidget.h b/doc/src/snippets/qx11embedwidget/embedwidget.h index 0391a9d..e3248c5 100644 --- a/doc/src/snippets/qx11embedwidget/embedwidget.h +++ b/doc/src/snippets/qx11embedwidget/embedwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qx11embedwidget/main.cpp b/doc/src/snippets/qx11embedwidget/main.cpp index 9801ae6..21ba658 100644 --- a/doc/src/snippets/qx11embedwidget/main.cpp +++ b/doc/src/snippets/qx11embedwidget/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/qxmlstreamwriter/main.cpp b/doc/src/snippets/qxmlstreamwriter/main.cpp index a0e7010..5f4a1cc 100644 --- a/doc/src/snippets/qxmlstreamwriter/main.cpp +++ b/doc/src/snippets/qxmlstreamwriter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/reading-selections/main.cpp b/doc/src/snippets/reading-selections/main.cpp index d8d5943..85576e9 100644 --- a/doc/src/snippets/reading-selections/main.cpp +++ b/doc/src/snippets/reading-selections/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/reading-selections/model.cpp b/doc/src/snippets/reading-selections/model.cpp index 7ac48c5..16eff23 100644 --- a/doc/src/snippets/reading-selections/model.cpp +++ b/doc/src/snippets/reading-selections/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/reading-selections/model.h b/doc/src/snippets/reading-selections/model.h index 207f83a..d448990 100644 --- a/doc/src/snippets/reading-selections/model.h +++ b/doc/src/snippets/reading-selections/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/reading-selections/window.cpp b/doc/src/snippets/reading-selections/window.cpp index acf5096..9604aa4 100644 --- a/doc/src/snippets/reading-selections/window.cpp +++ b/doc/src/snippets/reading-selections/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/reading-selections/window.h b/doc/src/snippets/reading-selections/window.h index 02b2e5d..8014c21 100644 --- a/doc/src/snippets/reading-selections/window.h +++ b/doc/src/snippets/reading-selections/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/scribe-overview/main.cpp b/doc/src/snippets/scribe-overview/main.cpp index b38b1d3..7be596a 100644 --- a/doc/src/snippets/scribe-overview/main.cpp +++ b/doc/src/snippets/scribe-overview/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/finalwidget.cpp b/doc/src/snippets/separations/finalwidget.cpp index c6b103a..8782b5e 100644 --- a/doc/src/snippets/separations/finalwidget.cpp +++ b/doc/src/snippets/separations/finalwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/finalwidget.h b/doc/src/snippets/separations/finalwidget.h index df45fcc..89d11e4 100644 --- a/doc/src/snippets/separations/finalwidget.h +++ b/doc/src/snippets/separations/finalwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/main.cpp b/doc/src/snippets/separations/main.cpp index 0a859c2..4955c21 100644 --- a/doc/src/snippets/separations/main.cpp +++ b/doc/src/snippets/separations/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/screenwidget.cpp b/doc/src/snippets/separations/screenwidget.cpp index daa276b..9d792e0 100644 --- a/doc/src/snippets/separations/screenwidget.cpp +++ b/doc/src/snippets/separations/screenwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/screenwidget.h b/doc/src/snippets/separations/screenwidget.h index 3371028..d876db5 100644 --- a/doc/src/snippets/separations/screenwidget.h +++ b/doc/src/snippets/separations/screenwidget.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/separations.qdoc b/doc/src/snippets/separations/separations.qdoc index 5091352..ea16f05 100644 --- a/doc/src/snippets/separations/separations.qdoc +++ b/doc/src/snippets/separations/separations.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/viewer.cpp b/doc/src/snippets/separations/viewer.cpp index f33be69..6cbe674 100644 --- a/doc/src/snippets/separations/viewer.cpp +++ b/doc/src/snippets/separations/viewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/separations/viewer.h b/doc/src/snippets/separations/viewer.h index 148f081..eb39383 100644 --- a/doc/src/snippets/separations/viewer.h +++ b/doc/src/snippets/separations/viewer.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/settings/settings.cpp b/doc/src/snippets/settings/settings.cpp index b1b8a03..5d7e51b 100644 --- a/doc/src/snippets/settings/settings.cpp +++ b/doc/src/snippets/settings/settings.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/shareddirmodel/main.cpp b/doc/src/snippets/shareddirmodel/main.cpp index 6390521..1ca9211 100644 --- a/doc/src/snippets/shareddirmodel/main.cpp +++ b/doc/src/snippets/shareddirmodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedemployee/employee.cpp b/doc/src/snippets/sharedemployee/employee.cpp index 41ba922..da4cf1c 100644 --- a/doc/src/snippets/sharedemployee/employee.cpp +++ b/doc/src/snippets/sharedemployee/employee.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h index 22fae8b..e63fcfa 100644 --- a/doc/src/snippets/sharedemployee/employee.h +++ b/doc/src/snippets/sharedemployee/employee.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedemployee/main.cpp b/doc/src/snippets/sharedemployee/main.cpp index 9e12116..19d4258 100644 --- a/doc/src/snippets/sharedemployee/main.cpp +++ b/doc/src/snippets/sharedemployee/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedtablemodel/main.cpp b/doc/src/snippets/sharedtablemodel/main.cpp index d333575..f7d7996 100644 --- a/doc/src/snippets/sharedtablemodel/main.cpp +++ b/doc/src/snippets/sharedtablemodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedtablemodel/model.cpp b/doc/src/snippets/sharedtablemodel/model.cpp index ad7d2ed..8cdc14c 100644 --- a/doc/src/snippets/sharedtablemodel/model.cpp +++ b/doc/src/snippets/sharedtablemodel/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sharedtablemodel/model.h b/doc/src/snippets/sharedtablemodel/model.h index 207f83a..d448990 100644 --- a/doc/src/snippets/sharedtablemodel/model.h +++ b/doc/src/snippets/sharedtablemodel/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/signalsandslots/lcdnumber.cpp b/doc/src/snippets/signalsandslots/lcdnumber.cpp index 2374992..23afa4d 100644 --- a/doc/src/snippets/signalsandslots/lcdnumber.cpp +++ b/doc/src/snippets/signalsandslots/lcdnumber.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/signalsandslots/lcdnumber.h b/doc/src/snippets/signalsandslots/lcdnumber.h index b1d5f50..2ed75dd 100644 --- a/doc/src/snippets/signalsandslots/lcdnumber.h +++ b/doc/src/snippets/signalsandslots/lcdnumber.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/signalsandslots/signalsandslots.cpp b/doc/src/snippets/signalsandslots/signalsandslots.cpp index a8f3a01..4e17ae6 100644 --- a/doc/src/snippets/signalsandslots/signalsandslots.cpp +++ b/doc/src/snippets/signalsandslots/signalsandslots.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/signalsandslots/signalsandslots.h b/doc/src/snippets/signalsandslots/signalsandslots.h index 25d8984..be9f825 100644 --- a/doc/src/snippets/signalsandslots/signalsandslots.h +++ b/doc/src/snippets/signalsandslots/signalsandslots.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/simplemodel-use/main.cpp b/doc/src/snippets/simplemodel-use/main.cpp index acb680d..4f21665 100644 --- a/doc/src/snippets/simplemodel-use/main.cpp +++ b/doc/src/snippets/simplemodel-use/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/splitter/splitter.cpp b/doc/src/snippets/splitter/splitter.cpp index 8584b62..825df95 100644 --- a/doc/src/snippets/splitter/splitter.cpp +++ b/doc/src/snippets/splitter/splitter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/splitterhandle/main.cpp b/doc/src/snippets/splitterhandle/main.cpp index 3f4e7ec..dd29a47 100644 --- a/doc/src/snippets/splitterhandle/main.cpp +++ b/doc/src/snippets/splitterhandle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/splitterhandle/splitter.cpp b/doc/src/snippets/splitterhandle/splitter.cpp index 192dc79..7034f99 100644 --- a/doc/src/snippets/splitterhandle/splitter.cpp +++ b/doc/src/snippets/splitterhandle/splitter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/splitterhandle/splitter.h b/doc/src/snippets/splitterhandle/splitter.h index f9cb1a4..c01de09 100644 --- a/doc/src/snippets/splitterhandle/splitter.h +++ b/doc/src/snippets/splitterhandle/splitter.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/src/snippets/sqldatabase/sqldatabase.cpp index ae176ac..fd259ce 100644 --- a/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/streaming/main.cpp b/doc/src/snippets/streaming/main.cpp index 7ea53de..4f19ad2 100644 --- a/doc/src/snippets/streaming/main.cpp +++ b/doc/src/snippets/streaming/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/stringlistmodel/main.cpp b/doc/src/snippets/stringlistmodel/main.cpp index 383acc6..50d07b0 100644 --- a/doc/src/snippets/stringlistmodel/main.cpp +++ b/doc/src/snippets/stringlistmodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/stringlistmodel/model.cpp b/doc/src/snippets/stringlistmodel/model.cpp index 8f681cc..6388b25 100644 --- a/doc/src/snippets/stringlistmodel/model.cpp +++ b/doc/src/snippets/stringlistmodel/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/stringlistmodel/model.h b/doc/src/snippets/stringlistmodel/model.h index 8e8f9c6..6501dc7 100644 --- a/doc/src/snippets/stringlistmodel/model.h +++ b/doc/src/snippets/stringlistmodel/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/styles/styles.cpp b/doc/src/snippets/styles/styles.cpp index f411c0c..0e800eb 100644 --- a/doc/src/snippets/styles/styles.cpp +++ b/doc/src/snippets/styles/styles.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-formats/main.cpp b/doc/src/snippets/textblock-formats/main.cpp index 6d84a40..1c527ef 100644 --- a/doc/src/snippets/textblock-formats/main.cpp +++ b/doc/src/snippets/textblock-formats/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-fragments/main.cpp b/doc/src/snippets/textblock-fragments/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textblock-fragments/main.cpp +++ b/doc/src/snippets/textblock-fragments/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-fragments/mainwindow.cpp b/doc/src/snippets/textblock-fragments/mainwindow.cpp index ab1d9b4..709147d 100644 --- a/doc/src/snippets/textblock-fragments/mainwindow.cpp +++ b/doc/src/snippets/textblock-fragments/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-fragments/mainwindow.h b/doc/src/snippets/textblock-fragments/mainwindow.h index e2f4961..97b6a76 100644 --- a/doc/src/snippets/textblock-fragments/mainwindow.h +++ b/doc/src/snippets/textblock-fragments/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/doc/src/snippets/textblock-fragments/xmlwriter.cpp index c96a36b..42c2d1b 100644 --- a/doc/src/snippets/textblock-fragments/xmlwriter.cpp +++ b/doc/src/snippets/textblock-fragments/xmlwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.h b/doc/src/snippets/textblock-fragments/xmlwriter.h index d7a057c..93ec0a3 100644 --- a/doc/src/snippets/textblock-fragments/xmlwriter.h +++ b/doc/src/snippets/textblock-fragments/xmlwriter.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-blocks/main.cpp b/doc/src/snippets/textdocument-blocks/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textdocument-blocks/main.cpp +++ b/doc/src/snippets/textdocument-blocks/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-blocks/mainwindow.cpp b/doc/src/snippets/textdocument-blocks/mainwindow.cpp index 14ddb8b..424fa14 100644 --- a/doc/src/snippets/textdocument-blocks/mainwindow.cpp +++ b/doc/src/snippets/textdocument-blocks/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-blocks/mainwindow.h b/doc/src/snippets/textdocument-blocks/mainwindow.h index e2f4961..97b6a76 100644 --- a/doc/src/snippets/textdocument-blocks/mainwindow.h +++ b/doc/src/snippets/textdocument-blocks/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-blocks/xmlwriter.cpp b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp index bfb16a0..4fe6ffb 100644 --- a/doc/src/snippets/textdocument-blocks/xmlwriter.cpp +++ b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-blocks/xmlwriter.h b/doc/src/snippets/textdocument-blocks/xmlwriter.h index 2bd59c8..7ceb1cb 100644 --- a/doc/src/snippets/textdocument-blocks/xmlwriter.h +++ b/doc/src/snippets/textdocument-blocks/xmlwriter.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-charformats/main.cpp b/doc/src/snippets/textdocument-charformats/main.cpp index 2abe346..4f34d11 100644 --- a/doc/src/snippets/textdocument-charformats/main.cpp +++ b/doc/src/snippets/textdocument-charformats/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-css/main.cpp b/doc/src/snippets/textdocument-css/main.cpp index b055cb8..7f1fa3b 100644 --- a/doc/src/snippets/textdocument-css/main.cpp +++ b/doc/src/snippets/textdocument-css/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-cursors/main.cpp b/doc/src/snippets/textdocument-cursors/main.cpp index e1981dc..ca967ee 100644 --- a/doc/src/snippets/textdocument-cursors/main.cpp +++ b/doc/src/snippets/textdocument-cursors/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-find/main.cpp b/doc/src/snippets/textdocument-find/main.cpp index 0e76052..57a045f 100644 --- a/doc/src/snippets/textdocument-find/main.cpp +++ b/doc/src/snippets/textdocument-find/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-frames/main.cpp b/doc/src/snippets/textdocument-frames/main.cpp index 17475ab..17d0473 100644 --- a/doc/src/snippets/textdocument-frames/main.cpp +++ b/doc/src/snippets/textdocument-frames/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-frames/mainwindow.cpp b/doc/src/snippets/textdocument-frames/mainwindow.cpp index c81f237..f3c68b5 100644 --- a/doc/src/snippets/textdocument-frames/mainwindow.cpp +++ b/doc/src/snippets/textdocument-frames/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-frames/mainwindow.h b/doc/src/snippets/textdocument-frames/mainwindow.h index b987530..ba4eca0 100644 --- a/doc/src/snippets/textdocument-frames/mainwindow.h +++ b/doc/src/snippets/textdocument-frames/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.cpp b/doc/src/snippets/textdocument-frames/xmlwriter.cpp index 37f81cf..90c0e3d 100644 --- a/doc/src/snippets/textdocument-frames/xmlwriter.cpp +++ b/doc/src/snippets/textdocument-frames/xmlwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.h b/doc/src/snippets/textdocument-frames/xmlwriter.h index 23c6e7d..9d25526 100644 --- a/doc/src/snippets/textdocument-frames/xmlwriter.h +++ b/doc/src/snippets/textdocument-frames/xmlwriter.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-imagedrop/main.cpp b/doc/src/snippets/textdocument-imagedrop/main.cpp index ba6a35c..1a6a134 100644 --- a/doc/src/snippets/textdocument-imagedrop/main.cpp +++ b/doc/src/snippets/textdocument-imagedrop/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.cpp b/doc/src/snippets/textdocument-imagedrop/textedit.cpp index c6254f7..693d449 100644 --- a/doc/src/snippets/textdocument-imagedrop/textedit.cpp +++ b/doc/src/snippets/textdocument-imagedrop/textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.h b/doc/src/snippets/textdocument-imagedrop/textedit.h index b50a27e..4faa1a8 100644 --- a/doc/src/snippets/textdocument-imagedrop/textedit.h +++ b/doc/src/snippets/textdocument-imagedrop/textedit.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-imageformat/main.cpp b/doc/src/snippets/textdocument-imageformat/main.cpp index 9933aed..4d2bdb8 100644 --- a/doc/src/snippets/textdocument-imageformat/main.cpp +++ b/doc/src/snippets/textdocument-imageformat/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-images/main.cpp b/doc/src/snippets/textdocument-images/main.cpp index 8c0f646..9ab5e03 100644 --- a/doc/src/snippets/textdocument-images/main.cpp +++ b/doc/src/snippets/textdocument-images/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-listitems/main.cpp b/doc/src/snippets/textdocument-listitems/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textdocument-listitems/main.cpp +++ b/doc/src/snippets/textdocument-listitems/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-listitems/mainwindow.cpp b/doc/src/snippets/textdocument-listitems/mainwindow.cpp index 85ce524..e68779b 100644 --- a/doc/src/snippets/textdocument-listitems/mainwindow.cpp +++ b/doc/src/snippets/textdocument-listitems/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-listitems/mainwindow.h b/doc/src/snippets/textdocument-listitems/mainwindow.h index 223f72c..a42efb1 100644 --- a/doc/src/snippets/textdocument-listitems/mainwindow.h +++ b/doc/src/snippets/textdocument-listitems/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-lists/main.cpp b/doc/src/snippets/textdocument-lists/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textdocument-lists/main.cpp +++ b/doc/src/snippets/textdocument-lists/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-lists/mainwindow.cpp b/doc/src/snippets/textdocument-lists/mainwindow.cpp index f6ddb8e..e29bacf 100644 --- a/doc/src/snippets/textdocument-lists/mainwindow.cpp +++ b/doc/src/snippets/textdocument-lists/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-lists/mainwindow.h b/doc/src/snippets/textdocument-lists/mainwindow.h index e1907aa..4ca8143 100644 --- a/doc/src/snippets/textdocument-lists/mainwindow.h +++ b/doc/src/snippets/textdocument-lists/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-printing/main.cpp b/doc/src/snippets/textdocument-printing/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textdocument-printing/main.cpp +++ b/doc/src/snippets/textdocument-printing/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-printing/mainwindow.cpp b/doc/src/snippets/textdocument-printing/mainwindow.cpp index 9cbf7fb..16af328 100644 --- a/doc/src/snippets/textdocument-printing/mainwindow.cpp +++ b/doc/src/snippets/textdocument-printing/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-printing/mainwindow.h b/doc/src/snippets/textdocument-printing/mainwindow.h index 5d69a81..7b9c59b 100644 --- a/doc/src/snippets/textdocument-printing/mainwindow.h +++ b/doc/src/snippets/textdocument-printing/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-resources/main.cpp b/doc/src/snippets/textdocument-resources/main.cpp index dac1a8f..b212033 100644 --- a/doc/src/snippets/textdocument-resources/main.cpp +++ b/doc/src/snippets/textdocument-resources/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-selections/main.cpp b/doc/src/snippets/textdocument-selections/main.cpp index 96dc33e..912e1d3 100644 --- a/doc/src/snippets/textdocument-selections/main.cpp +++ b/doc/src/snippets/textdocument-selections/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-selections/mainwindow.cpp b/doc/src/snippets/textdocument-selections/mainwindow.cpp index 47f626b..73d3984 100644 --- a/doc/src/snippets/textdocument-selections/mainwindow.cpp +++ b/doc/src/snippets/textdocument-selections/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-selections/mainwindow.h b/doc/src/snippets/textdocument-selections/mainwindow.h index effe935..a51a61b 100644 --- a/doc/src/snippets/textdocument-selections/mainwindow.h +++ b/doc/src/snippets/textdocument-selections/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-tables/main.cpp b/doc/src/snippets/textdocument-tables/main.cpp index 1854ad5..7589428 100644 --- a/doc/src/snippets/textdocument-tables/main.cpp +++ b/doc/src/snippets/textdocument-tables/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-tables/mainwindow.cpp b/doc/src/snippets/textdocument-tables/mainwindow.cpp index 10d1abb..c319311 100644 --- a/doc/src/snippets/textdocument-tables/mainwindow.cpp +++ b/doc/src/snippets/textdocument-tables/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-tables/mainwindow.h b/doc/src/snippets/textdocument-tables/mainwindow.h index fbb3442..dd93afd 100644 --- a/doc/src/snippets/textdocument-tables/mainwindow.h +++ b/doc/src/snippets/textdocument-tables/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-tables/xmlwriter.cpp b/doc/src/snippets/textdocument-tables/xmlwriter.cpp index c753c06..76bcf53 100644 --- a/doc/src/snippets/textdocument-tables/xmlwriter.cpp +++ b/doc/src/snippets/textdocument-tables/xmlwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-tables/xmlwriter.h b/doc/src/snippets/textdocument-tables/xmlwriter.h index 3a6f1a9..cf8187b 100644 --- a/doc/src/snippets/textdocument-tables/xmlwriter.h +++ b/doc/src/snippets/textdocument-tables/xmlwriter.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocument-texttable/main.cpp b/doc/src/snippets/textdocument-texttable/main.cpp index 0917dfc..141f59b 100644 --- a/doc/src/snippets/textdocument-texttable/main.cpp +++ b/doc/src/snippets/textdocument-texttable/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/textdocumentendsnippet.cpp b/doc/src/snippets/textdocumentendsnippet.cpp index 4123f78..f0b5b91 100644 --- a/doc/src/snippets/textdocumentendsnippet.cpp +++ b/doc/src/snippets/textdocumentendsnippet.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/threads/threads.cpp b/doc/src/snippets/threads/threads.cpp index 76a19db..2263f1c 100644 --- a/doc/src/snippets/threads/threads.cpp +++ b/doc/src/snippets/threads/threads.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/threads/threads.h b/doc/src/snippets/threads/threads.h index 45a59cd..db60ca9 100644 --- a/doc/src/snippets/threads/threads.h +++ b/doc/src/snippets/threads/threads.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/timeline/main.cpp b/doc/src/snippets/timeline/main.cpp index b2767ba..f0a7438 100644 --- a/doc/src/snippets/timeline/main.cpp +++ b/doc/src/snippets/timeline/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/timers/timers.cpp b/doc/src/snippets/timers/timers.cpp index 9f901f0..21407a1 100644 --- a/doc/src/snippets/timers/timers.cpp +++ b/doc/src/snippets/timers/timers.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/transform/main.cpp b/doc/src/snippets/transform/main.cpp index a4712a4..202f50e 100644 --- a/doc/src/snippets/transform/main.cpp +++ b/doc/src/snippets/transform/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/uitools/calculatorform/main.cpp b/doc/src/snippets/uitools/calculatorform/main.cpp index e9af926..270f4f8 100644 --- a/doc/src/snippets/uitools/calculatorform/main.cpp +++ b/doc/src/snippets/uitools/calculatorform/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/updating-selections/main.cpp b/doc/src/snippets/updating-selections/main.cpp index d8d5943..85576e9 100644 --- a/doc/src/snippets/updating-selections/main.cpp +++ b/doc/src/snippets/updating-selections/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/updating-selections/model.cpp b/doc/src/snippets/updating-selections/model.cpp index ad7d2ed..8cdc14c 100644 --- a/doc/src/snippets/updating-selections/model.cpp +++ b/doc/src/snippets/updating-selections/model.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/updating-selections/model.h b/doc/src/snippets/updating-selections/model.h index 207f83a..d448990 100644 --- a/doc/src/snippets/updating-selections/model.h +++ b/doc/src/snippets/updating-selections/model.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/updating-selections/window.cpp b/doc/src/snippets/updating-selections/window.cpp index 3ca4911..217290d 100644 --- a/doc/src/snippets/updating-selections/window.cpp +++ b/doc/src/snippets/updating-selections/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/updating-selections/window.h b/doc/src/snippets/updating-selections/window.h index f3556f7..d73845c 100644 --- a/doc/src/snippets/updating-selections/window.h +++ b/doc/src/snippets/updating-selections/window.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/webkit/simple/main.cpp b/doc/src/snippets/webkit/simple/main.cpp index a6a4fc2..f702497 100644 --- a/doc/src/snippets/webkit/simple/main.cpp +++ b/doc/src/snippets/webkit/simple/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/whatsthis/whatsthis.cpp b/doc/src/snippets/whatsthis/whatsthis.cpp index ce7edc4..2c562c1 100644 --- a/doc/src/snippets/whatsthis/whatsthis.cpp +++ b/doc/src/snippets/whatsthis/whatsthis.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/widget-mask/main.cpp b/doc/src/snippets/widget-mask/main.cpp index accbb71..908ae0d 100644 --- a/doc/src/snippets/widget-mask/main.cpp +++ b/doc/src/snippets/widget-mask/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/prettyprint/main.cpp b/doc/src/snippets/xml/prettyprint/main.cpp index fa13ff6..5be9d10 100644 --- a/doc/src/snippets/xml/prettyprint/main.cpp +++ b/doc/src/snippets/xml/prettyprint/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/rsslisting/handler.cpp b/doc/src/snippets/xml/rsslisting/handler.cpp index 1088871..35941c2 100644 --- a/doc/src/snippets/xml/rsslisting/handler.cpp +++ b/doc/src/snippets/xml/rsslisting/handler.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/rsslisting/handler.h b/doc/src/snippets/xml/rsslisting/handler.h index dfe8e62..95dc503 100644 --- a/doc/src/snippets/xml/rsslisting/handler.h +++ b/doc/src/snippets/xml/rsslisting/handler.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/rsslisting/main.cpp b/doc/src/snippets/xml/rsslisting/main.cpp index aec9d4d..8146ce7 100644 --- a/doc/src/snippets/xml/rsslisting/main.cpp +++ b/doc/src/snippets/xml/rsslisting/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/rsslisting/rsslisting.cpp b/doc/src/snippets/xml/rsslisting/rsslisting.cpp index f5c65e5..3ef5b4e 100644 --- a/doc/src/snippets/xml/rsslisting/rsslisting.cpp +++ b/doc/src/snippets/xml/rsslisting/rsslisting.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/rsslisting/rsslisting.h b/doc/src/snippets/xml/rsslisting/rsslisting.h index 203d5f3..a13f591 100644 --- a/doc/src/snippets/xml/rsslisting/rsslisting.h +++ b/doc/src/snippets/xml/rsslisting/rsslisting.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/simpleparse/handler.cpp b/doc/src/snippets/xml/simpleparse/handler.cpp index 440f6be..de8818f 100644 --- a/doc/src/snippets/xml/simpleparse/handler.cpp +++ b/doc/src/snippets/xml/simpleparse/handler.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/simpleparse/handler.h b/doc/src/snippets/xml/simpleparse/handler.h index c69c919..55a00c1 100644 --- a/doc/src/snippets/xml/simpleparse/handler.h +++ b/doc/src/snippets/xml/simpleparse/handler.h @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/snippets/xml/simpleparse/main.cpp b/doc/src/snippets/xml/simpleparse/main.cpp index e3a7b32..0a238a4 100644 --- a/doc/src/snippets/xml/simpleparse/main.cpp +++ b/doc/src/snippets/xml/simpleparse/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/sql-driver.qdoc b/doc/src/sql-driver.qdoc index 8a33760..d60b861 100644 --- a/doc/src/sql-driver.qdoc +++ b/doc/src/sql-driver.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/styles.qdoc b/doc/src/styles.qdoc index 9e72416..bf610b1 100644 --- a/doc/src/styles.qdoc +++ b/doc/src/styles.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/stylesheet.qdoc b/doc/src/stylesheet.qdoc index c0d13da..d4cd6ce 100644 --- a/doc/src/stylesheet.qdoc +++ b/doc/src/stylesheet.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/templates.qdoc b/doc/src/templates.qdoc index ab602a7..e0a7dc5 100644 --- a/doc/src/templates.qdoc +++ b/doc/src/templates.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/threads.qdoc b/doc/src/threads.qdoc index 54bcf2d..fd27ccd 100644 --- a/doc/src/threads.qdoc +++ b/doc/src/threads.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/timers.qdoc b/doc/src/timers.qdoc index 4f54343..5530e78 100644 --- a/doc/src/timers.qdoc +++ b/doc/src/timers.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/tools-list.qdoc b/doc/src/tools-list.qdoc index 7af9936..644958c 100644 --- a/doc/src/tools-list.qdoc +++ b/doc/src/tools-list.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc index 301f0d4..fe2083e 100644 --- a/doc/src/topics.qdoc +++ b/doc/src/topics.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/trademarks.qdoc b/doc/src/trademarks.qdoc index 647c6a6..d814da0 100644 --- a/doc/src/trademarks.qdoc +++ b/doc/src/trademarks.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc index 3897fcf..925020b 100644 --- a/doc/src/trolltech-webpages.qdoc +++ b/doc/src/trolltech-webpages.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc index 2847f1b..52be480 100644 --- a/doc/src/tutorials/addressbook-fr.qdoc +++ b/doc/src/tutorials/addressbook-fr.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc index 3b0d2bc..f637af6 100644 --- a/doc/src/tutorials/addressbook.qdoc +++ b/doc/src/tutorials/addressbook.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/tutorials/widgets-tutorial.qdoc b/doc/src/tutorials/widgets-tutorial.qdoc index ead44af..29b618b 100644 --- a/doc/src/tutorials/widgets-tutorial.qdoc +++ b/doc/src/tutorials/widgets-tutorial.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/uic.qdoc b/doc/src/uic.qdoc index b0a4630..4299855 100644 --- a/doc/src/uic.qdoc +++ b/doc/src/uic.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/unicode.qdoc b/doc/src/unicode.qdoc index 42ac5a4..bedbdf1 100644 --- a/doc/src/unicode.qdoc +++ b/doc/src/unicode.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/unix-signal-handlers.qdoc b/doc/src/unix-signal-handlers.qdoc index 6efaa6f..d46033f 100644 --- a/doc/src/unix-signal-handlers.qdoc +++ b/doc/src/unix-signal-handlers.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/wince-customization.qdoc b/doc/src/wince-customization.qdoc index b61c48d..e2745f3 100644 --- a/doc/src/wince-customization.qdoc +++ b/doc/src/wince-customization.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/wince-introduction.qdoc b/doc/src/wince-introduction.qdoc index d94116b..db953ef 100644 --- a/doc/src/wince-introduction.qdoc +++ b/doc/src/wince-introduction.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/wince-opengl.qdoc b/doc/src/wince-opengl.qdoc index b151aa9..b1781d8 100644 --- a/doc/src/wince-opengl.qdoc +++ b/doc/src/wince-opengl.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/winsystem.qdoc b/doc/src/winsystem.qdoc index 5d5f3a7..ae65730 100644 --- a/doc/src/winsystem.qdoc +++ b/doc/src/winsystem.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/doc/src/xquery-introduction.qdoc b/doc/src/xquery-introduction.qdoc index 37a45ac..794bc8a 100644 --- a/doc/src/xquery-introduction.qdoc +++ b/doc/src/xquery-introduction.qdoc @@ -6,11 +6,11 @@ ** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/comapp/main.cpp b/examples/activeqt/comapp/main.cpp index 95caaa3..989f048 100644 --- a/examples/activeqt/comapp/main.cpp +++ b/examples/activeqt/comapp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/networker.cpp b/examples/activeqt/dotnet/wrapper/lib/networker.cpp index 54e862b..b9d91e7 100644 --- a/examples/activeqt/dotnet/wrapper/lib/networker.cpp +++ b/examples/activeqt/dotnet/wrapper/lib/networker.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/networker.h b/examples/activeqt/dotnet/wrapper/lib/networker.h index 583c6c4..b90af0c 100644 --- a/examples/activeqt/dotnet/wrapper/lib/networker.h +++ b/examples/activeqt/dotnet/wrapper/lib/networker.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.cpp b/examples/activeqt/dotnet/wrapper/lib/tools.cpp index aa67aea..7502301 100644 --- a/examples/activeqt/dotnet/wrapper/lib/tools.cpp +++ b/examples/activeqt/dotnet/wrapper/lib/tools.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/tools.h b/examples/activeqt/dotnet/wrapper/lib/tools.h index 8569eca..defa6c9 100644 --- a/examples/activeqt/dotnet/wrapper/lib/tools.h +++ b/examples/activeqt/dotnet/wrapper/lib/tools.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/worker.cpp b/examples/activeqt/dotnet/wrapper/lib/worker.cpp index 695db57..1092a7f 100644 --- a/examples/activeqt/dotnet/wrapper/lib/worker.cpp +++ b/examples/activeqt/dotnet/wrapper/lib/worker.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/dotnet/wrapper/lib/worker.h b/examples/activeqt/dotnet/wrapper/lib/worker.h index 8bab9ed..90fafbd 100644 --- a/examples/activeqt/dotnet/wrapper/lib/worker.h +++ b/examples/activeqt/dotnet/wrapper/lib/worker.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/hierarchy/main.cpp b/examples/activeqt/hierarchy/main.cpp index e817635..4b6634d 100644 --- a/examples/activeqt/hierarchy/main.cpp +++ b/examples/activeqt/hierarchy/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp index c3928b5..e232224 100644 --- a/examples/activeqt/hierarchy/objects.cpp +++ b/examples/activeqt/hierarchy/objects.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/hierarchy/objects.h b/examples/activeqt/hierarchy/objects.h index e719e6d..a153d6f 100644 --- a/examples/activeqt/hierarchy/objects.h +++ b/examples/activeqt/hierarchy/objects.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/menus/main.cpp b/examples/activeqt/menus/main.cpp index 56f8a9f..b89d88f 100644 --- a/examples/activeqt/menus/main.cpp +++ b/examples/activeqt/menus/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp index 27f064e..cf86067 100644 --- a/examples/activeqt/menus/menus.cpp +++ b/examples/activeqt/menus/menus.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/menus/menus.h b/examples/activeqt/menus/menus.h index c961cd5..c8217dc 100644 --- a/examples/activeqt/menus/menus.h +++ b/examples/activeqt/menus/menus.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/multiple/ax1.h b/examples/activeqt/multiple/ax1.h index a53e4f4..8030db0 100644 --- a/examples/activeqt/multiple/ax1.h +++ b/examples/activeqt/multiple/ax1.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/multiple/ax2.h b/examples/activeqt/multiple/ax2.h index b6b50f3..1263fe1 100644 --- a/examples/activeqt/multiple/ax2.h +++ b/examples/activeqt/multiple/ax2.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/multiple/main.cpp b/examples/activeqt/multiple/main.cpp index 612292e..2b30011 100644 --- a/examples/activeqt/multiple/main.cpp +++ b/examples/activeqt/multiple/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/opengl/glbox.cpp b/examples/activeqt/opengl/glbox.cpp index 4cb015b..d902b67 100644 --- a/examples/activeqt/opengl/glbox.cpp +++ b/examples/activeqt/opengl/glbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/opengl/glbox.h b/examples/activeqt/opengl/glbox.h index 3ebf818..e3faae9 100644 --- a/examples/activeqt/opengl/glbox.h +++ b/examples/activeqt/opengl/glbox.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/opengl/globjwin.cpp b/examples/activeqt/opengl/globjwin.cpp index 3ac5d78..72c7d1a 100644 --- a/examples/activeqt/opengl/globjwin.cpp +++ b/examples/activeqt/opengl/globjwin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/opengl/globjwin.h b/examples/activeqt/opengl/globjwin.h index d707aa6..a29a296 100644 --- a/examples/activeqt/opengl/globjwin.h +++ b/examples/activeqt/opengl/globjwin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/opengl/main.cpp b/examples/activeqt/opengl/main.cpp index 469bdfb..8cc7fc9 100644 --- a/examples/activeqt/opengl/main.cpp +++ b/examples/activeqt/opengl/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/qutlook/addressview.cpp b/examples/activeqt/qutlook/addressview.cpp index 281fe6a..8ce7fec 100644 --- a/examples/activeqt/qutlook/addressview.cpp +++ b/examples/activeqt/qutlook/addressview.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/qutlook/addressview.h b/examples/activeqt/qutlook/addressview.h index 5363cc1..e19487e 100644 --- a/examples/activeqt/qutlook/addressview.h +++ b/examples/activeqt/qutlook/addressview.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/qutlook/main.cpp b/examples/activeqt/qutlook/main.cpp index b015d8a..3da1272 100644 --- a/examples/activeqt/qutlook/main.cpp +++ b/examples/activeqt/qutlook/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/simple/main.cpp b/examples/activeqt/simple/main.cpp index 7f939e4..b34fbca 100644 --- a/examples/activeqt/simple/main.cpp +++ b/examples/activeqt/simple/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp index fe93eab..d572589 100644 --- a/examples/activeqt/webbrowser/main.cpp +++ b/examples/activeqt/webbrowser/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/webbrowser/webaxwidget.h b/examples/activeqt/webbrowser/webaxwidget.h index 0e82311..12e20a4 100644 --- a/examples/activeqt/webbrowser/webaxwidget.h +++ b/examples/activeqt/webbrowser/webaxwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/activeqt/wrapper/main.cpp b/examples/activeqt/wrapper/main.cpp index a403084..9746c29 100644 --- a/examples/activeqt/wrapper/main.cpp +++ b/examples/activeqt/wrapper/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp index f73657e..c1db413 100644 --- a/examples/assistant/simpletextviewer/findfiledialog.cpp +++ b/examples/assistant/simpletextviewer/findfiledialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/assistant/simpletextviewer/findfiledialog.h b/examples/assistant/simpletextviewer/findfiledialog.h index 0c89fda..b7d8b52 100644 --- a/examples/assistant/simpletextviewer/findfiledialog.h +++ b/examples/assistant/simpletextviewer/findfiledialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/assistant/simpletextviewer/main.cpp b/examples/assistant/simpletextviewer/main.cpp index 1d51376..95e9ba6 100644 --- a/examples/assistant/simpletextviewer/main.cpp +++ b/examples/assistant/simpletextviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/assistant/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp index cc2f3c0..1bd9a95 100644 --- a/examples/assistant/simpletextviewer/mainwindow.cpp +++ b/examples/assistant/simpletextviewer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/assistant/simpletextviewer/mainwindow.h b/examples/assistant/simpletextviewer/mainwindow.h index b56d201..7a68dcf 100644 --- a/examples/assistant/simpletextviewer/mainwindow.h +++ b/examples/assistant/simpletextviewer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp index 18fa66d..2d4d828 100644 --- a/examples/dbus/complexpingpong/complexping.cpp +++ b/examples/dbus/complexpingpong/complexping.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/complexpingpong/complexping.h b/examples/dbus/complexpingpong/complexping.h index 4c2a473..f1caa60 100644 --- a/examples/dbus/complexpingpong/complexping.h +++ b/examples/dbus/complexpingpong/complexping.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp index 283e440..c6f4bb8 100644 --- a/examples/dbus/complexpingpong/complexpong.cpp +++ b/examples/dbus/complexpingpong/complexpong.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h index 5682e99..da8f79e 100644 --- a/examples/dbus/complexpingpong/complexpong.h +++ b/examples/dbus/complexpingpong/complexpong.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h index 06228a9..05390c0 100644 --- a/examples/dbus/complexpingpong/ping-common.h +++ b/examples/dbus/complexpingpong/ping-common.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/dbus-chat/chat.cpp b/examples/dbus/dbus-chat/chat.cpp index 1dbc764..e6ee74b 100644 --- a/examples/dbus/dbus-chat/chat.cpp +++ b/examples/dbus/dbus-chat/chat.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/dbus-chat/chat.h b/examples/dbus/dbus-chat/chat.h index 48b549e..fb240ae 100644 --- a/examples/dbus/dbus-chat/chat.h +++ b/examples/dbus/dbus-chat/chat.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/listnames/listnames.cpp b/examples/dbus/listnames/listnames.cpp index dca32e6..33697d1 100644 --- a/examples/dbus/listnames/listnames.cpp +++ b/examples/dbus/listnames/listnames.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h index 06228a9..05390c0 100644 --- a/examples/dbus/pingpong/ping-common.h +++ b/examples/dbus/pingpong/ping-common.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/pingpong/ping.cpp b/examples/dbus/pingpong/ping.cpp index d773be4..96c827c 100644 --- a/examples/dbus/pingpong/ping.cpp +++ b/examples/dbus/pingpong/ping.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp index fc7800c..548022f 100644 --- a/examples/dbus/pingpong/pong.cpp +++ b/examples/dbus/pingpong/pong.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/pingpong/pong.h b/examples/dbus/pingpong/pong.h index 4bc45d8..87d230a 100644 --- a/examples/dbus/pingpong/pong.h +++ b/examples/dbus/pingpong/pong.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/car/car.cpp b/examples/dbus/remotecontrolledcar/car/car.cpp index 5f3bef9..5577543 100644 --- a/examples/dbus/remotecontrolledcar/car/car.cpp +++ b/examples/dbus/remotecontrolledcar/car/car.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h index 609bc03..515a4fb 100644 --- a/examples/dbus/remotecontrolledcar/car/car.h +++ b/examples/dbus/remotecontrolledcar/car/car.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp index 13a191a..0a3dadb 100644 --- a/examples/dbus/remotecontrolledcar/car/main.cpp +++ b/examples/dbus/remotecontrolledcar/car/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp index 7d27bd3..6eb0072 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.cpp +++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/controller/controller.h b/examples/dbus/remotecontrolledcar/controller/controller.h index 200ef3c..75d4adb 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.h +++ b/examples/dbus/remotecontrolledcar/controller/controller.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dbus/remotecontrolledcar/controller/main.cpp b/examples/dbus/remotecontrolledcar/controller/main.cpp index f28661e..a4fe6e8 100644 --- a/examples/dbus/remotecontrolledcar/controller/main.cpp +++ b/examples/dbus/remotecontrolledcar/controller/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp index 92d75c5..0168eae 100644 --- a/examples/designer/calculatorbuilder/calculatorform.cpp +++ b/examples/designer/calculatorbuilder/calculatorform.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorbuilder/calculatorform.h b/examples/designer/calculatorbuilder/calculatorform.h index 8b322b7..e9ac41d 100644 --- a/examples/designer/calculatorbuilder/calculatorform.h +++ b/examples/designer/calculatorbuilder/calculatorform.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorbuilder/main.cpp b/examples/designer/calculatorbuilder/main.cpp index 56358b8..b7a9874 100644 --- a/examples/designer/calculatorbuilder/main.cpp +++ b/examples/designer/calculatorbuilder/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorform/calculatorform.cpp b/examples/designer/calculatorform/calculatorform.cpp index 3de2852..44ce75f 100644 --- a/examples/designer/calculatorform/calculatorform.cpp +++ b/examples/designer/calculatorform/calculatorform.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorform/calculatorform.h b/examples/designer/calculatorform/calculatorform.h index 37f0a18..b73e9f2 100644 --- a/examples/designer/calculatorform/calculatorform.h +++ b/examples/designer/calculatorform/calculatorform.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/calculatorform/main.cpp b/examples/designer/calculatorform/main.cpp index dcb7366..bb4b232 100644 --- a/examples/designer/calculatorform/main.cpp +++ b/examples/designer/calculatorform/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp index 5a3697b..10f2947 100644 --- a/examples/designer/containerextension/multipagewidget.cpp +++ b/examples/designer/containerextension/multipagewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidget.h b/examples/designer/containerextension/multipagewidget.h index 77a09c5..2101f1e 100644 --- a/examples/designer/containerextension/multipagewidget.h +++ b/examples/designer/containerextension/multipagewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.cpp b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp index b61da3d..1b24841 100644 --- a/examples/designer/containerextension/multipagewidgetcontainerextension.cpp +++ b/examples/designer/containerextension/multipagewidgetcontainerextension.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.h b/examples/designer/containerextension/multipagewidgetcontainerextension.h index 661146e..716c890 100644 --- a/examples/designer/containerextension/multipagewidgetcontainerextension.h +++ b/examples/designer/containerextension/multipagewidgetcontainerextension.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetextensionfactory.cpp b/examples/designer/containerextension/multipagewidgetextensionfactory.cpp index 4a1e81b..a3dc619 100644 --- a/examples/designer/containerextension/multipagewidgetextensionfactory.cpp +++ b/examples/designer/containerextension/multipagewidgetextensionfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetextensionfactory.h b/examples/designer/containerextension/multipagewidgetextensionfactory.h index 9a96b37..b4f88b4 100644 --- a/examples/designer/containerextension/multipagewidgetextensionfactory.h +++ b/examples/designer/containerextension/multipagewidgetextensionfactory.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetplugin.cpp b/examples/designer/containerextension/multipagewidgetplugin.cpp index c09ed3a..79b31ce 100644 --- a/examples/designer/containerextension/multipagewidgetplugin.cpp +++ b/examples/designer/containerextension/multipagewidgetplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h index 1431c8a..b3cd929 100644 --- a/examples/designer/containerextension/multipagewidgetplugin.h +++ b/examples/designer/containerextension/multipagewidgetplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/customwidgetplugin/analogclock.cpp b/examples/designer/customwidgetplugin/analogclock.cpp index 28155ba..05e2bfe 100644 --- a/examples/designer/customwidgetplugin/analogclock.cpp +++ b/examples/designer/customwidgetplugin/analogclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/customwidgetplugin/analogclock.h b/examples/designer/customwidgetplugin/analogclock.h index 4d843ad..a2d45cc 100644 --- a/examples/designer/customwidgetplugin/analogclock.h +++ b/examples/designer/customwidgetplugin/analogclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.cpp b/examples/designer/customwidgetplugin/customwidgetplugin.cpp index bcea3b8..f0f3167 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.cpp +++ b/examples/designer/customwidgetplugin/customwidgetplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h index 4438690..28de156 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.h +++ b/examples/designer/customwidgetplugin/customwidgetplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoe.cpp b/examples/designer/taskmenuextension/tictactoe.cpp index ba766ccd..27fc305 100644 --- a/examples/designer/taskmenuextension/tictactoe.cpp +++ b/examples/designer/taskmenuextension/tictactoe.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoe.h b/examples/designer/taskmenuextension/tictactoe.h index ef3c533..8dd1648 100644 --- a/examples/designer/taskmenuextension/tictactoe.h +++ b/examples/designer/taskmenuextension/tictactoe.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp index a9bd16a..0317821 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.cpp +++ b/examples/designer/taskmenuextension/tictactoedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoedialog.h b/examples/designer/taskmenuextension/tictactoedialog.h index 55b25d2..974c558 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.h +++ b/examples/designer/taskmenuextension/tictactoedialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoeplugin.cpp b/examples/designer/taskmenuextension/tictactoeplugin.cpp index 1333090..b8be274 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.cpp +++ b/examples/designer/taskmenuextension/tictactoeplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h index b51540e..1aebbc4 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.h +++ b/examples/designer/taskmenuextension/tictactoeplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp index af5401a..0edb449 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h index 4bd3170..5ce2e02 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.h +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/worldtimeclockbuilder/main.cpp b/examples/designer/worldtimeclockbuilder/main.cpp index 35f7dc0..c8ba873 100644 --- a/examples/designer/worldtimeclockbuilder/main.cpp +++ b/examples/designer/worldtimeclockbuilder/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp index 77eff54..edd63f3 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp +++ b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.h b/examples/designer/worldtimeclockplugin/worldtimeclock.h index 7bfe8c5..ce18420 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp index e73c45b..d39931b 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h index 87d797a..2c57495 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/screenshot/main.cpp b/examples/desktop/screenshot/main.cpp index 59e8674..e3cc951 100644 --- a/examples/desktop/screenshot/main.cpp +++ b/examples/desktop/screenshot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/screenshot/screenshot.cpp b/examples/desktop/screenshot/screenshot.cpp index 7d9545e..81d2b41 100644 --- a/examples/desktop/screenshot/screenshot.cpp +++ b/examples/desktop/screenshot/screenshot.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/screenshot/screenshot.h b/examples/desktop/screenshot/screenshot.h index ecc7724..a8d2546 100644 --- a/examples/desktop/screenshot/screenshot.h +++ b/examples/desktop/screenshot/screenshot.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/systray/main.cpp b/examples/desktop/systray/main.cpp index d406d16..61318af 100644 --- a/examples/desktop/systray/main.cpp +++ b/examples/desktop/systray/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/systray/window.cpp b/examples/desktop/systray/window.cpp index 052ecdd..5c94787 100644 --- a/examples/desktop/systray/window.cpp +++ b/examples/desktop/systray/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/desktop/systray/window.h b/examples/desktop/systray/window.h index d9bfd52..0d32523 100644 --- a/examples/desktop/systray/window.h +++ b/examples/desktop/systray/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/classwizard/classwizard.cpp b/examples/dialogs/classwizard/classwizard.cpp index 200d7ac..4fa33dc 100644 --- a/examples/dialogs/classwizard/classwizard.cpp +++ b/examples/dialogs/classwizard/classwizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/classwizard/classwizard.h b/examples/dialogs/classwizard/classwizard.h index 4808629..1b80b11 100644 --- a/examples/dialogs/classwizard/classwizard.h +++ b/examples/dialogs/classwizard/classwizard.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/classwizard/main.cpp b/examples/dialogs/classwizard/main.cpp index 8230695..d124e30 100644 --- a/examples/dialogs/classwizard/main.cpp +++ b/examples/dialogs/classwizard/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/configdialog/configdialog.cpp b/examples/dialogs/configdialog/configdialog.cpp index f442e10..3669d36 100644 --- a/examples/dialogs/configdialog/configdialog.cpp +++ b/examples/dialogs/configdialog/configdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/configdialog/configdialog.h b/examples/dialogs/configdialog/configdialog.h index b09771c..7e786cc 100644 --- a/examples/dialogs/configdialog/configdialog.h +++ b/examples/dialogs/configdialog/configdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/configdialog/main.cpp b/examples/dialogs/configdialog/main.cpp index afc5467..2812ebd 100644 --- a/examples/dialogs/configdialog/main.cpp +++ b/examples/dialogs/configdialog/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/configdialog/pages.cpp b/examples/dialogs/configdialog/pages.cpp index 27c322a..cc2c13f 100644 --- a/examples/dialogs/configdialog/pages.cpp +++ b/examples/dialogs/configdialog/pages.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/configdialog/pages.h b/examples/dialogs/configdialog/pages.h index 534798f..a83bb20 100644 --- a/examples/dialogs/configdialog/pages.h +++ b/examples/dialogs/configdialog/pages.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp index 80c2868..557acf4 100644 --- a/examples/dialogs/extension/finddialog.cpp +++ b/examples/dialogs/extension/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/extension/finddialog.h b/examples/dialogs/extension/finddialog.h index 4fc7ee5..b77b82c 100644 --- a/examples/dialogs/extension/finddialog.h +++ b/examples/dialogs/extension/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/extension/main.cpp b/examples/dialogs/extension/main.cpp index fa70a55..1a64a38 100644 --- a/examples/dialogs/extension/main.cpp +++ b/examples/dialogs/extension/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/findfiles/main.cpp b/examples/dialogs/findfiles/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/dialogs/findfiles/main.cpp +++ b/examples/dialogs/findfiles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/findfiles/window.cpp b/examples/dialogs/findfiles/window.cpp index 7620a68..9f3b652 100644 --- a/examples/dialogs/findfiles/window.cpp +++ b/examples/dialogs/findfiles/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/findfiles/window.h b/examples/dialogs/findfiles/window.h index 8cd4813..a51da75 100644 --- a/examples/dialogs/findfiles/window.h +++ b/examples/dialogs/findfiles/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp index 30b4165..33cb768 100644 --- a/examples/dialogs/licensewizard/licensewizard.cpp +++ b/examples/dialogs/licensewizard/licensewizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/licensewizard/licensewizard.h b/examples/dialogs/licensewizard/licensewizard.h index bcf22a2..84b8f72 100644 --- a/examples/dialogs/licensewizard/licensewizard.h +++ b/examples/dialogs/licensewizard/licensewizard.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/licensewizard/main.cpp b/examples/dialogs/licensewizard/main.cpp index 9d10032..ae9b184 100644 --- a/examples/dialogs/licensewizard/main.cpp +++ b/examples/dialogs/licensewizard/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp index 9f1b9ad..dff863d 100644 --- a/examples/dialogs/sipdialog/dialog.cpp +++ b/examples/dialogs/sipdialog/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/sipdialog/dialog.h b/examples/dialogs/sipdialog/dialog.h index ffcc926..811c538 100644 --- a/examples/dialogs/sipdialog/dialog.h +++ b/examples/dialogs/sipdialog/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/dialogs/sipdialog/main.cpp index 5fcbfd8..35c16f8 100644 --- a/examples/dialogs/sipdialog/main.cpp +++ b/examples/dialogs/sipdialog/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp index 0fe1f7e..d62bee2 100644 --- a/examples/dialogs/standarddialogs/dialog.cpp +++ b/examples/dialogs/standarddialogs/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/standarddialogs/dialog.h b/examples/dialogs/standarddialogs/dialog.h index 35f0b05..7374138 100644 --- a/examples/dialogs/standarddialogs/dialog.h +++ b/examples/dialogs/standarddialogs/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/standarddialogs/main.cpp b/examples/dialogs/standarddialogs/main.cpp index 3b7ed8b..472a1ee 100644 --- a/examples/dialogs/standarddialogs/main.cpp +++ b/examples/dialogs/standarddialogs/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/tabdialog/main.cpp b/examples/dialogs/tabdialog/main.cpp index 04f3b33..11a9f39 100644 --- a/examples/dialogs/tabdialog/main.cpp +++ b/examples/dialogs/tabdialog/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/tabdialog/tabdialog.cpp b/examples/dialogs/tabdialog/tabdialog.cpp index 189d085..2f3e974 100644 --- a/examples/dialogs/tabdialog/tabdialog.cpp +++ b/examples/dialogs/tabdialog/tabdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/tabdialog/tabdialog.h b/examples/dialogs/tabdialog/tabdialog.h index b22997d..d16e2f1 100644 --- a/examples/dialogs/tabdialog/tabdialog.h +++ b/examples/dialogs/tabdialog/tabdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/dialogs/trivialwizard/trivialwizard.cpp b/examples/dialogs/trivialwizard/trivialwizard.cpp index 128bce7..869d1ca 100644 --- a/examples/dialogs/trivialwizard/trivialwizard.cpp +++ b/examples/dialogs/trivialwizard/trivialwizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/images/example.svg b/examples/draganddrop/delayedencoding/images/example.svg index 4707cf8..8953d4b 100644 --- a/examples/draganddrop/delayedencoding/images/example.svg +++ b/examples/draganddrop/delayedencoding/images/example.svg @@ -7,11 +7,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/draganddrop/delayedencoding/main.cpp index 801e474..2fbade2 100644 --- a/examples/draganddrop/delayedencoding/main.cpp +++ b/examples/draganddrop/delayedencoding/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/mimedata.cpp b/examples/draganddrop/delayedencoding/mimedata.cpp index 5c7c23c..c21c297 100644 --- a/examples/draganddrop/delayedencoding/mimedata.cpp +++ b/examples/draganddrop/delayedencoding/mimedata.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/mimedata.h b/examples/draganddrop/delayedencoding/mimedata.h index 13e834d..cc8c852 100644 --- a/examples/draganddrop/delayedencoding/mimedata.h +++ b/examples/draganddrop/delayedencoding/mimedata.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/draganddrop/delayedencoding/sourcewidget.cpp index f5aed89..66093be 100644 --- a/examples/draganddrop/delayedencoding/sourcewidget.cpp +++ b/examples/draganddrop/delayedencoding/sourcewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/delayedencoding/sourcewidget.h b/examples/draganddrop/delayedencoding/sourcewidget.h index 8d6a690..a51d621 100644 --- a/examples/draganddrop/delayedencoding/sourcewidget.h +++ b/examples/draganddrop/delayedencoding/sourcewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggableicons/dragwidget.cpp b/examples/draganddrop/draggableicons/dragwidget.cpp index 021f816..7114d8b 100644 --- a/examples/draganddrop/draggableicons/dragwidget.cpp +++ b/examples/draganddrop/draggableicons/dragwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggableicons/dragwidget.h b/examples/draganddrop/draggableicons/dragwidget.h index 201adf8..a3fe0de 100644 --- a/examples/draganddrop/draggableicons/dragwidget.h +++ b/examples/draganddrop/draggableicons/dragwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggableicons/main.cpp b/examples/draganddrop/draggableicons/main.cpp index cd94537..a09b8c46 100644 --- a/examples/draganddrop/draggableicons/main.cpp +++ b/examples/draganddrop/draggableicons/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggabletext/draglabel.cpp b/examples/draganddrop/draggabletext/draglabel.cpp index 4dfa099..2f9d56c 100644 --- a/examples/draganddrop/draggabletext/draglabel.cpp +++ b/examples/draganddrop/draggabletext/draglabel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggabletext/draglabel.h b/examples/draganddrop/draggabletext/draglabel.h index 8ba2778..980a316 100644 --- a/examples/draganddrop/draggabletext/draglabel.h +++ b/examples/draganddrop/draggabletext/draglabel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggabletext/dragwidget.cpp b/examples/draganddrop/draggabletext/dragwidget.cpp index 2af7b29..03a8117 100644 --- a/examples/draganddrop/draggabletext/dragwidget.cpp +++ b/examples/draganddrop/draggabletext/dragwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggabletext/dragwidget.h b/examples/draganddrop/draggabletext/dragwidget.h index b51f05b..fc3a8d0 100644 --- a/examples/draganddrop/draggabletext/dragwidget.h +++ b/examples/draganddrop/draggabletext/dragwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/draggabletext/main.cpp b/examples/draganddrop/draggabletext/main.cpp index e66c8b7..84cf3c5 100644 --- a/examples/draganddrop/draggabletext/main.cpp +++ b/examples/draganddrop/draggabletext/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/dropsite/droparea.cpp b/examples/draganddrop/dropsite/droparea.cpp index 495e2bf..902fc7a 100644 --- a/examples/draganddrop/dropsite/droparea.cpp +++ b/examples/draganddrop/dropsite/droparea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/dropsite/droparea.h b/examples/draganddrop/dropsite/droparea.h index 8a40acc..1ee9dcb 100644 --- a/examples/draganddrop/dropsite/droparea.h +++ b/examples/draganddrop/dropsite/droparea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/dropsite/dropsitewindow.cpp b/examples/draganddrop/dropsite/dropsitewindow.cpp index 6e7055b..1f321cd 100644 --- a/examples/draganddrop/dropsite/dropsitewindow.cpp +++ b/examples/draganddrop/dropsite/dropsitewindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/dropsite/dropsitewindow.h b/examples/draganddrop/dropsite/dropsitewindow.h index bbdc687..f5d2da0 100644 --- a/examples/draganddrop/dropsite/dropsitewindow.h +++ b/examples/draganddrop/dropsite/dropsitewindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/dropsite/main.cpp b/examples/draganddrop/dropsite/main.cpp index 62589ad..5a92917 100644 --- a/examples/draganddrop/dropsite/main.cpp +++ b/examples/draganddrop/dropsite/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/fridgemagnets/draglabel.cpp b/examples/draganddrop/fridgemagnets/draglabel.cpp index 1bec024..ca52c20 100644 --- a/examples/draganddrop/fridgemagnets/draglabel.cpp +++ b/examples/draganddrop/fridgemagnets/draglabel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/fridgemagnets/draglabel.h b/examples/draganddrop/fridgemagnets/draglabel.h index 5d2fd52..93a4b79 100644 --- a/examples/draganddrop/fridgemagnets/draglabel.h +++ b/examples/draganddrop/fridgemagnets/draglabel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp index 43a9588..ebd800f 100644 --- a/examples/draganddrop/fridgemagnets/dragwidget.cpp +++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/fridgemagnets/dragwidget.h b/examples/draganddrop/fridgemagnets/dragwidget.h index 4722917..0e80c28 100644 --- a/examples/draganddrop/fridgemagnets/dragwidget.h +++ b/examples/draganddrop/fridgemagnets/dragwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp index c24cdb2..8d29f59 100644 --- a/examples/draganddrop/fridgemagnets/main.cpp +++ b/examples/draganddrop/fridgemagnets/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/main.cpp b/examples/draganddrop/puzzle/main.cpp index e0e5cc1..f6b0677 100644 --- a/examples/draganddrop/puzzle/main.cpp +++ b/examples/draganddrop/puzzle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/mainwindow.cpp b/examples/draganddrop/puzzle/mainwindow.cpp index f998882..15876b8 100644 --- a/examples/draganddrop/puzzle/mainwindow.cpp +++ b/examples/draganddrop/puzzle/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/mainwindow.h b/examples/draganddrop/puzzle/mainwindow.h index edfbb12..61f1bd4 100644 --- a/examples/draganddrop/puzzle/mainwindow.h +++ b/examples/draganddrop/puzzle/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/pieceslist.cpp b/examples/draganddrop/puzzle/pieceslist.cpp index 77d06fb..b6cdf51 100644 --- a/examples/draganddrop/puzzle/pieceslist.cpp +++ b/examples/draganddrop/puzzle/pieceslist.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/pieceslist.h b/examples/draganddrop/puzzle/pieceslist.h index 26685e3..5433601 100644 --- a/examples/draganddrop/puzzle/pieceslist.h +++ b/examples/draganddrop/puzzle/pieceslist.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/puzzlewidget.cpp b/examples/draganddrop/puzzle/puzzlewidget.cpp index 8548db5..987334d7 100644 --- a/examples/draganddrop/puzzle/puzzlewidget.cpp +++ b/examples/draganddrop/puzzle/puzzlewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/draganddrop/puzzle/puzzlewidget.h b/examples/draganddrop/puzzle/puzzlewidget.h index 312e25f..3ab9d8f 100644 --- a/examples/draganddrop/puzzle/puzzlewidget.h +++ b/examples/draganddrop/puzzle/puzzlewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp b/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp index 8216b6e..bb68665 100644 --- a/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp +++ b/examples/graphicsview/basicgraphicslayouts/layoutitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/basicgraphicslayouts/layoutitem.h b/examples/graphicsview/basicgraphicslayouts/layoutitem.h index cbda636..ea748fe 100644 --- a/examples/graphicsview/basicgraphicslayouts/layoutitem.h +++ b/examples/graphicsview/basicgraphicslayouts/layoutitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/basicgraphicslayouts/main.cpp b/examples/graphicsview/basicgraphicslayouts/main.cpp index 720f6ff..749696b 100644 --- a/examples/graphicsview/basicgraphicslayouts/main.cpp +++ b/examples/graphicsview/basicgraphicslayouts/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/basicgraphicslayouts/window.cpp b/examples/graphicsview/basicgraphicslayouts/window.cpp index afa98eb..8a96e1e 100644 --- a/examples/graphicsview/basicgraphicslayouts/window.cpp +++ b/examples/graphicsview/basicgraphicslayouts/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/basicgraphicslayouts/window.h b/examples/graphicsview/basicgraphicslayouts/window.h index 0ecde8a..b733e81 100644 --- a/examples/graphicsview/basicgraphicslayouts/window.h +++ b/examples/graphicsview/basicgraphicslayouts/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/collidingmice/main.cpp b/examples/graphicsview/collidingmice/main.cpp index 23c91b0..0d81643 100644 --- a/examples/graphicsview/collidingmice/main.cpp +++ b/examples/graphicsview/collidingmice/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/collidingmice/mouse.cpp b/examples/graphicsview/collidingmice/mouse.cpp index bbdb4e3..e708881 100644 --- a/examples/graphicsview/collidingmice/mouse.cpp +++ b/examples/graphicsview/collidingmice/mouse.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/collidingmice/mouse.h b/examples/graphicsview/collidingmice/mouse.h index c08ce4a..70de613 100644 --- a/examples/graphicsview/collidingmice/mouse.h +++ b/examples/graphicsview/collidingmice/mouse.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/arrow.cpp b/examples/graphicsview/diagramscene/arrow.cpp index 0bc2ca8..338c854 100644 --- a/examples/graphicsview/diagramscene/arrow.cpp +++ b/examples/graphicsview/diagramscene/arrow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/arrow.h b/examples/graphicsview/diagramscene/arrow.h index f624eb1..058de26 100644 --- a/examples/graphicsview/diagramscene/arrow.h +++ b/examples/graphicsview/diagramscene/arrow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramitem.cpp b/examples/graphicsview/diagramscene/diagramitem.cpp index b31f6b5..20c6f81 100644 --- a/examples/graphicsview/diagramscene/diagramitem.cpp +++ b/examples/graphicsview/diagramscene/diagramitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramitem.h b/examples/graphicsview/diagramscene/diagramitem.h index 5409f20..d14ec2c 100644 --- a/examples/graphicsview/diagramscene/diagramitem.h +++ b/examples/graphicsview/diagramscene/diagramitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramscene.cpp b/examples/graphicsview/diagramscene/diagramscene.cpp index 8065ec5..64e5e89 100644 --- a/examples/graphicsview/diagramscene/diagramscene.cpp +++ b/examples/graphicsview/diagramscene/diagramscene.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramscene.h b/examples/graphicsview/diagramscene/diagramscene.h index e33ee4f..e4ac3c1 100644 --- a/examples/graphicsview/diagramscene/diagramscene.h +++ b/examples/graphicsview/diagramscene/diagramscene.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramtextitem.cpp b/examples/graphicsview/diagramscene/diagramtextitem.cpp index 008b70f..316f9cf 100644 --- a/examples/graphicsview/diagramscene/diagramtextitem.cpp +++ b/examples/graphicsview/diagramscene/diagramtextitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/diagramtextitem.h b/examples/graphicsview/diagramscene/diagramtextitem.h index 6f0ddcb..0f6fb62 100644 --- a/examples/graphicsview/diagramscene/diagramtextitem.h +++ b/examples/graphicsview/diagramscene/diagramtextitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/main.cpp b/examples/graphicsview/diagramscene/main.cpp index 4e03074..e4a1f22 100644 --- a/examples/graphicsview/diagramscene/main.cpp +++ b/examples/graphicsview/diagramscene/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/mainwindow.cpp b/examples/graphicsview/diagramscene/mainwindow.cpp index b536a7a..f5529a4 100644 --- a/examples/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/graphicsview/diagramscene/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/diagramscene/mainwindow.h b/examples/graphicsview/diagramscene/mainwindow.h index e4dae4f..2d4957a 100644 --- a/examples/graphicsview/diagramscene/mainwindow.h +++ b/examples/graphicsview/diagramscene/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/dragdroprobot/coloritem.cpp b/examples/graphicsview/dragdroprobot/coloritem.cpp index 2d6b145..0dcad28 100644 --- a/examples/graphicsview/dragdroprobot/coloritem.cpp +++ b/examples/graphicsview/dragdroprobot/coloritem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/dragdroprobot/coloritem.h b/examples/graphicsview/dragdroprobot/coloritem.h index 67b2c70..0324694 100644 --- a/examples/graphicsview/dragdroprobot/coloritem.h +++ b/examples/graphicsview/dragdroprobot/coloritem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/dragdroprobot/main.cpp b/examples/graphicsview/dragdroprobot/main.cpp index 204305e..97a38e6 100644 --- a/examples/graphicsview/dragdroprobot/main.cpp +++ b/examples/graphicsview/dragdroprobot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/dragdroprobot/robot.cpp b/examples/graphicsview/dragdroprobot/robot.cpp index c6d8c44..3071590 100644 --- a/examples/graphicsview/dragdroprobot/robot.cpp +++ b/examples/graphicsview/dragdroprobot/robot.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/dragdroprobot/robot.h b/examples/graphicsview/dragdroprobot/robot.h index c0b6d14..e8c334e 100644 --- a/examples/graphicsview/dragdroprobot/robot.h +++ b/examples/graphicsview/dragdroprobot/robot.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/edge.cpp b/examples/graphicsview/elasticnodes/edge.cpp index 4018c25..b43b134 100644 --- a/examples/graphicsview/elasticnodes/edge.cpp +++ b/examples/graphicsview/elasticnodes/edge.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/edge.h b/examples/graphicsview/elasticnodes/edge.h index 9078870..de12f78 100644 --- a/examples/graphicsview/elasticnodes/edge.h +++ b/examples/graphicsview/elasticnodes/edge.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/graphwidget.cpp b/examples/graphicsview/elasticnodes/graphwidget.cpp index 5c5029c..8d8732d 100644 --- a/examples/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/graphicsview/elasticnodes/graphwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/graphwidget.h b/examples/graphicsview/elasticnodes/graphwidget.h index 2c86c76..409ab0c 100644 --- a/examples/graphicsview/elasticnodes/graphwidget.h +++ b/examples/graphicsview/elasticnodes/graphwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/main.cpp b/examples/graphicsview/elasticnodes/main.cpp index 8043d58..247c799 100644 --- a/examples/graphicsview/elasticnodes/main.cpp +++ b/examples/graphicsview/elasticnodes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp index 6942fa0..08d0a81 100644 --- a/examples/graphicsview/elasticnodes/node.cpp +++ b/examples/graphicsview/elasticnodes/node.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/elasticnodes/node.h b/examples/graphicsview/elasticnodes/node.h index 42309c4..c7714d4 100644 --- a/examples/graphicsview/elasticnodes/node.h +++ b/examples/graphicsview/elasticnodes/node.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp index dc5ff0c..29c7ee8 100644 --- a/examples/graphicsview/padnavigator/main.cpp +++ b/examples/graphicsview/padnavigator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/panel.cpp b/examples/graphicsview/padnavigator/panel.cpp index 28a3cb4..91c80a0 100644 --- a/examples/graphicsview/padnavigator/panel.cpp +++ b/examples/graphicsview/padnavigator/panel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h index 03876b7..838c933 100644 --- a/examples/graphicsview/padnavigator/panel.h +++ b/examples/graphicsview/padnavigator/panel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/roundrectitem.cpp b/examples/graphicsview/padnavigator/roundrectitem.cpp index c5dc35d..8f5f00a 100644 --- a/examples/graphicsview/padnavigator/roundrectitem.cpp +++ b/examples/graphicsview/padnavigator/roundrectitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h index 33e33d7..8488d9f 100644 --- a/examples/graphicsview/padnavigator/roundrectitem.h +++ b/examples/graphicsview/padnavigator/roundrectitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/splashitem.cpp b/examples/graphicsview/padnavigator/splashitem.cpp index 2a374bf..3cbcd56 100644 --- a/examples/graphicsview/padnavigator/splashitem.cpp +++ b/examples/graphicsview/padnavigator/splashitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/padnavigator/splashitem.h b/examples/graphicsview/padnavigator/splashitem.h index 982bbe2..7648528 100644 --- a/examples/graphicsview/padnavigator/splashitem.h +++ b/examples/graphicsview/padnavigator/splashitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/animateditem.cpp b/examples/graphicsview/portedasteroids/animateditem.cpp index ac41fb5..427ad59 100644 --- a/examples/graphicsview/portedasteroids/animateditem.cpp +++ b/examples/graphicsview/portedasteroids/animateditem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/animateditem.h b/examples/graphicsview/portedasteroids/animateditem.h index 54e8e56..3d58e99 100644 --- a/examples/graphicsview/portedasteroids/animateditem.h +++ b/examples/graphicsview/portedasteroids/animateditem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/ledmeter.cpp b/examples/graphicsview/portedasteroids/ledmeter.cpp index 37aee26..798a4c9 100644 --- a/examples/graphicsview/portedasteroids/ledmeter.cpp +++ b/examples/graphicsview/portedasteroids/ledmeter.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/ledmeter.h b/examples/graphicsview/portedasteroids/ledmeter.h index 117b113..3d1a796 100644 --- a/examples/graphicsview/portedasteroids/ledmeter.h +++ b/examples/graphicsview/portedasteroids/ledmeter.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/main.cpp b/examples/graphicsview/portedasteroids/main.cpp index 69b5fd5..0e23dce 100644 --- a/examples/graphicsview/portedasteroids/main.cpp +++ b/examples/graphicsview/portedasteroids/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/sprites.h b/examples/graphicsview/portedasteroids/sprites.h index 1483d68..e0ee1d5 100644 --- a/examples/graphicsview/portedasteroids/sprites.h +++ b/examples/graphicsview/portedasteroids/sprites.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/toplevel.cpp b/examples/graphicsview/portedasteroids/toplevel.cpp index 1aecc84..ba3389a 100644 --- a/examples/graphicsview/portedasteroids/toplevel.cpp +++ b/examples/graphicsview/portedasteroids/toplevel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/toplevel.h b/examples/graphicsview/portedasteroids/toplevel.h index 67781da..3673539 100644 --- a/examples/graphicsview/portedasteroids/toplevel.h +++ b/examples/graphicsview/portedasteroids/toplevel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/view.cpp b/examples/graphicsview/portedasteroids/view.cpp index fc6956b..5de6c78 100644 --- a/examples/graphicsview/portedasteroids/view.cpp +++ b/examples/graphicsview/portedasteroids/view.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedasteroids/view.h b/examples/graphicsview/portedasteroids/view.h index d055f29..5d78dd0 100644 --- a/examples/graphicsview/portedasteroids/view.h +++ b/examples/graphicsview/portedasteroids/view.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedcanvas/blendshadow.cpp b/examples/graphicsview/portedcanvas/blendshadow.cpp index 42cd0e3..df23df1 100644 --- a/examples/graphicsview/portedcanvas/blendshadow.cpp +++ b/examples/graphicsview/portedcanvas/blendshadow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedcanvas/canvas.cpp b/examples/graphicsview/portedcanvas/canvas.cpp index c8718dc..6d74464 100644 --- a/examples/graphicsview/portedcanvas/canvas.cpp +++ b/examples/graphicsview/portedcanvas/canvas.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedcanvas/canvas.h b/examples/graphicsview/portedcanvas/canvas.h index 769edbf..ed7b0d7 100644 --- a/examples/graphicsview/portedcanvas/canvas.h +++ b/examples/graphicsview/portedcanvas/canvas.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedcanvas/main.cpp b/examples/graphicsview/portedcanvas/main.cpp index b68c4cb..f4e6c34 100644 --- a/examples/graphicsview/portedcanvas/main.cpp +++ b/examples/graphicsview/portedcanvas/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/graphicsview/portedcanvas/makeimg.cpp b/examples/graphicsview/portedcanvas/makeimg.cpp index 93a8efe..767cc62 100644 --- a/examples/graphicsview/portedcanvas/makeimg.cpp +++ b/examples/graphicsview/portedcanvas/makeimg.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp index 100b940..9f8c213 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.cpp +++ b/examples/help/contextsensitivehelp/helpbrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/contextsensitivehelp/helpbrowser.h b/examples/help/contextsensitivehelp/helpbrowser.h index 1335524..fc01362 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.h +++ b/examples/help/contextsensitivehelp/helpbrowser.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/contextsensitivehelp/main.cpp b/examples/help/contextsensitivehelp/main.cpp index b05cf3e..1049dd0 100644 --- a/examples/help/contextsensitivehelp/main.cpp +++ b/examples/help/contextsensitivehelp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.cpp b/examples/help/contextsensitivehelp/wateringconfigdialog.cpp index 285123a..7fdc8f0 100644 --- a/examples/help/contextsensitivehelp/wateringconfigdialog.cpp +++ b/examples/help/contextsensitivehelp/wateringconfigdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.h b/examples/help/contextsensitivehelp/wateringconfigdialog.h index 7fc3c51..73e4d2a 100644 --- a/examples/help/contextsensitivehelp/wateringconfigdialog.h +++ b/examples/help/contextsensitivehelp/wateringconfigdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/remotecontrol/main.cpp b/examples/help/remotecontrol/main.cpp index 746dec4..65daa1f 100644 --- a/examples/help/remotecontrol/main.cpp +++ b/examples/help/remotecontrol/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/remotecontrol/remotecontrol.cpp b/examples/help/remotecontrol/remotecontrol.cpp index 8701afb..8b43326 100644 --- a/examples/help/remotecontrol/remotecontrol.cpp +++ b/examples/help/remotecontrol/remotecontrol.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/remotecontrol/remotecontrol.h b/examples/help/remotecontrol/remotecontrol.h index cc1c1c8..9424e95 100644 --- a/examples/help/remotecontrol/remotecontrol.h +++ b/examples/help/remotecontrol/remotecontrol.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/assistant.cpp b/examples/help/simpletextviewer/assistant.cpp index b6fb88a..2a22e76 100644 --- a/examples/help/simpletextviewer/assistant.cpp +++ b/examples/help/simpletextviewer/assistant.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/assistant.h b/examples/help/simpletextviewer/assistant.h index e58939c..9f93411 100644 --- a/examples/help/simpletextviewer/assistant.h +++ b/examples/help/simpletextviewer/assistant.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/findfiledialog.cpp b/examples/help/simpletextviewer/findfiledialog.cpp index 51d78ce..f36af22 100644 --- a/examples/help/simpletextviewer/findfiledialog.cpp +++ b/examples/help/simpletextviewer/findfiledialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/findfiledialog.h b/examples/help/simpletextviewer/findfiledialog.h index 97af229..911af0b 100644 --- a/examples/help/simpletextviewer/findfiledialog.h +++ b/examples/help/simpletextviewer/findfiledialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/main.cpp b/examples/help/simpletextviewer/main.cpp index ce4ee60..4f75bca 100644 --- a/examples/help/simpletextviewer/main.cpp +++ b/examples/help/simpletextviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/help/simpletextviewer/mainwindow.cpp index fc9af58..c90c7e3 100644 --- a/examples/help/simpletextviewer/mainwindow.cpp +++ b/examples/help/simpletextviewer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/mainwindow.h b/examples/help/simpletextviewer/mainwindow.h index 46d3b82..9c4bd09 100644 --- a/examples/help/simpletextviewer/mainwindow.h +++ b/examples/help/simpletextviewer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/textedit.cpp b/examples/help/simpletextviewer/textedit.cpp index 5c0fd1b..4b9e230 100644 --- a/examples/help/simpletextviewer/textedit.cpp +++ b/examples/help/simpletextviewer/textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/help/simpletextviewer/textedit.h b/examples/help/simpletextviewer/textedit.h index 58b6406..90dbd1e 100644 --- a/examples/help/simpletextviewer/textedit.h +++ b/examples/help/simpletextviewer/textedit.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneclient/client.cpp b/examples/ipc/localfortuneclient/client.cpp index 2edbcc3..1b17e88 100644 --- a/examples/ipc/localfortuneclient/client.cpp +++ b/examples/ipc/localfortuneclient/client.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneclient/client.h b/examples/ipc/localfortuneclient/client.h index 4dbdeb1..285c753 100644 --- a/examples/ipc/localfortuneclient/client.h +++ b/examples/ipc/localfortuneclient/client.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneclient/main.cpp b/examples/ipc/localfortuneclient/main.cpp index 11dcbc6..97f6a03 100644 --- a/examples/ipc/localfortuneclient/main.cpp +++ b/examples/ipc/localfortuneclient/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneserver/main.cpp b/examples/ipc/localfortuneserver/main.cpp index b505c44..1640cbd 100644 --- a/examples/ipc/localfortuneserver/main.cpp +++ b/examples/ipc/localfortuneserver/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneserver/server.cpp b/examples/ipc/localfortuneserver/server.cpp index 96a2663..0a7c786 100644 --- a/examples/ipc/localfortuneserver/server.cpp +++ b/examples/ipc/localfortuneserver/server.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/localfortuneserver/server.h b/examples/ipc/localfortuneserver/server.h index 7198fd9..8b67c07 100644 --- a/examples/ipc/localfortuneserver/server.h +++ b/examples/ipc/localfortuneserver/server.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/sharedmemory/dialog.cpp b/examples/ipc/sharedmemory/dialog.cpp index 245a4a1..f1d768a 100644 --- a/examples/ipc/sharedmemory/dialog.cpp +++ b/examples/ipc/sharedmemory/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/sharedmemory/dialog.h b/examples/ipc/sharedmemory/dialog.h index a0c84b6..d530320 100644 --- a/examples/ipc/sharedmemory/dialog.h +++ b/examples/ipc/sharedmemory/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/ipc/sharedmemory/main.cpp b/examples/ipc/sharedmemory/main.cpp index 533efeb..84b02f9 100644 --- a/examples/ipc/sharedmemory/main.cpp +++ b/examples/ipc/sharedmemory/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/adddialog.cpp b/examples/itemviews/addressbook/adddialog.cpp index 3eaba49..3d88940 100644 --- a/examples/itemviews/addressbook/adddialog.cpp +++ b/examples/itemviews/addressbook/adddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/adddialog.h b/examples/itemviews/addressbook/adddialog.h index a68f566..dd56b0d 100644 --- a/examples/itemviews/addressbook/adddialog.h +++ b/examples/itemviews/addressbook/adddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/addresswidget.cpp b/examples/itemviews/addressbook/addresswidget.cpp index e8d0527..1b4a1d6 100644 --- a/examples/itemviews/addressbook/addresswidget.cpp +++ b/examples/itemviews/addressbook/addresswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/addresswidget.h b/examples/itemviews/addressbook/addresswidget.h index 826e8b8..e1739f4 100644 --- a/examples/itemviews/addressbook/addresswidget.h +++ b/examples/itemviews/addressbook/addresswidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/main.cpp b/examples/itemviews/addressbook/main.cpp index da15c26..17fcaf2 100644 --- a/examples/itemviews/addressbook/main.cpp +++ b/examples/itemviews/addressbook/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/mainwindow.cpp b/examples/itemviews/addressbook/mainwindow.cpp index 8923522..8aaeaaa 100644 --- a/examples/itemviews/addressbook/mainwindow.cpp +++ b/examples/itemviews/addressbook/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/mainwindow.h b/examples/itemviews/addressbook/mainwindow.h index 8c25e70..18dc4da 100644 --- a/examples/itemviews/addressbook/mainwindow.h +++ b/examples/itemviews/addressbook/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/newaddresstab.cpp b/examples/itemviews/addressbook/newaddresstab.cpp index bd0a314..19ec5ab 100644 --- a/examples/itemviews/addressbook/newaddresstab.cpp +++ b/examples/itemviews/addressbook/newaddresstab.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/newaddresstab.h b/examples/itemviews/addressbook/newaddresstab.h index 5ef6c37..9e19400 100644 --- a/examples/itemviews/addressbook/newaddresstab.h +++ b/examples/itemviews/addressbook/newaddresstab.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/tablemodel.cpp b/examples/itemviews/addressbook/tablemodel.cpp index 5673451..d4e78c6 100644 --- a/examples/itemviews/addressbook/tablemodel.cpp +++ b/examples/itemviews/addressbook/tablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/addressbook/tablemodel.h b/examples/itemviews/addressbook/tablemodel.h index 9433bec..f8960ee 100644 --- a/examples/itemviews/addressbook/tablemodel.h +++ b/examples/itemviews/addressbook/tablemodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/basicsortfiltermodel/main.cpp b/examples/itemviews/basicsortfiltermodel/main.cpp index da499ed..67a42e5 100644 --- a/examples/itemviews/basicsortfiltermodel/main.cpp +++ b/examples/itemviews/basicsortfiltermodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/basicsortfiltermodel/window.cpp b/examples/itemviews/basicsortfiltermodel/window.cpp index e60553e..652aa41 100644 --- a/examples/itemviews/basicsortfiltermodel/window.cpp +++ b/examples/itemviews/basicsortfiltermodel/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/basicsortfiltermodel/window.h b/examples/itemviews/basicsortfiltermodel/window.h index 029a83a..f7e7ff4 100644 --- a/examples/itemviews/basicsortfiltermodel/window.h +++ b/examples/itemviews/basicsortfiltermodel/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/chart/main.cpp b/examples/itemviews/chart/main.cpp index dc3733c..b4cece1 100644 --- a/examples/itemviews/chart/main.cpp +++ b/examples/itemviews/chart/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/chart/mainwindow.cpp b/examples/itemviews/chart/mainwindow.cpp index 208a465..025290d 100644 --- a/examples/itemviews/chart/mainwindow.cpp +++ b/examples/itemviews/chart/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/chart/mainwindow.h b/examples/itemviews/chart/mainwindow.h index f3a9a10..37ee835 100644 --- a/examples/itemviews/chart/mainwindow.h +++ b/examples/itemviews/chart/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp index 6b62f25..67d525d 100644 --- a/examples/itemviews/chart/pieview.cpp +++ b/examples/itemviews/chart/pieview.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/chart/pieview.h b/examples/itemviews/chart/pieview.h index 5bebefc..39853f48 100644 --- a/examples/itemviews/chart/pieview.h +++ b/examples/itemviews/chart/pieview.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/coloreditorfactory/colorlisteditor.cpp b/examples/itemviews/coloreditorfactory/colorlisteditor.cpp index 88b953c..92d9336 100644 --- a/examples/itemviews/coloreditorfactory/colorlisteditor.cpp +++ b/examples/itemviews/coloreditorfactory/colorlisteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/coloreditorfactory/colorlisteditor.h b/examples/itemviews/coloreditorfactory/colorlisteditor.h index 810e268..1001f1d 100644 --- a/examples/itemviews/coloreditorfactory/colorlisteditor.h +++ b/examples/itemviews/coloreditorfactory/colorlisteditor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/coloreditorfactory/main.cpp b/examples/itemviews/coloreditorfactory/main.cpp index a9740af..77ca9e1 100644 --- a/examples/itemviews/coloreditorfactory/main.cpp +++ b/examples/itemviews/coloreditorfactory/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/coloreditorfactory/window.cpp b/examples/itemviews/coloreditorfactory/window.cpp index 2ac64a3..915dec5 100644 --- a/examples/itemviews/coloreditorfactory/window.cpp +++ b/examples/itemviews/coloreditorfactory/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/coloreditorfactory/window.h b/examples/itemviews/coloreditorfactory/window.h index fc7b13a..16331c5 100644 --- a/examples/itemviews/coloreditorfactory/window.h +++ b/examples/itemviews/coloreditorfactory/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/combowidgetmapper/main.cpp b/examples/itemviews/combowidgetmapper/main.cpp index 055ac21..07752b6 100644 --- a/examples/itemviews/combowidgetmapper/main.cpp +++ b/examples/itemviews/combowidgetmapper/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/combowidgetmapper/window.cpp b/examples/itemviews/combowidgetmapper/window.cpp index 69a4c3c..4f755bc 100644 --- a/examples/itemviews/combowidgetmapper/window.cpp +++ b/examples/itemviews/combowidgetmapper/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/combowidgetmapper/window.h b/examples/itemviews/combowidgetmapper/window.h index 8c45117..42a3edf 100644 --- a/examples/itemviews/combowidgetmapper/window.h +++ b/examples/itemviews/combowidgetmapper/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/customsortfiltermodel/main.cpp b/examples/itemviews/customsortfiltermodel/main.cpp index 043f28a..a806407 100644 --- a/examples/itemviews/customsortfiltermodel/main.cpp +++ b/examples/itemviews/customsortfiltermodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp index ead2eb7..1514f55 100644 --- a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp +++ b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h index 0e09bf1..416b1b3 100644 --- a/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h +++ b/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/customsortfiltermodel/window.cpp b/examples/itemviews/customsortfiltermodel/window.cpp index 54ba646..82058c6 100644 --- a/examples/itemviews/customsortfiltermodel/window.cpp +++ b/examples/itemviews/customsortfiltermodel/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/customsortfiltermodel/window.h b/examples/itemviews/customsortfiltermodel/window.h index ba97408..243ae3a 100644 --- a/examples/itemviews/customsortfiltermodel/window.h +++ b/examples/itemviews/customsortfiltermodel/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/dirview/main.cpp b/examples/itemviews/dirview/main.cpp index 65d2ecc..77d0eaf 100644 --- a/examples/itemviews/dirview/main.cpp +++ b/examples/itemviews/dirview/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/main.cpp b/examples/itemviews/editabletreemodel/main.cpp index e476d2e..d2374d2 100644 --- a/examples/itemviews/editabletreemodel/main.cpp +++ b/examples/itemviews/editabletreemodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/mainwindow.cpp b/examples/itemviews/editabletreemodel/mainwindow.cpp index f81b2fe..aa14b8c 100644 --- a/examples/itemviews/editabletreemodel/mainwindow.cpp +++ b/examples/itemviews/editabletreemodel/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/mainwindow.h b/examples/itemviews/editabletreemodel/mainwindow.h index 6de08b6..02e3049 100644 --- a/examples/itemviews/editabletreemodel/mainwindow.h +++ b/examples/itemviews/editabletreemodel/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/treeitem.cpp b/examples/itemviews/editabletreemodel/treeitem.cpp index 81a1bf3..dc2a0d0 100644 --- a/examples/itemviews/editabletreemodel/treeitem.cpp +++ b/examples/itemviews/editabletreemodel/treeitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/treeitem.h b/examples/itemviews/editabletreemodel/treeitem.h index 9a36529..bae79c0 100644 --- a/examples/itemviews/editabletreemodel/treeitem.h +++ b/examples/itemviews/editabletreemodel/treeitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/treemodel.cpp b/examples/itemviews/editabletreemodel/treemodel.cpp index f1dff03..a524afc 100644 --- a/examples/itemviews/editabletreemodel/treemodel.cpp +++ b/examples/itemviews/editabletreemodel/treemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/editabletreemodel/treemodel.h b/examples/itemviews/editabletreemodel/treemodel.h index 36ae739..47caa8a 100644 --- a/examples/itemviews/editabletreemodel/treemodel.h +++ b/examples/itemviews/editabletreemodel/treemodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/fetchmore/filelistmodel.cpp b/examples/itemviews/fetchmore/filelistmodel.cpp index fc51087..0b61884 100644 --- a/examples/itemviews/fetchmore/filelistmodel.cpp +++ b/examples/itemviews/fetchmore/filelistmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/fetchmore/filelistmodel.h b/examples/itemviews/fetchmore/filelistmodel.h index 921a9e2..b5164df 100644 --- a/examples/itemviews/fetchmore/filelistmodel.h +++ b/examples/itemviews/fetchmore/filelistmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/fetchmore/main.cpp b/examples/itemviews/fetchmore/main.cpp index 58c9705..f924392 100644 --- a/examples/itemviews/fetchmore/main.cpp +++ b/examples/itemviews/fetchmore/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/fetchmore/window.cpp b/examples/itemviews/fetchmore/window.cpp index 066f26b..1d971b2 100644 --- a/examples/itemviews/fetchmore/window.cpp +++ b/examples/itemviews/fetchmore/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/fetchmore/window.h b/examples/itemviews/fetchmore/window.h index 1b8076f..f450a12 100644 --- a/examples/itemviews/fetchmore/window.h +++ b/examples/itemviews/fetchmore/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/imagemodel.cpp b/examples/itemviews/pixelator/imagemodel.cpp index ea42b62..4ef25c6 100644 --- a/examples/itemviews/pixelator/imagemodel.cpp +++ b/examples/itemviews/pixelator/imagemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/imagemodel.h b/examples/itemviews/pixelator/imagemodel.h index e92115a..434cc7aa 100644 --- a/examples/itemviews/pixelator/imagemodel.h +++ b/examples/itemviews/pixelator/imagemodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/main.cpp b/examples/itemviews/pixelator/main.cpp index 7a30347..3b6c313 100644 --- a/examples/itemviews/pixelator/main.cpp +++ b/examples/itemviews/pixelator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/mainwindow.cpp b/examples/itemviews/pixelator/mainwindow.cpp index a2b98cf..adf1eb2 100644 --- a/examples/itemviews/pixelator/mainwindow.cpp +++ b/examples/itemviews/pixelator/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/mainwindow.h b/examples/itemviews/pixelator/mainwindow.h index df9510e..ef966a5 100644 --- a/examples/itemviews/pixelator/mainwindow.h +++ b/examples/itemviews/pixelator/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/pixeldelegate.cpp b/examples/itemviews/pixelator/pixeldelegate.cpp index 496b365..4f37ba8 100644 --- a/examples/itemviews/pixelator/pixeldelegate.cpp +++ b/examples/itemviews/pixelator/pixeldelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/pixelator/pixeldelegate.h b/examples/itemviews/pixelator/pixeldelegate.h index b38e470..29f5d05 100644 --- a/examples/itemviews/pixelator/pixeldelegate.h +++ b/examples/itemviews/pixelator/pixeldelegate.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/main.cpp b/examples/itemviews/puzzle/main.cpp index e0e5cc1..f6b0677 100644 --- a/examples/itemviews/puzzle/main.cpp +++ b/examples/itemviews/puzzle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/mainwindow.cpp b/examples/itemviews/puzzle/mainwindow.cpp index c6088f6..34848eb 100644 --- a/examples/itemviews/puzzle/mainwindow.cpp +++ b/examples/itemviews/puzzle/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/mainwindow.h b/examples/itemviews/puzzle/mainwindow.h index 2fb97d4..dba2f1a 100644 --- a/examples/itemviews/puzzle/mainwindow.h +++ b/examples/itemviews/puzzle/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/piecesmodel.cpp b/examples/itemviews/puzzle/piecesmodel.cpp index f480837..86b5a7a 100644 --- a/examples/itemviews/puzzle/piecesmodel.cpp +++ b/examples/itemviews/puzzle/piecesmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/piecesmodel.h b/examples/itemviews/puzzle/piecesmodel.h index 777768a..cff0e2a 100644 --- a/examples/itemviews/puzzle/piecesmodel.h +++ b/examples/itemviews/puzzle/piecesmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/puzzlewidget.cpp b/examples/itemviews/puzzle/puzzlewidget.cpp index aa41ead..f75461e 100644 --- a/examples/itemviews/puzzle/puzzlewidget.cpp +++ b/examples/itemviews/puzzle/puzzlewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/puzzle/puzzlewidget.h b/examples/itemviews/puzzle/puzzlewidget.h index 312e25f..3ab9d8f 100644 --- a/examples/itemviews/puzzle/puzzlewidget.h +++ b/examples/itemviews/puzzle/puzzlewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/domitem.cpp b/examples/itemviews/simpledommodel/domitem.cpp index 18f65ea..518a525 100644 --- a/examples/itemviews/simpledommodel/domitem.cpp +++ b/examples/itemviews/simpledommodel/domitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/domitem.h b/examples/itemviews/simpledommodel/domitem.h index 61f2acc..1560a81 100644 --- a/examples/itemviews/simpledommodel/domitem.h +++ b/examples/itemviews/simpledommodel/domitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/dommodel.cpp b/examples/itemviews/simpledommodel/dommodel.cpp index 495fd55..28717a9 100644 --- a/examples/itemviews/simpledommodel/dommodel.cpp +++ b/examples/itemviews/simpledommodel/dommodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/dommodel.h b/examples/itemviews/simpledommodel/dommodel.h index 1178b2c..7a4045a 100644 --- a/examples/itemviews/simpledommodel/dommodel.h +++ b/examples/itemviews/simpledommodel/dommodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/main.cpp b/examples/itemviews/simpledommodel/main.cpp index d2ecfc9..4a1c10b 100644 --- a/examples/itemviews/simpledommodel/main.cpp +++ b/examples/itemviews/simpledommodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/mainwindow.cpp b/examples/itemviews/simpledommodel/mainwindow.cpp index ac96899..acc8c6d 100644 --- a/examples/itemviews/simpledommodel/mainwindow.cpp +++ b/examples/itemviews/simpledommodel/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpledommodel/mainwindow.h b/examples/itemviews/simpledommodel/mainwindow.h index 4bc967a..995c400 100644 --- a/examples/itemviews/simpledommodel/mainwindow.h +++ b/examples/itemviews/simpledommodel/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpletreemodel/main.cpp b/examples/itemviews/simpletreemodel/main.cpp index 89bdc77..67a5537 100644 --- a/examples/itemviews/simpletreemodel/main.cpp +++ b/examples/itemviews/simpletreemodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpletreemodel/treeitem.cpp b/examples/itemviews/simpletreemodel/treeitem.cpp index d2c1eed..03db327 100644 --- a/examples/itemviews/simpletreemodel/treeitem.cpp +++ b/examples/itemviews/simpletreemodel/treeitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpletreemodel/treeitem.h b/examples/itemviews/simpletreemodel/treeitem.h index 7bfd63b..7e3af88 100644 --- a/examples/itemviews/simpletreemodel/treeitem.h +++ b/examples/itemviews/simpletreemodel/treeitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpletreemodel/treemodel.cpp b/examples/itemviews/simpletreemodel/treemodel.cpp index ec7bd64..184087a 100644 --- a/examples/itemviews/simpletreemodel/treemodel.cpp +++ b/examples/itemviews/simpletreemodel/treemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simpletreemodel/treemodel.h b/examples/itemviews/simpletreemodel/treemodel.h index 3b535f9..d54fd0c 100644 --- a/examples/itemviews/simpletreemodel/treemodel.h +++ b/examples/itemviews/simpletreemodel/treemodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simplewidgetmapper/main.cpp b/examples/itemviews/simplewidgetmapper/main.cpp index 055ac21..07752b6 100644 --- a/examples/itemviews/simplewidgetmapper/main.cpp +++ b/examples/itemviews/simplewidgetmapper/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simplewidgetmapper/window.cpp b/examples/itemviews/simplewidgetmapper/window.cpp index 406a3d7..a989641 100644 --- a/examples/itemviews/simplewidgetmapper/window.cpp +++ b/examples/itemviews/simplewidgetmapper/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/simplewidgetmapper/window.h b/examples/itemviews/simplewidgetmapper/window.h index 726d4d6..65a29a5 100644 --- a/examples/itemviews/simplewidgetmapper/window.h +++ b/examples/itemviews/simplewidgetmapper/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/spinboxdelegate/delegate.cpp b/examples/itemviews/spinboxdelegate/delegate.cpp index 03a1a23..a5dadb3 100644 --- a/examples/itemviews/spinboxdelegate/delegate.cpp +++ b/examples/itemviews/spinboxdelegate/delegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/spinboxdelegate/delegate.h b/examples/itemviews/spinboxdelegate/delegate.h index a81cfd1..ef7f56c 100644 --- a/examples/itemviews/spinboxdelegate/delegate.h +++ b/examples/itemviews/spinboxdelegate/delegate.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/spinboxdelegate/main.cpp b/examples/itemviews/spinboxdelegate/main.cpp index 4b9d6a4..1e721c4 100644 --- a/examples/itemviews/spinboxdelegate/main.cpp +++ b/examples/itemviews/spinboxdelegate/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/main.cpp b/examples/itemviews/stardelegate/main.cpp index 5b27ee1..a2dad09 100644 --- a/examples/itemviews/stardelegate/main.cpp +++ b/examples/itemviews/stardelegate/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/stardelegate.cpp b/examples/itemviews/stardelegate/stardelegate.cpp index 1e12971..c7a8c1b9 100644 --- a/examples/itemviews/stardelegate/stardelegate.cpp +++ b/examples/itemviews/stardelegate/stardelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/stardelegate.h b/examples/itemviews/stardelegate/stardelegate.h index 84814ed..e6c1c11 100644 --- a/examples/itemviews/stardelegate/stardelegate.h +++ b/examples/itemviews/stardelegate/stardelegate.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/stareditor.cpp b/examples/itemviews/stardelegate/stareditor.cpp index 633229f..f77d4d7 100644 --- a/examples/itemviews/stardelegate/stareditor.cpp +++ b/examples/itemviews/stardelegate/stareditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/stareditor.h b/examples/itemviews/stardelegate/stareditor.h index 7365ca1..dd701f5 100644 --- a/examples/itemviews/stardelegate/stareditor.h +++ b/examples/itemviews/stardelegate/stareditor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/starrating.cpp b/examples/itemviews/stardelegate/starrating.cpp index e40f22d..c7d67c6 100644 --- a/examples/itemviews/stardelegate/starrating.cpp +++ b/examples/itemviews/stardelegate/starrating.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/itemviews/stardelegate/starrating.h b/examples/itemviews/stardelegate/starrating.h index 1e73076..72d89f2 100644 --- a/examples/itemviews/stardelegate/starrating.h +++ b/examples/itemviews/stardelegate/starrating.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/basiclayouts/dialog.cpp b/examples/layouts/basiclayouts/dialog.cpp index 86cafb9..0ac0755 100644 --- a/examples/layouts/basiclayouts/dialog.cpp +++ b/examples/layouts/basiclayouts/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/basiclayouts/dialog.h b/examples/layouts/basiclayouts/dialog.h index b6b1e3a..c7cc0fa 100644 --- a/examples/layouts/basiclayouts/dialog.h +++ b/examples/layouts/basiclayouts/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/basiclayouts/main.cpp b/examples/layouts/basiclayouts/main.cpp index 09c49ee..d431b64 100644 --- a/examples/layouts/basiclayouts/main.cpp +++ b/examples/layouts/basiclayouts/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/borderlayout/borderlayout.cpp b/examples/layouts/borderlayout/borderlayout.cpp index 25a4778..1e384ca0 100644 --- a/examples/layouts/borderlayout/borderlayout.cpp +++ b/examples/layouts/borderlayout/borderlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/borderlayout/borderlayout.h b/examples/layouts/borderlayout/borderlayout.h index 781a01f..84d29c1 100644 --- a/examples/layouts/borderlayout/borderlayout.h +++ b/examples/layouts/borderlayout/borderlayout.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/borderlayout/main.cpp b/examples/layouts/borderlayout/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/layouts/borderlayout/main.cpp +++ b/examples/layouts/borderlayout/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/borderlayout/window.cpp b/examples/layouts/borderlayout/window.cpp index 2b08551..1500e22 100644 --- a/examples/layouts/borderlayout/window.cpp +++ b/examples/layouts/borderlayout/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/borderlayout/window.h b/examples/layouts/borderlayout/window.h index 708d270..a280162 100644 --- a/examples/layouts/borderlayout/window.h +++ b/examples/layouts/borderlayout/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/dynamiclayouts/dialog.cpp b/examples/layouts/dynamiclayouts/dialog.cpp index eee15f6..2353a71 100644 --- a/examples/layouts/dynamiclayouts/dialog.cpp +++ b/examples/layouts/dynamiclayouts/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/dynamiclayouts/dialog.h b/examples/layouts/dynamiclayouts/dialog.h index bc1225a..a06b456 100644 --- a/examples/layouts/dynamiclayouts/dialog.h +++ b/examples/layouts/dynamiclayouts/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/dynamiclayouts/main.cpp b/examples/layouts/dynamiclayouts/main.cpp index 09c49ee..d431b64 100644 --- a/examples/layouts/dynamiclayouts/main.cpp +++ b/examples/layouts/dynamiclayouts/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/flowlayout/flowlayout.cpp b/examples/layouts/flowlayout/flowlayout.cpp index d1e857d..5464c7c 100644 --- a/examples/layouts/flowlayout/flowlayout.cpp +++ b/examples/layouts/flowlayout/flowlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/flowlayout/flowlayout.h b/examples/layouts/flowlayout/flowlayout.h index f864d8e..24f4c4b 100644 --- a/examples/layouts/flowlayout/flowlayout.h +++ b/examples/layouts/flowlayout/flowlayout.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/flowlayout/main.cpp b/examples/layouts/flowlayout/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/layouts/flowlayout/main.cpp +++ b/examples/layouts/flowlayout/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/flowlayout/window.cpp b/examples/layouts/flowlayout/window.cpp index 51d9886..70d9e6d 100644 --- a/examples/layouts/flowlayout/window.cpp +++ b/examples/layouts/flowlayout/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/layouts/flowlayout/window.h b/examples/layouts/flowlayout/window.h index ffd60af..93dc3bd 100644 --- a/examples/layouts/flowlayout/window.h +++ b/examples/layouts/flowlayout/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/arrowpad/arrowpad.cpp b/examples/linguist/arrowpad/arrowpad.cpp index 149247e..529db3d 100644 --- a/examples/linguist/arrowpad/arrowpad.cpp +++ b/examples/linguist/arrowpad/arrowpad.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/arrowpad/arrowpad.h b/examples/linguist/arrowpad/arrowpad.h index d87a40c..53e0781 100644 --- a/examples/linguist/arrowpad/arrowpad.h +++ b/examples/linguist/arrowpad/arrowpad.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/arrowpad/main.cpp b/examples/linguist/arrowpad/main.cpp index 912cac4..4484094 100644 --- a/examples/linguist/arrowpad/main.cpp +++ b/examples/linguist/arrowpad/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/arrowpad/mainwindow.cpp b/examples/linguist/arrowpad/mainwindow.cpp index a167cc2..265de47 100644 --- a/examples/linguist/arrowpad/mainwindow.cpp +++ b/examples/linguist/arrowpad/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/arrowpad/mainwindow.h b/examples/linguist/arrowpad/mainwindow.h index 74e89be..f8d483c 100644 --- a/examples/linguist/arrowpad/mainwindow.h +++ b/examples/linguist/arrowpad/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/hellotr/main.cpp b/examples/linguist/hellotr/main.cpp index f98089d..87da60d 100644 --- a/examples/linguist/hellotr/main.cpp +++ b/examples/linguist/hellotr/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/trollprint/main.cpp b/examples/linguist/trollprint/main.cpp index 9f37661..ba59ff6 100644 --- a/examples/linguist/trollprint/main.cpp +++ b/examples/linguist/trollprint/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/trollprint/mainwindow.cpp b/examples/linguist/trollprint/mainwindow.cpp index f7aa1ca..51949bb 100644 --- a/examples/linguist/trollprint/mainwindow.cpp +++ b/examples/linguist/trollprint/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/trollprint/mainwindow.h b/examples/linguist/trollprint/mainwindow.h index 415512b..fbe0441 100644 --- a/examples/linguist/trollprint/mainwindow.h +++ b/examples/linguist/trollprint/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/trollprint/printpanel.cpp b/examples/linguist/trollprint/printpanel.cpp index 888c12a..611dd43 100644 --- a/examples/linguist/trollprint/printpanel.cpp +++ b/examples/linguist/trollprint/printpanel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/linguist/trollprint/printpanel.h b/examples/linguist/trollprint/printpanel.h index f6eef67..dffd456 100644 --- a/examples/linguist/trollprint/printpanel.h +++ b/examples/linguist/trollprint/printpanel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/application/main.cpp b/examples/mainwindows/application/main.cpp index 0f9d1b2..f82b364 100644 --- a/examples/mainwindows/application/main.cpp +++ b/examples/mainwindows/application/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/application/mainwindow.cpp b/examples/mainwindows/application/mainwindow.cpp index 9a22254..9402310 100644 --- a/examples/mainwindows/application/mainwindow.cpp +++ b/examples/mainwindows/application/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/application/mainwindow.h b/examples/mainwindows/application/mainwindow.h index 264be03..3042289 100644 --- a/examples/mainwindows/application/mainwindow.h +++ b/examples/mainwindows/application/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/dockwidgets/main.cpp b/examples/mainwindows/dockwidgets/main.cpp index f4bed91..ed7f690 100644 --- a/examples/mainwindows/dockwidgets/main.cpp +++ b/examples/mainwindows/dockwidgets/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/dockwidgets/mainwindow.cpp b/examples/mainwindows/dockwidgets/mainwindow.cpp index 1683034..83fcff2 100644 --- a/examples/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/mainwindows/dockwidgets/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/dockwidgets/mainwindow.h b/examples/mainwindows/dockwidgets/mainwindow.h index f4768d7..1658d9b 100644 --- a/examples/mainwindows/dockwidgets/mainwindow.h +++ b/examples/mainwindows/dockwidgets/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/mdi/main.cpp b/examples/mainwindows/mdi/main.cpp index 8592836..74cd712 100644 --- a/examples/mainwindows/mdi/main.cpp +++ b/examples/mainwindows/mdi/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp index 49f9b21..e09bf23 100644 --- a/examples/mainwindows/mdi/mainwindow.cpp +++ b/examples/mainwindows/mdi/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/mdi/mainwindow.h b/examples/mainwindows/mdi/mainwindow.h index ee91d36..9a993f6 100644 --- a/examples/mainwindows/mdi/mainwindow.h +++ b/examples/mainwindows/mdi/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/mdi/mdichild.cpp b/examples/mainwindows/mdi/mdichild.cpp index 1433450..1850205 100644 --- a/examples/mainwindows/mdi/mdichild.cpp +++ b/examples/mainwindows/mdi/mdichild.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/mdi/mdichild.h b/examples/mainwindows/mdi/mdichild.h index 04084c7..719e88d 100644 --- a/examples/mainwindows/mdi/mdichild.h +++ b/examples/mainwindows/mdi/mdichild.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/menus/main.cpp b/examples/mainwindows/menus/main.cpp index 1d51376..95e9ba6 100644 --- a/examples/mainwindows/menus/main.cpp +++ b/examples/mainwindows/menus/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/menus/mainwindow.cpp b/examples/mainwindows/menus/mainwindow.cpp index 4c10f73..8312d79 100644 --- a/examples/mainwindows/menus/mainwindow.cpp +++ b/examples/mainwindows/menus/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/menus/mainwindow.h b/examples/mainwindows/menus/mainwindow.h index 4894a9a..6206486 100644 --- a/examples/mainwindows/menus/mainwindow.h +++ b/examples/mainwindows/menus/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/recentfiles/main.cpp b/examples/mainwindows/recentfiles/main.cpp index d1c8eb0..382580e 100644 --- a/examples/mainwindows/recentfiles/main.cpp +++ b/examples/mainwindows/recentfiles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/recentfiles/mainwindow.cpp b/examples/mainwindows/recentfiles/mainwindow.cpp index c8c2f88..bd535bc 100644 --- a/examples/mainwindows/recentfiles/mainwindow.cpp +++ b/examples/mainwindows/recentfiles/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/recentfiles/mainwindow.h b/examples/mainwindows/recentfiles/mainwindow.h index 9d9d467..7673451 100644 --- a/examples/mainwindows/recentfiles/mainwindow.h +++ b/examples/mainwindows/recentfiles/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/sdi/main.cpp b/examples/mainwindows/sdi/main.cpp index 163ad93..809c2a0 100644 --- a/examples/mainwindows/sdi/main.cpp +++ b/examples/mainwindows/sdi/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/sdi/mainwindow.cpp b/examples/mainwindows/sdi/mainwindow.cpp index 61d63b3..8eee138 100644 --- a/examples/mainwindows/sdi/mainwindow.cpp +++ b/examples/mainwindows/sdi/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/mainwindows/sdi/mainwindow.h b/examples/mainwindows/sdi/mainwindow.h index f08cee2..b5ade0d 100644 --- a/examples/mainwindows/sdi/mainwindow.h +++ b/examples/mainwindows/sdi/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp index 207ff5f..cc2d3e0 100644 --- a/examples/network/blockingfortuneclient/blockingclient.cpp +++ b/examples/network/blockingfortuneclient/blockingclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h index 2bc0b80..a694216 100644 --- a/examples/network/blockingfortuneclient/blockingclient.h +++ b/examples/network/blockingfortuneclient/blockingclient.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp index af1c612..984da7a 100644 --- a/examples/network/blockingfortuneclient/fortunethread.cpp +++ b/examples/network/blockingfortuneclient/fortunethread.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h index c2fbe6f..fd995a9 100644 --- a/examples/network/blockingfortuneclient/fortunethread.h +++ b/examples/network/blockingfortuneclient/fortunethread.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp index 98982c1..0f945b7 100644 --- a/examples/network/blockingfortuneclient/main.cpp +++ b/examples/network/blockingfortuneclient/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp index f815729..fc8520a 100644 --- a/examples/network/broadcastreceiver/main.cpp +++ b/examples/network/broadcastreceiver/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp index ea9ab14..90cbd95 100644 --- a/examples/network/broadcastreceiver/receiver.cpp +++ b/examples/network/broadcastreceiver/receiver.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h index 9939cbe..57eba1c 100644 --- a/examples/network/broadcastreceiver/receiver.h +++ b/examples/network/broadcastreceiver/receiver.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp index 85613c5..9a55afa 100644 --- a/examples/network/broadcastsender/main.cpp +++ b/examples/network/broadcastsender/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastsender/sender.cpp b/examples/network/broadcastsender/sender.cpp index a74beae..7282276 100644 --- a/examples/network/broadcastsender/sender.cpp +++ b/examples/network/broadcastsender/sender.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/broadcastsender/sender.h b/examples/network/broadcastsender/sender.h index 92265b8..1a4a462 100644 --- a/examples/network/broadcastsender/sender.h +++ b/examples/network/broadcastsender/sender.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp index e0158e7..61817e5 100644 --- a/examples/network/download/main.cpp +++ b/examples/network/download/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/downloadmanager/downloadmanager.cpp b/examples/network/downloadmanager/downloadmanager.cpp index a4721a2..025c9e5 100644 --- a/examples/network/downloadmanager/downloadmanager.cpp +++ b/examples/network/downloadmanager/downloadmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/downloadmanager/downloadmanager.h b/examples/network/downloadmanager/downloadmanager.h index 7ed80c4..bf3c246 100644 --- a/examples/network/downloadmanager/downloadmanager.h +++ b/examples/network/downloadmanager/downloadmanager.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/downloadmanager/main.cpp b/examples/network/downloadmanager/main.cpp index 8a3fe24..03ed6d4 100644 --- a/examples/network/downloadmanager/main.cpp +++ b/examples/network/downloadmanager/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/downloadmanager/textprogressbar.cpp b/examples/network/downloadmanager/textprogressbar.cpp index e1fbf52..974cf05 100644 --- a/examples/network/downloadmanager/textprogressbar.cpp +++ b/examples/network/downloadmanager/textprogressbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/downloadmanager/textprogressbar.h b/examples/network/downloadmanager/textprogressbar.h index 34097d0..1a02945 100644 --- a/examples/network/downloadmanager/textprogressbar.h +++ b/examples/network/downloadmanager/textprogressbar.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp index 4d65828..aad6f0f 100644 --- a/examples/network/fortuneclient/client.cpp +++ b/examples/network/fortuneclient/client.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneclient/client.h b/examples/network/fortuneclient/client.h index b9fe7b1..6f0981d 100644 --- a/examples/network/fortuneclient/client.h +++ b/examples/network/fortuneclient/client.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp index 11dcbc6..97f6a03 100644 --- a/examples/network/fortuneclient/main.cpp +++ b/examples/network/fortuneclient/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp index b505c44..1640cbd 100644 --- a/examples/network/fortuneserver/main.cpp +++ b/examples/network/fortuneserver/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index 09626a8..322857f 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/fortuneserver/server.h b/examples/network/fortuneserver/server.h index dcd64c7..320b2d4 100644 --- a/examples/network/fortuneserver/server.h +++ b/examples/network/fortuneserver/server.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp index a05a5dd..e3ce504 100644 --- a/examples/network/ftp/ftpwindow.cpp +++ b/examples/network/ftp/ftpwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/ftp/ftpwindow.h b/examples/network/ftp/ftpwindow.h index a3045fa..1d7ed9c 100644 --- a/examples/network/ftp/ftpwindow.h +++ b/examples/network/ftp/ftpwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/ftp/main.cpp b/examples/network/ftp/main.cpp index b9ffd33..ab4c89e 100644 --- a/examples/network/ftp/main.cpp +++ b/examples/network/ftp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index ebde770..1787b74 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h index f0fb504..becc277 100644 --- a/examples/network/http/httpwindow.h +++ b/examples/network/http/httpwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp index dba4082..8ff7414 100644 --- a/examples/network/http/main.cpp +++ b/examples/network/http/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp index 06ec8dd..b3729fa 100644 --- a/examples/network/loopback/dialog.cpp +++ b/examples/network/loopback/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h index cc15376..420fb35 100644 --- a/examples/network/loopback/dialog.h +++ b/examples/network/loopback/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp index 3e9e62c..42b1fd4 100644 --- a/examples/network/loopback/main.cpp +++ b/examples/network/loopback/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/chatdialog.cpp b/examples/network/network-chat/chatdialog.cpp index 7e88e5b..161c00e 100644 --- a/examples/network/network-chat/chatdialog.cpp +++ b/examples/network/network-chat/chatdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/chatdialog.h b/examples/network/network-chat/chatdialog.h index 552d794..6452941 100644 --- a/examples/network/network-chat/chatdialog.h +++ b/examples/network/network-chat/chatdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp index d5931a6..67c265d 100644 --- a/examples/network/network-chat/client.cpp +++ b/examples/network/network-chat/client.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/client.h b/examples/network/network-chat/client.h index 307df46..0e79cac 100644 --- a/examples/network/network-chat/client.h +++ b/examples/network/network-chat/client.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/connection.cpp b/examples/network/network-chat/connection.cpp index 116ca3a..b025c23 100644 --- a/examples/network/network-chat/connection.cpp +++ b/examples/network/network-chat/connection.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/connection.h b/examples/network/network-chat/connection.h index 0784154..b11969b 100644 --- a/examples/network/network-chat/connection.h +++ b/examples/network/network-chat/connection.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp index ffe28c9..72b042e 100644 --- a/examples/network/network-chat/main.cpp +++ b/examples/network/network-chat/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp index 4ed4c5a..bf33fcb 100644 --- a/examples/network/network-chat/peermanager.cpp +++ b/examples/network/network-chat/peermanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/peermanager.h b/examples/network/network-chat/peermanager.h index a729329..14af169 100644 --- a/examples/network/network-chat/peermanager.h +++ b/examples/network/network-chat/peermanager.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/server.cpp b/examples/network/network-chat/server.cpp index 26f1e70..697d958 100644 --- a/examples/network/network-chat/server.cpp +++ b/examples/network/network-chat/server.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/network-chat/server.h b/examples/network/network-chat/server.h index d297693..8f83b22 100644 --- a/examples/network/network-chat/server.h +++ b/examples/network/network-chat/server.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp index d9be2e3..8c603a2 100644 --- a/examples/network/securesocketclient/certificateinfo.cpp +++ b/examples/network/securesocketclient/certificateinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/securesocketclient/certificateinfo.h b/examples/network/securesocketclient/certificateinfo.h index dc6a200..770447b 100644 --- a/examples/network/securesocketclient/certificateinfo.h +++ b/examples/network/securesocketclient/certificateinfo.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp index 200aa26..bb65276 100644 --- a/examples/network/securesocketclient/main.cpp +++ b/examples/network/securesocketclient/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp index bf8443d..d337905 100644 --- a/examples/network/securesocketclient/sslclient.cpp +++ b/examples/network/securesocketclient/sslclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/securesocketclient/sslclient.h b/examples/network/securesocketclient/sslclient.h index ae208bb..0f515a0 100644 --- a/examples/network/securesocketclient/sslclient.h +++ b/examples/network/securesocketclient/sslclient.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/dialog.cpp b/examples/network/threadedfortuneserver/dialog.cpp index 4161c7f..9b8a9bc 100644 --- a/examples/network/threadedfortuneserver/dialog.cpp +++ b/examples/network/threadedfortuneserver/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/dialog.h b/examples/network/threadedfortuneserver/dialog.h index 5fe1c67..ca12c2a 100644 --- a/examples/network/threadedfortuneserver/dialog.h +++ b/examples/network/threadedfortuneserver/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/fortuneserver.cpp b/examples/network/threadedfortuneserver/fortuneserver.cpp index e23c899..39d6173 100644 --- a/examples/network/threadedfortuneserver/fortuneserver.cpp +++ b/examples/network/threadedfortuneserver/fortuneserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/fortuneserver.h b/examples/network/threadedfortuneserver/fortuneserver.h index 2374f85..7f2286c 100644 --- a/examples/network/threadedfortuneserver/fortuneserver.h +++ b/examples/network/threadedfortuneserver/fortuneserver.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/fortunethread.cpp b/examples/network/threadedfortuneserver/fortunethread.cpp index 8c41076..582ebde 100644 --- a/examples/network/threadedfortuneserver/fortunethread.cpp +++ b/examples/network/threadedfortuneserver/fortunethread.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/fortunethread.h b/examples/network/threadedfortuneserver/fortunethread.h index e534032..90a3c28 100644 --- a/examples/network/threadedfortuneserver/fortunethread.h +++ b/examples/network/threadedfortuneserver/fortunethread.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/threadedfortuneserver/main.cpp b/examples/network/threadedfortuneserver/main.cpp index 5187495..1a9e19e 100644 --- a/examples/network/threadedfortuneserver/main.cpp +++ b/examples/network/threadedfortuneserver/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/addtorrentdialog.cpp b/examples/network/torrent/addtorrentdialog.cpp index fb43f59..8b08db6 100644 --- a/examples/network/torrent/addtorrentdialog.cpp +++ b/examples/network/torrent/addtorrentdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/addtorrentdialog.h b/examples/network/torrent/addtorrentdialog.h index 89cb77c..005f05f 100644 --- a/examples/network/torrent/addtorrentdialog.h +++ b/examples/network/torrent/addtorrentdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp index 9311c0c..61b5c60 100644 --- a/examples/network/torrent/bencodeparser.cpp +++ b/examples/network/torrent/bencodeparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/bencodeparser.h b/examples/network/torrent/bencodeparser.h index b4fc74b..c4ae87b 100644 --- a/examples/network/torrent/bencodeparser.h +++ b/examples/network/torrent/bencodeparser.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/connectionmanager.cpp b/examples/network/torrent/connectionmanager.cpp index 3b78537..1677127 100644 --- a/examples/network/torrent/connectionmanager.cpp +++ b/examples/network/torrent/connectionmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/connectionmanager.h b/examples/network/torrent/connectionmanager.h index 3b791e3..71e00ed 100644 --- a/examples/network/torrent/connectionmanager.h +++ b/examples/network/torrent/connectionmanager.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/filemanager.cpp b/examples/network/torrent/filemanager.cpp index 07d5cca..7f91994 100644 --- a/examples/network/torrent/filemanager.cpp +++ b/examples/network/torrent/filemanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/filemanager.h b/examples/network/torrent/filemanager.h index 05d1f49..35f6d7f 100644 --- a/examples/network/torrent/filemanager.h +++ b/examples/network/torrent/filemanager.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/main.cpp b/examples/network/torrent/main.cpp index 3821254..9e954c5 100644 --- a/examples/network/torrent/main.cpp +++ b/examples/network/torrent/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index 6ca3247..8b73797 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h index 3249781..e22bc06 100644 --- a/examples/network/torrent/mainwindow.h +++ b/examples/network/torrent/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/metainfo.cpp b/examples/network/torrent/metainfo.cpp index 03d824c..a6bca20 100644 --- a/examples/network/torrent/metainfo.cpp +++ b/examples/network/torrent/metainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/metainfo.h b/examples/network/torrent/metainfo.h index de60b99..fc1319f 100644 --- a/examples/network/torrent/metainfo.h +++ b/examples/network/torrent/metainfo.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/peerwireclient.cpp b/examples/network/torrent/peerwireclient.cpp index e79184b..aabba1b 100644 --- a/examples/network/torrent/peerwireclient.cpp +++ b/examples/network/torrent/peerwireclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h index a21faa2..b931029 100644 --- a/examples/network/torrent/peerwireclient.h +++ b/examples/network/torrent/peerwireclient.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/ratecontroller.cpp b/examples/network/torrent/ratecontroller.cpp index 243d897..d6d9bb7 100644 --- a/examples/network/torrent/ratecontroller.cpp +++ b/examples/network/torrent/ratecontroller.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/ratecontroller.h b/examples/network/torrent/ratecontroller.h index fb22159..d08ae6e 100644 --- a/examples/network/torrent/ratecontroller.h +++ b/examples/network/torrent/ratecontroller.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index e8473bb..7210f1b 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/torrentclient.h b/examples/network/torrent/torrentclient.h index 6caaf38..cdbc7f2 100644 --- a/examples/network/torrent/torrentclient.h +++ b/examples/network/torrent/torrentclient.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp index 3087d6a..7c57f05 100644 --- a/examples/network/torrent/torrentserver.cpp +++ b/examples/network/torrent/torrentserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/torrentserver.h b/examples/network/torrent/torrentserver.h index 6ae89e1..73819c7 100644 --- a/examples/network/torrent/torrentserver.h +++ b/examples/network/torrent/torrentserver.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp index bda8140..755df42 100644 --- a/examples/network/torrent/trackerclient.cpp +++ b/examples/network/torrent/trackerclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/network/torrent/trackerclient.h b/examples/network/torrent/trackerclient.h index f1ce37db..bab2511 100644 --- a/examples/network/torrent/trackerclient.h +++ b/examples/network/torrent/trackerclient.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/glwidget.cpp b/examples/opengl/2dpainting/glwidget.cpp index d5f63d2..d22c906 100644 --- a/examples/opengl/2dpainting/glwidget.cpp +++ b/examples/opengl/2dpainting/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/glwidget.h b/examples/opengl/2dpainting/glwidget.h index f3a9bd5..62f1da8 100644 --- a/examples/opengl/2dpainting/glwidget.h +++ b/examples/opengl/2dpainting/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/helper.cpp b/examples/opengl/2dpainting/helper.cpp index 8796d87..8cfefc9 100644 --- a/examples/opengl/2dpainting/helper.cpp +++ b/examples/opengl/2dpainting/helper.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/helper.h b/examples/opengl/2dpainting/helper.h index 1d63cc9..3517f77 100644 --- a/examples/opengl/2dpainting/helper.h +++ b/examples/opengl/2dpainting/helper.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/main.cpp b/examples/opengl/2dpainting/main.cpp index 58c9705..f924392 100644 --- a/examples/opengl/2dpainting/main.cpp +++ b/examples/opengl/2dpainting/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/widget.cpp b/examples/opengl/2dpainting/widget.cpp index 89d4608..4ad19af 100644 --- a/examples/opengl/2dpainting/widget.cpp +++ b/examples/opengl/2dpainting/widget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/widget.h b/examples/opengl/2dpainting/widget.h index f88c676..221e996 100644 --- a/examples/opengl/2dpainting/widget.h +++ b/examples/opengl/2dpainting/widget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/window.cpp b/examples/opengl/2dpainting/window.cpp index f55e90e..2460968 100644 --- a/examples/opengl/2dpainting/window.cpp +++ b/examples/opengl/2dpainting/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/2dpainting/window.h b/examples/opengl/2dpainting/window.h index 84a4440..3eff407 100644 --- a/examples/opengl/2dpainting/window.h +++ b/examples/opengl/2dpainting/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject/glwidget.cpp b/examples/opengl/framebufferobject/glwidget.cpp index d3591d6..415ca4b 100644 --- a/examples/opengl/framebufferobject/glwidget.cpp +++ b/examples/opengl/framebufferobject/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject/glwidget.h b/examples/opengl/framebufferobject/glwidget.h index b64cfa8..3a0cc66 100644 --- a/examples/opengl/framebufferobject/glwidget.h +++ b/examples/opengl/framebufferobject/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject/main.cpp b/examples/opengl/framebufferobject/main.cpp index f9af3f9..74debc8 100644 --- a/examples/opengl/framebufferobject/main.cpp +++ b/examples/opengl/framebufferobject/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject2/glwidget.cpp b/examples/opengl/framebufferobject2/glwidget.cpp index 24bc2ef..3aca080 100644 --- a/examples/opengl/framebufferobject2/glwidget.cpp +++ b/examples/opengl/framebufferobject2/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject2/glwidget.h b/examples/opengl/framebufferobject2/glwidget.h index e200ac2..ee57a76 100644 --- a/examples/opengl/framebufferobject2/glwidget.h +++ b/examples/opengl/framebufferobject2/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/framebufferobject2/main.cpp b/examples/opengl/framebufferobject2/main.cpp index 912f4ec..5518803 100644 --- a/examples/opengl/framebufferobject2/main.cpp +++ b/examples/opengl/framebufferobject2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/grabber/glwidget.cpp b/examples/opengl/grabber/glwidget.cpp index 71550ac..d243e8d 100644 --- a/examples/opengl/grabber/glwidget.cpp +++ b/examples/opengl/grabber/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/grabber/glwidget.h b/examples/opengl/grabber/glwidget.h index 4e66b1f..0999707 100644 --- a/examples/opengl/grabber/glwidget.h +++ b/examples/opengl/grabber/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/grabber/main.cpp b/examples/opengl/grabber/main.cpp index 4856752..36a6f5d 100644 --- a/examples/opengl/grabber/main.cpp +++ b/examples/opengl/grabber/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/grabber/mainwindow.cpp b/examples/opengl/grabber/mainwindow.cpp index 7e878f9..17d35e3 100644 --- a/examples/opengl/grabber/mainwindow.cpp +++ b/examples/opengl/grabber/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/grabber/mainwindow.h b/examples/opengl/grabber/mainwindow.h index 8f77747..ce44536 100644 --- a/examples/opengl/grabber/mainwindow.h +++ b/examples/opengl/grabber/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl/glwidget.cpp b/examples/opengl/hellogl/glwidget.cpp index d81e7e6..418b3b1 100644 --- a/examples/opengl/hellogl/glwidget.cpp +++ b/examples/opengl/hellogl/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl/glwidget.h b/examples/opengl/hellogl/glwidget.h index a5f73ee..90c1a35 100644 --- a/examples/opengl/hellogl/glwidget.h +++ b/examples/opengl/hellogl/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl/main.cpp b/examples/opengl/hellogl/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/opengl/hellogl/main.cpp +++ b/examples/opengl/hellogl/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl/window.cpp b/examples/opengl/hellogl/window.cpp index 82031ee..9f18ad3 100644 --- a/examples/opengl/hellogl/window.cpp +++ b/examples/opengl/hellogl/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl/window.h b/examples/opengl/hellogl/window.h index b20f8a8..19c66ac 100644 --- a/examples/opengl/hellogl/window.h +++ b/examples/opengl/hellogl/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/bubble.cpp b/examples/opengl/hellogl_es/bubble.cpp index 691d314..60e2415 100644 --- a/examples/opengl/hellogl_es/bubble.cpp +++ b/examples/opengl/hellogl_es/bubble.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/bubble.h b/examples/opengl/hellogl_es/bubble.h index a32754f..b283db2 100644 --- a/examples/opengl/hellogl_es/bubble.h +++ b/examples/opengl/hellogl_es/bubble.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/cl_helper.h b/examples/opengl/hellogl_es/cl_helper.h index 416c9bb..c7ebb89 100644 --- a/examples/opengl/hellogl_es/cl_helper.h +++ b/examples/opengl/hellogl_es/cl_helper.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/glwidget.cpp b/examples/opengl/hellogl_es/glwidget.cpp index 6098c99..5dd96b1 100644 --- a/examples/opengl/hellogl_es/glwidget.cpp +++ b/examples/opengl/hellogl_es/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/glwidget.h b/examples/opengl/hellogl_es/glwidget.h index 954342e..c665d9a 100644 --- a/examples/opengl/hellogl_es/glwidget.h +++ b/examples/opengl/hellogl_es/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/main.cpp b/examples/opengl/hellogl_es/main.cpp index feff054..d9b204a 100644 --- a/examples/opengl/hellogl_es/main.cpp +++ b/examples/opengl/hellogl_es/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/mainwindow.cpp b/examples/opengl/hellogl_es/mainwindow.cpp index 26fbeaa..1217792 100644 --- a/examples/opengl/hellogl_es/mainwindow.cpp +++ b/examples/opengl/hellogl_es/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es/mainwindow.h b/examples/opengl/hellogl_es/mainwindow.h index 72b723c..750ecb0 100644 --- a/examples/opengl/hellogl_es/mainwindow.h +++ b/examples/opengl/hellogl_es/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/bubble.cpp b/examples/opengl/hellogl_es2/bubble.cpp index 691d314..60e2415 100644 --- a/examples/opengl/hellogl_es2/bubble.cpp +++ b/examples/opengl/hellogl_es2/bubble.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/bubble.h b/examples/opengl/hellogl_es2/bubble.h index a32754f..b283db2 100644 --- a/examples/opengl/hellogl_es2/bubble.h +++ b/examples/opengl/hellogl_es2/bubble.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp index 213c5b2..40627a8 100644 --- a/examples/opengl/hellogl_es2/glwidget.cpp +++ b/examples/opengl/hellogl_es2/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/glwidget.h b/examples/opengl/hellogl_es2/glwidget.h index 9a7823a..b90cf18 100644 --- a/examples/opengl/hellogl_es2/glwidget.h +++ b/examples/opengl/hellogl_es2/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/main.cpp b/examples/opengl/hellogl_es2/main.cpp index feff054..d9b204a 100644 --- a/examples/opengl/hellogl_es2/main.cpp +++ b/examples/opengl/hellogl_es2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/mainwindow.cpp b/examples/opengl/hellogl_es2/mainwindow.cpp index 26fbeaa..1217792 100644 --- a/examples/opengl/hellogl_es2/mainwindow.cpp +++ b/examples/opengl/hellogl_es2/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/hellogl_es2/mainwindow.h b/examples/opengl/hellogl_es2/mainwindow.h index 72b723c..750ecb0 100644 --- a/examples/opengl/hellogl_es2/mainwindow.h +++ b/examples/opengl/hellogl_es2/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/overpainting/bubble.cpp b/examples/opengl/overpainting/bubble.cpp index 8bbe9b0..22297f7 100644 --- a/examples/opengl/overpainting/bubble.cpp +++ b/examples/opengl/overpainting/bubble.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/overpainting/bubble.h b/examples/opengl/overpainting/bubble.h index 7e71550..13fdc3e 100644 --- a/examples/opengl/overpainting/bubble.h +++ b/examples/opengl/overpainting/bubble.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/overpainting/glwidget.cpp b/examples/opengl/overpainting/glwidget.cpp index e3a7b1e..8b72a09 100644 --- a/examples/opengl/overpainting/glwidget.cpp +++ b/examples/opengl/overpainting/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/overpainting/glwidget.h b/examples/opengl/overpainting/glwidget.h index f1b49c1..622d597 100644 --- a/examples/opengl/overpainting/glwidget.h +++ b/examples/opengl/overpainting/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/overpainting/main.cpp b/examples/opengl/overpainting/main.cpp index c1b17df..e06ad2c 100644 --- a/examples/opengl/overpainting/main.cpp +++ b/examples/opengl/overpainting/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp index 4dfbcf4..b735e27 100644 --- a/examples/opengl/pbuffers/glwidget.cpp +++ b/examples/opengl/pbuffers/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers/glwidget.h b/examples/opengl/pbuffers/glwidget.h index 9f2e86c..39a95d4 100644 --- a/examples/opengl/pbuffers/glwidget.h +++ b/examples/opengl/pbuffers/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers/main.cpp b/examples/opengl/pbuffers/main.cpp index 91799e0..efdce1c 100644 --- a/examples/opengl/pbuffers/main.cpp +++ b/examples/opengl/pbuffers/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers2/glwidget.cpp b/examples/opengl/pbuffers2/glwidget.cpp index fa37946..aea992f 100644 --- a/examples/opengl/pbuffers2/glwidget.cpp +++ b/examples/opengl/pbuffers2/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers2/glwidget.h b/examples/opengl/pbuffers2/glwidget.h index 8058a41..c05e3cf 100644 --- a/examples/opengl/pbuffers2/glwidget.h +++ b/examples/opengl/pbuffers2/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/pbuffers2/main.cpp b/examples/opengl/pbuffers2/main.cpp index 9d03beb..87c7406 100644 --- a/examples/opengl/pbuffers2/main.cpp +++ b/examples/opengl/pbuffers2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp index 381ff95..20d6eca 100644 --- a/examples/opengl/samplebuffers/glwidget.cpp +++ b/examples/opengl/samplebuffers/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/samplebuffers/glwidget.h b/examples/opengl/samplebuffers/glwidget.h index dee739e..463bd8a 100644 --- a/examples/opengl/samplebuffers/glwidget.h +++ b/examples/opengl/samplebuffers/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/samplebuffers/main.cpp b/examples/opengl/samplebuffers/main.cpp index 88a37b4..1fbbd2b 100644 --- a/examples/opengl/samplebuffers/main.cpp +++ b/examples/opengl/samplebuffers/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/textures/glwidget.cpp b/examples/opengl/textures/glwidget.cpp index 5882373..caf66ad 100644 --- a/examples/opengl/textures/glwidget.cpp +++ b/examples/opengl/textures/glwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/textures/glwidget.h b/examples/opengl/textures/glwidget.h index 623b301..2e157c3 100644 --- a/examples/opengl/textures/glwidget.h +++ b/examples/opengl/textures/glwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/textures/main.cpp b/examples/opengl/textures/main.cpp index 5129cda..211c52f 100644 --- a/examples/opengl/textures/main.cpp +++ b/examples/opengl/textures/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/textures/window.cpp b/examples/opengl/textures/window.cpp index a974e68..a6593f8 100644 --- a/examples/opengl/textures/window.cpp +++ b/examples/opengl/textures/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/opengl/textures/window.h b/examples/opengl/textures/window.h index 50bb7f0..c6a1064 100644 --- a/examples/opengl/textures/window.h +++ b/examples/opengl/textures/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/basicdrawing/main.cpp b/examples/painting/basicdrawing/main.cpp index e7c3da4..b64e3c5 100644 --- a/examples/painting/basicdrawing/main.cpp +++ b/examples/painting/basicdrawing/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/basicdrawing/renderarea.cpp b/examples/painting/basicdrawing/renderarea.cpp index 22e511f..6d25bf5 100644 --- a/examples/painting/basicdrawing/renderarea.cpp +++ b/examples/painting/basicdrawing/renderarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/basicdrawing/renderarea.h b/examples/painting/basicdrawing/renderarea.h index f59e843..15f29a3 100644 --- a/examples/painting/basicdrawing/renderarea.h +++ b/examples/painting/basicdrawing/renderarea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp index 8640162..366e9a3 100644 --- a/examples/painting/basicdrawing/window.cpp +++ b/examples/painting/basicdrawing/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/basicdrawing/window.h b/examples/painting/basicdrawing/window.h index 7c42aef..cf73a38 100644 --- a/examples/painting/basicdrawing/window.h +++ b/examples/painting/basicdrawing/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/concentriccircles/circlewidget.cpp b/examples/painting/concentriccircles/circlewidget.cpp index ab62a88..107eba6 100644 --- a/examples/painting/concentriccircles/circlewidget.cpp +++ b/examples/painting/concentriccircles/circlewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/concentriccircles/circlewidget.h b/examples/painting/concentriccircles/circlewidget.h index c5acaa8..6f7f64c 100644 --- a/examples/painting/concentriccircles/circlewidget.h +++ b/examples/painting/concentriccircles/circlewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/concentriccircles/main.cpp b/examples/painting/concentriccircles/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/painting/concentriccircles/main.cpp +++ b/examples/painting/concentriccircles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/concentriccircles/window.cpp b/examples/painting/concentriccircles/window.cpp index dd5e6e5..704ed88 100644 --- a/examples/painting/concentriccircles/window.cpp +++ b/examples/painting/concentriccircles/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/concentriccircles/window.h b/examples/painting/concentriccircles/window.h index 2b3ad67..7402e43 100644 --- a/examples/painting/concentriccircles/window.h +++ b/examples/painting/concentriccircles/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/fontsampler/main.cpp b/examples/painting/fontsampler/main.cpp index 1d51376..95e9ba6 100644 --- a/examples/painting/fontsampler/main.cpp +++ b/examples/painting/fontsampler/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp index 424f175..5d9a2b4 100644 --- a/examples/painting/fontsampler/mainwindow.cpp +++ b/examples/painting/fontsampler/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/fontsampler/mainwindow.h b/examples/painting/fontsampler/mainwindow.h index 25d7730..ba72dee 100644 --- a/examples/painting/fontsampler/mainwindow.h +++ b/examples/painting/fontsampler/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp index c16d85f..285bba9 100644 --- a/examples/painting/imagecomposition/imagecomposer.cpp +++ b/examples/painting/imagecomposition/imagecomposer.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/imagecomposition/imagecomposer.h b/examples/painting/imagecomposition/imagecomposer.h index e8d039f..88b55cd 100644 --- a/examples/painting/imagecomposition/imagecomposer.h +++ b/examples/painting/imagecomposition/imagecomposer.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/imagecomposition/main.cpp b/examples/painting/imagecomposition/main.cpp index 34527a4..63f0644 100644 --- a/examples/painting/imagecomposition/main.cpp +++ b/examples/painting/imagecomposition/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/painterpaths/main.cpp b/examples/painting/painterpaths/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/painting/painterpaths/main.cpp +++ b/examples/painting/painterpaths/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/painterpaths/renderarea.cpp b/examples/painting/painterpaths/renderarea.cpp index 64d149b..7af90fe 100644 --- a/examples/painting/painterpaths/renderarea.cpp +++ b/examples/painting/painterpaths/renderarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/painterpaths/renderarea.h b/examples/painting/painterpaths/renderarea.h index 39b7efd..9596e32 100644 --- a/examples/painting/painterpaths/renderarea.h +++ b/examples/painting/painterpaths/renderarea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp index 712e961..ae9504e 100644 --- a/examples/painting/painterpaths/window.cpp +++ b/examples/painting/painterpaths/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/painterpaths/window.h b/examples/painting/painterpaths/window.h index f2ad0ae..05e7e93 100644 --- a/examples/painting/painterpaths/window.h +++ b/examples/painting/painterpaths/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svggenerator/displaywidget.cpp b/examples/painting/svggenerator/displaywidget.cpp index c973341..c73884f 100644 --- a/examples/painting/svggenerator/displaywidget.cpp +++ b/examples/painting/svggenerator/displaywidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svggenerator/displaywidget.h b/examples/painting/svggenerator/displaywidget.h index 58ad97e..3763f7b 100644 --- a/examples/painting/svggenerator/displaywidget.h +++ b/examples/painting/svggenerator/displaywidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svggenerator/main.cpp b/examples/painting/svggenerator/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/painting/svggenerator/main.cpp +++ b/examples/painting/svggenerator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svggenerator/window.cpp b/examples/painting/svggenerator/window.cpp index 1965604..33c45ca 100644 --- a/examples/painting/svggenerator/window.cpp +++ b/examples/painting/svggenerator/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svggenerator/window.h b/examples/painting/svggenerator/window.h index 4bc4d22..550c71e 100644 --- a/examples/painting/svggenerator/window.h +++ b/examples/painting/svggenerator/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svgviewer/main.cpp b/examples/painting/svgviewer/main.cpp index 18520f7..caf3978 100644 --- a/examples/painting/svgviewer/main.cpp +++ b/examples/painting/svgviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svgviewer/mainwindow.cpp b/examples/painting/svgviewer/mainwindow.cpp index 22393eb..f9e15a0 100644 --- a/examples/painting/svgviewer/mainwindow.cpp +++ b/examples/painting/svgviewer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svgviewer/mainwindow.h b/examples/painting/svgviewer/mainwindow.h index 5df430b..d8517a7 100644 --- a/examples/painting/svgviewer/mainwindow.h +++ b/examples/painting/svgviewer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svgviewer/svgview.cpp b/examples/painting/svgviewer/svgview.cpp index daf7bf0..a65c646 100644 --- a/examples/painting/svgviewer/svgview.cpp +++ b/examples/painting/svgviewer/svgview.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/svgviewer/svgview.h b/examples/painting/svgviewer/svgview.h index 993268a..7ae310f 100644 --- a/examples/painting/svgviewer/svgview.h +++ b/examples/painting/svgviewer/svgview.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/transformations/main.cpp b/examples/painting/transformations/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/painting/transformations/main.cpp +++ b/examples/painting/transformations/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/transformations/renderarea.cpp b/examples/painting/transformations/renderarea.cpp index a25869b..1fd3f74 100644 --- a/examples/painting/transformations/renderarea.cpp +++ b/examples/painting/transformations/renderarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/transformations/renderarea.h b/examples/painting/transformations/renderarea.h index 04ab0d3..cbc2660 100644 --- a/examples/painting/transformations/renderarea.h +++ b/examples/painting/transformations/renderarea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/transformations/window.cpp b/examples/painting/transformations/window.cpp index 7d83654..bfb5292 100644 --- a/examples/painting/transformations/window.cpp +++ b/examples/painting/transformations/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/painting/transformations/window.h b/examples/painting/transformations/window.h index f4f05d6..7e32d27 100644 --- a/examples/painting/transformations/window.h +++ b/examples/painting/transformations/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/capabilities/main.cpp b/examples/phonon/capabilities/main.cpp index a746925..578e275 100644 --- a/examples/phonon/capabilities/main.cpp +++ b/examples/phonon/capabilities/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/capabilities/window.cpp b/examples/phonon/capabilities/window.cpp index 920e3e0..974b00e 100644 --- a/examples/phonon/capabilities/window.cpp +++ b/examples/phonon/capabilities/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index 23121d3..a0508c8 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/musicplayer/main.cpp b/examples/phonon/musicplayer/main.cpp index 4a614c8..ae52b87 100644 --- a/examples/phonon/musicplayer/main.cpp +++ b/examples/phonon/musicplayer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp index f50a2bd..1a2e46a 100644 --- a/examples/phonon/musicplayer/mainwindow.cpp +++ b/examples/phonon/musicplayer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/phonon/musicplayer/mainwindow.h b/examples/phonon/musicplayer/mainwindow.h index 2d4e297..7da768c 100644 --- a/examples/phonon/musicplayer/mainwindow.h +++ b/examples/phonon/musicplayer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/main.cpp b/examples/qmake/precompile/main.cpp index 28eb25e..3392776 100644 --- a/examples/qmake/precompile/main.cpp +++ b/examples/qmake/precompile/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/mydialog.cpp b/examples/qmake/precompile/mydialog.cpp index 544a94b..d21457f 100644 --- a/examples/qmake/precompile/mydialog.cpp +++ b/examples/qmake/precompile/mydialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/mydialog.h b/examples/qmake/precompile/mydialog.h index 948afc2..01228ea 100644 --- a/examples/qmake/precompile/mydialog.h +++ b/examples/qmake/precompile/mydialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/myobject.cpp b/examples/qmake/precompile/myobject.cpp index 5d399eb..72d80d1 100644 --- a/examples/qmake/precompile/myobject.cpp +++ b/examples/qmake/precompile/myobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/myobject.h b/examples/qmake/precompile/myobject.h index 90fb59d..6ca1529 100644 --- a/examples/qmake/precompile/myobject.h +++ b/examples/qmake/precompile/myobject.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/stable.h b/examples/qmake/precompile/stable.h index 3eaaea9..06db793 100644 --- a/examples/qmake/precompile/stable.h +++ b/examples/qmake/precompile/stable.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/precompile/util.cpp b/examples/qmake/precompile/util.cpp index c361258..133a31e 100644 --- a/examples/qmake/precompile/util.cpp +++ b/examples/qmake/precompile/util.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/tutorial/hello.cpp b/examples/qmake/tutorial/hello.cpp index 9edc2af..11de599 100644 --- a/examples/qmake/tutorial/hello.cpp +++ b/examples/qmake/tutorial/hello.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/tutorial/hello.h b/examples/qmake/tutorial/hello.h index 9e73e47..9455b4c 100644 --- a/examples/qmake/tutorial/hello.h +++ b/examples/qmake/tutorial/hello.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/tutorial/hellounix.cpp b/examples/qmake/tutorial/hellounix.cpp index 0fbeffd..499bb09 100644 --- a/examples/qmake/tutorial/hellounix.cpp +++ b/examples/qmake/tutorial/hellounix.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/tutorial/hellowin.cpp b/examples/qmake/tutorial/hellowin.cpp index 2e966da..353101f 100644 --- a/examples/qmake/tutorial/hellowin.cpp +++ b/examples/qmake/tutorial/hellowin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qmake/tutorial/main.cpp b/examples/qmake/tutorial/main.cpp index e0452e2..d22ef4f 100644 --- a/examples/qmake/tutorial/main.cpp +++ b/examples/qmake/tutorial/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp index d69adaa..c44a06d 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.cpp +++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/imagescaling/imagescaling.h b/examples/qtconcurrent/imagescaling/imagescaling.h index 46dccf5..b326afb 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.h +++ b/examples/qtconcurrent/imagescaling/imagescaling.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp index c0bf9ce..2682c04 100644 --- a/examples/qtconcurrent/imagescaling/main.cpp +++ b/examples/qtconcurrent/imagescaling/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp index 35b484d..ff8035b 100644 --- a/examples/qtconcurrent/map/main.cpp +++ b/examples/qtconcurrent/map/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 249fbc1..4e588a9 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp index c758f83..9bc3571 100644 --- a/examples/qtconcurrent/runfunction/main.cpp +++ b/examples/qtconcurrent/runfunction/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp index 5008eaf..a02ce07 100644 --- a/examples/qtconcurrent/wordcount/main.cpp +++ b/examples/qtconcurrent/wordcount/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtestlib/tutorial1/testqstring.cpp b/examples/qtestlib/tutorial1/testqstring.cpp index cc2e7ca..24384b8 100644 --- a/examples/qtestlib/tutorial1/testqstring.cpp +++ b/examples/qtestlib/tutorial1/testqstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtestlib/tutorial2/testqstring.cpp b/examples/qtestlib/tutorial2/testqstring.cpp index 1c1f6f7..808fdfa 100644 --- a/examples/qtestlib/tutorial2/testqstring.cpp +++ b/examples/qtestlib/tutorial2/testqstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtestlib/tutorial3/testgui.cpp b/examples/qtestlib/tutorial3/testgui.cpp index 8e116f8..ee34bca 100644 --- a/examples/qtestlib/tutorial3/testgui.cpp +++ b/examples/qtestlib/tutorial3/testgui.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtestlib/tutorial4/testgui.cpp b/examples/qtestlib/tutorial4/testgui.cpp index f392fec..fdcad56 100644 --- a/examples/qtestlib/tutorial4/testgui.cpp +++ b/examples/qtestlib/tutorial4/testgui.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp index 05ca266..064903b 100644 --- a/examples/qtestlib/tutorial5/benchmarking.cpp +++ b/examples/qtestlib/tutorial5/benchmarking.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/ahigl/qscreenahigl_qws.cpp b/examples/qws/ahigl/qscreenahigl_qws.cpp index b5880b3..2deef7d 100644 --- a/examples/qws/ahigl/qscreenahigl_qws.cpp +++ b/examples/qws/ahigl/qscreenahigl_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/ahigl/qscreenahigl_qws.h b/examples/qws/ahigl/qscreenahigl_qws.h index 332d5c3..2663ee5 100644 --- a/examples/qws/ahigl/qscreenahigl_qws.h +++ b/examples/qws/ahigl/qscreenahigl_qws.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/ahigl/qscreenahiglplugin.cpp b/examples/qws/ahigl/qscreenahiglplugin.cpp index 828de82..ba1deb3 100644 --- a/examples/qws/ahigl/qscreenahiglplugin.cpp +++ b/examples/qws/ahigl/qscreenahiglplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/ahigl/qwindowsurface_ahigl.cpp b/examples/qws/ahigl/qwindowsurface_ahigl.cpp index 79924f9..0030930 100644 --- a/examples/qws/ahigl/qwindowsurface_ahigl.cpp +++ b/examples/qws/ahigl/qwindowsurface_ahigl.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/ahigl/qwindowsurface_ahigl_p.h b/examples/qws/ahigl/qwindowsurface_ahigl_p.h index 40a82ed..05bcad9 100644 --- a/examples/qws/ahigl/qwindowsurface_ahigl_p.h +++ b/examples/qws/ahigl/qwindowsurface_ahigl_p.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/dbscreen/dbscreen.cpp b/examples/qws/dbscreen/dbscreen.cpp index bd26848..89a518c 100644 --- a/examples/qws/dbscreen/dbscreen.cpp +++ b/examples/qws/dbscreen/dbscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/dbscreen/dbscreen.h b/examples/qws/dbscreen/dbscreen.h index 00221e9..58270cf 100644 --- a/examples/qws/dbscreen/dbscreen.h +++ b/examples/qws/dbscreen/dbscreen.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/dbscreen/dbscreendriverplugin.cpp b/examples/qws/dbscreen/dbscreendriverplugin.cpp index 36587a1..36c2652 100644 --- a/examples/qws/dbscreen/dbscreendriverplugin.cpp +++ b/examples/qws/dbscreen/dbscreendriverplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/framebuffer/main.c b/examples/qws/framebuffer/main.c index 2c2cf31..dfa05a4 100644 --- a/examples/qws/framebuffer/main.c +++ b/examples/qws/framebuffer/main.c @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/mousecalibration/calibration.cpp b/examples/qws/mousecalibration/calibration.cpp index 7e344e0..3c8b16f 100644 --- a/examples/qws/mousecalibration/calibration.cpp +++ b/examples/qws/mousecalibration/calibration.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/mousecalibration/calibration.h b/examples/qws/mousecalibration/calibration.h index ae862e5..8af6efd 100644 --- a/examples/qws/mousecalibration/calibration.h +++ b/examples/qws/mousecalibration/calibration.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/mousecalibration/main.cpp b/examples/qws/mousecalibration/main.cpp index c318383..2a7ef18 100644 --- a/examples/qws/mousecalibration/main.cpp +++ b/examples/qws/mousecalibration/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/mousecalibration/scribblewidget.cpp b/examples/qws/mousecalibration/scribblewidget.cpp index 255afd0..91dfe76 100644 --- a/examples/qws/mousecalibration/scribblewidget.cpp +++ b/examples/qws/mousecalibration/scribblewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/mousecalibration/scribblewidget.h b/examples/qws/mousecalibration/scribblewidget.h index 6693082..5bf1d6a 100644 --- a/examples/qws/mousecalibration/scribblewidget.h +++ b/examples/qws/mousecalibration/scribblewidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/simpledecoration/analogclock.cpp b/examples/qws/simpledecoration/analogclock.cpp index 28155ba..05e2bfe 100644 --- a/examples/qws/simpledecoration/analogclock.cpp +++ b/examples/qws/simpledecoration/analogclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/simpledecoration/analogclock.h b/examples/qws/simpledecoration/analogclock.h index f779744..118d692 100644 --- a/examples/qws/simpledecoration/analogclock.h +++ b/examples/qws/simpledecoration/analogclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/simpledecoration/main.cpp b/examples/qws/simpledecoration/main.cpp index 597f5b3..4213a49 100644 --- a/examples/qws/simpledecoration/main.cpp +++ b/examples/qws/simpledecoration/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/simpledecoration/mydecoration.cpp b/examples/qws/simpledecoration/mydecoration.cpp index 282bc88..53e2bd8 100644 --- a/examples/qws/simpledecoration/mydecoration.cpp +++ b/examples/qws/simpledecoration/mydecoration.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/simpledecoration/mydecoration.h b/examples/qws/simpledecoration/mydecoration.h index dffac30..6c1a9c1 100644 --- a/examples/qws/simpledecoration/mydecoration.h +++ b/examples/qws/simpledecoration/mydecoration.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibpaintdevice.cpp b/examples/qws/svgalib/svgalibpaintdevice.cpp index b4e0276..89da629 100644 --- a/examples/qws/svgalib/svgalibpaintdevice.cpp +++ b/examples/qws/svgalib/svgalibpaintdevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibpaintdevice.h b/examples/qws/svgalib/svgalibpaintdevice.h index bf6cc7a..df092a4 100644 --- a/examples/qws/svgalib/svgalibpaintdevice.h +++ b/examples/qws/svgalib/svgalibpaintdevice.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibpaintengine.cpp b/examples/qws/svgalib/svgalibpaintengine.cpp index 3621db7..fbe83d1 100644 --- a/examples/qws/svgalib/svgalibpaintengine.cpp +++ b/examples/qws/svgalib/svgalibpaintengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibpaintengine.h b/examples/qws/svgalib/svgalibpaintengine.h index 1fa9770..04f5ffc 100644 --- a/examples/qws/svgalib/svgalibpaintengine.h +++ b/examples/qws/svgalib/svgalibpaintengine.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibplugin.cpp b/examples/qws/svgalib/svgalibplugin.cpp index 080a350..723045d 100644 --- a/examples/qws/svgalib/svgalibplugin.cpp +++ b/examples/qws/svgalib/svgalibplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibscreen.cpp b/examples/qws/svgalib/svgalibscreen.cpp index 1961d3c..361fb3c 100644 --- a/examples/qws/svgalib/svgalibscreen.cpp +++ b/examples/qws/svgalib/svgalibscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibscreen.h b/examples/qws/svgalib/svgalibscreen.h index 4d32b7c..8ac316f 100644 --- a/examples/qws/svgalib/svgalibscreen.h +++ b/examples/qws/svgalib/svgalibscreen.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibsurface.cpp b/examples/qws/svgalib/svgalibsurface.cpp index 8e7e6b6..be153dd 100644 --- a/examples/qws/svgalib/svgalibsurface.cpp +++ b/examples/qws/svgalib/svgalibsurface.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/qws/svgalib/svgalibsurface.h b/examples/qws/svgalib/svgalibsurface.h index c33d51a..3a5f193 100644 --- a/examples/qws/svgalib/svgalibsurface.h +++ b/examples/qws/svgalib/svgalibsurface.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/calendar/main.cpp b/examples/richtext/calendar/main.cpp index aab8adc..86aa898 100644 --- a/examples/richtext/calendar/main.cpp +++ b/examples/richtext/calendar/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/calendar/mainwindow.cpp b/examples/richtext/calendar/mainwindow.cpp index ca8ab5a..d4c823f 100644 --- a/examples/richtext/calendar/mainwindow.cpp +++ b/examples/richtext/calendar/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/calendar/mainwindow.h b/examples/richtext/calendar/mainwindow.h index 704bdd9..dcb4d25 100644 --- a/examples/richtext/calendar/mainwindow.h +++ b/examples/richtext/calendar/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/orderform/detailsdialog.cpp b/examples/richtext/orderform/detailsdialog.cpp index 273ed57..577a1fb 100644 --- a/examples/richtext/orderform/detailsdialog.cpp +++ b/examples/richtext/orderform/detailsdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/orderform/detailsdialog.h b/examples/richtext/orderform/detailsdialog.h index c74ff2a..189317f 100644 --- a/examples/richtext/orderform/detailsdialog.h +++ b/examples/richtext/orderform/detailsdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/orderform/main.cpp b/examples/richtext/orderform/main.cpp index d6458bc..127b8ca 100644 --- a/examples/richtext/orderform/main.cpp +++ b/examples/richtext/orderform/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/orderform/mainwindow.cpp b/examples/richtext/orderform/mainwindow.cpp index e5cffe3..a94513e 100644 --- a/examples/richtext/orderform/mainwindow.cpp +++ b/examples/richtext/orderform/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/orderform/mainwindow.h b/examples/richtext/orderform/mainwindow.h index 70cc9cc..7a9284e 100644 --- a/examples/richtext/orderform/mainwindow.h +++ b/examples/richtext/orderform/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/syntaxhighlighter/highlighter.cpp b/examples/richtext/syntaxhighlighter/highlighter.cpp index 5d9939d..20f4888 100644 --- a/examples/richtext/syntaxhighlighter/highlighter.cpp +++ b/examples/richtext/syntaxhighlighter/highlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/syntaxhighlighter/highlighter.h b/examples/richtext/syntaxhighlighter/highlighter.h index 2774212..4780321 100644 --- a/examples/richtext/syntaxhighlighter/highlighter.h +++ b/examples/richtext/syntaxhighlighter/highlighter.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/syntaxhighlighter/main.cpp b/examples/richtext/syntaxhighlighter/main.cpp index fbb822d..3a4215e 100644 --- a/examples/richtext/syntaxhighlighter/main.cpp +++ b/examples/richtext/syntaxhighlighter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/syntaxhighlighter/mainwindow.cpp b/examples/richtext/syntaxhighlighter/mainwindow.cpp index a6312f9..617c635 100644 --- a/examples/richtext/syntaxhighlighter/mainwindow.cpp +++ b/examples/richtext/syntaxhighlighter/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/syntaxhighlighter/mainwindow.h b/examples/richtext/syntaxhighlighter/mainwindow.h index 12334ab..a4382c5 100644 --- a/examples/richtext/syntaxhighlighter/mainwindow.h +++ b/examples/richtext/syntaxhighlighter/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp index 263d03e..3487126 100644 --- a/examples/richtext/textobject/main.cpp +++ b/examples/richtext/textobject/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/richtext/textobject/svgtextobject.cpp index 6c336e5..62aeb6b 100644 --- a/examples/richtext/textobject/svgtextobject.cpp +++ b/examples/richtext/textobject/svgtextobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/textobject/svgtextobject.h b/examples/richtext/textobject/svgtextobject.h index 1e91a8b..fa650e1 100644 --- a/examples/richtext/textobject/svgtextobject.h +++ b/examples/richtext/textobject/svgtextobject.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/textobject/window.cpp b/examples/richtext/textobject/window.cpp index 5fbb100..017b353 100644 --- a/examples/richtext/textobject/window.cpp +++ b/examples/richtext/textobject/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/richtext/textobject/window.h b/examples/richtext/textobject/window.h index 8994e23..dc97c14 100644 --- a/examples/richtext/textobject/window.h +++ b/examples/richtext/textobject/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/calculator/main.cpp b/examples/script/calculator/main.cpp index 4608aa5..37a8e09 100644 --- a/examples/script/calculator/main.cpp +++ b/examples/script/calculator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index d49cc3d..f546855 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/context2d.h b/examples/script/context2d/context2d.h index 38188f7..a7640a2 100644 --- a/examples/script/context2d/context2d.h +++ b/examples/script/context2d/context2d.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/domimage.cpp b/examples/script/context2d/domimage.cpp index 66a2c95..6c0a7fc 100644 --- a/examples/script/context2d/domimage.cpp +++ b/examples/script/context2d/domimage.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/domimage.h b/examples/script/context2d/domimage.h index 0793d1d..91cd817 100644 --- a/examples/script/context2d/domimage.h +++ b/examples/script/context2d/domimage.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp index 1c1a3a6..569bec7 100644 --- a/examples/script/context2d/environment.cpp +++ b/examples/script/context2d/environment.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/environment.h b/examples/script/context2d/environment.h index e47e6cb..516863b 100644 --- a/examples/script/context2d/environment.h +++ b/examples/script/context2d/environment.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp index 78c9df9..d0d6e37 100644 --- a/examples/script/context2d/main.cpp +++ b/examples/script/context2d/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp index 30bb3eb..cb0b55b 100644 --- a/examples/script/context2d/qcontext2dcanvas.cpp +++ b/examples/script/context2d/qcontext2dcanvas.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/qcontext2dcanvas.h b/examples/script/context2d/qcontext2dcanvas.h index 657ffc3..e842fc6 100644 --- a/examples/script/context2d/qcontext2dcanvas.h +++ b/examples/script/context2d/qcontext2dcanvas.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/window.cpp b/examples/script/context2d/window.cpp index a93bf30..305a3c4 100644 --- a/examples/script/context2d/window.cpp +++ b/examples/script/context2d/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/context2d/window.h b/examples/script/context2d/window.h index a0aff8e..148dba4 100644 --- a/examples/script/context2d/window.h +++ b/examples/script/context2d/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/customclass/bytearrayclass.cpp b/examples/script/customclass/bytearrayclass.cpp index 7865381..3ecfe4e 100644 --- a/examples/script/customclass/bytearrayclass.cpp +++ b/examples/script/customclass/bytearrayclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/customclass/bytearrayclass.h b/examples/script/customclass/bytearrayclass.h index e9a5f07..739b4f5 100644 --- a/examples/script/customclass/bytearrayclass.h +++ b/examples/script/customclass/bytearrayclass.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/customclass/bytearrayprototype.cpp b/examples/script/customclass/bytearrayprototype.cpp index eeb73f9..059925e 100644 --- a/examples/script/customclass/bytearrayprototype.cpp +++ b/examples/script/customclass/bytearrayprototype.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/customclass/bytearrayprototype.h b/examples/script/customclass/bytearrayprototype.h index fe9e15b..e861494 100644 --- a/examples/script/customclass/bytearrayprototype.h +++ b/examples/script/customclass/bytearrayprototype.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/customclass/main.cpp b/examples/script/customclass/main.cpp index 1c3ceb1..94170ee 100644 --- a/examples/script/customclass/main.cpp +++ b/examples/script/customclass/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/defaultprototypes/main.cpp b/examples/script/defaultprototypes/main.cpp index 3245ae0..175d984 100644 --- a/examples/script/defaultprototypes/main.cpp +++ b/examples/script/defaultprototypes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/defaultprototypes/prototypes.cpp b/examples/script/defaultprototypes/prototypes.cpp index b2bad45..bc59254 100644 --- a/examples/script/defaultprototypes/prototypes.cpp +++ b/examples/script/defaultprototypes/prototypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/defaultprototypes/prototypes.h b/examples/script/defaultprototypes/prototypes.h index 76cecaa..10eb4fe 100644 --- a/examples/script/defaultprototypes/prototypes.h +++ b/examples/script/defaultprototypes/prototypes.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp index 4d243a6..4b368ae 100644 --- a/examples/script/helloscript/main.cpp +++ b/examples/script/helloscript/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/marshal/main.cpp b/examples/script/marshal/main.cpp index e5dbdde..85acbd2 100644 --- a/examples/script/marshal/main.cpp +++ b/examples/script/marshal/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qscript/main.cpp b/examples/script/qscript/main.cpp index 891c89f..cbf2ec4 100644 --- a/examples/script/qscript/main.cpp +++ b/examples/script/qscript/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qsdbg/main.cpp b/examples/script/qsdbg/main.cpp index eb377cf..121c7c3 100644 --- a/examples/script/qsdbg/main.cpp +++ b/examples/script/qsdbg/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qsdbg/scriptbreakpointmanager.cpp b/examples/script/qsdbg/scriptbreakpointmanager.cpp index 7668d7b..72caf72 100644 --- a/examples/script/qsdbg/scriptbreakpointmanager.cpp +++ b/examples/script/qsdbg/scriptbreakpointmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qsdbg/scriptbreakpointmanager.h b/examples/script/qsdbg/scriptbreakpointmanager.h index cdb176c..338ced3 100644 --- a/examples/script/qsdbg/scriptbreakpointmanager.h +++ b/examples/script/qsdbg/scriptbreakpointmanager.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp index e3639b9..a5829a0 100644 --- a/examples/script/qsdbg/scriptdebugger.cpp +++ b/examples/script/qsdbg/scriptdebugger.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qsdbg/scriptdebugger.h b/examples/script/qsdbg/scriptdebugger.h index c33adf6..e740635 100644 --- a/examples/script/qsdbg/scriptdebugger.h +++ b/examples/script/qsdbg/scriptdebugger.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qstetrix/main.cpp b/examples/script/qstetrix/main.cpp index 6d7af45..2e66ff2 100644 --- a/examples/script/qstetrix/main.cpp +++ b/examples/script/qstetrix/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp index 55c4d3c..5e1590c 100644 --- a/examples/script/qstetrix/tetrixboard.cpp +++ b/examples/script/qstetrix/tetrixboard.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/script/qstetrix/tetrixboard.h b/examples/script/qstetrix/tetrixboard.h index e8c1016..04de608 100644 --- a/examples/script/qstetrix/tetrixboard.h +++ b/examples/script/qstetrix/tetrixboard.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/cachedtable/main.cpp b/examples/sql/cachedtable/main.cpp index 47e3b9f..efeacd1 100644 --- a/examples/sql/cachedtable/main.cpp +++ b/examples/sql/cachedtable/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/cachedtable/tableeditor.cpp b/examples/sql/cachedtable/tableeditor.cpp index 33ddd54..30a1eb8 100644 --- a/examples/sql/cachedtable/tableeditor.cpp +++ b/examples/sql/cachedtable/tableeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/cachedtable/tableeditor.h b/examples/sql/cachedtable/tableeditor.h index 3485fd3..a0695db 100644 --- a/examples/sql/cachedtable/tableeditor.h +++ b/examples/sql/cachedtable/tableeditor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/connection.h b/examples/sql/connection.h index d4b77ef..8c65b3e 100644 --- a/examples/sql/connection.h +++ b/examples/sql/connection.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/imageitem.cpp b/examples/sql/drilldown/imageitem.cpp index 620afed..77a540d 100644 --- a/examples/sql/drilldown/imageitem.cpp +++ b/examples/sql/drilldown/imageitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/imageitem.h b/examples/sql/drilldown/imageitem.h index 20c7811..5455635 100644 --- a/examples/sql/drilldown/imageitem.h +++ b/examples/sql/drilldown/imageitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp index 6573ae1..a4e90ce 100644 --- a/examples/sql/drilldown/informationwindow.cpp +++ b/examples/sql/drilldown/informationwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/informationwindow.h b/examples/sql/drilldown/informationwindow.h index f28b47d..bf670fb 100644 --- a/examples/sql/drilldown/informationwindow.h +++ b/examples/sql/drilldown/informationwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp index ee5a4d5..591202c 100644 --- a/examples/sql/drilldown/main.cpp +++ b/examples/sql/drilldown/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp index 763d094..ee46c32 100644 --- a/examples/sql/drilldown/view.cpp +++ b/examples/sql/drilldown/view.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/drilldown/view.h b/examples/sql/drilldown/view.h index 37ddabb..5dc5730 100644 --- a/examples/sql/drilldown/view.h +++ b/examples/sql/drilldown/view.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/database.h b/examples/sql/masterdetail/database.h index a760e41..9c9b8cb 100644 --- a/examples/sql/masterdetail/database.h +++ b/examples/sql/masterdetail/database.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/dialog.cpp b/examples/sql/masterdetail/dialog.cpp index 0adf208..2e56b85 100644 --- a/examples/sql/masterdetail/dialog.cpp +++ b/examples/sql/masterdetail/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/dialog.h b/examples/sql/masterdetail/dialog.h index 0f4b54a..d976da2 100644 --- a/examples/sql/masterdetail/dialog.h +++ b/examples/sql/masterdetail/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/main.cpp b/examples/sql/masterdetail/main.cpp index 932b67a..e8bff28 100644 --- a/examples/sql/masterdetail/main.cpp +++ b/examples/sql/masterdetail/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp index 67825d6..c74f482 100644 --- a/examples/sql/masterdetail/mainwindow.cpp +++ b/examples/sql/masterdetail/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/masterdetail/mainwindow.h b/examples/sql/masterdetail/mainwindow.h index 4d05022..ac432f7 100644 --- a/examples/sql/masterdetail/mainwindow.h +++ b/examples/sql/masterdetail/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/querymodel/customsqlmodel.cpp b/examples/sql/querymodel/customsqlmodel.cpp index e122ce8..4f50fc9 100644 --- a/examples/sql/querymodel/customsqlmodel.cpp +++ b/examples/sql/querymodel/customsqlmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/querymodel/customsqlmodel.h b/examples/sql/querymodel/customsqlmodel.h index f4a0eab..5188eb5 100644 --- a/examples/sql/querymodel/customsqlmodel.h +++ b/examples/sql/querymodel/customsqlmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/querymodel/editablesqlmodel.cpp b/examples/sql/querymodel/editablesqlmodel.cpp index d7841f6..fb6b1f8 100644 --- a/examples/sql/querymodel/editablesqlmodel.cpp +++ b/examples/sql/querymodel/editablesqlmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/querymodel/editablesqlmodel.h b/examples/sql/querymodel/editablesqlmodel.h index 3606ebc..4820160 100644 --- a/examples/sql/querymodel/editablesqlmodel.h +++ b/examples/sql/querymodel/editablesqlmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/querymodel/main.cpp b/examples/sql/querymodel/main.cpp index 90d4265..001557d 100644 --- a/examples/sql/querymodel/main.cpp +++ b/examples/sql/querymodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/examples/sql/relationaltablemodel/relationaltablemodel.cpp index b38cdda..4c718e7 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/examples/sql/relationaltablemodel/relationaltablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/sqlwidgetmapper/main.cpp b/examples/sql/sqlwidgetmapper/main.cpp index 055ac21..07752b6 100644 --- a/examples/sql/sqlwidgetmapper/main.cpp +++ b/examples/sql/sqlwidgetmapper/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/sqlwidgetmapper/window.cpp b/examples/sql/sqlwidgetmapper/window.cpp index ebfa2cf..7d25145 100644 --- a/examples/sql/sqlwidgetmapper/window.cpp +++ b/examples/sql/sqlwidgetmapper/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/sqlwidgetmapper/window.h b/examples/sql/sqlwidgetmapper/window.h index a3628a9..b087943 100644 --- a/examples/sql/sqlwidgetmapper/window.h +++ b/examples/sql/sqlwidgetmapper/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/sql/tablemodel/tablemodel.cpp b/examples/sql/tablemodel/tablemodel.cpp index f24c62f..3119171 100644 --- a/examples/sql/tablemodel/tablemodel.cpp +++ b/examples/sql/tablemodel/tablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/mandelbrot/main.cpp b/examples/threads/mandelbrot/main.cpp index 2395ff6..bf8b3b2 100644 --- a/examples/threads/mandelbrot/main.cpp +++ b/examples/threads/mandelbrot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/mandelbrot/mandelbrotwidget.cpp b/examples/threads/mandelbrot/mandelbrotwidget.cpp index 74b27d8..0df3414 100644 --- a/examples/threads/mandelbrot/mandelbrotwidget.cpp +++ b/examples/threads/mandelbrot/mandelbrotwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/mandelbrot/mandelbrotwidget.h b/examples/threads/mandelbrot/mandelbrotwidget.h index 3e8084c..046c938 100644 --- a/examples/threads/mandelbrot/mandelbrotwidget.h +++ b/examples/threads/mandelbrot/mandelbrotwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/mandelbrot/renderthread.cpp b/examples/threads/mandelbrot/renderthread.cpp index 5879035..16819a5 100644 --- a/examples/threads/mandelbrot/renderthread.cpp +++ b/examples/threads/mandelbrot/renderthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/mandelbrot/renderthread.h b/examples/threads/mandelbrot/renderthread.h index 2b03186..0aa24c9 100644 --- a/examples/threads/mandelbrot/renderthread.h +++ b/examples/threads/mandelbrot/renderthread.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/block.cpp b/examples/threads/queuedcustomtype/block.cpp index 1a14f09..66292eb 100644 --- a/examples/threads/queuedcustomtype/block.cpp +++ b/examples/threads/queuedcustomtype/block.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/block.h b/examples/threads/queuedcustomtype/block.h index 2a75529..7b8e6cd 100644 --- a/examples/threads/queuedcustomtype/block.h +++ b/examples/threads/queuedcustomtype/block.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/main.cpp b/examples/threads/queuedcustomtype/main.cpp index 93dab49..38fab7d 100644 --- a/examples/threads/queuedcustomtype/main.cpp +++ b/examples/threads/queuedcustomtype/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/renderthread.cpp b/examples/threads/queuedcustomtype/renderthread.cpp index 052dd39..977fc32 100644 --- a/examples/threads/queuedcustomtype/renderthread.cpp +++ b/examples/threads/queuedcustomtype/renderthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/renderthread.h b/examples/threads/queuedcustomtype/renderthread.h index 9c7f049..15a3821 100644 --- a/examples/threads/queuedcustomtype/renderthread.h +++ b/examples/threads/queuedcustomtype/renderthread.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/window.cpp b/examples/threads/queuedcustomtype/window.cpp index 7282e0c..fa9c100 100644 --- a/examples/threads/queuedcustomtype/window.cpp +++ b/examples/threads/queuedcustomtype/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/queuedcustomtype/window.h b/examples/threads/queuedcustomtype/window.h index c0ed280..6413668 100644 --- a/examples/threads/queuedcustomtype/window.h +++ b/examples/threads/queuedcustomtype/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/semaphores/semaphores.cpp b/examples/threads/semaphores/semaphores.cpp index 548380d..090ed36 100644 --- a/examples/threads/semaphores/semaphores.cpp +++ b/examples/threads/semaphores/semaphores.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/threads/waitconditions/waitconditions.cpp b/examples/threads/waitconditions/waitconditions.cpp index 44188d5..a0561b9 100644 --- a/examples/threads/waitconditions/waitconditions.cpp +++ b/examples/threads/waitconditions/waitconditions.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/codecs/main.cpp b/examples/tools/codecs/main.cpp index 4856752..36a6f5d 100644 --- a/examples/tools/codecs/main.cpp +++ b/examples/tools/codecs/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/codecs/mainwindow.cpp b/examples/tools/codecs/mainwindow.cpp index 1e6fa69..f49f25d 100644 --- a/examples/tools/codecs/mainwindow.cpp +++ b/examples/tools/codecs/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/codecs/mainwindow.h b/examples/tools/codecs/mainwindow.h index 1702d5c..26c58f9 100644 --- a/examples/tools/codecs/mainwindow.h +++ b/examples/tools/codecs/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/codecs/previewform.cpp b/examples/tools/codecs/previewform.cpp index cbe084f..5aa2df8 100644 --- a/examples/tools/codecs/previewform.cpp +++ b/examples/tools/codecs/previewform.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/codecs/previewform.h b/examples/tools/codecs/previewform.h index 130cb79..51dec8a 100644 --- a/examples/tools/codecs/previewform.h +++ b/examples/tools/codecs/previewform.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/completer/dirmodel.cpp b/examples/tools/completer/dirmodel.cpp index 1daf03c..959d8d4 100644 --- a/examples/tools/completer/dirmodel.cpp +++ b/examples/tools/completer/dirmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/completer/dirmodel.h b/examples/tools/completer/dirmodel.h index bd49ca9..fca470d 100644 --- a/examples/tools/completer/dirmodel.h +++ b/examples/tools/completer/dirmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/completer/main.cpp b/examples/tools/completer/main.cpp index a414cd5..4be44be 100644 --- a/examples/tools/completer/main.cpp +++ b/examples/tools/completer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/completer/mainwindow.cpp b/examples/tools/completer/mainwindow.cpp index 862967a..8c58540 100644 --- a/examples/tools/completer/mainwindow.cpp +++ b/examples/tools/completer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/completer/mainwindow.h b/examples/tools/completer/mainwindow.h index f6fba9c..23244fe 100644 --- a/examples/tools/completer/mainwindow.h +++ b/examples/tools/completer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customcompleter/main.cpp b/examples/tools/customcompleter/main.cpp index 8e64f6c..b46ad14 100644 --- a/examples/tools/customcompleter/main.cpp +++ b/examples/tools/customcompleter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customcompleter/mainwindow.cpp b/examples/tools/customcompleter/mainwindow.cpp index 8d75ddd..44dd231 100644 --- a/examples/tools/customcompleter/mainwindow.cpp +++ b/examples/tools/customcompleter/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customcompleter/mainwindow.h b/examples/tools/customcompleter/mainwindow.h index 77089c2..6e22bde 100644 --- a/examples/tools/customcompleter/mainwindow.h +++ b/examples/tools/customcompleter/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customcompleter/textedit.cpp b/examples/tools/customcompleter/textedit.cpp index ecafa8f..ced1c7a 100644 --- a/examples/tools/customcompleter/textedit.cpp +++ b/examples/tools/customcompleter/textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customcompleter/textedit.h b/examples/tools/customcompleter/textedit.h index d727228..e1104e9 100644 --- a/examples/tools/customcompleter/textedit.h +++ b/examples/tools/customcompleter/textedit.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp index e8f4265..b6394de 100644 --- a/examples/tools/customtype/main.cpp +++ b/examples/tools/customtype/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtype/message.cpp b/examples/tools/customtype/message.cpp index b6fd536..e1d9bf5 100644 --- a/examples/tools/customtype/message.cpp +++ b/examples/tools/customtype/message.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtype/message.h b/examples/tools/customtype/message.h index 2620557..325bee7 100644 --- a/examples/tools/customtype/message.h +++ b/examples/tools/customtype/message.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtypesending/main.cpp b/examples/tools/customtypesending/main.cpp index 336f3d8..5917a5a 100644 --- a/examples/tools/customtypesending/main.cpp +++ b/examples/tools/customtypesending/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtypesending/message.cpp b/examples/tools/customtypesending/message.cpp index 6992804..b67798a 100644 --- a/examples/tools/customtypesending/message.cpp +++ b/examples/tools/customtypesending/message.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtypesending/message.h b/examples/tools/customtypesending/message.h index 55f9568..0096911 100644 --- a/examples/tools/customtypesending/message.h +++ b/examples/tools/customtypesending/message.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtypesending/window.cpp b/examples/tools/customtypesending/window.cpp index be79518..022ec6d 100644 --- a/examples/tools/customtypesending/window.cpp +++ b/examples/tools/customtypesending/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/customtypesending/window.h b/examples/tools/customtypesending/window.h index cbe9775..e468ddf 100644 --- a/examples/tools/customtypesending/window.h +++ b/examples/tools/customtypesending/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/echowindow/echointerface.h b/examples/tools/echoplugin/echowindow/echointerface.h index d4aecd2..0dc4e91 100644 --- a/examples/tools/echoplugin/echowindow/echointerface.h +++ b/examples/tools/echoplugin/echowindow/echointerface.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/echowindow/echowindow.cpp b/examples/tools/echoplugin/echowindow/echowindow.cpp index 0de85ea..061fcc7 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.cpp +++ b/examples/tools/echoplugin/echowindow/echowindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/echowindow/echowindow.h b/examples/tools/echoplugin/echowindow/echowindow.h index 7378e62..6264534 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.h +++ b/examples/tools/echoplugin/echowindow/echowindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/echowindow/main.cpp b/examples/tools/echoplugin/echowindow/main.cpp index cc18f66..d3bbe74 100644 --- a/examples/tools/echoplugin/echowindow/main.cpp +++ b/examples/tools/echoplugin/echowindow/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/plugin/echoplugin.cpp b/examples/tools/echoplugin/plugin/echoplugin.cpp index 67126be..8d5a65a 100644 --- a/examples/tools/echoplugin/plugin/echoplugin.cpp +++ b/examples/tools/echoplugin/plugin/echoplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/echoplugin/plugin/echoplugin.h b/examples/tools/echoplugin/plugin/echoplugin.h index 7ea1d47..1546549 100644 --- a/examples/tools/echoplugin/plugin/echoplugin.h +++ b/examples/tools/echoplugin/plugin/echoplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/i18n/languagechooser.cpp b/examples/tools/i18n/languagechooser.cpp index a8e9779..c5df34e 100644 --- a/examples/tools/i18n/languagechooser.cpp +++ b/examples/tools/i18n/languagechooser.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/i18n/languagechooser.h b/examples/tools/i18n/languagechooser.h index 69914f7..7e0bcd9 100644 --- a/examples/tools/i18n/languagechooser.h +++ b/examples/tools/i18n/languagechooser.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/i18n/main.cpp b/examples/tools/i18n/main.cpp index 98d3da0..2e67c70 100644 --- a/examples/tools/i18n/main.cpp +++ b/examples/tools/i18n/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/i18n/mainwindow.cpp b/examples/tools/i18n/mainwindow.cpp index 33cd5f5..d3ea940 100644 --- a/examples/tools/i18n/mainwindow.cpp +++ b/examples/tools/i18n/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/i18n/mainwindow.h b/examples/tools/i18n/mainwindow.h index 5928be2..c09a241 100644 --- a/examples/tools/i18n/mainwindow.h +++ b/examples/tools/i18n/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/interfaces.h b/examples/tools/plugandpaint/interfaces.h index 87eb9d0..c6728ea 100644 --- a/examples/tools/plugandpaint/interfaces.h +++ b/examples/tools/plugandpaint/interfaces.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/main.cpp b/examples/tools/plugandpaint/main.cpp index 7778cac..8819e49 100644 --- a/examples/tools/plugandpaint/main.cpp +++ b/examples/tools/plugandpaint/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/mainwindow.cpp b/examples/tools/plugandpaint/mainwindow.cpp index 224bc71..69fb799 100644 --- a/examples/tools/plugandpaint/mainwindow.cpp +++ b/examples/tools/plugandpaint/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/mainwindow.h b/examples/tools/plugandpaint/mainwindow.h index 47afb2d..8dd845b 100644 --- a/examples/tools/plugandpaint/mainwindow.h +++ b/examples/tools/plugandpaint/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/paintarea.cpp b/examples/tools/plugandpaint/paintarea.cpp index 9d5b3c5..c376a72 100644 --- a/examples/tools/plugandpaint/paintarea.cpp +++ b/examples/tools/plugandpaint/paintarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/paintarea.h b/examples/tools/plugandpaint/paintarea.h index e4215d5..3b53492 100644 --- a/examples/tools/plugandpaint/paintarea.h +++ b/examples/tools/plugandpaint/paintarea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/plugindialog.cpp b/examples/tools/plugandpaint/plugindialog.cpp index 5e37a8b..2bb5910 100644 --- a/examples/tools/plugandpaint/plugindialog.cpp +++ b/examples/tools/plugandpaint/plugindialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaint/plugindialog.h b/examples/tools/plugandpaint/plugindialog.h index 73cb6e4..9882691 100644 --- a/examples/tools/plugandpaint/plugindialog.h +++ b/examples/tools/plugandpaint/plugindialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp index 95b239f..4d163ad 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp +++ b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h index 98aed0b..180e5f1 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h +++ b/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp index b54d8b6..58c48cb 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h index b1b497e..8468821 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/regexp/main.cpp b/examples/tools/regexp/main.cpp index 4fc8de8..132771a 100644 --- a/examples/tools/regexp/main.cpp +++ b/examples/tools/regexp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/regexp/regexpdialog.cpp b/examples/tools/regexp/regexpdialog.cpp index 8fe7383..8662011 100644 --- a/examples/tools/regexp/regexpdialog.cpp +++ b/examples/tools/regexp/regexpdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/regexp/regexpdialog.h b/examples/tools/regexp/regexpdialog.h index d4dfb65..ecbd481 100644 --- a/examples/tools/regexp/regexpdialog.h +++ b/examples/tools/regexp/regexpdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/locationdialog.cpp b/examples/tools/settingseditor/locationdialog.cpp index 600038b..5ae8545 100644 --- a/examples/tools/settingseditor/locationdialog.cpp +++ b/examples/tools/settingseditor/locationdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/locationdialog.h b/examples/tools/settingseditor/locationdialog.h index 3ea8359..7f532e6 100644 --- a/examples/tools/settingseditor/locationdialog.h +++ b/examples/tools/settingseditor/locationdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/main.cpp b/examples/tools/settingseditor/main.cpp index 4856752..36a6f5d 100644 --- a/examples/tools/settingseditor/main.cpp +++ b/examples/tools/settingseditor/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/mainwindow.cpp b/examples/tools/settingseditor/mainwindow.cpp index 0f48a5c..11f7109 100644 --- a/examples/tools/settingseditor/mainwindow.cpp +++ b/examples/tools/settingseditor/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/mainwindow.h b/examples/tools/settingseditor/mainwindow.h index 749602d..4e3ad38 100644 --- a/examples/tools/settingseditor/mainwindow.h +++ b/examples/tools/settingseditor/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/settingstree.cpp b/examples/tools/settingseditor/settingstree.cpp index 82d32fd..03a92ca 100644 --- a/examples/tools/settingseditor/settingstree.cpp +++ b/examples/tools/settingseditor/settingstree.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/settingstree.h b/examples/tools/settingseditor/settingstree.h index f82034b..c66f8ae 100644 --- a/examples/tools/settingseditor/settingstree.h +++ b/examples/tools/settingseditor/settingstree.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/variantdelegate.cpp b/examples/tools/settingseditor/variantdelegate.cpp index 937a0e1..2fc9138 100644 --- a/examples/tools/settingseditor/variantdelegate.cpp +++ b/examples/tools/settingseditor/variantdelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/settingseditor/variantdelegate.h b/examples/tools/settingseditor/variantdelegate.h index 60997f7..5a5bf96 100644 --- a/examples/tools/settingseditor/variantdelegate.h +++ b/examples/tools/settingseditor/variantdelegate.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/plugin/simplestyle.cpp b/examples/tools/styleplugin/plugin/simplestyle.cpp index 900c772..8a2c2593 100644 --- a/examples/tools/styleplugin/plugin/simplestyle.cpp +++ b/examples/tools/styleplugin/plugin/simplestyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/plugin/simplestyle.h b/examples/tools/styleplugin/plugin/simplestyle.h index f4c499c..8eb3b68 100644 --- a/examples/tools/styleplugin/plugin/simplestyle.h +++ b/examples/tools/styleplugin/plugin/simplestyle.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/plugin/simplestyleplugin.cpp b/examples/tools/styleplugin/plugin/simplestyleplugin.cpp index 6845c81..4350595 100644 --- a/examples/tools/styleplugin/plugin/simplestyleplugin.cpp +++ b/examples/tools/styleplugin/plugin/simplestyleplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/plugin/simplestyleplugin.h b/examples/tools/styleplugin/plugin/simplestyleplugin.h index 106c4a9..564fd83 100644 --- a/examples/tools/styleplugin/plugin/simplestyleplugin.h +++ b/examples/tools/styleplugin/plugin/simplestyleplugin.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/stylewindow/main.cpp b/examples/tools/styleplugin/stylewindow/main.cpp index b6e69ef..7b65636 100644 --- a/examples/tools/styleplugin/stylewindow/main.cpp +++ b/examples/tools/styleplugin/stylewindow/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.cpp b/examples/tools/styleplugin/stylewindow/stylewindow.cpp index 8a813ba..13dae84 100644 --- a/examples/tools/styleplugin/stylewindow/stylewindow.cpp +++ b/examples/tools/styleplugin/stylewindow/stylewindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.h b/examples/tools/styleplugin/stylewindow/stylewindow.h index 5eba751..bd0fa31 100644 --- a/examples/tools/styleplugin/stylewindow/stylewindow.h +++ b/examples/tools/styleplugin/stylewindow/stylewindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/treemodelcompleter/main.cpp b/examples/tools/treemodelcompleter/main.cpp index 982575e..ff52663 100644 --- a/examples/tools/treemodelcompleter/main.cpp +++ b/examples/tools/treemodelcompleter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/treemodelcompleter/mainwindow.cpp b/examples/tools/treemodelcompleter/mainwindow.cpp index 9f69e80..6ddc7b7 100644 --- a/examples/tools/treemodelcompleter/mainwindow.cpp +++ b/examples/tools/treemodelcompleter/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/treemodelcompleter/mainwindow.h b/examples/tools/treemodelcompleter/mainwindow.h index be14c34..e4b135f 100644 --- a/examples/tools/treemodelcompleter/mainwindow.h +++ b/examples/tools/treemodelcompleter/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.cpp b/examples/tools/treemodelcompleter/treemodelcompleter.cpp index c1464b0..3c1be53 100644 --- a/examples/tools/treemodelcompleter/treemodelcompleter.cpp +++ b/examples/tools/treemodelcompleter/treemodelcompleter.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.h b/examples/tools/treemodelcompleter/treemodelcompleter.h index 51a5902..de23658 100644 --- a/examples/tools/treemodelcompleter/treemodelcompleter.h +++ b/examples/tools/treemodelcompleter/treemodelcompleter.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/commands.cpp b/examples/tools/undoframework/commands.cpp index 78f0c16..10fa12d 100644 --- a/examples/tools/undoframework/commands.cpp +++ b/examples/tools/undoframework/commands.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/commands.h b/examples/tools/undoframework/commands.h index 17e4f3c..4fd78bf 100644 --- a/examples/tools/undoframework/commands.h +++ b/examples/tools/undoframework/commands.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/diagramitem.cpp b/examples/tools/undoframework/diagramitem.cpp index 1b4301e..3947504 100644 --- a/examples/tools/undoframework/diagramitem.cpp +++ b/examples/tools/undoframework/diagramitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/diagramitem.h b/examples/tools/undoframework/diagramitem.h index 68da876..25dcfd0 100644 --- a/examples/tools/undoframework/diagramitem.h +++ b/examples/tools/undoframework/diagramitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/diagramscene.cpp b/examples/tools/undoframework/diagramscene.cpp index fcc63c9..b5a62b0 100644 --- a/examples/tools/undoframework/diagramscene.cpp +++ b/examples/tools/undoframework/diagramscene.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/diagramscene.h b/examples/tools/undoframework/diagramscene.h index e1537cc..5f8397b 100644 --- a/examples/tools/undoframework/diagramscene.h +++ b/examples/tools/undoframework/diagramscene.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/main.cpp b/examples/tools/undoframework/main.cpp index 170d292..3e20cdf 100644 --- a/examples/tools/undoframework/main.cpp +++ b/examples/tools/undoframework/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/mainwindow.cpp b/examples/tools/undoframework/mainwindow.cpp index f912ff2..08cd3f1 100644 --- a/examples/tools/undoframework/mainwindow.cpp +++ b/examples/tools/undoframework/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tools/undoframework/mainwindow.h b/examples/tools/undoframework/mainwindow.h index 5f08ffc..397f14f 100644 --- a/examples/tools/undoframework/mainwindow.h +++ b/examples/tools/undoframework/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part1/addressbook.cpp b/examples/tutorials/addressbook-fr/part1/addressbook.cpp index d0107ba..c09fa1a 100644 --- a/examples/tutorials/addressbook-fr/part1/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part1/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part1/addressbook.h b/examples/tutorials/addressbook-fr/part1/addressbook.h index 811fb05..638800f 100644 --- a/examples/tutorials/addressbook-fr/part1/addressbook.h +++ b/examples/tutorials/addressbook-fr/part1/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part1/main.cpp b/examples/tutorials/addressbook-fr/part1/main.cpp index 22bfd3e..d18d4e8 100644 --- a/examples/tutorials/addressbook-fr/part1/main.cpp +++ b/examples/tutorials/addressbook-fr/part1/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part2/addressbook.cpp b/examples/tutorials/addressbook-fr/part2/addressbook.cpp index ac4b9c1..4e298a6 100644 --- a/examples/tutorials/addressbook-fr/part2/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part2/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part2/addressbook.h b/examples/tutorials/addressbook-fr/part2/addressbook.h index c99b373..280fee3 100644 --- a/examples/tutorials/addressbook-fr/part2/addressbook.h +++ b/examples/tutorials/addressbook-fr/part2/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part2/main.cpp b/examples/tutorials/addressbook-fr/part2/main.cpp index 22bfd3e..d18d4e8 100644 --- a/examples/tutorials/addressbook-fr/part2/main.cpp +++ b/examples/tutorials/addressbook-fr/part2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part3/addressbook.cpp b/examples/tutorials/addressbook-fr/part3/addressbook.cpp index 49c5206..ce161e8 100644 --- a/examples/tutorials/addressbook-fr/part3/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part3/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part3/addressbook.h b/examples/tutorials/addressbook-fr/part3/addressbook.h index c13dc21..b84eacb 100644 --- a/examples/tutorials/addressbook-fr/part3/addressbook.h +++ b/examples/tutorials/addressbook-fr/part3/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part3/main.cpp b/examples/tutorials/addressbook-fr/part3/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook-fr/part3/main.cpp +++ b/examples/tutorials/addressbook-fr/part3/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part4/addressbook.cpp b/examples/tutorials/addressbook-fr/part4/addressbook.cpp index 95def9c..2555fa4 100644 --- a/examples/tutorials/addressbook-fr/part4/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part4/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part4/addressbook.h b/examples/tutorials/addressbook-fr/part4/addressbook.h index 83c7af3..2653e5b 100644 --- a/examples/tutorials/addressbook-fr/part4/addressbook.h +++ b/examples/tutorials/addressbook-fr/part4/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part4/main.cpp b/examples/tutorials/addressbook-fr/part4/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook-fr/part4/main.cpp +++ b/examples/tutorials/addressbook-fr/part4/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part5/addressbook.cpp b/examples/tutorials/addressbook-fr/part5/addressbook.cpp index 5afb6b8..527e207 100644 --- a/examples/tutorials/addressbook-fr/part5/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part5/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part5/addressbook.h b/examples/tutorials/addressbook-fr/part5/addressbook.h index 04dfa00..9e9d332 100644 --- a/examples/tutorials/addressbook-fr/part5/addressbook.h +++ b/examples/tutorials/addressbook-fr/part5/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part5/finddialog.cpp b/examples/tutorials/addressbook-fr/part5/finddialog.cpp index f883950..82ce87e 100644 --- a/examples/tutorials/addressbook-fr/part5/finddialog.cpp +++ b/examples/tutorials/addressbook-fr/part5/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part5/finddialog.h b/examples/tutorials/addressbook-fr/part5/finddialog.h index db60784..ba3052e 100644 --- a/examples/tutorials/addressbook-fr/part5/finddialog.h +++ b/examples/tutorials/addressbook-fr/part5/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part5/main.cpp b/examples/tutorials/addressbook-fr/part5/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook-fr/part5/main.cpp +++ b/examples/tutorials/addressbook-fr/part5/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part6/addressbook.cpp b/examples/tutorials/addressbook-fr/part6/addressbook.cpp index b7cd446..82bb6d5 100644 --- a/examples/tutorials/addressbook-fr/part6/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part6/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part6/addressbook.h b/examples/tutorials/addressbook-fr/part6/addressbook.h index 5a36af3..0f77c14 100644 --- a/examples/tutorials/addressbook-fr/part6/addressbook.h +++ b/examples/tutorials/addressbook-fr/part6/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part6/finddialog.cpp b/examples/tutorials/addressbook-fr/part6/finddialog.cpp index e28bbae..f5ddc5f 100644 --- a/examples/tutorials/addressbook-fr/part6/finddialog.cpp +++ b/examples/tutorials/addressbook-fr/part6/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part6/finddialog.h b/examples/tutorials/addressbook-fr/part6/finddialog.h index c94baad..2be2160 100644 --- a/examples/tutorials/addressbook-fr/part6/finddialog.h +++ b/examples/tutorials/addressbook-fr/part6/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part6/main.cpp b/examples/tutorials/addressbook-fr/part6/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook-fr/part6/main.cpp +++ b/examples/tutorials/addressbook-fr/part6/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part7/addressbook.cpp b/examples/tutorials/addressbook-fr/part7/addressbook.cpp index 2f81d2b..86d7a92 100644 --- a/examples/tutorials/addressbook-fr/part7/addressbook.cpp +++ b/examples/tutorials/addressbook-fr/part7/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part7/addressbook.h b/examples/tutorials/addressbook-fr/part7/addressbook.h index 3a6ae41..e07a250 100644 --- a/examples/tutorials/addressbook-fr/part7/addressbook.h +++ b/examples/tutorials/addressbook-fr/part7/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part7/finddialog.cpp b/examples/tutorials/addressbook-fr/part7/finddialog.cpp index e28bbae..f5ddc5f 100644 --- a/examples/tutorials/addressbook-fr/part7/finddialog.cpp +++ b/examples/tutorials/addressbook-fr/part7/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part7/finddialog.h b/examples/tutorials/addressbook-fr/part7/finddialog.h index c94baad..2be2160 100644 --- a/examples/tutorials/addressbook-fr/part7/finddialog.h +++ b/examples/tutorials/addressbook-fr/part7/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook-fr/part7/main.cpp b/examples/tutorials/addressbook-fr/part7/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook-fr/part7/main.cpp +++ b/examples/tutorials/addressbook-fr/part7/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part1/addressbook.cpp b/examples/tutorials/addressbook/part1/addressbook.cpp index d0107ba..c09fa1a 100644 --- a/examples/tutorials/addressbook/part1/addressbook.cpp +++ b/examples/tutorials/addressbook/part1/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part1/addressbook.h b/examples/tutorials/addressbook/part1/addressbook.h index 811fb05..638800f 100644 --- a/examples/tutorials/addressbook/part1/addressbook.h +++ b/examples/tutorials/addressbook/part1/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part1/main.cpp b/examples/tutorials/addressbook/part1/main.cpp index 22bfd3e..d18d4e8 100644 --- a/examples/tutorials/addressbook/part1/main.cpp +++ b/examples/tutorials/addressbook/part1/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part2/addressbook.cpp b/examples/tutorials/addressbook/part2/addressbook.cpp index ac4b9c1..4e298a6 100644 --- a/examples/tutorials/addressbook/part2/addressbook.cpp +++ b/examples/tutorials/addressbook/part2/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part2/addressbook.h b/examples/tutorials/addressbook/part2/addressbook.h index c99b373..280fee3 100644 --- a/examples/tutorials/addressbook/part2/addressbook.h +++ b/examples/tutorials/addressbook/part2/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part2/main.cpp b/examples/tutorials/addressbook/part2/main.cpp index 22bfd3e..d18d4e8 100644 --- a/examples/tutorials/addressbook/part2/main.cpp +++ b/examples/tutorials/addressbook/part2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part3/addressbook.cpp b/examples/tutorials/addressbook/part3/addressbook.cpp index 49c5206..ce161e8 100644 --- a/examples/tutorials/addressbook/part3/addressbook.cpp +++ b/examples/tutorials/addressbook/part3/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part3/addressbook.h b/examples/tutorials/addressbook/part3/addressbook.h index c13dc21..b84eacb 100644 --- a/examples/tutorials/addressbook/part3/addressbook.h +++ b/examples/tutorials/addressbook/part3/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part3/main.cpp b/examples/tutorials/addressbook/part3/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook/part3/main.cpp +++ b/examples/tutorials/addressbook/part3/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part4/addressbook.cpp b/examples/tutorials/addressbook/part4/addressbook.cpp index 95def9c..2555fa4 100644 --- a/examples/tutorials/addressbook/part4/addressbook.cpp +++ b/examples/tutorials/addressbook/part4/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part4/addressbook.h b/examples/tutorials/addressbook/part4/addressbook.h index 83c7af3..2653e5b 100644 --- a/examples/tutorials/addressbook/part4/addressbook.h +++ b/examples/tutorials/addressbook/part4/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part4/main.cpp b/examples/tutorials/addressbook/part4/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook/part4/main.cpp +++ b/examples/tutorials/addressbook/part4/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part5/addressbook.cpp b/examples/tutorials/addressbook/part5/addressbook.cpp index 5afb6b8..527e207 100644 --- a/examples/tutorials/addressbook/part5/addressbook.cpp +++ b/examples/tutorials/addressbook/part5/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part5/addressbook.h b/examples/tutorials/addressbook/part5/addressbook.h index 04dfa00..9e9d332 100644 --- a/examples/tutorials/addressbook/part5/addressbook.h +++ b/examples/tutorials/addressbook/part5/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part5/finddialog.cpp b/examples/tutorials/addressbook/part5/finddialog.cpp index f883950..82ce87e 100644 --- a/examples/tutorials/addressbook/part5/finddialog.cpp +++ b/examples/tutorials/addressbook/part5/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part5/finddialog.h b/examples/tutorials/addressbook/part5/finddialog.h index db60784..ba3052e 100644 --- a/examples/tutorials/addressbook/part5/finddialog.h +++ b/examples/tutorials/addressbook/part5/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part5/main.cpp b/examples/tutorials/addressbook/part5/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook/part5/main.cpp +++ b/examples/tutorials/addressbook/part5/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part6/addressbook.cpp b/examples/tutorials/addressbook/part6/addressbook.cpp index b7cd446..82bb6d5 100644 --- a/examples/tutorials/addressbook/part6/addressbook.cpp +++ b/examples/tutorials/addressbook/part6/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part6/addressbook.h b/examples/tutorials/addressbook/part6/addressbook.h index 5a36af3..0f77c14 100644 --- a/examples/tutorials/addressbook/part6/addressbook.h +++ b/examples/tutorials/addressbook/part6/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part6/finddialog.cpp b/examples/tutorials/addressbook/part6/finddialog.cpp index e28bbae..f5ddc5f 100644 --- a/examples/tutorials/addressbook/part6/finddialog.cpp +++ b/examples/tutorials/addressbook/part6/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part6/finddialog.h b/examples/tutorials/addressbook/part6/finddialog.h index c94baad..2be2160 100644 --- a/examples/tutorials/addressbook/part6/finddialog.h +++ b/examples/tutorials/addressbook/part6/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part6/main.cpp b/examples/tutorials/addressbook/part6/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook/part6/main.cpp +++ b/examples/tutorials/addressbook/part6/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part7/addressbook.cpp b/examples/tutorials/addressbook/part7/addressbook.cpp index 2f81d2b..86d7a92 100644 --- a/examples/tutorials/addressbook/part7/addressbook.cpp +++ b/examples/tutorials/addressbook/part7/addressbook.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part7/addressbook.h b/examples/tutorials/addressbook/part7/addressbook.h index 3a6ae41..e07a250 100644 --- a/examples/tutorials/addressbook/part7/addressbook.h +++ b/examples/tutorials/addressbook/part7/addressbook.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part7/finddialog.cpp b/examples/tutorials/addressbook/part7/finddialog.cpp index e28bbae..f5ddc5f 100644 --- a/examples/tutorials/addressbook/part7/finddialog.cpp +++ b/examples/tutorials/addressbook/part7/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part7/finddialog.h b/examples/tutorials/addressbook/part7/finddialog.h index c94baad..2be2160 100644 --- a/examples/tutorials/addressbook/part7/finddialog.h +++ b/examples/tutorials/addressbook/part7/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/tutorials/addressbook/part7/main.cpp b/examples/tutorials/addressbook/part7/main.cpp index b25d656..5055e04 100644 --- a/examples/tutorials/addressbook/part7/main.cpp +++ b/examples/tutorials/addressbook/part7/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/multipleinheritance/calculatorform.cpp b/examples/uitools/multipleinheritance/calculatorform.cpp index d2241d2..1b514db 100644 --- a/examples/uitools/multipleinheritance/calculatorform.cpp +++ b/examples/uitools/multipleinheritance/calculatorform.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/multipleinheritance/calculatorform.h b/examples/uitools/multipleinheritance/calculatorform.h index 2483244..c567116 100644 --- a/examples/uitools/multipleinheritance/calculatorform.h +++ b/examples/uitools/multipleinheritance/calculatorform.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/multipleinheritance/main.cpp b/examples/uitools/multipleinheritance/main.cpp index 2ed0016..1e85df3 100644 --- a/examples/uitools/multipleinheritance/main.cpp +++ b/examples/uitools/multipleinheritance/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/textfinder/main.cpp b/examples/uitools/textfinder/main.cpp index dac93c6..c2e112f 100644 --- a/examples/uitools/textfinder/main.cpp +++ b/examples/uitools/textfinder/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp index d4b5d9e..a4eb043 100644 --- a/examples/uitools/textfinder/textfinder.cpp +++ b/examples/uitools/textfinder/textfinder.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/uitools/textfinder/textfinder.h b/examples/uitools/textfinder/textfinder.h index c4880dc..675e27e 100644 --- a/examples/uitools/textfinder/textfinder.h +++ b/examples/uitools/textfinder/textfinder.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/formextractor/formextractor.cpp b/examples/webkit/formextractor/formextractor.cpp index d5ecc29..245ac63 100644 --- a/examples/webkit/formextractor/formextractor.cpp +++ b/examples/webkit/formextractor/formextractor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/formextractor/formextractor.h b/examples/webkit/formextractor/formextractor.h index 5b11565..32a56c7 100644 --- a/examples/webkit/formextractor/formextractor.h +++ b/examples/webkit/formextractor/formextractor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/formextractor/main.cpp b/examples/webkit/formextractor/main.cpp index aa7847d..88afc0c 100644 --- a/examples/webkit/formextractor/main.cpp +++ b/examples/webkit/formextractor/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/formextractor/mainwindow.cpp b/examples/webkit/formextractor/mainwindow.cpp index 222d9b2..3d6cd24 100644 --- a/examples/webkit/formextractor/mainwindow.cpp +++ b/examples/webkit/formextractor/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/formextractor/mainwindow.h b/examples/webkit/formextractor/mainwindow.h index 7918870..a588297 100644 --- a/examples/webkit/formextractor/mainwindow.h +++ b/examples/webkit/formextractor/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp index 87612e2..f31cb11 100644 --- a/examples/webkit/previewer/main.cpp +++ b/examples/webkit/previewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/previewer/mainwindow.cpp b/examples/webkit/previewer/mainwindow.cpp index abe7941..1811f31 100644 --- a/examples/webkit/previewer/mainwindow.cpp +++ b/examples/webkit/previewer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/previewer/mainwindow.h b/examples/webkit/previewer/mainwindow.h index 3a0a4b1..27758b3 100644 --- a/examples/webkit/previewer/mainwindow.h +++ b/examples/webkit/previewer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/previewer/previewer.cpp b/examples/webkit/previewer/previewer.cpp index 51419d7..8e32a68 100644 --- a/examples/webkit/previewer/previewer.cpp +++ b/examples/webkit/previewer/previewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/webkit/previewer/previewer.h b/examples/webkit/previewer/previewer.h index ae70f9f..7a7e9be 100644 --- a/examples/webkit/previewer/previewer.h +++ b/examples/webkit/previewer/previewer.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/analogclock/analogclock.cpp b/examples/widgets/analogclock/analogclock.cpp index 5856ec9..3102a94 100644 --- a/examples/widgets/analogclock/analogclock.cpp +++ b/examples/widgets/analogclock/analogclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/analogclock/analogclock.h b/examples/widgets/analogclock/analogclock.h index 4a32219..46f018c 100644 --- a/examples/widgets/analogclock/analogclock.h +++ b/examples/widgets/analogclock/analogclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/analogclock/main.cpp b/examples/widgets/analogclock/main.cpp index e8fa08b..49247c9 100644 --- a/examples/widgets/analogclock/main.cpp +++ b/examples/widgets/analogclock/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calculator/button.cpp b/examples/widgets/calculator/button.cpp index e77442e..d2fac71 100644 --- a/examples/widgets/calculator/button.cpp +++ b/examples/widgets/calculator/button.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calculator/button.h b/examples/widgets/calculator/button.h index 5637e6b..c38154e 100644 --- a/examples/widgets/calculator/button.h +++ b/examples/widgets/calculator/button.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calculator/calculator.cpp b/examples/widgets/calculator/calculator.cpp index 9c2ef4a..be54c80 100644 --- a/examples/widgets/calculator/calculator.cpp +++ b/examples/widgets/calculator/calculator.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calculator/calculator.h b/examples/widgets/calculator/calculator.h index 4955c28..af1205a 100644 --- a/examples/widgets/calculator/calculator.h +++ b/examples/widgets/calculator/calculator.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calculator/main.cpp b/examples/widgets/calculator/main.cpp index ddb0028..2759ecd 100644 --- a/examples/widgets/calculator/main.cpp +++ b/examples/widgets/calculator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calendarwidget/main.cpp b/examples/widgets/calendarwidget/main.cpp index a2fa399..3eb2410 100644 --- a/examples/widgets/calendarwidget/main.cpp +++ b/examples/widgets/calendarwidget/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calendarwidget/window.cpp b/examples/widgets/calendarwidget/window.cpp index 613a30a..7736aff 100644 --- a/examples/widgets/calendarwidget/window.cpp +++ b/examples/widgets/calendarwidget/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/calendarwidget/window.h b/examples/widgets/calendarwidget/window.h index a483cf5..5cfbf60 100644 --- a/examples/widgets/calendarwidget/window.h +++ b/examples/widgets/calendarwidget/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/charactermap/characterwidget.cpp b/examples/widgets/charactermap/characterwidget.cpp index 3409169..427f6aa 100644 --- a/examples/widgets/charactermap/characterwidget.cpp +++ b/examples/widgets/charactermap/characterwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/charactermap/characterwidget.h b/examples/widgets/charactermap/characterwidget.h index aa95963..4fb8204 100644 --- a/examples/widgets/charactermap/characterwidget.h +++ b/examples/widgets/charactermap/characterwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/charactermap/main.cpp b/examples/widgets/charactermap/main.cpp index 1d51376..95e9ba6 100644 --- a/examples/widgets/charactermap/main.cpp +++ b/examples/widgets/charactermap/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/charactermap/mainwindow.cpp b/examples/widgets/charactermap/mainwindow.cpp index a1e206b..d5ae1e2 100644 --- a/examples/widgets/charactermap/mainwindow.cpp +++ b/examples/widgets/charactermap/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/charactermap/mainwindow.h b/examples/widgets/charactermap/mainwindow.h index 3f3208c..ce2ffc6 100644 --- a/examples/widgets/charactermap/mainwindow.h +++ b/examples/widgets/charactermap/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/codeeditor/codeeditor.cpp b/examples/widgets/codeeditor/codeeditor.cpp index b855c7a..e113a24 100644 --- a/examples/widgets/codeeditor/codeeditor.cpp +++ b/examples/widgets/codeeditor/codeeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/codeeditor/codeeditor.h b/examples/widgets/codeeditor/codeeditor.h index 51ecf11..6a0d163 100644 --- a/examples/widgets/codeeditor/codeeditor.h +++ b/examples/widgets/codeeditor/codeeditor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/codeeditor/main.cpp b/examples/widgets/codeeditor/main.cpp index a8b26c9..7be0e44 100644 --- a/examples/widgets/codeeditor/main.cpp +++ b/examples/widgets/codeeditor/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/digitalclock/digitalclock.cpp b/examples/widgets/digitalclock/digitalclock.cpp index 5bc9292..86de088 100644 --- a/examples/widgets/digitalclock/digitalclock.cpp +++ b/examples/widgets/digitalclock/digitalclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/digitalclock/digitalclock.h b/examples/widgets/digitalclock/digitalclock.h index 4bf26bc..76adf6e 100644 --- a/examples/widgets/digitalclock/digitalclock.h +++ b/examples/widgets/digitalclock/digitalclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/digitalclock/main.cpp b/examples/widgets/digitalclock/main.cpp index 9e7e16d..6e0b5ca 100644 --- a/examples/widgets/digitalclock/main.cpp +++ b/examples/widgets/digitalclock/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/groupbox/main.cpp b/examples/widgets/groupbox/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/widgets/groupbox/main.cpp +++ b/examples/widgets/groupbox/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/groupbox/window.cpp b/examples/widgets/groupbox/window.cpp index 8acc307..420ca3f 100644 --- a/examples/widgets/groupbox/window.cpp +++ b/examples/widgets/groupbox/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/groupbox/window.h b/examples/widgets/groupbox/window.h index 9f196fd..bfe23b3 100644 --- a/examples/widgets/groupbox/window.h +++ b/examples/widgets/groupbox/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/iconpreviewarea.cpp b/examples/widgets/icons/iconpreviewarea.cpp index d80d41d..fb254e1 100644 --- a/examples/widgets/icons/iconpreviewarea.cpp +++ b/examples/widgets/icons/iconpreviewarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/iconpreviewarea.h b/examples/widgets/icons/iconpreviewarea.h index 9b915a4..ac3f569 100644 --- a/examples/widgets/icons/iconpreviewarea.h +++ b/examples/widgets/icons/iconpreviewarea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/iconsizespinbox.cpp b/examples/widgets/icons/iconsizespinbox.cpp index 22f45e9..3646497 100644 --- a/examples/widgets/icons/iconsizespinbox.cpp +++ b/examples/widgets/icons/iconsizespinbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/iconsizespinbox.h b/examples/widgets/icons/iconsizespinbox.h index ea84dc7..0f74689 100644 --- a/examples/widgets/icons/iconsizespinbox.h +++ b/examples/widgets/icons/iconsizespinbox.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/imagedelegate.cpp b/examples/widgets/icons/imagedelegate.cpp index e8e79b3..815c356 100644 --- a/examples/widgets/icons/imagedelegate.cpp +++ b/examples/widgets/icons/imagedelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/imagedelegate.h b/examples/widgets/icons/imagedelegate.h index 638c0eb..87ba7ee 100644 --- a/examples/widgets/icons/imagedelegate.h +++ b/examples/widgets/icons/imagedelegate.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/main.cpp b/examples/widgets/icons/main.cpp index 4856752..36a6f5d 100644 --- a/examples/widgets/icons/main.cpp +++ b/examples/widgets/icons/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/mainwindow.cpp b/examples/widgets/icons/mainwindow.cpp index 00ce8b0..fe86334 100644 --- a/examples/widgets/icons/mainwindow.cpp +++ b/examples/widgets/icons/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/icons/mainwindow.h b/examples/widgets/icons/mainwindow.h index 3494359..8c6b173 100644 --- a/examples/widgets/icons/mainwindow.h +++ b/examples/widgets/icons/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/imageviewer/imageviewer.cpp b/examples/widgets/imageviewer/imageviewer.cpp index 39d1b35..7d5a218 100644 --- a/examples/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/imageviewer/imageviewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/imageviewer/imageviewer.h b/examples/widgets/imageviewer/imageviewer.h index b84f7d5..0bc0d1a 100644 --- a/examples/widgets/imageviewer/imageviewer.h +++ b/examples/widgets/imageviewer/imageviewer.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/imageviewer/main.cpp b/examples/widgets/imageviewer/main.cpp index 090580c..7046587 100644 --- a/examples/widgets/imageviewer/main.cpp +++ b/examples/widgets/imageviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/lineedits/main.cpp b/examples/widgets/lineedits/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/widgets/lineedits/main.cpp +++ b/examples/widgets/lineedits/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/lineedits/window.cpp b/examples/widgets/lineedits/window.cpp index 13acffd..909f7c1 100644 --- a/examples/widgets/lineedits/window.cpp +++ b/examples/widgets/lineedits/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/lineedits/window.h b/examples/widgets/lineedits/window.h index 2d10d78..afc4d0f 100644 --- a/examples/widgets/lineedits/window.h +++ b/examples/widgets/lineedits/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/movie/main.cpp b/examples/widgets/movie/main.cpp index 50bec73..1d70690 100644 --- a/examples/widgets/movie/main.cpp +++ b/examples/widgets/movie/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/movie/movieplayer.cpp b/examples/widgets/movie/movieplayer.cpp index 1ffc233..f863b3e 100644 --- a/examples/widgets/movie/movieplayer.cpp +++ b/examples/widgets/movie/movieplayer.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/movie/movieplayer.h b/examples/widgets/movie/movieplayer.h index 123c2e2..809ea2d 100644 --- a/examples/widgets/movie/movieplayer.h +++ b/examples/widgets/movie/movieplayer.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/scribble/main.cpp b/examples/widgets/scribble/main.cpp index 1d51376..95e9ba6 100644 --- a/examples/widgets/scribble/main.cpp +++ b/examples/widgets/scribble/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/scribble/mainwindow.cpp b/examples/widgets/scribble/mainwindow.cpp index ad1a837..7dd52a5 100644 --- a/examples/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/scribble/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/scribble/mainwindow.h b/examples/widgets/scribble/mainwindow.h index 0c3b2a4..3f183c3 100644 --- a/examples/widgets/scribble/mainwindow.h +++ b/examples/widgets/scribble/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/scribble/scribblearea.cpp b/examples/widgets/scribble/scribblearea.cpp index 0d10fcd..0235329 100644 --- a/examples/widgets/scribble/scribblearea.cpp +++ b/examples/widgets/scribble/scribblearea.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/scribble/scribblearea.h b/examples/widgets/scribble/scribblearea.h index afa3cbc..9211e91 100644 --- a/examples/widgets/scribble/scribblearea.h +++ b/examples/widgets/scribble/scribblearea.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/shapedclock/main.cpp b/examples/widgets/shapedclock/main.cpp index 889aac1..37006ca 100644 --- a/examples/widgets/shapedclock/main.cpp +++ b/examples/widgets/shapedclock/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/shapedclock/shapedclock.cpp b/examples/widgets/shapedclock/shapedclock.cpp index 9b8a282..1d2fbca 100644 --- a/examples/widgets/shapedclock/shapedclock.cpp +++ b/examples/widgets/shapedclock/shapedclock.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/shapedclock/shapedclock.h b/examples/widgets/shapedclock/shapedclock.h index 1de52e7..bbe25ad 100644 --- a/examples/widgets/shapedclock/shapedclock.h +++ b/examples/widgets/shapedclock/shapedclock.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/sliders/main.cpp b/examples/widgets/sliders/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/widgets/sliders/main.cpp +++ b/examples/widgets/sliders/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/sliders/slidersgroup.cpp b/examples/widgets/sliders/slidersgroup.cpp index 9a0b98b..373dda8 100644 --- a/examples/widgets/sliders/slidersgroup.cpp +++ b/examples/widgets/sliders/slidersgroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/sliders/slidersgroup.h b/examples/widgets/sliders/slidersgroup.h index 1f2ea82..cfc2938 100644 --- a/examples/widgets/sliders/slidersgroup.h +++ b/examples/widgets/sliders/slidersgroup.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/sliders/window.cpp b/examples/widgets/sliders/window.cpp index f74af74..e984121 100644 --- a/examples/widgets/sliders/window.cpp +++ b/examples/widgets/sliders/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/sliders/window.h b/examples/widgets/sliders/window.h index e8854fb..2c6817d 100644 --- a/examples/widgets/sliders/window.h +++ b/examples/widgets/sliders/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/spinboxes/main.cpp b/examples/widgets/spinboxes/main.cpp index fa8b0ab..7fa50bd 100644 --- a/examples/widgets/spinboxes/main.cpp +++ b/examples/widgets/spinboxes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/spinboxes/window.cpp b/examples/widgets/spinboxes/window.cpp index 0dae9c5..91a7916 100644 --- a/examples/widgets/spinboxes/window.cpp +++ b/examples/widgets/spinboxes/window.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/spinboxes/window.h b/examples/widgets/spinboxes/window.h index 68055f6..5a08cee 100644 --- a/examples/widgets/spinboxes/window.h +++ b/examples/widgets/spinboxes/window.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/styles/main.cpp b/examples/widgets/styles/main.cpp index 8998858..bd7b56a 100644 --- a/examples/widgets/styles/main.cpp +++ b/examples/widgets/styles/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/styles/norwegianwoodstyle.cpp b/examples/widgets/styles/norwegianwoodstyle.cpp index 1be5db0..b63b3b7 100644 --- a/examples/widgets/styles/norwegianwoodstyle.cpp +++ b/examples/widgets/styles/norwegianwoodstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/styles/norwegianwoodstyle.h b/examples/widgets/styles/norwegianwoodstyle.h index 07c7797..5e145b1 100644 --- a/examples/widgets/styles/norwegianwoodstyle.h +++ b/examples/widgets/styles/norwegianwoodstyle.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/styles/widgetgallery.cpp b/examples/widgets/styles/widgetgallery.cpp index 9a071a6..fc5b793 100644 --- a/examples/widgets/styles/widgetgallery.cpp +++ b/examples/widgets/styles/widgetgallery.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/styles/widgetgallery.h b/examples/widgets/styles/widgetgallery.h index f9f1723..1c4527b 100644 --- a/examples/widgets/styles/widgetgallery.h +++ b/examples/widgets/styles/widgetgallery.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/stylesheet/main.cpp b/examples/widgets/stylesheet/main.cpp index 931a89b..b6f00ac 100644 --- a/examples/widgets/stylesheet/main.cpp +++ b/examples/widgets/stylesheet/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/stylesheet/mainwindow.cpp b/examples/widgets/stylesheet/mainwindow.cpp index a1307a8..6c538a6 100644 --- a/examples/widgets/stylesheet/mainwindow.cpp +++ b/examples/widgets/stylesheet/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/stylesheet/mainwindow.h b/examples/widgets/stylesheet/mainwindow.h index eedca88..4d1dd75 100644 --- a/examples/widgets/stylesheet/mainwindow.h +++ b/examples/widgets/stylesheet/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/stylesheet/stylesheeteditor.cpp b/examples/widgets/stylesheet/stylesheeteditor.cpp index 1210415..4d77eec 100644 --- a/examples/widgets/stylesheet/stylesheeteditor.cpp +++ b/examples/widgets/stylesheet/stylesheeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/stylesheet/stylesheeteditor.h b/examples/widgets/stylesheet/stylesheeteditor.h index bd90f9e..bcbb39f 100644 --- a/examples/widgets/stylesheet/stylesheeteditor.h +++ b/examples/widgets/stylesheet/stylesheeteditor.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/main.cpp b/examples/widgets/tablet/main.cpp index 15043a6..00b7861 100644 --- a/examples/widgets/tablet/main.cpp +++ b/examples/widgets/tablet/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/mainwindow.cpp b/examples/widgets/tablet/mainwindow.cpp index 56a10cd..f58f454 100644 --- a/examples/widgets/tablet/mainwindow.cpp +++ b/examples/widgets/tablet/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/mainwindow.h b/examples/widgets/tablet/mainwindow.h index 85be425..6e0126d 100644 --- a/examples/widgets/tablet/mainwindow.h +++ b/examples/widgets/tablet/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/tabletapplication.cpp b/examples/widgets/tablet/tabletapplication.cpp index c318b85..14b3343 100644 --- a/examples/widgets/tablet/tabletapplication.cpp +++ b/examples/widgets/tablet/tabletapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/tabletapplication.h b/examples/widgets/tablet/tabletapplication.h index acbaa50..a652158 100644 --- a/examples/widgets/tablet/tabletapplication.h +++ b/examples/widgets/tablet/tabletapplication.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/tabletcanvas.cpp b/examples/widgets/tablet/tabletcanvas.cpp index dc42c3c..612048d 100644 --- a/examples/widgets/tablet/tabletcanvas.cpp +++ b/examples/widgets/tablet/tabletcanvas.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tablet/tabletcanvas.h b/examples/widgets/tablet/tabletcanvas.h index 90eb1db..2fb607b 100644 --- a/examples/widgets/tablet/tabletcanvas.h +++ b/examples/widgets/tablet/tabletcanvas.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/main.cpp b/examples/widgets/tetrix/main.cpp index c9bf49a..1e54774 100644 --- a/examples/widgets/tetrix/main.cpp +++ b/examples/widgets/tetrix/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixboard.cpp b/examples/widgets/tetrix/tetrixboard.cpp index e8ef4bf..1484638 100644 --- a/examples/widgets/tetrix/tetrixboard.cpp +++ b/examples/widgets/tetrix/tetrixboard.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixboard.h b/examples/widgets/tetrix/tetrixboard.h index 5d71125..60ddb52 100644 --- a/examples/widgets/tetrix/tetrixboard.h +++ b/examples/widgets/tetrix/tetrixboard.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixpiece.cpp b/examples/widgets/tetrix/tetrixpiece.cpp index eeaab53..5ba97ea 100644 --- a/examples/widgets/tetrix/tetrixpiece.cpp +++ b/examples/widgets/tetrix/tetrixpiece.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixpiece.h b/examples/widgets/tetrix/tetrixpiece.h index cbf5583..9cd0f8e 100644 --- a/examples/widgets/tetrix/tetrixpiece.h +++ b/examples/widgets/tetrix/tetrixpiece.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixwindow.cpp b/examples/widgets/tetrix/tetrixwindow.cpp index 98e460a..879a34f 100644 --- a/examples/widgets/tetrix/tetrixwindow.cpp +++ b/examples/widgets/tetrix/tetrixwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tetrix/tetrixwindow.h b/examples/widgets/tetrix/tetrixwindow.h index ad22b0f..3c01a90 100644 --- a/examples/widgets/tetrix/tetrixwindow.h +++ b/examples/widgets/tetrix/tetrixwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tooltips/main.cpp b/examples/widgets/tooltips/main.cpp index 2f4c713..0099f1e 100644 --- a/examples/widgets/tooltips/main.cpp +++ b/examples/widgets/tooltips/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tooltips/shapeitem.cpp b/examples/widgets/tooltips/shapeitem.cpp index a8d8f3a..06cd180 100644 --- a/examples/widgets/tooltips/shapeitem.cpp +++ b/examples/widgets/tooltips/shapeitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tooltips/shapeitem.h b/examples/widgets/tooltips/shapeitem.h index d41b990..e97413e 100644 --- a/examples/widgets/tooltips/shapeitem.h +++ b/examples/widgets/tooltips/shapeitem.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tooltips/sortingbox.cpp b/examples/widgets/tooltips/sortingbox.cpp index 995da3e..cd2e5de 100644 --- a/examples/widgets/tooltips/sortingbox.cpp +++ b/examples/widgets/tooltips/sortingbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/tooltips/sortingbox.h b/examples/widgets/tooltips/sortingbox.h index fb565cd..5638762 100644 --- a/examples/widgets/tooltips/sortingbox.h +++ b/examples/widgets/tooltips/sortingbox.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/validators/ledwidget.cpp b/examples/widgets/validators/ledwidget.cpp index 9213755..ade4944 100644 --- a/examples/widgets/validators/ledwidget.cpp +++ b/examples/widgets/validators/ledwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/validators/ledwidget.h b/examples/widgets/validators/ledwidget.h index 08992f9..30037c0 100644 --- a/examples/widgets/validators/ledwidget.h +++ b/examples/widgets/validators/ledwidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/validators/localeselector.cpp b/examples/widgets/validators/localeselector.cpp index b725d26..2c5871b 100644 --- a/examples/widgets/validators/localeselector.cpp +++ b/examples/widgets/validators/localeselector.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/validators/localeselector.h b/examples/widgets/validators/localeselector.h index 763b58b..cf8965b 100644 --- a/examples/widgets/validators/localeselector.h +++ b/examples/widgets/validators/localeselector.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/validators/main.cpp b/examples/widgets/validators/main.cpp index 6822b62..867d5bf 100644 --- a/examples/widgets/validators/main.cpp +++ b/examples/widgets/validators/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/wiggly/dialog.cpp b/examples/widgets/wiggly/dialog.cpp index 2f4191d..c90c206 100644 --- a/examples/widgets/wiggly/dialog.cpp +++ b/examples/widgets/wiggly/dialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/wiggly/dialog.h b/examples/widgets/wiggly/dialog.h index 9c209e1..d2a040d 100644 --- a/examples/widgets/wiggly/dialog.h +++ b/examples/widgets/wiggly/dialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp index 872dce6..34b7e66 100644 --- a/examples/widgets/wiggly/main.cpp +++ b/examples/widgets/wiggly/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/wiggly/wigglywidget.cpp b/examples/widgets/wiggly/wigglywidget.cpp index e89fdde..4829959 100644 --- a/examples/widgets/wiggly/wigglywidget.cpp +++ b/examples/widgets/wiggly/wigglywidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/wiggly/wigglywidget.h b/examples/widgets/wiggly/wigglywidget.h index 8b6a137..d176e9f 100644 --- a/examples/widgets/wiggly/wigglywidget.h +++ b/examples/widgets/wiggly/wigglywidget.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/windowflags/controllerwindow.cpp b/examples/widgets/windowflags/controllerwindow.cpp index 075bcb3..2ad2b35 100644 --- a/examples/widgets/windowflags/controllerwindow.cpp +++ b/examples/widgets/windowflags/controllerwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/windowflags/controllerwindow.h b/examples/widgets/windowflags/controllerwindow.h index 467ab7d..6822d87 100644 --- a/examples/widgets/windowflags/controllerwindow.h +++ b/examples/widgets/windowflags/controllerwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/windowflags/main.cpp b/examples/widgets/windowflags/main.cpp index 338da56..e522673 100644 --- a/examples/widgets/windowflags/main.cpp +++ b/examples/widgets/windowflags/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/windowflags/previewwindow.cpp b/examples/widgets/windowflags/previewwindow.cpp index 6fbd654..e6872e2 100644 --- a/examples/widgets/windowflags/previewwindow.cpp +++ b/examples/widgets/windowflags/previewwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/widgets/windowflags/previewwindow.h b/examples/widgets/windowflags/previewwindow.h index 22ec649..6f4be74 100644 --- a/examples/widgets/windowflags/previewwindow.h +++ b/examples/widgets/windowflags/previewwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/dombookmarks/main.cpp b/examples/xml/dombookmarks/main.cpp index 3f0a207..ed51e4f 100644 --- a/examples/xml/dombookmarks/main.cpp +++ b/examples/xml/dombookmarks/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/dombookmarks/mainwindow.cpp b/examples/xml/dombookmarks/mainwindow.cpp index 6b0c101..e955fe2 100644 --- a/examples/xml/dombookmarks/mainwindow.cpp +++ b/examples/xml/dombookmarks/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/dombookmarks/mainwindow.h b/examples/xml/dombookmarks/mainwindow.h index cf30a3e..93a8729 100644 --- a/examples/xml/dombookmarks/mainwindow.h +++ b/examples/xml/dombookmarks/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp index 37e8bb2..658d239 100644 --- a/examples/xml/dombookmarks/xbeltree.cpp +++ b/examples/xml/dombookmarks/xbeltree.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h index 4f2d304..e47a2b7 100644 --- a/examples/xml/dombookmarks/xbeltree.h +++ b/examples/xml/dombookmarks/xbeltree.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/rsslisting/main.cpp b/examples/xml/rsslisting/main.cpp index 0c9b275..3a03635 100644 --- a/examples/xml/rsslisting/main.cpp +++ b/examples/xml/rsslisting/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp index 9212c11..efa0982 100644 --- a/examples/xml/rsslisting/rsslisting.cpp +++ b/examples/xml/rsslisting/rsslisting.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h index f0007de..bbc69fe 100644 --- a/examples/xml/rsslisting/rsslisting.h +++ b/examples/xml/rsslisting/rsslisting.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/main.cpp b/examples/xml/saxbookmarks/main.cpp index 3f0a207..ed51e4f 100644 --- a/examples/xml/saxbookmarks/main.cpp +++ b/examples/xml/saxbookmarks/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp index 2cba559..68c0692 100644 --- a/examples/xml/saxbookmarks/mainwindow.cpp +++ b/examples/xml/saxbookmarks/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/mainwindow.h b/examples/xml/saxbookmarks/mainwindow.h index 2c70d4a..67476bc 100644 --- a/examples/xml/saxbookmarks/mainwindow.h +++ b/examples/xml/saxbookmarks/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/xbelgenerator.cpp b/examples/xml/saxbookmarks/xbelgenerator.cpp index cafaf51..638192c 100644 --- a/examples/xml/saxbookmarks/xbelgenerator.cpp +++ b/examples/xml/saxbookmarks/xbelgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/xbelgenerator.h b/examples/xml/saxbookmarks/xbelgenerator.h index 023d626..32f96bd 100644 --- a/examples/xml/saxbookmarks/xbelgenerator.h +++ b/examples/xml/saxbookmarks/xbelgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/xbelhandler.cpp b/examples/xml/saxbookmarks/xbelhandler.cpp index 2fdb1fa..2a58fac 100644 --- a/examples/xml/saxbookmarks/xbelhandler.cpp +++ b/examples/xml/saxbookmarks/xbelhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/saxbookmarks/xbelhandler.h b/examples/xml/saxbookmarks/xbelhandler.h index 5b6c0c0..17d9f3a 100644 --- a/examples/xml/saxbookmarks/xbelhandler.h +++ b/examples/xml/saxbookmarks/xbelhandler.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/main.cpp b/examples/xml/streambookmarks/main.cpp index 58b5c5e..a37c27d 100644 --- a/examples/xml/streambookmarks/main.cpp +++ b/examples/xml/streambookmarks/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp index 2136b4b..3fba1e1 100644 --- a/examples/xml/streambookmarks/mainwindow.cpp +++ b/examples/xml/streambookmarks/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/mainwindow.h b/examples/xml/streambookmarks/mainwindow.h index 8bed33d..7fac1d7 100644 --- a/examples/xml/streambookmarks/mainwindow.h +++ b/examples/xml/streambookmarks/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp index 561997a..b8317c1 100644 --- a/examples/xml/streambookmarks/xbelreader.cpp +++ b/examples/xml/streambookmarks/xbelreader.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/xbelreader.h b/examples/xml/streambookmarks/xbelreader.h index dc5eac9..dedbd3d 100644 --- a/examples/xml/streambookmarks/xbelreader.h +++ b/examples/xml/streambookmarks/xbelreader.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/xbelwriter.cpp b/examples/xml/streambookmarks/xbelwriter.cpp index b3ce288..7f1da79 100644 --- a/examples/xml/streambookmarks/xbelwriter.cpp +++ b/examples/xml/streambookmarks/xbelwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/streambookmarks/xbelwriter.h b/examples/xml/streambookmarks/xbelwriter.h index ec80e05..48c7533 100644 --- a/examples/xml/streambookmarks/xbelwriter.h +++ b/examples/xml/streambookmarks/xbelwriter.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xml/xmlstreamlint/main.cpp b/examples/xml/xmlstreamlint/main.cpp index 6063b84..540269e 100644 --- a/examples/xml/xmlstreamlint/main.cpp +++ b/examples/xml/xmlstreamlint/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/filetree/filetree.cpp b/examples/xmlpatterns/filetree/filetree.cpp index 6695a96..b63b7f0 100644 --- a/examples/xmlpatterns/filetree/filetree.cpp +++ b/examples/xmlpatterns/filetree/filetree.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/filetree/filetree.h b/examples/xmlpatterns/filetree/filetree.h index 7c8f3ca..5a8f9b2 100644 --- a/examples/xmlpatterns/filetree/filetree.h +++ b/examples/xmlpatterns/filetree/filetree.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/filetree/main.cpp b/examples/xmlpatterns/filetree/main.cpp index e407a45..b1c7d0e 100644 --- a/examples/xmlpatterns/filetree/main.cpp +++ b/examples/xmlpatterns/filetree/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp index 341128a..6263b7b 100644 --- a/examples/xmlpatterns/filetree/mainwindow.cpp +++ b/examples/xmlpatterns/filetree/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/filetree/mainwindow.h b/examples/xmlpatterns/filetree/mainwindow.h index 6651c80..cb6c3c3 100644 --- a/examples/xmlpatterns/filetree/mainwindow.h +++ b/examples/xmlpatterns/filetree/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/qobjectxmlmodel/main.cpp b/examples/xmlpatterns/qobjectxmlmodel/main.cpp index c73d211..d1e3166 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/main.cpp +++ b/examples/xmlpatterns/qobjectxmlmodel/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp index 056ebae..dfd29b7 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp +++ b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h index 362bd0e..961c0c4 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h +++ b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp index 3eee67a..5df5b52 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp +++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h index 2c2b468..88384f7 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h +++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/recipes/main.cpp b/examples/xmlpatterns/recipes/main.cpp index ee0698f..92fcc45 100644 --- a/examples/xmlpatterns/recipes/main.cpp +++ b/examples/xmlpatterns/recipes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp index 0438ab9..80f9ce1 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.cpp +++ b/examples/xmlpatterns/recipes/querymainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 2c85932..771a943 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp index c796f81..7ff0ddb 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h index 5fe9aa4..d50e89d 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/main.cpp b/examples/xmlpatterns/trafficinfo/main.cpp index 97b2bf7..2348c7b 100644 --- a/examples/xmlpatterns/trafficinfo/main.cpp +++ b/examples/xmlpatterns/trafficinfo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp index 1f754d5..7818c87 100644 --- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp +++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.h b/examples/xmlpatterns/trafficinfo/mainwindow.h index d48109d..8f7c796 100644 --- a/examples/xmlpatterns/trafficinfo/mainwindow.h +++ b/examples/xmlpatterns/trafficinfo/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/stationdialog.cpp b/examples/xmlpatterns/trafficinfo/stationdialog.cpp index 9876bdb..b89ddbd 100644 --- a/examples/xmlpatterns/trafficinfo/stationdialog.cpp +++ b/examples/xmlpatterns/trafficinfo/stationdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/stationdialog.h b/examples/xmlpatterns/trafficinfo/stationdialog.h index 5ac1635..84654db 100644 --- a/examples/xmlpatterns/trafficinfo/stationdialog.h +++ b/examples/xmlpatterns/trafficinfo/stationdialog.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/stationquery.cpp b/examples/xmlpatterns/trafficinfo/stationquery.cpp index ab42ad9..a7c688b 100644 --- a/examples/xmlpatterns/trafficinfo/stationquery.cpp +++ b/examples/xmlpatterns/trafficinfo/stationquery.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/stationquery.h b/examples/xmlpatterns/trafficinfo/stationquery.h index 5cbf28a..21acf39 100644 --- a/examples/xmlpatterns/trafficinfo/stationquery.h +++ b/examples/xmlpatterns/trafficinfo/stationquery.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/timequery.cpp b/examples/xmlpatterns/trafficinfo/timequery.cpp index bd63560..d37acd9 100644 --- a/examples/xmlpatterns/trafficinfo/timequery.cpp +++ b/examples/xmlpatterns/trafficinfo/timequery.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/trafficinfo/timequery.h b/examples/xmlpatterns/trafficinfo/timequery.h index f88e62c..76c3f67 100644 --- a/examples/xmlpatterns/trafficinfo/timequery.h +++ b/examples/xmlpatterns/trafficinfo/timequery.h @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/examples/xmlpatterns/xquery/globalVariables/globals.cpp b/examples/xmlpatterns/xquery/globalVariables/globals.cpp index 7ecd9ed..a9c7100 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globals.cpp +++ b/examples/xmlpatterns/xquery/globalVariables/globals.cpp @@ -6,11 +6,11 @@ ** This file is part of the examples 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h index 8e1059a..698044f 100644 --- a/mkspecs/aix-g++-64/qplatformdefs.h +++ b/mkspecs/aix-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h index 8e1059a..698044f 100644 --- a/mkspecs/aix-g++/qplatformdefs.h +++ b/mkspecs/aix-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h index c0501da..2a85cfd 100644 --- a/mkspecs/aix-xlc-64/qplatformdefs.h +++ b/mkspecs/aix-xlc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index f41dad2..74e52f1 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h index b0fac04..e585f94 100644 --- a/mkspecs/cygwin-g++/qplatformdefs.h +++ b/mkspecs/cygwin-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h index 012e524..b0b03db 100644 --- a/mkspecs/darwin-g++/qplatformdefs.h +++ b/mkspecs/darwin-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index 84915af..f8d7bd4 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/freebsd-g++34/qplatformdefs.h b/mkspecs/freebsd-g++34/qplatformdefs.h index 516cc10..375a7b9 100644 --- a/mkspecs/freebsd-g++34/qplatformdefs.h +++ b/mkspecs/freebsd-g++34/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/freebsd-g++40/qplatformdefs.h b/mkspecs/freebsd-g++40/qplatformdefs.h index 516cc10..375a7b9 100644 --- a/mkspecs/freebsd-g++40/qplatformdefs.h +++ b/mkspecs/freebsd-g++40/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/freebsd-icc/qplatformdefs.h b/mkspecs/freebsd-icc/qplatformdefs.h index 516cc10..375a7b9 100644 --- a/mkspecs/freebsd-icc/qplatformdefs.h +++ b/mkspecs/freebsd-icc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h index 81d3b2b..0f3b0ab 100644 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ b/mkspecs/hpux-acc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h index 92ec532..86e676f 100644 --- a/mkspecs/hpux-acc-o64/qplatformdefs.h +++ b/mkspecs/hpux-acc-o64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h index 7f17a4f..48134b4 100644 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ b/mkspecs/hpux-acc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h index f601449..86f8cb3 100644 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ b/mkspecs/hpux-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h index 9e60682..fa5f863 100644 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ b/mkspecs/hpux-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h index f3bad56..16889ca 100644 --- a/mkspecs/hpuxi-acc-32/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h index f3bad56..16889ca 100644 --- a/mkspecs/hpuxi-acc-64/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hpuxi-g++-64/qplatformdefs.h b/mkspecs/hpuxi-g++-64/qplatformdefs.h index a1d0e86..d1aed8b 100644 --- a/mkspecs/hpuxi-g++-64/qplatformdefs.h +++ b/mkspecs/hpuxi-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h index b3720e8..a21bf09 100644 --- a/mkspecs/hurd-g++/qplatformdefs.h +++ b/mkspecs/hurd-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h index 9bf7726..0115758 100644 --- a/mkspecs/irix-cc-64/qplatformdefs.h +++ b/mkspecs/irix-cc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h index 9bf7726..0115758 100644 --- a/mkspecs/irix-cc/qplatformdefs.h +++ b/mkspecs/irix-cc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/irix-g++-64/qplatformdefs.h b/mkspecs/irix-g++-64/qplatformdefs.h index 9afa988..b0f6a6d 100644 --- a/mkspecs/irix-g++-64/qplatformdefs.h +++ b/mkspecs/irix-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h index 2b7d6ce..7fb1240 100644 --- a/mkspecs/irix-g++/qplatformdefs.h +++ b/mkspecs/irix-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h index 289f083..2dacee0 100644 --- a/mkspecs/linux-cxx/qplatformdefs.h +++ b/mkspecs/linux-cxx/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h index 289f083..2dacee0 100644 --- a/mkspecs/linux-ecc-64/qplatformdefs.h +++ b/mkspecs/linux-ecc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h index 16774ee..ecfc95e 100644 --- a/mkspecs/linux-g++-32/qplatformdefs.h +++ b/mkspecs/linux-g++-32/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h index 16774ee..ecfc95e 100644 --- a/mkspecs/linux-g++-64/qplatformdefs.h +++ b/mkspecs/linux-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h index 288f9fd..80e2b68 100644 --- a/mkspecs/linux-g++/qplatformdefs.h +++ b/mkspecs/linux-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-icc-32/qplatformdefs.h b/mkspecs/linux-icc-32/qplatformdefs.h index 16774ee..ecfc95e 100644 --- a/mkspecs/linux-icc-32/qplatformdefs.h +++ b/mkspecs/linux-icc-32/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-icc-64/qplatformdefs.h b/mkspecs/linux-icc-64/qplatformdefs.h index 16774ee..ecfc95e 100644 --- a/mkspecs/linux-icc-64/qplatformdefs.h +++ b/mkspecs/linux-icc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h index 16774ee..ecfc95e 100644 --- a/mkspecs/linux-icc/qplatformdefs.h +++ b/mkspecs/linux-icc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h index de9dcc9..b17f216 100644 --- a/mkspecs/linux-kcc/qplatformdefs.h +++ b/mkspecs/linux-kcc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-llvm/qplatformdefs.h b/mkspecs/linux-llvm/qplatformdefs.h index 288f9fd..80e2b68 100644 --- a/mkspecs/linux-llvm/qplatformdefs.h +++ b/mkspecs/linux-llvm/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-lsb-g++/qplatformdefs.h b/mkspecs/linux-lsb-g++/qplatformdefs.h index 742a550..9a912c5 100644 --- a/mkspecs/linux-lsb-g++/qplatformdefs.h +++ b/mkspecs/linux-lsb-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h index 289f083..2dacee0 100644 --- a/mkspecs/linux-pgcc/qplatformdefs.h +++ b/mkspecs/linux-pgcc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h index 08a9f0c..c8a0c81 100644 --- a/mkspecs/lynxos-g++/qplatformdefs.h +++ b/mkspecs/lynxos-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h index f8ea276..4e39ba6 100644 --- a/mkspecs/macx-g++/qplatformdefs.h +++ b/mkspecs/macx-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-g++42/qplatformdefs.h b/mkspecs/macx-g++42/qplatformdefs.h index f8ea276..4e39ba6 100644 --- a/mkspecs/macx-g++42/qplatformdefs.h +++ b/mkspecs/macx-g++42/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-icc/qplatformdefs.h b/mkspecs/macx-icc/qplatformdefs.h index 38a1810..50605b9 100644 --- a/mkspecs/macx-icc/qplatformdefs.h +++ b/mkspecs/macx-icc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-llvm/qplatformdefs.h b/mkspecs/macx-llvm/qplatformdefs.h index f8ea276..4e39ba6 100644 --- a/mkspecs/macx-llvm/qplatformdefs.h +++ b/mkspecs/macx-llvm/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h index bcd1327..97f96bf 100644 --- a/mkspecs/macx-pbuilder/qplatformdefs.h +++ b/mkspecs/macx-pbuilder/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-xcode/qplatformdefs.h b/mkspecs/macx-xcode/qplatformdefs.h index f8ea276..4e39ba6 100644 --- a/mkspecs/macx-xcode/qplatformdefs.h +++ b/mkspecs/macx-xcode/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h index a9a8ca2..a8a1e29 100644 --- a/mkspecs/macx-xlc/qplatformdefs.h +++ b/mkspecs/macx-xlc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h index b90f0ad..eaba612 100644 --- a/mkspecs/netbsd-g++/qplatformdefs.h +++ b/mkspecs/netbsd-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h index b58e88d..17daad3 100644 --- a/mkspecs/openbsd-g++/qplatformdefs.h +++ b/mkspecs/openbsd-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h index 744cbbb..a62a32e 100644 --- a/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-arm-g++/qplatformdefs.h b/mkspecs/qws/linux-arm-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-arm-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-arm-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-cellon-g++/qplatformdefs.h b/mkspecs/qws/linux-cellon-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-cellon-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-cellon-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h b/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-dm800-g++/qplatformdefs.h b/mkspecs/qws/linux-dm800-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-dm800-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-dm800-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h b/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h +++ b/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-generic-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-generic-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h b/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-lsb-g++/qplatformdefs.h b/mkspecs/qws/linux-lsb-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-lsb-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-lsb-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-mips-g++/qplatformdefs.h b/mkspecs/qws/linux-mips-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-mips-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-mips-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-ppc-g++/qplatformdefs.h b/mkspecs/qws/linux-ppc-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-ppc-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-ppc-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-sharp-g++/qplatformdefs.h b/mkspecs/qws/linux-sharp-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-sharp-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-sharp-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-x86-g++/qplatformdefs.h b/mkspecs/qws/linux-x86-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-x86-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-x86-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h b/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h b/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h index 919ac0f..b5d3336 100644 --- a/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h +++ b/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/macx-generic-g++/qplatformdefs.h b/mkspecs/qws/macx-generic-g++/qplatformdefs.h index 4837562..731998e 100644 --- a/mkspecs/qws/macx-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/macx-generic-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h index 2f0d880..075ce09 100644 --- a/mkspecs/qws/solaris-generic-g++/qplatformdefs.h +++ b/mkspecs/qws/solaris-generic-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h index cc4f014..7bb2a3c 100644 --- a/mkspecs/sco-cc/qplatformdefs.h +++ b/mkspecs/sco-cc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h index 44bc092..086af8f 100644 --- a/mkspecs/sco-g++/qplatformdefs.h +++ b/mkspecs/sco-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h index f448a25..2b0c1ed 100644 --- a/mkspecs/solaris-cc-64/qplatformdefs.h +++ b/mkspecs/solaris-cc-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index 40b8984..73cf08b 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h index fe47e36..77c8127 100644 --- a/mkspecs/solaris-g++-64/qplatformdefs.h +++ b/mkspecs/solaris-g++-64/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h index 6c86f02..6a6aeb3 100644 --- a/mkspecs/solaris-g++/qplatformdefs.h +++ b/mkspecs/solaris-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h index d03a2b4..ed94bac 100644 --- a/mkspecs/tru64-cxx/qplatformdefs.h +++ b/mkspecs/tru64-cxx/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h index 6d447a4..7c5bf77 100644 --- a/mkspecs/tru64-g++/qplatformdefs.h +++ b/mkspecs/tru64-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h index 95c5881..a53b070 100644 --- a/mkspecs/unixware-cc/qplatformdefs.h +++ b/mkspecs/unixware-cc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h index 95c5881..a53b070 100644 --- a/mkspecs/unixware-g++/qplatformdefs.h +++ b/mkspecs/unixware-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h index 22a1cb7..6eb9673 100644 --- a/mkspecs/win32-borland/qplatformdefs.h +++ b/mkspecs/win32-borland/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h index 47ce8b2..cd509a9 100644 --- a/mkspecs/win32-g++/qplatformdefs.h +++ b/mkspecs/win32-g++/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h index af7cc31..acdceb4 100644 --- a/mkspecs/win32-icc/qplatformdefs.h +++ b/mkspecs/win32-icc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h index e1b3f2d..87cc4fd 100644 --- a/mkspecs/win32-msvc.net/qplatformdefs.h +++ b/mkspecs/win32-msvc.net/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc/qplatformdefs.h b/mkspecs/win32-msvc/qplatformdefs.h index 0af9ee8..a3a5037 100644 --- a/mkspecs/win32-msvc/qplatformdefs.h +++ b/mkspecs/win32-msvc/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc2002/qplatformdefs.h b/mkspecs/win32-msvc2002/qplatformdefs.h index 32acf35..3bd9512 100644 --- a/mkspecs/win32-msvc2002/qplatformdefs.h +++ b/mkspecs/win32-msvc2002/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc2003/qplatformdefs.h b/mkspecs/win32-msvc2003/qplatformdefs.h index 32acf35..3bd9512 100644 --- a/mkspecs/win32-msvc2003/qplatformdefs.h +++ b/mkspecs/win32-msvc2003/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc2005/qplatformdefs.h b/mkspecs/win32-msvc2005/qplatformdefs.h index 9995f79..535ecce 100644 --- a/mkspecs/win32-msvc2005/qplatformdefs.h +++ b/mkspecs/win32-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/win32-msvc2008/qplatformdefs.h b/mkspecs/win32-msvc2008/qplatformdefs.h index 509472f..333dca8 100644 --- a/mkspecs/win32-msvc2008/qplatformdefs.h +++ b/mkspecs/win32-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h +++ b/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h index f7d681b..c800e50 100644 --- a/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h +++ b/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h +++ b/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h index afa1c82..ac85fb2 100644 --- a/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h +++ b/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h +++ b/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h index a16ceb7..cd798d2 100644 --- a/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h +++ b/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h +++ b/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h index 317504e..6699c95 100644 --- a/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h +++ b/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h b/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h +++ b/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h b/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h index 5e50725..86e6157 100644 --- a/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h +++ b/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h b/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h +++ b/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h b/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h +++ b/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h b/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h index 8eaf757..9a34155 100644 --- a/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h +++ b/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h b/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h +++ b/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h b/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h index 6b34db8..bed97cd 100644 --- a/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h +++ b/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h b/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h +++ b/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h b/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h index 5e05da0..34c4094 100644 --- a/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h +++ b/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h b/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h index 2be2b56..f85ebe0 100644 --- a/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h +++ b/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h b/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h index 98c1e4c..ae4a842 100644 --- a/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h +++ b/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @@ -6,11 +6,11 @@ ** This file is part of the qmake spec 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h index 066bdb1..2fec67c 100644 --- a/qmake/cachekeys.h +++ b/qmake/cachekeys.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 473a625..8c0bf9a 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h index c9f5ae9..18a09f6 100644 --- a/qmake/generators/mac/pbuilder_pbx.h +++ b/qmake/generators/mac/pbuilder_pbx.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 3e5452e..c334418 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index cf09a6a..35e9e2a 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 852d6a2..095c139 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index 182d401..5ac51a2 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 3f60791..a2cdcfe 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h index cba0c75..cf9aed2 100644 --- a/qmake/generators/metamakefile.h +++ b/qmake/generators/metamakefile.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 7215818..9cdcf85 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h index 8402d32..08433ba 100644 --- a/qmake/generators/projectgenerator.h +++ b/qmake/generators/projectgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 1f02fb5..c014851 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h index a1c6233..2526a95 100644 --- a/qmake/generators/unix/unixmake.h +++ b/qmake/generators/unix/unixmake.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 585ab55..3bed87b 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 411c7ab..bee7aae 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h index 46c7d0a..eaad485 100644 --- a/qmake/generators/win32/borland_bmake.h +++ b/qmake/generators/win32/borland_bmake.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 7473b10..d181659 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index 1c394b2..e5db458 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 17a5154..ff1a657 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h index a870976..d3201b9 100644 --- a/qmake/generators/win32/msvc_dsp.h +++ b/qmake/generators/win32/msvc_dsp.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index b5904cc..a3ef34f 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index f4e8de6..eb66d4a 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index c1f5ce1..5c4ff8d 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index e3f56f6..950c6be 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 08159b0..ae30149 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index 9e7d725..2224bff 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 60a27be..cbcac3e 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index c8e32f8..26abae9 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/xmloutput.cpp b/qmake/generators/xmloutput.cpp index 68d22e1..cc932f5 100644 --- a/qmake/generators/xmloutput.cpp +++ b/qmake/generators/xmloutput.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/generators/xmloutput.h b/qmake/generators/xmloutput.h index d0abc5e..d301746 100644 --- a/qmake/generators/xmloutput.h +++ b/qmake/generators/xmloutput.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/main.cpp b/qmake/main.cpp index fe274c4..b681de4 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/meta.cpp b/qmake/meta.cpp index a50cae6..3068cdd 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/meta.h b/qmake/meta.h index 739e727..2039c92 100644 --- a/qmake/meta.h +++ b/qmake/meta.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/option.cpp b/qmake/option.cpp index 5231a47..f028896 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/option.h b/qmake/option.h index 8c01252..2425dd7 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/project.cpp b/qmake/project.cpp index eef32db..e160743 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/project.h b/qmake/project.h index 1e2b754..7154b52 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/property.cpp b/qmake/property.cpp index 979678c..8ba89f9 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/property.h b/qmake/property.h index d1ede0b..8369e4b 100644 --- a/qmake/property.h +++ b/qmake/property.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h index 1fec856..23723df 100644 --- a/qmake/qmake_pch.h +++ b/qmake/qmake_pch.h @@ -6,11 +6,11 @@ ** This file is part of the qmake application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/3rdparty/sha1/sha1.cpp b/src/3rdparty/sha1/sha1.cpp index d270c60..5f133be 100644 --- a/src/3rdparty/sha1/sha1.cpp +++ b/src/3rdparty/sha1/sha1.cpp @@ -6,11 +6,11 @@ ** This file is part 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/arm/qatomic_arm.cpp b/src/corelib/arch/arm/qatomic_arm.cpp index 901c181..6f65ab8 100644 --- a/src/corelib/arch/arm/qatomic_arm.cpp +++ b/src/corelib/arch/arm/qatomic_arm.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp index 15918be..eb069ba 100644 --- a/src/corelib/arch/generic/qatomic_generic_unix.cpp +++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/generic/qatomic_generic_windows.cpp b/src/corelib/arch/generic/qatomic_generic_windows.cpp index 13ef767..2f90ef4 100644 --- a/src/corelib/arch/generic/qatomic_generic_windows.cpp +++ b/src/corelib/arch/generic/qatomic_generic_windows.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/parisc/qatomic_parisc.cpp b/src/corelib/arch/parisc/qatomic_parisc.cpp index 580838e..11af027 100644 --- a/src/corelib/arch/parisc/qatomic_parisc.cpp +++ b/src/corelib/arch/parisc/qatomic_parisc.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h index 0387baf..db62bdd 100644 --- a/src/corelib/arch/qatomic_alpha.h +++ b/src/corelib/arch/qatomic_alpha.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h index 33641fc..6dacb63 100644 --- a/src/corelib/arch/qatomic_arch.h +++ b/src/corelib/arch/qatomic_arch.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h index 07ad70c..fe8e7a1 100644 --- a/src/corelib/arch/qatomic_arm.h +++ b/src/corelib/arch/qatomic_arm.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 2dd38fd..4525b5e 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_avr32.h b/src/corelib/arch/qatomic_avr32.h index 7efbb39..2e4b2f6 100644 --- a/src/corelib/arch/qatomic_avr32.h +++ b/src/corelib/arch/qatomic_avr32.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_bfin.h b/src/corelib/arch/qatomic_bfin.h index d1d4c91..02b690f 100644 --- a/src/corelib/arch/qatomic_bfin.h +++ b/src/corelib/arch/qatomic_bfin.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h index 7584b84..0cb713a 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/arch/qatomic_bootstrap.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h index f6e6a28..65cc77a 100644 --- a/src/corelib/arch/qatomic_generic.h +++ b/src/corelib/arch/qatomic_generic.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_i386.h b/src/corelib/arch/qatomic_i386.h index f8d3708..e1a211f 100644 --- a/src/corelib/arch/qatomic_i386.h +++ b/src/corelib/arch/qatomic_i386.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index 1803c85..a28d623 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_macosx.h b/src/corelib/arch/qatomic_macosx.h index b343e41..3ba0f88 100644 --- a/src/corelib/arch/qatomic_macosx.h +++ b/src/corelib/arch/qatomic_macosx.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index b263aab..cc414e8 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_parisc.h b/src/corelib/arch/qatomic_parisc.h index 134faf9..ff535f3 100644 --- a/src/corelib/arch/qatomic_parisc.h +++ b/src/corelib/arch/qatomic_parisc.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_powerpc.h index 28a143e..3fc7bc7 100644 --- a/src/corelib/arch/qatomic_powerpc.h +++ b/src/corelib/arch/qatomic_powerpc.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h index 434e12a..97a63ce 100644 --- a/src/corelib/arch/qatomic_s390.h +++ b/src/corelib/arch/qatomic_s390.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_sh.h b/src/corelib/arch/qatomic_sh.h index b78ad45..5422bf44 100644 --- a/src/corelib/arch/qatomic_sh.h +++ b/src/corelib/arch/qatomic_sh.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_sh4a.h b/src/corelib/arch/qatomic_sh4a.h index 54371cd..e303621 100644 --- a/src/corelib/arch/qatomic_sh4a.h +++ b/src/corelib/arch/qatomic_sh4a.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h index 4129f14..d655d59 100644 --- a/src/corelib/arch/qatomic_sparc.h +++ b/src/corelib/arch/qatomic_sparc.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_windows.h index ac26b4f..b243446 100644 --- a/src/corelib/arch/qatomic_windows.h +++ b/src/corelib/arch/qatomic_windows.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_windowsce.h b/src/corelib/arch/qatomic_windowsce.h index 95ecba8..85694af 100644 --- a/src/corelib/arch/qatomic_windowsce.h +++ b/src/corelib/arch/qatomic_windowsce.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h index 79d8a07..b2e4136 100644 --- a/src/corelib/arch/qatomic_x86_64.h +++ b/src/corelib/arch/qatomic_x86_64.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/sh/qatomic_sh.cpp b/src/corelib/arch/sh/qatomic_sh.cpp index 00a32ee..734a5c6 100644 --- a/src/corelib/arch/sh/qatomic_sh.cpp +++ b/src/corelib/arch/sh/qatomic_sh.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp index bb411cd..a61a879 100644 --- a/src/corelib/arch/sparc/qatomic_sparc.cpp +++ b/src/corelib/arch/sparc/qatomic_sparc.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qfontlaocodec.cpp b/src/corelib/codecs/qfontlaocodec.cpp index 496ac02..2b94d3b 100644 --- a/src/corelib/codecs/qfontlaocodec.cpp +++ b/src/corelib/codecs/qfontlaocodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qfontlaocodec_p.h b/src/corelib/codecs/qfontlaocodec_p.h index a8e142d..817e01e 100644 --- a/src/corelib/codecs/qfontlaocodec_p.h +++ b/src/corelib/codecs/qfontlaocodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index c8f28d9..9f60388 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qiconvcodec_p.h b/src/corelib/codecs/qiconvcodec_p.h index 839bee7..ec6392a 100644 --- a/src/corelib/codecs/qiconvcodec_p.h +++ b/src/corelib/codecs/qiconvcodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qisciicodec.cpp b/src/corelib/codecs/qisciicodec.cpp index dd2bc8d..cdd3122 100644 --- a/src/corelib/codecs/qisciicodec.cpp +++ b/src/corelib/codecs/qisciicodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h index 0477ca6..5aa01a4 100644 --- a/src/corelib/codecs/qisciicodec_p.h +++ b/src/corelib/codecs/qisciicodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp index aae436e..c865d02 100644 --- a/src/corelib/codecs/qlatincodec.cpp +++ b/src/corelib/codecs/qlatincodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h index 676647a..03e7068 100644 --- a/src/corelib/codecs/qlatincodec_p.h +++ b/src/corelib/codecs/qlatincodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qsimplecodec.cpp b/src/corelib/codecs/qsimplecodec.cpp index 0184a5a..a577fd9 100644 --- a/src/corelib/codecs/qsimplecodec.cpp +++ b/src/corelib/codecs/qsimplecodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qsimplecodec_p.h b/src/corelib/codecs/qsimplecodec_p.h index 0fa874a..c0a80ca 100644 --- a/src/corelib/codecs/qsimplecodec_p.h +++ b/src/corelib/codecs/qsimplecodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 6e8ffa1..cbe0b30 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index e32650f..c9b4f46 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h index 39f643d..588663a 100644 --- a/src/corelib/codecs/qtextcodec_p.h +++ b/src/corelib/codecs/qtextcodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp index 7342b45..9c4581e 100644 --- a/src/corelib/codecs/qtextcodecplugin.cpp +++ b/src/corelib/codecs/qtextcodecplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h index 4600fec..b024ac1 100644 --- a/src/corelib/codecs/qtextcodecplugin.h +++ b/src/corelib/codecs/qtextcodecplugin.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp index 14d2c9c..c43772c 100644 --- a/src/corelib/codecs/qtsciicodec.cpp +++ b/src/corelib/codecs/qtsciicodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h index 8f11e48..a176aff 100644 --- a/src/corelib/codecs/qtsciicodec_p.h +++ b/src/corelib/codecs/qtsciicodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index 281bf75..319f175 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h index 0abcfaf..fee9b83 100644 --- a/src/corelib/codecs/qutfcodec_p.h +++ b/src/corelib/codecs/qutfcodec_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuture.cpp b/src/corelib/concurrent/qfuture.cpp index 1840fab..34c83bd 100644 --- a/src/corelib/concurrent/qfuture.cpp +++ b/src/corelib/concurrent/qfuture.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h index da24db7..828d337 100644 --- a/src/corelib/concurrent/qfuture.h +++ b/src/corelib/concurrent/qfuture.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfutureinterface.cpp b/src/corelib/concurrent/qfutureinterface.cpp index b7589b7..885a2b3 100644 --- a/src/corelib/concurrent/qfutureinterface.cpp +++ b/src/corelib/concurrent/qfutureinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfutureinterface.h b/src/corelib/concurrent/qfutureinterface.h index 85d03c9..3de04b7 100644 --- a/src/corelib/concurrent/qfutureinterface.h +++ b/src/corelib/concurrent/qfutureinterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfutureinterface_p.h b/src/corelib/concurrent/qfutureinterface_p.h index 719d7a1..94a5655 100644 --- a/src/corelib/concurrent/qfutureinterface_p.h +++ b/src/corelib/concurrent/qfutureinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuturesynchronizer.cpp b/src/corelib/concurrent/qfuturesynchronizer.cpp index a0e88f3..2a5f769 100644 --- a/src/corelib/concurrent/qfuturesynchronizer.cpp +++ b/src/corelib/concurrent/qfuturesynchronizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuturesynchronizer.h b/src/corelib/concurrent/qfuturesynchronizer.h index daf65b9..18ad71e 100644 --- a/src/corelib/concurrent/qfuturesynchronizer.h +++ b/src/corelib/concurrent/qfuturesynchronizer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp index ea35e9e..df71674 100644 --- a/src/corelib/concurrent/qfuturewatcher.cpp +++ b/src/corelib/concurrent/qfuturewatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h index 75dfd3d..4fa3fe8 100644 --- a/src/corelib/concurrent/qfuturewatcher.h +++ b/src/corelib/concurrent/qfuturewatcher.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qfuturewatcher_p.h b/src/corelib/concurrent/qfuturewatcher_p.h index 324839d..aeac5a9 100644 --- a/src/corelib/concurrent/qfuturewatcher_p.h +++ b/src/corelib/concurrent/qfuturewatcher_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qrunnable.cpp b/src/corelib/concurrent/qrunnable.cpp index a581a21..6ff4486 100644 --- a/src/corelib/concurrent/qrunnable.cpp +++ b/src/corelib/concurrent/qrunnable.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qrunnable.h b/src/corelib/concurrent/qrunnable.h index 1f480f4..6e3f6fc 100644 --- a/src/corelib/concurrent/qrunnable.h +++ b/src/corelib/concurrent/qrunnable.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentcompilertest.h b/src/corelib/concurrent/qtconcurrentcompilertest.h index 763750a..f8f34e4 100644 --- a/src/corelib/concurrent/qtconcurrentcompilertest.h +++ b/src/corelib/concurrent/qtconcurrentcompilertest.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp index cce1c31..c937af5 100644 --- a/src/corelib/concurrent/qtconcurrentexception.cpp +++ b/src/corelib/concurrent/qtconcurrentexception.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentexception.h b/src/corelib/concurrent/qtconcurrentexception.h index eaa63d8..2e7cc05 100644 --- a/src/corelib/concurrent/qtconcurrentexception.h +++ b/src/corelib/concurrent/qtconcurrentexception.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentfilter.cpp b/src/corelib/concurrent/qtconcurrentfilter.cpp index 4fbda82..ead6d52 100644 --- a/src/corelib/concurrent/qtconcurrentfilter.cpp +++ b/src/corelib/concurrent/qtconcurrentfilter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h index 3fae7d2..c25396c 100644 --- a/src/corelib/concurrent/qtconcurrentfilter.h +++ b/src/corelib/concurrent/qtconcurrentfilter.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentfilterkernel.h b/src/corelib/concurrent/qtconcurrentfilterkernel.h index 2ee1246..fd300b4 100644 --- a/src/corelib/concurrent/qtconcurrentfilterkernel.h +++ b/src/corelib/concurrent/qtconcurrentfilterkernel.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h index d076f73..fc65384 100644 --- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp index 5c20146..e44b889 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h index 01c54a7..68e3372 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.h +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index 8880a87..2a080e6 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentmap.h b/src/corelib/concurrent/qtconcurrentmap.h index 0d55a74..6fca091 100644 --- a/src/corelib/concurrent/qtconcurrentmap.h +++ b/src/corelib/concurrent/qtconcurrentmap.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentmapkernel.h b/src/corelib/concurrent/qtconcurrentmapkernel.h index 0c6a5ad..36d4b4b 100644 --- a/src/corelib/concurrent/qtconcurrentmapkernel.h +++ b/src/corelib/concurrent/qtconcurrentmapkernel.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentmedian.h b/src/corelib/concurrent/qtconcurrentmedian.h index a8ad17d..7a305aa 100644 --- a/src/corelib/concurrent/qtconcurrentmedian.h +++ b/src/corelib/concurrent/qtconcurrentmedian.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentreducekernel.h b/src/corelib/concurrent/qtconcurrentreducekernel.h index 2dad519..a299bdd 100644 --- a/src/corelib/concurrent/qtconcurrentreducekernel.h +++ b/src/corelib/concurrent/qtconcurrentreducekernel.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentresultstore.cpp b/src/corelib/concurrent/qtconcurrentresultstore.cpp index 87bb2a7d..7a9d76f 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.cpp +++ b/src/corelib/concurrent/qtconcurrentresultstore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentresultstore.h b/src/corelib/concurrent/qtconcurrentresultstore.h index c39e921..70633da 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.h +++ b/src/corelib/concurrent/qtconcurrentresultstore.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentrun.cpp b/src/corelib/concurrent/qtconcurrentrun.cpp index 068a913..e8ff5c6 100644 --- a/src/corelib/concurrent/qtconcurrentrun.cpp +++ b/src/corelib/concurrent/qtconcurrentrun.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentrun.h b/src/corelib/concurrent/qtconcurrentrun.h index 00938fa..6d15e93 100644 --- a/src/corelib/concurrent/qtconcurrentrun.h +++ b/src/corelib/concurrent/qtconcurrentrun.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h index 51f5aa1..4ae09fa 100644 --- a/src/corelib/concurrent/qtconcurrentrunbase.h +++ b/src/corelib/concurrent/qtconcurrentrunbase.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h index c7aeb9d..54171d5 100644 --- a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.cpp b/src/corelib/concurrent/qtconcurrentthreadengine.cpp index d6e6057..f108431 100644 --- a/src/corelib/concurrent/qtconcurrentthreadengine.cpp +++ b/src/corelib/concurrent/qtconcurrentthreadengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h index 9e7d12e..d9414e9 100644 --- a/src/corelib/concurrent/qtconcurrentthreadengine.h +++ b/src/corelib/concurrent/qtconcurrentthreadengine.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qthreadpool.cpp b/src/corelib/concurrent/qthreadpool.cpp index 30edfd4..b1d1f86 100644 --- a/src/corelib/concurrent/qthreadpool.cpp +++ b/src/corelib/concurrent/qthreadpool.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h index f3dd96c..ad0afb0 100644 --- a/src/corelib/concurrent/qthreadpool.h +++ b/src/corelib/concurrent/qthreadpool.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/concurrent/qthreadpool_p.h b/src/corelib/concurrent/qthreadpool_p.h index 6948ee1..203a7cb 100644 --- a/src/corelib/concurrent/qthreadpool_p.h +++ b/src/corelib/concurrent/qthreadpool_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h index 6868f92..44672b4 100644 --- a/src/corelib/global/qconfig-dist.h +++ b/src/corelib/global/qconfig-dist.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h index f1deb14..3ef184b 100644 --- a/src/corelib/global/qconfig-large.h +++ b/src/corelib/global/qconfig-large.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h index b4ec70b..ea902ce 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 265c26b..898908d 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index 13b9361..15740bd 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index dec7792..26e09d5 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 6d55f7c..a1fbc82 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 8324d05..ff74393 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 81af295..0b4f515 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index ada08c7..99343a7 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 466839f..9169f22 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp index 76afac9..b767a36 100644 --- a/src/corelib/global/qmalloc.cpp +++ b/src/corelib/global/qmalloc.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index fb7fa0c..e10b912 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp index a989d92..4d1cad6 100644 --- a/src/corelib/global/qnumeric.cpp +++ b/src/corelib/global/qnumeric.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h index 6e3bf27..0d97cac 100644 --- a/src/corelib/global/qnumeric.h +++ b/src/corelib/global/qnumeric.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 664831d..75a3ec1 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h index 7558e6a..3ec0342 100644 --- a/src/corelib/global/qt_pch.h +++ b/src/corelib/global/qt_pch.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 2ce4059..89b8028 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index bedc121..93e1e34 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h index d742467..0e669c0 100644 --- a/src/corelib/io/qabstractfileengine.h +++ b/src/corelib/io/qabstractfileengine.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 34a5a02..46ef9a9 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index a34f7ba..0a1ab7c 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index 37aefb2..3c4d67f 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 9990696..584b754 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 4c8295e..aaeeb51 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 611b19a..177c42e 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 8334146..f2c80c9 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 6d75c59..b0e4ae2 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index c4f6b1a..e11ac60 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index b14f436..5f4fc7c 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qdiriterator.h b/src/corelib/io/qdiriterator.h index 540ad4f..38325b3 100644 --- a/src/corelib/io/qdiriterator.h +++ b/src/corelib/io/qdiriterator.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index d7da800..528bba3 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index e4ca9cc..4404399 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h index ee6f56a..27aa464 100644 --- a/src/corelib/io/qfile_p.h +++ b/src/corelib/io/qfile_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 96e0f82..cd7924d 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 97997a3..c0228f7 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h index 7d66581..913aa88 100644 --- a/src/corelib/io/qfileinfo_p.h +++ b/src/corelib/io/qfileinfo_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index e073a08..a7ccf94 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index b9cea53..aa9f085 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_dnotify.cpp b/src/corelib/io/qfilesystemwatcher_dnotify.cpp index e87375a..259d189 100644 --- a/src/corelib/io/qfilesystemwatcher_dnotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_dnotify.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_dnotify_p.h b/src/corelib/io/qfilesystemwatcher_dnotify_p.h index 81a70ed..eeb070a 100644 --- a/src/corelib/io/qfilesystemwatcher_dnotify_p.h +++ b/src/corelib/io/qfilesystemwatcher_dnotify_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index 4445e3c..e9117b6 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_inotify_p.h b/src/corelib/io/qfilesystemwatcher_inotify_p.h index 8f3595c..e1bb547 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify_p.h +++ b/src/corelib/io/qfilesystemwatcher_inotify_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp index cdf436e..6b41ae9 100644 --- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp +++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_kqueue_p.h b/src/corelib/io/qfilesystemwatcher_kqueue_p.h index 789fb3a..6edecf5 100644 --- a/src/corelib/io/qfilesystemwatcher_kqueue_p.h +++ b/src/corelib/io/qfilesystemwatcher_kqueue_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_p.h b/src/corelib/io/qfilesystemwatcher_p.h index 7cc9153..cbc674f 100644 --- a/src/corelib/io/qfilesystemwatcher_p.h +++ b/src/corelib/io/qfilesystemwatcher_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index 74e3e27..5b5881a 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h index 525e32f..a6c0443 100644 --- a/src/corelib/io/qfilesystemwatcher_win_p.h +++ b/src/corelib/io/qfilesystemwatcher_win_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 61ea7cc..ec81f0b 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h index a2b732e..8f0f066 100644 --- a/src/corelib/io/qfsfileengine.h +++ b/src/corelib/io/qfsfileengine.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp index c5e23f2..5aea15a 100644 --- a/src/corelib/io/qfsfileengine_iterator.cpp +++ b/src/corelib/io/qfsfileengine_iterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h index 7dcdbe2..613ad09 100644 --- a/src/corelib/io/qfsfileengine_iterator_p.h +++ b/src/corelib/io/qfsfileengine_iterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_iterator_unix.cpp b/src/corelib/io/qfsfileengine_iterator_unix.cpp index 2284d9b..b9b5d3c 100644 --- a/src/corelib/io/qfsfileengine_iterator_unix.cpp +++ b/src/corelib/io/qfsfileengine_iterator_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_iterator_win.cpp b/src/corelib/io/qfsfileengine_iterator_win.cpp index 3212d73..02d8fd0 100644 --- a/src/corelib/io/qfsfileengine_iterator_win.cpp +++ b/src/corelib/io/qfsfileengine_iterator_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 8b6cc53..ebcc6e9 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 0d88b06..45e4d25 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 522be20..fe7c1cd 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index c739054..6c876f2 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index 76d47ca..d9e31f6 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h index b996225..474ec8a 100644 --- a/src/corelib/io/qiodevice_p.h +++ b/src/corelib/io/qiodevice_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index a128482..e39178d 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 54a96c7..2c803a6 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index 33059dd..a2da189 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 37173c8..3b137d4 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 0e36760..ea86887 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index a1f921e..d177190 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index 1e9b2d5..a5426db 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qresource_iterator.cpp b/src/corelib/io/qresource_iterator.cpp index 0e7c0dd..649a1d4 100644 --- a/src/corelib/io/qresource_iterator.cpp +++ b/src/corelib/io/qresource_iterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qresource_iterator_p.h b/src/corelib/io/qresource_iterator_p.h index 0cf8fe7..b7fe0d6 100644 --- a/src/corelib/io/qresource_iterator_p.h +++ b/src/corelib/io/qresource_iterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 9706e93..48798bd 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 62b4ed5..876a251 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index cbb24ba..ad6998d 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index 9a9e2d7..5d020bb 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index dd72fd9..73d73b8 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index a08c969..27db995 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 3cfce83..0d31156 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index 4c3eb9a..bcfcbd4 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index ed9d0aa..91c2446 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 6302d34..d9de61d 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 9ce9a2e..0e344f5 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 9242092..a43bf8a 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 5971987..0361430 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index ce0c7f9..03e0604 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 51fde17..865414e 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 7daeaad..f0be77f 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstracteventdispatcher_p.h b/src/corelib/kernel/qabstracteventdispatcher_p.h index 7909ab4..7e53a7a 100644 --- a/src/corelib/kernel/qabstracteventdispatcher_p.h +++ b/src/corelib/kernel/qabstracteventdispatcher_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp index fd0e105..ec8f7e1 100644 --- a/src/corelib/kernel/qabstractitemmodel.cpp +++ b/src/corelib/kernel/qabstractitemmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h index b062768..d3ed977 100644 --- a/src/corelib/kernel/qabstractitemmodel.h +++ b/src/corelib/kernel/qabstractitemmodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/kernel/qabstractitemmodel_p.h index df1a6ce..08cd128 100644 --- a/src/corelib/kernel/qabstractitemmodel_p.h +++ b/src/corelib/kernel/qabstractitemmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index 40a12c1..1120f01 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h index 1146b62..36af162 100644 --- a/src/corelib/kernel/qbasictimer.h +++ b/src/corelib/kernel/qbasictimer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp index 1681b09..073e404 100644 --- a/src/corelib/kernel/qcore_mac.cpp +++ b/src/corelib/kernel/qcore_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 54c9aaa..3958849 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index a23b2dd..ebecccc 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index f7175ae..99c36aa 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreapplication_mac.cpp b/src/corelib/kernel/qcoreapplication_mac.cpp index 4e34a10..2eeeaf1 100644 --- a/src/corelib/kernel/qcoreapplication_mac.cpp +++ b/src/corelib/kernel/qcoreapplication_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 9490ad7..5093f65 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 225821f..ff84a47 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index d1ca3f8..8209256 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 3fcfc98..74a271a 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 5487703..f0ee4b3 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp index c756b6a..d0abe2c 100644 --- a/src/corelib/kernel/qcoreglobaldata.cpp +++ b/src/corelib/kernel/qcoreglobaldata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h index b4904ab..6b31595 100644 --- a/src/corelib/kernel/qcoreglobaldata_p.h +++ b/src/corelib/kernel/qcoreglobaldata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcrashhandler.cpp b/src/corelib/kernel/qcrashhandler.cpp index 7350b66..477a9fb 100644 --- a/src/corelib/kernel/qcrashhandler.cpp +++ b/src/corelib/kernel/qcrashhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qcrashhandler_p.h b/src/corelib/kernel/qcrashhandler_p.h index d41e637..0b596ab 100644 --- a/src/corelib/kernel/qcrashhandler_p.h +++ b/src/corelib/kernel/qcrashhandler_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 3fd768a..30d498c 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h index a2e6c3b..bbbf253 100644 --- a/src/corelib/kernel/qeventdispatcher_glib_p.h +++ b/src/corelib/kernel/qeventdispatcher_glib_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 6aa3b56..c50003d 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 41329cf..eb797ef 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 880e95c..32d9eec 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index aec0f7d..4d38148 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 92bdf73..5d78e10 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index 81ec339..689bd85 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h index 15f5fec..f227c9a 100644 --- a/src/corelib/kernel/qfunctions_p.h +++ b/src/corelib/kernel/qfunctions_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp index 1c929c7..dab1759 100644 --- a/src/corelib/kernel/qfunctions_wince.cpp +++ b/src/corelib/kernel/qfunctions_wince.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 123bd23..57ab943 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index d8e0230..c13297b 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index b65f956..9eb69f6 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 18c488a..7c6a1b6 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 2e0dbb2..6cf36b7 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index ce10bae..873b08d 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 648f933..de33f46 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index f1c8e53..d36b316 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 47c5075..6282cea 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 05015c0..6487194 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index dbec0a6..76b63f5 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index b324334..0bcccba 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobjectcleanuphandler.cpp b/src/corelib/kernel/qobjectcleanuphandler.cpp index d2241ad..d9dbad6 100644 --- a/src/corelib/kernel/qobjectcleanuphandler.cpp +++ b/src/corelib/kernel/qobjectcleanuphandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobjectcleanuphandler.h b/src/corelib/kernel/qobjectcleanuphandler.h index 67db5d3..93f20c2 100644 --- a/src/corelib/kernel/qobjectcleanuphandler.h +++ b/src/corelib/kernel/qobjectcleanuphandler.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 3a22323..7dd5669 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index 99a8e4b..a0384e6 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index ec4a623..46c06f7 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 9853079..0539aeb 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index 481a815..221f801 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index 08f0321..7868b4b 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 487c653..94ad11e 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index b71fbd0..958eebb 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp index 23c6ba7..d21a548 100644 --- a/src/corelib/kernel/qsignalmapper.cpp +++ b/src/corelib/kernel/qsignalmapper.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index ab84b56..d8f27c1 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp index 0ff9c8e..6b21510 100644 --- a/src/corelib/kernel/qsocketnotifier.cpp +++ b/src/corelib/kernel/qsocketnotifier.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index b1fa290..ec0abdf 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/kernel/qsystemsemaphore.cpp index e8426b3..615d8af 100644 --- a/src/corelib/kernel/qsystemsemaphore.cpp +++ b/src/corelib/kernel/qsystemsemaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h index 5a02072..ac3a504 100644 --- a/src/corelib/kernel/qsystemsemaphore.h +++ b/src/corelib/kernel/qsystemsemaphore.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index 81d4f10..302cb94 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp index a7802ee..bf517db 100644 --- a/src/corelib/kernel/qsystemsemaphore_unix.cpp +++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 5912344..8a9f3e1 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 01e81ab..111c247 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 26afe2d..631533a 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 77d6599..84b72a0 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 08eb994..19755e6 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h index 77ec8f5..3e88d3b 100644 --- a/src/corelib/kernel/qtranslator_p.h +++ b/src/corelib/kernel/qtranslator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index b4427c0..6df09c0 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index d7b7e3c..cc31d21 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 727a390..0969ec9 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qwineventnotifier_p.cpp b/src/corelib/kernel/qwineventnotifier_p.cpp index dfbae7a..2f47f1a 100644 --- a/src/corelib/kernel/qwineventnotifier_p.cpp +++ b/src/corelib/kernel/qwineventnotifier_p.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/kernel/qwineventnotifier_p.h b/src/corelib/kernel/qwineventnotifier_p.h index 458c71c..13f1220 100644 --- a/src/corelib/kernel/qwineventnotifier_p.h +++ b/src/corelib/kernel/qwineventnotifier_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index ee00d8f..b70be0b 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 5163027..8871396 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index 8110a60..690715b 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 79400a8..986b3ca 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 7e551e5..e89031a 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h index 36bde95..8b1a728 100644 --- a/src/corelib/plugin/qlibrary_p.h +++ b/src/corelib/plugin/qlibrary_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 08bd2d0..1eaaacc 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index bbd698d..75fc584 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 4d0e53c..6512819 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 15ebe3d..6f4f3c5 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h index 7b8b9ed..2c5f02e 100644 --- a/src/corelib/plugin/qpluginloader.h +++ b/src/corelib/plugin/qpluginloader.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 3e05d28..4f08704 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 95716d4..93952a2 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index f426feb..c2d7e8e 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 4e949ee..b7a453e 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index a5af6c5..b67a4eb 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index a3b3fe7..63efe76 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 51f1f79..1528d20 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index 6eb15be..2bfd135 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp index e15ec7e..f02f476 100644 --- a/src/corelib/thread/qmutex_unix.cpp +++ b/src/corelib/thread/qmutex_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp index a73815d..0bb95c3 100644 --- a/src/corelib/thread/qmutex_win.cpp +++ b/src/corelib/thread/qmutex_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp index 96a9940..c158507 100644 --- a/src/corelib/thread/qmutexpool.cpp +++ b/src/corelib/thread/qmutexpool.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h index 1009ebb..96b8eea 100644 --- a/src/corelib/thread/qmutexpool_p.h +++ b/src/corelib/thread/qmutexpool_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index 3b92e31..19beb68 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index 809e07f..6cb5ed9 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index c8df738..b1c6806 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h index a813aa6..9bfd0c5 100644 --- a/src/corelib/thread/qreadwritelock_p.h +++ b/src/corelib/thread/qreadwritelock_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 82c3607..96c9a69 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index 6bc1920..a49896e 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 2fb6335..d6a2516 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index d9a6240..7782253 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 75293ce..88df719 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index f602821..d77149c 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 27193c6..0dbbf20 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 35c55c1..071adb9 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h index 952e4b2..6b013a5 100644 --- a/src/corelib/thread/qthreadstorage.h +++ b/src/corelib/thread/qthreadstorage.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qwaitcondition.h b/src/corelib/thread/qwaitcondition.h index 850f76a..ffa41e2 100644 --- a/src/corelib/thread/qwaitcondition.h +++ b/src/corelib/thread/qwaitcondition.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index ff7e961..8a5e7f4 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp index fa6610c..7d0bc90 100644 --- a/src/corelib/thread/qwaitcondition_win.cpp +++ b/src/corelib/thread/qwaitcondition_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 3bfa6ad..0771c52 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index a947ab5..2e374d2 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index d754b07..8827eba 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 6aa35f3..91a694c 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index f6422fb..e3af106 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp index cd4cf90..633c373 100644 --- a/src/corelib/tools/qbytearraymatcher.cpp +++ b/src/corelib/tools/qbytearraymatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index d7f2366..b0690fe 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 38adac6..c8d0549 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index a940cda..604e49e 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index ccf7e87..36cd254 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index 8af9557..6f24eff 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 7232626..43e3400 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index ab549e6..00426f4 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 781514c..49911f9 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 3278297..3f566db 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h index b2fb58d..ccba4b6 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/tools/qdatetime_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qdumper.cpp b/src/corelib/tools/qdumper.cpp index c3b8524..1370d64 100644 --- a/src/corelib/tools/qdumper.cpp +++ b/src/corelib/tools/qdumper.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/tools/qharfbuzz.cpp index 1940209..9cdf430 100644 --- a/src/corelib/tools/qharfbuzz.cpp +++ b/src/corelib/tools/qharfbuzz.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h index eaaf0d7..54ca271 100644 --- a/src/corelib/tools/qharfbuzz_p.h +++ b/src/corelib/tools/qharfbuzz_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 540f43d..e086942 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index a18b531..044da7e 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 3f050fe..8790163 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index f615dcd..b8b10565 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index e4c8c27..41131a6 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp index c454224..21b3c8c 100644 --- a/src/corelib/tools/qlinkedlist.cpp +++ b/src/corelib/tools/qlinkedlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 6a85386..99afe90 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 3c21ec1..e3d18b0 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlistdata.cpp b/src/corelib/tools/qlistdata.cpp index d7c39a7..9c862d1 100644 --- a/src/corelib/tools/qlistdata.cpp +++ b/src/corelib/tools/qlistdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 559ba81..e670ad2 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 5b611eb..95ea29b 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 37f59a4..4b32f9d 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 9d36a83..f85bad0 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 0699400..a68a6e8 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 5f13e5a..074d209 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 24088e4..a55ab46 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h index 9708f8d..a4a182b 100644 --- a/src/corelib/tools/qpodlist_p.h +++ b/src/corelib/tools/qpodlist_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp index feea473..ae650fd 100644 --- a/src/corelib/tools/qpoint.cpp +++ b/src/corelib/tools/qpoint.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index 1dab7e2..6eea424 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qqueue.cpp b/src/corelib/tools/qqueue.cpp index de16f8c..b05e991 100644 --- a/src/corelib/tools/qqueue.cpp +++ b/src/corelib/tools/qqueue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index 8c7385e..edafc86 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 3930a0d..75e195b 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 194787e..5ea6968 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index e1c3921..5d2d4a5 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index b387e23..6475385 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 3a0901d..4b5ea48 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 4b19adc..f7f97da 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp index 2b879ea..bd70302 100644 --- a/src/corelib/tools/qshareddata.cpp +++ b/src/corelib/tools/qshareddata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 875560d..bde5df8 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index c3a989e..d245276 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index 0a1efde..59d1294 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index f1b35ee..8c8548e 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp index 76a5484..4f9dc36 100644 --- a/src/corelib/tools/qsize.cpp +++ b/src/corelib/tools/qsize.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h index 57c55ca..828a53a 100644 --- a/src/corelib/tools/qsize.h +++ b/src/corelib/tools/qsize.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstack.cpp b/src/corelib/tools/qstack.cpp index 9fdaf0d..0cbc769 100644 --- a/src/corelib/tools/qstack.cpp +++ b/src/corelib/tools/qstack.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h index f55b53d..bb9b270 100644 --- a/src/corelib/tools/qstack.h +++ b/src/corelib/tools/qstack.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 9c637ac..2050de5 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 1493dce..ca24ec7 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 386321f1..2207300 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 37f7ff2..49b8ffc 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/tools/qstringmatcher.cpp index badc4c6..8f6a106 100644 --- a/src/corelib/tools/qstringmatcher.cpp +++ b/src/corelib/tools/qstringmatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 26fe0dc..81b4d88 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp index bc9b675..c8f4492 100644 --- a/src/corelib/tools/qtextboundaryfinder.cpp +++ b/src/corelib/tools/qtextboundaryfinder.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h index 095e290..e8ad5ff 100644 --- a/src/corelib/tools/qtextboundaryfinder.h +++ b/src/corelib/tools/qtextboundaryfinder.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index 2979a09..d767285 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 18c3980..d9791e1 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qtools_p.h b/src/corelib/tools/qtools_p.h index 574928e..f53f1ae 100644 --- a/src/corelib/tools/qtools_p.h +++ b/src/corelib/tools/qtools_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 0cfa26a..16fd772 100644 --- a/src/corelib/tools/qunicodetables.cpp +++ b/src/corelib/tools/qunicodetables.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index e588313..e5b2367 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index e2f60ed..dccc11b 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index 6b26b2e..d4e084b 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 6bea03b..83076da 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/tools/qvsnprintf.cpp index 31b8632..b86cfeb 100644 --- a/src/corelib/tools/qvsnprintf.cpp +++ b/src/corelib/tools/qvsnprintf.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index ff1a01f..bb703be 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g index d5e64a6..6a92aad 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/xml/qxmlstream.g @@ -6,11 +6,11 @@ -- This file is part of the QtCore 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 either Technology Preview License Agreement or the --- Beta Release License Agreement. +-- Commercial Usage +-- Licensees holding valid Qt Commercial licenses may use this file in +-- accordance with the Qt Commercial License Agreement provided with the +-- Software or, alternatively, in accordance with the terms contained in +-- a written agreement between you and Nokia. -- -- GNU Lesser General Public License Usage -- Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 2ba7972..1bd8e51 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h index 201f0c1..efeb6ab 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/xml/qxmlstream_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/xml/qxmlutils.cpp index 26ecc51..1e8be58 100644 --- a/src/corelib/xml/qxmlutils.cpp +++ b/src/corelib/xml/qxmlutils.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/corelib/xml/qxmlutils_p.h b/src/corelib/xml/qxmlutils_p.h index 5230bb7..c8be6a7 100644 --- a/src/corelib/xml/qxmlutils_p.h +++ b/src/corelib/xml/qxmlutils_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp index 549af1f..5224269 100644 --- a/src/dbus/qdbus_symbols.cpp +++ b/src/dbus/qdbus_symbols.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index 764d368..1829d33 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 883aabf..1dbdc5e 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index d829920..71b62c5 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index 9a1543c..a445ef8 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index c238653..1f9ffb2 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index ef69c44..f66685b 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h index 4735769..5d5b76f 100644 --- a/src/dbus/qdbusabstractinterface_p.h +++ b/src/dbus/qdbusabstractinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index fa2b68f..06c4568 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 6491f0f..df4b381 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index 757f345..2b1a1be 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 04f4976..c782cf5 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 862cad4..d46e553 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 9ff5b6f..f525cd0 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusconnectioninterface.cpp b/src/dbus/qdbusconnectioninterface.cpp index 1d38761..50a4441 100644 --- a/src/dbus/qdbusconnectioninterface.cpp +++ b/src/dbus/qdbusconnectioninterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 77a4add..50e3d60 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuscontext.cpp b/src/dbus/qdbuscontext.cpp index 8cffa81..ec50a53 100644 --- a/src/dbus/qdbuscontext.cpp +++ b/src/dbus/qdbuscontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 3d043cf..43d5afe 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuscontext_p.h b/src/dbus/qdbuscontext_p.h index ade1e7d..d034cb9 100644 --- a/src/dbus/qdbuscontext_p.h +++ b/src/dbus/qdbuscontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp index 7130324..63e07ea 100644 --- a/src/dbus/qdbusdemarshaller.cpp +++ b/src/dbus/qdbusdemarshaller.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index 955a31c..da43f06 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index f3de690..f90fde2 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index 7a11480..7c55454 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 873ab51..44349fa 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 8c701f5..3da3f56 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 9528019..c94ecac 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index e6290f3..189055e 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 3776cd0..37fe8c6 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h index c18ea5e..d604742 100644 --- a/src/dbus/qdbusinterface_p.h +++ b/src/dbus/qdbusinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 43888da..c71f2f4 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusintrospection.cpp b/src/dbus/qdbusintrospection.cpp index e642dbe..5641b75 100644 --- a/src/dbus/qdbusintrospection.cpp +++ b/src/dbus/qdbusintrospection.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index b741c61..d0ea61c 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index d3bbb78..cc3327e 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 3df8a97..b8130cb 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 19f0b04..e3b1ed6 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 5a6322d..1387cde 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h index 317f630..0e7d413 100644 --- a/src/dbus/qdbusmessage_p.h +++ b/src/dbus/qdbusmessage_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 8eb8b1a..9bb1522 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h index 8ef7c95..febb784 100644 --- a/src/dbus/qdbusmetaobject_p.h +++ b/src/dbus/qdbusmetaobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index a1a1a80..ce7fa15 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 7bd8431..2e74849 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h index f0d40f7..7996aa4 100644 --- a/src/dbus/qdbusmetatype_p.h +++ b/src/dbus/qdbusmetatype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index 6f89238..a935d7d 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 9753bbe..ea1060d 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 7602db3..bd61ee8 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h index 877cab9..9983729 100644 --- a/src/dbus/qdbuspendingcall_p.h +++ b/src/dbus/qdbuspendingcall_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp index 382b555..ea95bac 100644 --- a/src/dbus/qdbuspendingreply.cpp +++ b/src/dbus/qdbuspendingreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 5ec9800..f032ea3 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp index 2b322ec..025cf8d 100644 --- a/src/dbus/qdbusreply.cpp +++ b/src/dbus/qdbusreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 182989c..955d74f 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index 57ff60b..2934af4 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index f347b6c..17659ce 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusthread.cpp b/src/dbus/qdbusthread.cpp index 1ff52bc..410c1d7 100644 --- a/src/dbus/qdbusthread.cpp +++ b/src/dbus/qdbusthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h index 20d819f..1c44798 100644 --- a/src/dbus/qdbusthreaddebug_p.h +++ b/src/dbus/qdbusthreaddebug_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 471b899..db103e1 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 4f6f985..4a72e5e 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 43a982c..f005aea 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp index e3aa0dd..769e03d 100644 --- a/src/dbus/qdbusxmlparser.cpp +++ b/src/dbus/qdbusxmlparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index 6e0f391..a495d62 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtDBus 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index b0878ab..d350b35 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 91f18b3..d5a9754 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp index 465ea4e..bf312ed 100644 --- a/src/gui/accessible/qaccessible2.cpp +++ b/src/gui/accessible/qaccessible2.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h index 1e7b5f0..c9b4797 100644 --- a/src/gui/accessible/qaccessible2.h +++ b/src/gui/accessible/qaccessible2.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible_mac.mm b/src/gui/accessible/qaccessible_mac.mm index b6412c2..fd1af45 100644 --- a/src/gui/accessible/qaccessible_mac.mm +++ b/src/gui/accessible/qaccessible_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible_mac_carbon.cpp b/src/gui/accessible/qaccessible_mac_carbon.cpp index 3b2ab68..5890e12 100644 --- a/src/gui/accessible/qaccessible_mac_carbon.cpp +++ b/src/gui/accessible/qaccessible_mac_carbon.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible_mac_p.h b/src/gui/accessible/qaccessible_mac_p.h index e271253..d933664 100644 --- a/src/gui/accessible/qaccessible_mac_p.h +++ b/src/gui/accessible/qaccessible_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible_unix.cpp b/src/gui/accessible/qaccessible_unix.cpp index ac51e4f..da8f14d 100644 --- a/src/gui/accessible/qaccessible_unix.cpp +++ b/src/gui/accessible/qaccessible_unix.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp index 99cc272..98e2895 100644 --- a/src/gui/accessible/qaccessible_win.cpp +++ b/src/gui/accessible/qaccessible_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp index 7c03e9c..c7697ab 100644 --- a/src/gui/accessible/qaccessiblebridge.cpp +++ b/src/gui/accessible/qaccessiblebridge.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h index 0725e19..8f930b4 100644 --- a/src/gui/accessible/qaccessiblebridge.h +++ b/src/gui/accessible/qaccessiblebridge.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp index 7df097b..1eecd12 100644 --- a/src/gui/accessible/qaccessibleobject.cpp +++ b/src/gui/accessible/qaccessibleobject.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h index aef7ce7..8444d60 100644 --- a/src/gui/accessible/qaccessibleobject.h +++ b/src/gui/accessible/qaccessibleobject.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp index 00fe2b1..1481eb7 100644 --- a/src/gui/accessible/qaccessibleplugin.cpp +++ b/src/gui/accessible/qaccessibleplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h index a566921..f217f83 100644 --- a/src/gui/accessible/qaccessibleplugin.h +++ b/src/gui/accessible/qaccessibleplugin.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp index 4b2b2ab..5bb587b 100644 --- a/src/gui/accessible/qaccessiblewidget.cpp +++ b/src/gui/accessible/qaccessiblewidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/accessible/qaccessiblewidget.h b/src/gui/accessible/qaccessiblewidget.h index e6423d9..13bcf6f 100644 --- a/src/gui/accessible/qaccessiblewidget.h +++ b/src/gui/accessible/qaccessiblewidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractpagesetupdialog.cpp b/src/gui/dialogs/qabstractpagesetupdialog.cpp index a07cb0e..747235e 100644 --- a/src/gui/dialogs/qabstractpagesetupdialog.cpp +++ b/src/gui/dialogs/qabstractpagesetupdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractpagesetupdialog.h b/src/gui/dialogs/qabstractpagesetupdialog.h index 3169984..3966546 100644 --- a/src/gui/dialogs/qabstractpagesetupdialog.h +++ b/src/gui/dialogs/qabstractpagesetupdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractpagesetupdialog_p.h b/src/gui/dialogs/qabstractpagesetupdialog_p.h index 5d09342..4a5f4f0 100644 --- a/src/gui/dialogs/qabstractpagesetupdialog_p.h +++ b/src/gui/dialogs/qabstractpagesetupdialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/gui/dialogs/qabstractprintdialog.cpp index 0dc16c9..73e4ac8 100644 --- a/src/gui/dialogs/qabstractprintdialog.cpp +++ b/src/gui/dialogs/qabstractprintdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractprintdialog.h b/src/gui/dialogs/qabstractprintdialog.h index fc1750c..a05e5fd 100644 --- a/src/gui/dialogs/qabstractprintdialog.h +++ b/src/gui/dialogs/qabstractprintdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qabstractprintdialog_p.h b/src/gui/dialogs/qabstractprintdialog_p.h index 6bbe5a6..992ff1d 100644 --- a/src/gui/dialogs/qabstractprintdialog_p.h +++ b/src/gui/dialogs/qabstractprintdialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp index 3aa04f6..2fc4fa5 100644 --- a/src/gui/dialogs/qcolordialog.cpp +++ b/src/gui/dialogs/qcolordialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qcolordialog.h b/src/gui/dialogs/qcolordialog.h index 7ee2e0e..7fe14de 100644 --- a/src/gui/dialogs/qcolordialog.h +++ b/src/gui/dialogs/qcolordialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm index 2556265..15261c8 100644 --- a/src/gui/dialogs/qcolordialog_mac.mm +++ b/src/gui/dialogs/qcolordialog_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qcolordialog_p.h b/src/gui/dialogs/qcolordialog_p.h index 1f81985..38d7256 100644 --- a/src/gui/dialogs/qcolordialog_p.h +++ b/src/gui/dialogs/qcolordialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 14d8162..88590fa 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h index ee1997a..c2ed476 100644 --- a/src/gui/dialogs/qdialog.h +++ b/src/gui/dialogs/qdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qdialog_p.h b/src/gui/dialogs/qdialog_p.h index 81a7b19..cbce2b4 100644 --- a/src/gui/dialogs/qdialog_p.h +++ b/src/gui/dialogs/qdialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qdialogsbinarycompat_win.cpp b/src/gui/dialogs/qdialogsbinarycompat_win.cpp index 5c0efd9..765c307 100644 --- a/src/gui/dialogs/qdialogsbinarycompat_win.cpp +++ b/src/gui/dialogs/qdialogsbinarycompat_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/gui/dialogs/qerrormessage.cpp index f79c6b2..bc6ef0f 100644 --- a/src/gui/dialogs/qerrormessage.cpp +++ b/src/gui/dialogs/qerrormessage.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qerrormessage.h b/src/gui/dialogs/qerrormessage.h index 798631d..5ae3fe0 100644 --- a/src/gui/dialogs/qerrormessage.h +++ b/src/gui/dialogs/qerrormessage.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 5131271..d40e6db 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog.h b/src/gui/dialogs/qfiledialog.h index d4b8d85..c3e779c 100644 --- a/src/gui/dialogs/qfiledialog.h +++ b/src/gui/dialogs/qfiledialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog.ui b/src/gui/dialogs/qfiledialog.ui index 3afbd89..65f6053 100644 --- a/src/gui/dialogs/qfiledialog.ui +++ b/src/gui/dialogs/qfiledialog.ui @@ -7,11 +7,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 90af9fc..ef846c4 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h index dc24390..8d2b5a8 100644 --- a/src/gui/dialogs/qfiledialog_p.h +++ b/src/gui/dialogs/qfiledialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 8431488..ae4c75a 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfiledialog_wince.ui b/src/gui/dialogs/qfiledialog_wince.ui index 8aa9e1b..0c496fd 100644 --- a/src/gui/dialogs/qfiledialog_wince.ui +++ b/src/gui/dialogs/qfiledialog_wince.ui @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp index 23a2cbc..d96620a 100644 --- a/src/gui/dialogs/qfileinfogatherer.cpp +++ b/src/gui/dialogs/qfileinfogatherer.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h index 60b9d5f..701dce3 100644 --- a/src/gui/dialogs/qfileinfogatherer_p.h +++ b/src/gui/dialogs/qfileinfogatherer_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index 012d3a1..4346f12 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h index 52ecaf9..ff81b74 100644 --- a/src/gui/dialogs/qfilesystemmodel.h +++ b/src/gui/dialogs/qfilesystemmodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index 77c35a2..17a1bdd 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index 4c5bf4f..c4ed840 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfontdialog.h b/src/gui/dialogs/qfontdialog.h index 303241c..85b67b4 100644 --- a/src/gui/dialogs/qfontdialog.h +++ b/src/gui/dialogs/qfontdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index d6ddfa3..a8e9de6 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qfontdialog_p.h b/src/gui/dialogs/qfontdialog_p.h index 3a69949..1ffee6d 100644 --- a/src/gui/dialogs/qfontdialog_p.h +++ b/src/gui/dialogs/qfontdialog_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index b63c8ee..3796e71 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qinputdialog.h b/src/gui/dialogs/qinputdialog.h index 52b338a..f4850cf 100644 --- a/src/gui/dialogs/qinputdialog.h +++ b/src/gui/dialogs/qinputdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 1967837..f86d1bf 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h index e1667d6..12dcb71 100644 --- a/src/gui/dialogs/qmessagebox.h +++ b/src/gui/dialogs/qmessagebox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qnspanelproxy_mac.mm b/src/gui/dialogs/qnspanelproxy_mac.mm index e934b49..5af5b0f 100644 --- a/src/gui/dialogs/qnspanelproxy_mac.mm +++ b/src/gui/dialogs/qnspanelproxy_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog.cpp b/src/gui/dialogs/qpagesetupdialog.cpp index 63775d2..e32a5c2 100644 --- a/src/gui/dialogs/qpagesetupdialog.cpp +++ b/src/gui/dialogs/qpagesetupdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog.h b/src/gui/dialogs/qpagesetupdialog.h index 03420ee..dc18ea6 100644 --- a/src/gui/dialogs/qpagesetupdialog.h +++ b/src/gui/dialogs/qpagesetupdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/gui/dialogs/qpagesetupdialog_mac.mm index 401d95f..b3da100 100644 --- a/src/gui/dialogs/qpagesetupdialog_mac.mm +++ b/src/gui/dialogs/qpagesetupdialog_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog_unix.cpp b/src/gui/dialogs/qpagesetupdialog_unix.cpp index fc1f8b6..ee0d099 100644 --- a/src/gui/dialogs/qpagesetupdialog_unix.cpp +++ b/src/gui/dialogs/qpagesetupdialog_unix.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog_unix_p.h b/src/gui/dialogs/qpagesetupdialog_unix_p.h index 08f0f4d..f73b019 100644 --- a/src/gui/dialogs/qpagesetupdialog_unix_p.h +++ b/src/gui/dialogs/qpagesetupdialog_unix_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qpagesetupdialog_win.cpp b/src/gui/dialogs/qpagesetupdialog_win.cpp index 4bb571c..98d4016 100644 --- a/src/gui/dialogs/qpagesetupdialog_win.cpp +++ b/src/gui/dialogs/qpagesetupdialog_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h index b349226..afda116 100644 --- a/src/gui/dialogs/qprintdialog.h +++ b/src/gui/dialogs/qprintdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintdialog_mac.mm b/src/gui/dialogs/qprintdialog_mac.mm index 362dcb0..be996d6 100644 --- a/src/gui/dialogs/qprintdialog_mac.mm +++ b/src/gui/dialogs/qprintdialog_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintdialog_qws.cpp b/src/gui/dialogs/qprintdialog_qws.cpp index 70eeffa..a302949 100644 --- a/src/gui/dialogs/qprintdialog_qws.cpp +++ b/src/gui/dialogs/qprintdialog_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 76c22d0..f929ba9 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/gui/dialogs/qprintdialog_win.cpp index 936d1ed..5da54c4 100644 --- a/src/gui/dialogs/qprintdialog_win.cpp +++ b/src/gui/dialogs/qprintdialog_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp index c00bd14..192a96f 100644 --- a/src/gui/dialogs/qprintpreviewdialog.cpp +++ b/src/gui/dialogs/qprintpreviewdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/gui/dialogs/qprintpreviewdialog.h index c3a4d57..0ae878d 100644 --- a/src/gui/dialogs/qprintpreviewdialog.h +++ b/src/gui/dialogs/qprintpreviewdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp index 66a1285..5d6cae7 100644 --- a/src/gui/dialogs/qprogressdialog.cpp +++ b/src/gui/dialogs/qprogressdialog.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qprogressdialog.h b/src/gui/dialogs/qprogressdialog.h index 256981c..5ba739d 100644 --- a/src/gui/dialogs/qprogressdialog.h +++ b/src/gui/dialogs/qprogressdialog.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp index 1bd2b7d..83e556a 100644 --- a/src/gui/dialogs/qsidebar.cpp +++ b/src/gui/dialogs/qsidebar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qsidebar_p.h b/src/gui/dialogs/qsidebar_p.h index ecbbb37..91ae211 100644 --- a/src/gui/dialogs/qsidebar_p.h +++ b/src/gui/dialogs/qsidebar_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp index 32395c4..a80489a 100644 --- a/src/gui/dialogs/qwizard.cpp +++ b/src/gui/dialogs/qwizard.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qwizard.h b/src/gui/dialogs/qwizard.h index ef3ed39..7c8ff07 100644 --- a/src/gui/dialogs/qwizard.h +++ b/src/gui/dialogs/qwizard.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index 64696de..684ade4 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/dialogs/qwizard_win_p.h b/src/gui/dialogs/qwizard_win_p.h index cbb3b17..9f5e117 100644 --- a/src/gui/dialogs/qwizard_win_p.h +++ b/src/gui/dialogs/qwizard_win_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qcopchannel_qws.cpp b/src/gui/embedded/qcopchannel_qws.cpp index 00cf5dc..bcfaad1 100644 --- a/src/gui/embedded/qcopchannel_qws.cpp +++ b/src/gui/embedded/qcopchannel_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qcopchannel_qws.h b/src/gui/embedded/qcopchannel_qws.h index d6e6e6b..8204e7d 100644 --- a/src/gui/embedded/qcopchannel_qws.h +++ b/src/gui/embedded/qcopchannel_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecoration_qws.cpp b/src/gui/embedded/qdecoration_qws.cpp index 4ac1f01..92b94ba 100644 --- a/src/gui/embedded/qdecoration_qws.cpp +++ b/src/gui/embedded/qdecoration_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecoration_qws.h b/src/gui/embedded/qdecoration_qws.h index ff4ebac..d96e50a 100644 --- a/src/gui/embedded/qdecoration_qws.h +++ b/src/gui/embedded/qdecoration_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationdefault_qws.cpp b/src/gui/embedded/qdecorationdefault_qws.cpp index 6e5314d..3ef1e9b 100644 --- a/src/gui/embedded/qdecorationdefault_qws.cpp +++ b/src/gui/embedded/qdecorationdefault_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationdefault_qws.h b/src/gui/embedded/qdecorationdefault_qws.h index 4cc3703..2792625 100644 --- a/src/gui/embedded/qdecorationdefault_qws.h +++ b/src/gui/embedded/qdecorationdefault_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationfactory_qws.cpp b/src/gui/embedded/qdecorationfactory_qws.cpp index 999e346..f92c451 100644 --- a/src/gui/embedded/qdecorationfactory_qws.cpp +++ b/src/gui/embedded/qdecorationfactory_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationfactory_qws.h b/src/gui/embedded/qdecorationfactory_qws.h index 7397c78..b04572e 100644 --- a/src/gui/embedded/qdecorationfactory_qws.h +++ b/src/gui/embedded/qdecorationfactory_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationplugin_qws.cpp b/src/gui/embedded/qdecorationplugin_qws.cpp index eb37e21..4b76fa5 100644 --- a/src/gui/embedded/qdecorationplugin_qws.cpp +++ b/src/gui/embedded/qdecorationplugin_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationplugin_qws.h b/src/gui/embedded/qdecorationplugin_qws.h index c58aaab..53d0266 100644 --- a/src/gui/embedded/qdecorationplugin_qws.h +++ b/src/gui/embedded/qdecorationplugin_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationstyled_qws.cpp b/src/gui/embedded/qdecorationstyled_qws.cpp index 847881b..6302eee 100644 --- a/src/gui/embedded/qdecorationstyled_qws.cpp +++ b/src/gui/embedded/qdecorationstyled_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationstyled_qws.h b/src/gui/embedded/qdecorationstyled_qws.h index 583c3f2..c9e7dab 100644 --- a/src/gui/embedded/qdecorationstyled_qws.h +++ b/src/gui/embedded/qdecorationstyled_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationwindows_qws.cpp b/src/gui/embedded/qdecorationwindows_qws.cpp index 374f45e..1f95654 100644 --- a/src/gui/embedded/qdecorationwindows_qws.cpp +++ b/src/gui/embedded/qdecorationwindows_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdecorationwindows_qws.h b/src/gui/embedded/qdecorationwindows_qws.h index c7eb80e..c444fc6 100644 --- a/src/gui/embedded/qdecorationwindows_qws.h +++ b/src/gui/embedded/qdecorationwindows_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdirectpainter_qws.cpp b/src/gui/embedded/qdirectpainter_qws.cpp index 113e607..912be32 100644 --- a/src/gui/embedded/qdirectpainter_qws.cpp +++ b/src/gui/embedded/qdirectpainter_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qdirectpainter_qws.h b/src/gui/embedded/qdirectpainter_qws.h index 8c5c30f..c8693f6 100644 --- a/src/gui/embedded/qdirectpainter_qws.h +++ b/src/gui/embedded/qdirectpainter_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbd_qws.cpp b/src/gui/embedded/qkbd_qws.cpp index 8cf87db..d551bee 100644 --- a/src/gui/embedded/qkbd_qws.cpp +++ b/src/gui/embedded/qkbd_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbd_qws.h b/src/gui/embedded/qkbd_qws.h index 8809f0a..a988743 100644 --- a/src/gui/embedded/qkbd_qws.h +++ b/src/gui/embedded/qkbd_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbddriverfactory_qws.cpp b/src/gui/embedded/qkbddriverfactory_qws.cpp index 1ade652..37b5a83 100644 --- a/src/gui/embedded/qkbddriverfactory_qws.cpp +++ b/src/gui/embedded/qkbddriverfactory_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbddriverfactory_qws.h b/src/gui/embedded/qkbddriverfactory_qws.h index 45e5664..4c8cc26 100644 --- a/src/gui/embedded/qkbddriverfactory_qws.h +++ b/src/gui/embedded/qkbddriverfactory_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbddriverplugin_qws.cpp b/src/gui/embedded/qkbddriverplugin_qws.cpp index 93dd9df..1f91e2d 100644 --- a/src/gui/embedded/qkbddriverplugin_qws.cpp +++ b/src/gui/embedded/qkbddriverplugin_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbddriverplugin_qws.h b/src/gui/embedded/qkbddriverplugin_qws.h index e320b17..77a9f59 100644 --- a/src/gui/embedded/qkbddriverplugin_qws.h +++ b/src/gui/embedded/qkbddriverplugin_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdpc101_qws.cpp b/src/gui/embedded/qkbdpc101_qws.cpp index 3173645..2c195f5 100644 --- a/src/gui/embedded/qkbdpc101_qws.cpp +++ b/src/gui/embedded/qkbdpc101_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdpc101_qws.h b/src/gui/embedded/qkbdpc101_qws.h index f9f0104..ca34ed9 100644 --- a/src/gui/embedded/qkbdpc101_qws.h +++ b/src/gui/embedded/qkbdpc101_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdsl5000_qws.cpp b/src/gui/embedded/qkbdsl5000_qws.cpp index bc412b6..5f77ce0 100644 --- a/src/gui/embedded/qkbdsl5000_qws.cpp +++ b/src/gui/embedded/qkbdsl5000_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdsl5000_qws.h b/src/gui/embedded/qkbdsl5000_qws.h index 514d602..aaddfe8 100644 --- a/src/gui/embedded/qkbdsl5000_qws.h +++ b/src/gui/embedded/qkbdsl5000_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp index b588e55..843bca8 100644 --- a/src/gui/embedded/qkbdtty_qws.cpp +++ b/src/gui/embedded/qkbdtty_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdtty_qws.h b/src/gui/embedded/qkbdtty_qws.h index 4f93d6c..ff287ff 100644 --- a/src/gui/embedded/qkbdtty_qws.h +++ b/src/gui/embedded/qkbdtty_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdum_qws.cpp b/src/gui/embedded/qkbdum_qws.cpp index d525c66..cfcdc28 100644 --- a/src/gui/embedded/qkbdum_qws.cpp +++ b/src/gui/embedded/qkbdum_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdum_qws.h b/src/gui/embedded/qkbdum_qws.h index 96aaef6..5e75209 100644 --- a/src/gui/embedded/qkbdum_qws.h +++ b/src/gui/embedded/qkbdum_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdusb_qws.cpp b/src/gui/embedded/qkbdusb_qws.cpp index e35ac55..8f1da54 100644 --- a/src/gui/embedded/qkbdusb_qws.cpp +++ b/src/gui/embedded/qkbdusb_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdusb_qws.h b/src/gui/embedded/qkbdusb_qws.h index 81d0103..24d6a11 100644 --- a/src/gui/embedded/qkbdusb_qws.h +++ b/src/gui/embedded/qkbdusb_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdvfb_qws.cpp b/src/gui/embedded/qkbdvfb_qws.cpp index 1d53ce9..bedea12 100644 --- a/src/gui/embedded/qkbdvfb_qws.cpp +++ b/src/gui/embedded/qkbdvfb_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdvfb_qws.h b/src/gui/embedded/qkbdvfb_qws.h index 47fa5d3..fde1b8d 100644 --- a/src/gui/embedded/qkbdvfb_qws.h +++ b/src/gui/embedded/qkbdvfb_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdvr41xx_qws.cpp b/src/gui/embedded/qkbdvr41xx_qws.cpp index 4613891..60a6cb8 100644 --- a/src/gui/embedded/qkbdvr41xx_qws.cpp +++ b/src/gui/embedded/qkbdvr41xx_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdvr41xx_qws.h b/src/gui/embedded/qkbdvr41xx_qws.h index 51719cf..01899e3 100644 --- a/src/gui/embedded/qkbdvr41xx_qws.h +++ b/src/gui/embedded/qkbdvr41xx_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdyopy_qws.cpp b/src/gui/embedded/qkbdyopy_qws.cpp index bfa8c64..127641f 100644 --- a/src/gui/embedded/qkbdyopy_qws.cpp +++ b/src/gui/embedded/qkbdyopy_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qkbdyopy_qws.h b/src/gui/embedded/qkbdyopy_qws.h index 81c1c4d..67984a2 100644 --- a/src/gui/embedded/qkbdyopy_qws.h +++ b/src/gui/embedded/qkbdyopy_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qlock.cpp b/src/gui/embedded/qlock.cpp index 874ca7d..28197c0 100644 --- a/src/gui/embedded/qlock.cpp +++ b/src/gui/embedded/qlock.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qlock_p.h b/src/gui/embedded/qlock_p.h index 92e0704..a7ea2f2 100644 --- a/src/gui/embedded/qlock_p.h +++ b/src/gui/embedded/qlock_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouse_qws.cpp b/src/gui/embedded/qmouse_qws.cpp index 044a574..9d3c633 100644 --- a/src/gui/embedded/qmouse_qws.cpp +++ b/src/gui/embedded/qmouse_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouse_qws.h b/src/gui/embedded/qmouse_qws.h index d003b4e..c153098 100644 --- a/src/gui/embedded/qmouse_qws.h +++ b/src/gui/embedded/qmouse_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousebus_qws.cpp b/src/gui/embedded/qmousebus_qws.cpp index 6b26349..b8b321b 100644 --- a/src/gui/embedded/qmousebus_qws.cpp +++ b/src/gui/embedded/qmousebus_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousebus_qws.h b/src/gui/embedded/qmousebus_qws.h index 636b466..2849500 100644 --- a/src/gui/embedded/qmousebus_qws.h +++ b/src/gui/embedded/qmousebus_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousedriverfactory_qws.cpp b/src/gui/embedded/qmousedriverfactory_qws.cpp index db1d7a4..e813091 100644 --- a/src/gui/embedded/qmousedriverfactory_qws.cpp +++ b/src/gui/embedded/qmousedriverfactory_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousedriverfactory_qws.h b/src/gui/embedded/qmousedriverfactory_qws.h index 6a13bb7..03593ad 100644 --- a/src/gui/embedded/qmousedriverfactory_qws.h +++ b/src/gui/embedded/qmousedriverfactory_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousedriverplugin_qws.cpp b/src/gui/embedded/qmousedriverplugin_qws.cpp index e7f11b3..3cc1136 100644 --- a/src/gui/embedded/qmousedriverplugin_qws.cpp +++ b/src/gui/embedded/qmousedriverplugin_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousedriverplugin_qws.h b/src/gui/embedded/qmousedriverplugin_qws.h index 4a864f9..c7cb35b 100644 --- a/src/gui/embedded/qmousedriverplugin_qws.h +++ b/src/gui/embedded/qmousedriverplugin_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouselinuxtp_qws.cpp b/src/gui/embedded/qmouselinuxtp_qws.cpp index 7683be3..3747af4 100644 --- a/src/gui/embedded/qmouselinuxtp_qws.cpp +++ b/src/gui/embedded/qmouselinuxtp_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouselinuxtp_qws.h b/src/gui/embedded/qmouselinuxtp_qws.h index 2385455..dfbaccc 100644 --- a/src/gui/embedded/qmouselinuxtp_qws.h +++ b/src/gui/embedded/qmouselinuxtp_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousepc_qws.cpp b/src/gui/embedded/qmousepc_qws.cpp index a0cb032..96cb12d 100644 --- a/src/gui/embedded/qmousepc_qws.cpp +++ b/src/gui/embedded/qmousepc_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousepc_qws.h b/src/gui/embedded/qmousepc_qws.h index 6a08878..71bf910 100644 --- a/src/gui/embedded/qmousepc_qws.h +++ b/src/gui/embedded/qmousepc_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousetslib_qws.cpp b/src/gui/embedded/qmousetslib_qws.cpp index 8edbc62..56fda49 100644 --- a/src/gui/embedded/qmousetslib_qws.cpp +++ b/src/gui/embedded/qmousetslib_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousetslib_qws.h b/src/gui/embedded/qmousetslib_qws.h index 07bacde..7d795f3 100644 --- a/src/gui/embedded/qmousetslib_qws.h +++ b/src/gui/embedded/qmousetslib_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousevfb_qws.cpp b/src/gui/embedded/qmousevfb_qws.cpp index 9d81201..9b12c1e 100644 --- a/src/gui/embedded/qmousevfb_qws.cpp +++ b/src/gui/embedded/qmousevfb_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousevfb_qws.h b/src/gui/embedded/qmousevfb_qws.h index fbf1efe..8d17a39 100644 --- a/src/gui/embedded/qmousevfb_qws.h +++ b/src/gui/embedded/qmousevfb_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousevr41xx_qws.cpp b/src/gui/embedded/qmousevr41xx_qws.cpp index b4828bf..2a1bf67 100644 --- a/src/gui/embedded/qmousevr41xx_qws.cpp +++ b/src/gui/embedded/qmousevr41xx_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmousevr41xx_qws.h b/src/gui/embedded/qmousevr41xx_qws.h index ad21013..f7e7a36 100644 --- a/src/gui/embedded/qmousevr41xx_qws.h +++ b/src/gui/embedded/qmousevr41xx_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouseyopy_qws.cpp b/src/gui/embedded/qmouseyopy_qws.cpp index fcf5193..f810368 100644 --- a/src/gui/embedded/qmouseyopy_qws.cpp +++ b/src/gui/embedded/qmouseyopy_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qmouseyopy_qws.h b/src/gui/embedded/qmouseyopy_qws.h index 0209f10..aff98f7 100644 --- a/src/gui/embedded/qmouseyopy_qws.h +++ b/src/gui/embedded/qmouseyopy_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp index 6741f2c..eec5b35 100644 --- a/src/gui/embedded/qscreen_qws.cpp +++ b/src/gui/embedded/qscreen_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreen_qws.h b/src/gui/embedded/qscreen_qws.h index e777317..c735e76 100644 --- a/src/gui/embedded/qscreen_qws.h +++ b/src/gui/embedded/qscreen_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp index 8b17fba..86bfb4d 100644 --- a/src/gui/embedded/qscreendriverfactory_qws.cpp +++ b/src/gui/embedded/qscreendriverfactory_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreendriverfactory_qws.h b/src/gui/embedded/qscreendriverfactory_qws.h index eb9364c..9f53725 100644 --- a/src/gui/embedded/qscreendriverfactory_qws.h +++ b/src/gui/embedded/qscreendriverfactory_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreendriverplugin_qws.cpp b/src/gui/embedded/qscreendriverplugin_qws.cpp index 5429bde..64b97e5 100644 --- a/src/gui/embedded/qscreendriverplugin_qws.cpp +++ b/src/gui/embedded/qscreendriverplugin_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreendriverplugin_qws.h b/src/gui/embedded/qscreendriverplugin_qws.h index f7dd0fc..eb87ab5 100644 --- a/src/gui/embedded/qscreendriverplugin_qws.h +++ b/src/gui/embedded/qscreendriverplugin_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp index 48fe881..5a854a2 100644 --- a/src/gui/embedded/qscreenlinuxfb_qws.cpp +++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenlinuxfb_qws.h b/src/gui/embedded/qscreenlinuxfb_qws.h index 781b205..de9917c 100644 --- a/src/gui/embedded/qscreenlinuxfb_qws.h +++ b/src/gui/embedded/qscreenlinuxfb_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenmulti_qws.cpp b/src/gui/embedded/qscreenmulti_qws.cpp index 1914b44..caaffe7 100644 --- a/src/gui/embedded/qscreenmulti_qws.cpp +++ b/src/gui/embedded/qscreenmulti_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenmulti_qws_p.h b/src/gui/embedded/qscreenmulti_qws_p.h index e01b167..2b3d55c 100644 --- a/src/gui/embedded/qscreenmulti_qws_p.h +++ b/src/gui/embedded/qscreenmulti_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenproxy_qws.cpp b/src/gui/embedded/qscreenproxy_qws.cpp index 5b8f6f0..566ce6e 100644 --- a/src/gui/embedded/qscreenproxy_qws.cpp +++ b/src/gui/embedded/qscreenproxy_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenproxy_qws.h b/src/gui/embedded/qscreenproxy_qws.h index 6373c2a..ad0fbe2 100644 --- a/src/gui/embedded/qscreenproxy_qws.h +++ b/src/gui/embedded/qscreenproxy_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp index f988789..c935159 100644 --- a/src/gui/embedded/qscreentransformed_qws.cpp +++ b/src/gui/embedded/qscreentransformed_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreentransformed_qws.h b/src/gui/embedded/qscreentransformed_qws.h index e2d5a33..5ba1660 100644 --- a/src/gui/embedded/qscreentransformed_qws.h +++ b/src/gui/embedded/qscreentransformed_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenvfb_qws.cpp b/src/gui/embedded/qscreenvfb_qws.cpp index abbe73b..a3d2afa 100644 --- a/src/gui/embedded/qscreenvfb_qws.cpp +++ b/src/gui/embedded/qscreenvfb_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qscreenvfb_qws.h b/src/gui/embedded/qscreenvfb_qws.h index 1f8edf2..462be02 100644 --- a/src/gui/embedded/qscreenvfb_qws.h +++ b/src/gui/embedded/qscreenvfb_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qsoundqss_qws.cpp b/src/gui/embedded/qsoundqss_qws.cpp index c72ea91..3e4ea80 100644 --- a/src/gui/embedded/qsoundqss_qws.cpp +++ b/src/gui/embedded/qsoundqss_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qsoundqss_qws.h b/src/gui/embedded/qsoundqss_qws.h index 072a694..f39353e 100644 --- a/src/gui/embedded/qsoundqss_qws.h +++ b/src/gui/embedded/qsoundqss_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qtransportauth_qws.cpp b/src/gui/embedded/qtransportauth_qws.cpp index 97ba5b8..86be027 100644 --- a/src/gui/embedded/qtransportauth_qws.cpp +++ b/src/gui/embedded/qtransportauth_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qtransportauth_qws.h b/src/gui/embedded/qtransportauth_qws.h index 2d2dd52..62fe73f 100644 --- a/src/gui/embedded/qtransportauth_qws.h +++ b/src/gui/embedded/qtransportauth_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qtransportauth_qws_p.h b/src/gui/embedded/qtransportauth_qws_p.h index 33e2edc..183b052 100644 --- a/src/gui/embedded/qtransportauth_qws_p.h +++ b/src/gui/embedded/qtransportauth_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qtransportauthdefs_qws.h b/src/gui/embedded/qtransportauthdefs_qws.h index 85218b6..d06b23e 100644 --- a/src/gui/embedded/qtransportauthdefs_qws.h +++ b/src/gui/embedded/qtransportauthdefs_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qunixsocket.cpp b/src/gui/embedded/qunixsocket.cpp index 16f2cae..7fd03e9 100644 --- a/src/gui/embedded/qunixsocket.cpp +++ b/src/gui/embedded/qunixsocket.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qunixsocket_p.h b/src/gui/embedded/qunixsocket_p.h index 6b9bf61..58c2b93 100644 --- a/src/gui/embedded/qunixsocket_p.h +++ b/src/gui/embedded/qunixsocket_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qunixsocketserver.cpp b/src/gui/embedded/qunixsocketserver.cpp index 6e9347b..70232e4 100644 --- a/src/gui/embedded/qunixsocketserver.cpp +++ b/src/gui/embedded/qunixsocketserver.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qunixsocketserver_p.h b/src/gui/embedded/qunixsocketserver_p.h index 60d4cfc..66ed982 100644 --- a/src/gui/embedded/qunixsocketserver_p.h +++ b/src/gui/embedded/qunixsocketserver_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qvfbhdr.h b/src/gui/embedded/qvfbhdr.h index 421d991..262b278 100644 --- a/src/gui/embedded/qvfbhdr.h +++ b/src/gui/embedded/qvfbhdr.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwindowsystem_p.h b/src/gui/embedded/qwindowsystem_p.h index 7782206..6225392 100644 --- a/src/gui/embedded/qwindowsystem_p.h +++ b/src/gui/embedded/qwindowsystem_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp index dffebf2..8be5992 100644 --- a/src/gui/embedded/qwindowsystem_qws.cpp +++ b/src/gui/embedded/qwindowsystem_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwindowsystem_qws.h b/src/gui/embedded/qwindowsystem_qws.h index 8af59a3..41dcdc2 100644 --- a/src/gui/embedded/qwindowsystem_qws.h +++ b/src/gui/embedded/qwindowsystem_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwscommand_qws.cpp b/src/gui/embedded/qwscommand_qws.cpp index 88e33a3..231d2b4 100644 --- a/src/gui/embedded/qwscommand_qws.cpp +++ b/src/gui/embedded/qwscommand_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwscommand_qws_p.h b/src/gui/embedded/qwscommand_qws_p.h index 2155333..92b22c7 100644 --- a/src/gui/embedded/qwscommand_qws_p.h +++ b/src/gui/embedded/qwscommand_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwscursor_qws.cpp b/src/gui/embedded/qwscursor_qws.cpp index 3a5bd2c..1b08e50 100644 --- a/src/gui/embedded/qwscursor_qws.cpp +++ b/src/gui/embedded/qwscursor_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwscursor_qws.h b/src/gui/embedded/qwscursor_qws.h index 6d19c31..04c1b8f 100644 --- a/src/gui/embedded/qwscursor_qws.h +++ b/src/gui/embedded/qwscursor_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsdisplay_qws.h b/src/gui/embedded/qwsdisplay_qws.h index 455d46d..cfcd649 100644 --- a/src/gui/embedded/qwsdisplay_qws.h +++ b/src/gui/embedded/qwsdisplay_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsdisplay_qws_p.h b/src/gui/embedded/qwsdisplay_qws_p.h index 819b826..f9f0f92 100644 --- a/src/gui/embedded/qwsdisplay_qws_p.h +++ b/src/gui/embedded/qwsdisplay_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsembedwidget.cpp b/src/gui/embedded/qwsembedwidget.cpp index a449c65..99cde7f 100644 --- a/src/gui/embedded/qwsembedwidget.cpp +++ b/src/gui/embedded/qwsembedwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsembedwidget.h b/src/gui/embedded/qwsembedwidget.h index 6badf76..07aa517 100644 --- a/src/gui/embedded/qwsembedwidget.h +++ b/src/gui/embedded/qwsembedwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsevent_qws.cpp b/src/gui/embedded/qwsevent_qws.cpp index e23eacd..6afd4d3 100644 --- a/src/gui/embedded/qwsevent_qws.cpp +++ b/src/gui/embedded/qwsevent_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsevent_qws.h b/src/gui/embedded/qwsevent_qws.h index f231db2..e5b1980 100644 --- a/src/gui/embedded/qwsevent_qws.h +++ b/src/gui/embedded/qwsevent_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp index 5fb588c..f28f9c0 100644 --- a/src/gui/embedded/qwslock.cpp +++ b/src/gui/embedded/qwslock.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwslock_p.h b/src/gui/embedded/qwslock_p.h index 4dc8732..381b5cf 100644 --- a/src/gui/embedded/qwslock_p.h +++ b/src/gui/embedded/qwslock_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsmanager_p.h b/src/gui/embedded/qwsmanager_p.h index a891a75..d4bde31 100644 --- a/src/gui/embedded/qwsmanager_p.h +++ b/src/gui/embedded/qwsmanager_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsmanager_qws.cpp b/src/gui/embedded/qwsmanager_qws.cpp index 96abf3f..ff8fd91 100644 --- a/src/gui/embedded/qwsmanager_qws.cpp +++ b/src/gui/embedded/qwsmanager_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsmanager_qws.h b/src/gui/embedded/qwsmanager_qws.h index d342ae0..75a610c 100644 --- a/src/gui/embedded/qwsmanager_qws.h +++ b/src/gui/embedded/qwsmanager_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsproperty_qws.cpp b/src/gui/embedded/qwsproperty_qws.cpp index 1c44506..9cba244 100644 --- a/src/gui/embedded/qwsproperty_qws.cpp +++ b/src/gui/embedded/qwsproperty_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsproperty_qws.h b/src/gui/embedded/qwsproperty_qws.h index 27f0c65..352e725 100644 --- a/src/gui/embedded/qwsproperty_qws.h +++ b/src/gui/embedded/qwsproperty_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsprotocolitem_qws.h b/src/gui/embedded/qwsprotocolitem_qws.h index 71f70dd..fd4890a 100644 --- a/src/gui/embedded/qwsprotocolitem_qws.h +++ b/src/gui/embedded/qwsprotocolitem_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssharedmemory.cpp b/src/gui/embedded/qwssharedmemory.cpp index 8afbe9b..4f4270b 100644 --- a/src/gui/embedded/qwssharedmemory.cpp +++ b/src/gui/embedded/qwssharedmemory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssharedmemory_p.h b/src/gui/embedded/qwssharedmemory_p.h index 6b58605..6ef9d8c 100644 --- a/src/gui/embedded/qwssharedmemory_p.h +++ b/src/gui/embedded/qwssharedmemory_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssignalhandler.cpp b/src/gui/embedded/qwssignalhandler.cpp index 0946fb6..f183b46 100644 --- a/src/gui/embedded/qwssignalhandler.cpp +++ b/src/gui/embedded/qwssignalhandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssignalhandler_p.h b/src/gui/embedded/qwssignalhandler_p.h index f2228e1..ce3866d 100644 --- a/src/gui/embedded/qwssignalhandler_p.h +++ b/src/gui/embedded/qwssignalhandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssocket_qws.cpp b/src/gui/embedded/qwssocket_qws.cpp index bebd98e..249a8cb 100644 --- a/src/gui/embedded/qwssocket_qws.cpp +++ b/src/gui/embedded/qwssocket_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwssocket_qws.h b/src/gui/embedded/qwssocket_qws.h index 6b86d7c..34c66c5 100644 --- a/src/gui/embedded/qwssocket_qws.h +++ b/src/gui/embedded/qwssocket_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/embedded/qwsutils_qws.h b/src/gui/embedded/qwsutils_qws.h index 3aa96d1..7444e02 100644 --- a/src/gui/embedded/qwsutils_qws.h +++ b/src/gui/embedded/qwsutils_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp index 1e21b54..4c2469d 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.cpp +++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h index 5b40d6b..4c3682b 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.h +++ b/src/gui/graphicsview/qgraphicsgridlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 83a7e67..4787b6c 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index b98882d..7b379e9 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 07f6958..2815b8c 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsitemanimation.cpp b/src/gui/graphicsview/qgraphicsitemanimation.cpp index 1b58b9c..d1dfb3d 100644 --- a/src/gui/graphicsview/qgraphicsitemanimation.cpp +++ b/src/gui/graphicsview/qgraphicsitemanimation.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsitemanimation.h b/src/gui/graphicsview/qgraphicsitemanimation.h index c1312d4..a499d1a 100644 --- a/src/gui/graphicsview/qgraphicsitemanimation.h +++ b/src/gui/graphicsview/qgraphicsitemanimation.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp index f78b8c8..be345c5 100644 --- a/src/gui/graphicsview/qgraphicslayout.cpp +++ b/src/gui/graphicsview/qgraphicslayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/gui/graphicsview/qgraphicslayout.h index fad6c3bb..350903e 100644 --- a/src/gui/graphicsview/qgraphicslayout.h +++ b/src/gui/graphicsview/qgraphicslayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayout_p.cpp b/src/gui/graphicsview/qgraphicslayout_p.cpp index f76f4dd..17b42c5 100644 --- a/src/gui/graphicsview/qgraphicslayout_p.cpp +++ b/src/gui/graphicsview/qgraphicslayout_p.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayout_p.h b/src/gui/graphicsview/qgraphicslayout_p.h index a8895de..f0fd52a 100644 --- a/src/gui/graphicsview/qgraphicslayout_p.h +++ b/src/gui/graphicsview/qgraphicslayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index eaa97ff..16f1209 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h index 31f5d90..9e39fbf 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.h +++ b/src/gui/graphicsview/qgraphicslayoutitem.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h index fab0f39..52f265a 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h +++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp index 6a2d456..5ab7808 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h index 05ad325..9f7dca5 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.h +++ b/src/gui/graphicsview/qgraphicslinearlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index 1d2721b..3c1299d 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsproxywidget.h b/src/gui/graphicsview/qgraphicsproxywidget.h index b2c3c8f..0519349 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.h +++ b/src/gui/graphicsview/qgraphicsproxywidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsproxywidget_p.h b/src/gui/graphicsview/qgraphicsproxywidget_p.h index 5985eed..c383562 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget_p.h +++ b/src/gui/graphicsview/qgraphicsproxywidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index ff46e2e..25c8030 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index 9802f87..f1810e7 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/gui/graphicsview/qgraphicsscene_bsp.cpp index f8fa450..2c8f1f9 100644 --- a/src/gui/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/gui/graphicsview/qgraphicsscene_bsp.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsscene_bsp_p.h b/src/gui/graphicsview/qgraphicsscene_bsp_p.h index e6ceb78..761649a 100644 --- a/src/gui/graphicsview/qgraphicsscene_bsp_p.h +++ b/src/gui/graphicsview/qgraphicsscene_bsp_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index 9c165d1..f72ce99 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp index b819c2c..e818011 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.cpp +++ b/src/gui/graphicsview/qgraphicssceneevent.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h index be50e96..69c656b 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.h +++ b/src/gui/graphicsview/qgraphicssceneevent.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 2f7f57a..9e8a4f5 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h index e77e45c..d564c6e 100644 --- a/src/gui/graphicsview/qgraphicsview.h +++ b/src/gui/graphicsview/qgraphicsview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h index 2109673..401b37f 100644 --- a/src/gui/graphicsview/qgraphicsview_p.h +++ b/src/gui/graphicsview/qgraphicsview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 64ec0e7..0a0023e 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h index 34f1c5f..9398968 100644 --- a/src/gui/graphicsview/qgraphicswidget.h +++ b/src/gui/graphicsview/qgraphicswidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index 789f8da..638c440 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index 455a129..52c8f93 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index dc5ca21..f03de3d 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h index acc96de..64140da 100644 --- a/src/gui/graphicsview/qgridlayoutengine_p.h +++ b/src/gui/graphicsview/qgridlayoutengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 3805b6e..2189082 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index b17e4ac..0c4571b 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index 6734e02..7472978 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qbmphandler_p.h b/src/gui/image/qbmphandler_p.h index 6e953a5..1b7e5a8 100644 --- a/src/gui/image/qbmphandler_p.h +++ b/src/gui/image/qbmphandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 3c71f15..05a50f2 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 5a606d4..aaf9cad 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qiconengine.cpp b/src/gui/image/qiconengine.cpp index 866a82e..3dee16b 100644 --- a/src/gui/image/qiconengine.cpp +++ b/src/gui/image/qiconengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h index 71c8927..419ca09 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/image/qiconengine.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/image/qiconengineplugin.cpp index 22f62cf..fc8ec1a 100644 --- a/src/gui/image/qiconengineplugin.cpp +++ b/src/gui/image/qiconengineplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h index 5c7f8b5..8f2db70 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/image/qiconengineplugin.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index dc236e4..ab05321 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 08c8d7c..8effac8 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 9b47c5c..559290d 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index a47c69e..7fea75a 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 3b654f3..87d7ef9 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 5de39d9..ac4333a 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h index 95d4b9a..ef11d65 100644 --- a/src/gui/image/qimagereader.h +++ b/src/gui/image/qimagereader.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index c24bbda..52f3402 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h index 5756618..33d89e8 100644 --- a/src/gui/image/qimagewriter.h +++ b/src/gui/image/qimagewriter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index ca69cab..bb2c04a 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index c2c3abb..2b9c0cf 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 33e565c..227184d 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h index 860485a..c50d630 100644 --- a/src/gui/image/qnativeimage_p.h +++ b/src/gui/image/qnativeimage_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp index a130a1a..295bc7a 100644 --- a/src/gui/image/qpaintengine_pic.cpp +++ b/src/gui/image/qpaintengine_pic.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index 745d057..da3c920 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 92023e0..bf088ec 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index fe86e8d..103225c 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h index a3fd34f..4403d1c 100644 --- a/src/gui/image/qpicture_p.h +++ b/src/gui/image/qpicture_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp index 33d10a4..03b14b4 100644 --- a/src/gui/image/qpictureformatplugin.cpp +++ b/src/gui/image/qpictureformatplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h index 2eca024..fd8cf86 100644 --- a/src/gui/image/qpictureformatplugin.h +++ b/src/gui/image/qpictureformatplugin.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 8684a1b..2560325 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 1863273..76be676 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index 26d9618..06da605 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h index 75525c4..f24646c 100644 --- a/src/gui/image/qpixmap_mac_p.h +++ b/src/gui/image/qpixmap_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_qws.cpp b/src/gui/image/qpixmap_qws.cpp index 6cc7981..45d904c 100644 --- a/src/gui/image/qpixmap_qws.cpp +++ b/src/gui/image/qpixmap_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 7dfab70..759bc97 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 095f378..9803cde 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp index 3ec441b..6581bb3 100644 --- a/src/gui/image/qpixmap_win.cpp +++ b/src/gui/image/qpixmap_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index ff7c1b6..3eea4ec 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h index 980b10e..a2cc974 100644 --- a/src/gui/image/qpixmap_x11_p.h +++ b/src/gui/image/qpixmap_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 4253f8d..16ad74c 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index 2750a88..5279438 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index 3d88f4b..9e05c31 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 7296426..865ddfe 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp index 699489d..ff78fcf 100644 --- a/src/gui/image/qpixmapdatafactory.cpp +++ b/src/gui/image/qpixmapdatafactory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapdatafactory_p.h b/src/gui/image/qpixmapdatafactory_p.h index 65e3f11..df53a54 100644 --- a/src/gui/image/qpixmapdatafactory_p.h +++ b/src/gui/image/qpixmapdatafactory_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 8631c8c..4f01c93 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpixmapfilter_p.h b/src/gui/image/qpixmapfilter_p.h index d494c98..20a4c81 100644 --- a/src/gui/image/qpixmapfilter_p.h +++ b/src/gui/image/qpixmapfilter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 0a55910..ba4ba0f 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qpnghandler_p.h b/src/gui/image/qpnghandler_p.h index 543fa0f..b368e56 100644 --- a/src/gui/image/qpnghandler_p.h +++ b/src/gui/image/qpnghandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp index 902f764..8d28bbd 100644 --- a/src/gui/image/qppmhandler.cpp +++ b/src/gui/image/qppmhandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qppmhandler_p.h b/src/gui/image/qppmhandler_p.h index c40c51d..fc8d1d0 100644 --- a/src/gui/image/qppmhandler_p.h +++ b/src/gui/image/qppmhandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index 351bc25..5709e36 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qxbmhandler_p.h b/src/gui/image/qxbmhandler_p.h index ffbbfe4..be966c4 100644 --- a/src/gui/image/qxbmhandler_p.h +++ b/src/gui/image/qxbmhandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index 90bd2ab..9b31df6 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/image/qxpmhandler_p.h b/src/gui/image/qxpmhandler_p.h index 5c2f809..87733ec 100644 --- a/src/gui/image/qxpmhandler_p.h +++ b/src/gui/image/qxpmhandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp index f78b86a..63295eb 100644 --- a/src/gui/inputmethod/qinputcontext.cpp +++ b/src/gui/inputmethod/qinputcontext.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h index bcaa7fe..68d2ed3 100644 --- a/src/gui/inputmethod/qinputcontext.h +++ b/src/gui/inputmethod/qinputcontext.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontext_p.h b/src/gui/inputmethod/qinputcontext_p.h index 8c1b8de..0a62511 100644 --- a/src/gui/inputmethod/qinputcontext_p.h +++ b/src/gui/inputmethod/qinputcontext_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp index 06625f9..df3e36c 100644 --- a/src/gui/inputmethod/qinputcontextfactory.cpp +++ b/src/gui/inputmethod/qinputcontextfactory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontextfactory.h b/src/gui/inputmethod/qinputcontextfactory.h index bc17fd3..c994304 100644 --- a/src/gui/inputmethod/qinputcontextfactory.h +++ b/src/gui/inputmethod/qinputcontextfactory.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontextplugin.cpp b/src/gui/inputmethod/qinputcontextplugin.cpp index 69b4800..d168c0f 100644 --- a/src/gui/inputmethod/qinputcontextplugin.cpp +++ b/src/gui/inputmethod/qinputcontextplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qinputcontextplugin.h b/src/gui/inputmethod/qinputcontextplugin.h index 6c57284..ddb6ff6 100644 --- a/src/gui/inputmethod/qinputcontextplugin.h +++ b/src/gui/inputmethod/qinputcontextplugin.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qmacinputcontext_mac.cpp b/src/gui/inputmethod/qmacinputcontext_mac.cpp index f0e7ea9..306c558 100644 --- a/src/gui/inputmethod/qmacinputcontext_mac.cpp +++ b/src/gui/inputmethod/qmacinputcontext_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/gui/inputmethod/qmacinputcontext_p.h index f708040..d861cab 100644 --- a/src/gui/inputmethod/qmacinputcontext_p.h +++ b/src/gui/inputmethod/qmacinputcontext_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/gui/inputmethod/qwininputcontext_p.h index 38d7e32..f2253ad 100644 --- a/src/gui/inputmethod/qwininputcontext_p.h +++ b/src/gui/inputmethod/qwininputcontext_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp index 720f0b8..33048f8 100644 --- a/src/gui/inputmethod/qwininputcontext_win.cpp +++ b/src/gui/inputmethod/qwininputcontext_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qwsinputcontext_p.h b/src/gui/inputmethod/qwsinputcontext_p.h index 20811da..590d848 100644 --- a/src/gui/inputmethod/qwsinputcontext_p.h +++ b/src/gui/inputmethod/qwsinputcontext_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qwsinputcontext_qws.cpp b/src/gui/inputmethod/qwsinputcontext_qws.cpp index 46ac13d..d61d121 100644 --- a/src/gui/inputmethod/qwsinputcontext_qws.cpp +++ b/src/gui/inputmethod/qwsinputcontext_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qximinputcontext_p.h b/src/gui/inputmethod/qximinputcontext_p.h index 3773122..7859fc4 100644 --- a/src/gui/inputmethod/qximinputcontext_p.h +++ b/src/gui/inputmethod/qximinputcontext_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/gui/inputmethod/qximinputcontext_x11.cpp index c320fb4..0e2e696 100644 --- a/src/gui/inputmethod/qximinputcontext_x11.cpp +++ b/src/gui/inputmethod/qximinputcontext_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractitemdelegate.cpp b/src/gui/itemviews/qabstractitemdelegate.cpp index e94c067..f88b300 100644 --- a/src/gui/itemviews/qabstractitemdelegate.cpp +++ b/src/gui/itemviews/qabstractitemdelegate.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractitemdelegate.h b/src/gui/itemviews/qabstractitemdelegate.h index fe9aca7..e7f83b8 100644 --- a/src/gui/itemviews/qabstractitemdelegate.h +++ b/src/gui/itemviews/qabstractitemdelegate.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 7bd6207..761585d 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractitemview.h b/src/gui/itemviews/qabstractitemview.h index da8650d..54b2128 100644 --- a/src/gui/itemviews/qabstractitemview.h +++ b/src/gui/itemviews/qabstractitemview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h index 37fe4a2..5fee775 100644 --- a/src/gui/itemviews/qabstractitemview_p.h +++ b/src/gui/itemviews/qabstractitemview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp index d6e3a93..bd8476d 100644 --- a/src/gui/itemviews/qabstractproxymodel.cpp +++ b/src/gui/itemviews/qabstractproxymodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractproxymodel.h b/src/gui/itemviews/qabstractproxymodel.h index 51c8829..0fbcd5c 100644 --- a/src/gui/itemviews/qabstractproxymodel.h +++ b/src/gui/itemviews/qabstractproxymodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qabstractproxymodel_p.h b/src/gui/itemviews/qabstractproxymodel_p.h index a319953..68cb997 100644 --- a/src/gui/itemviews/qabstractproxymodel_p.h +++ b/src/gui/itemviews/qabstractproxymodel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qbsptree.cpp b/src/gui/itemviews/qbsptree.cpp index a09df53..4772d70 100644 --- a/src/gui/itemviews/qbsptree.cpp +++ b/src/gui/itemviews/qbsptree.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qbsptree_p.h b/src/gui/itemviews/qbsptree_p.h index ff91bfb..dcf0470 100644 --- a/src/gui/itemviews/qbsptree_p.h +++ b/src/gui/itemviews/qbsptree_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/gui/itemviews/qcolumnview.cpp index 4fb08bb..c8e0245 100644 --- a/src/gui/itemviews/qcolumnview.cpp +++ b/src/gui/itemviews/qcolumnview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qcolumnview.h b/src/gui/itemviews/qcolumnview.h index ca9134c..f2d5e9c 100644 --- a/src/gui/itemviews/qcolumnview.h +++ b/src/gui/itemviews/qcolumnview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h index 8f75bec..a941953 100644 --- a/src/gui/itemviews/qcolumnview_p.h +++ b/src/gui/itemviews/qcolumnview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qcolumnviewgrip.cpp b/src/gui/itemviews/qcolumnviewgrip.cpp index 5da70f6..601212b 100644 --- a/src/gui/itemviews/qcolumnviewgrip.cpp +++ b/src/gui/itemviews/qcolumnviewgrip.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qcolumnviewgrip_p.h b/src/gui/itemviews/qcolumnviewgrip_p.h index 12515b0..337b988 100644 --- a/src/gui/itemviews/qcolumnviewgrip_p.h +++ b/src/gui/itemviews/qcolumnviewgrip_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp index 909fba1..8586a1a 100644 --- a/src/gui/itemviews/qdatawidgetmapper.cpp +++ b/src/gui/itemviews/qdatawidgetmapper.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qdatawidgetmapper.h b/src/gui/itemviews/qdatawidgetmapper.h index d04e881..c9e9912 100644 --- a/src/gui/itemviews/qdatawidgetmapper.h +++ b/src/gui/itemviews/qdatawidgetmapper.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index 7da7c7a..b2d52ed 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qdirmodel.h b/src/gui/itemviews/qdirmodel.h index ec1056f..5b7739e 100644 --- a/src/gui/itemviews/qdirmodel.h +++ b/src/gui/itemviews/qdirmodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp index ac62551..64995a4 100644 --- a/src/gui/itemviews/qfileiconprovider.cpp +++ b/src/gui/itemviews/qfileiconprovider.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/gui/itemviews/qfileiconprovider.h index 7928552..66e12de 100644 --- a/src/gui/itemviews/qfileiconprovider.h +++ b/src/gui/itemviews/qfileiconprovider.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp index 5bd82d4..9cd845e 100644 --- a/src/gui/itemviews/qheaderview.cpp +++ b/src/gui/itemviews/qheaderview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qheaderview.h b/src/gui/itemviews/qheaderview.h index 47f5269..2e9ba61 100644 --- a/src/gui/itemviews/qheaderview.h +++ b/src/gui/itemviews/qheaderview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qheaderview_p.h b/src/gui/itemviews/qheaderview_p.h index fbba69a..aeb90c4 100644 --- a/src/gui/itemviews/qheaderview_p.h +++ b/src/gui/itemviews/qheaderview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index bf9b5c5..f2c5504 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemdelegate.h b/src/gui/itemviews/qitemdelegate.h index 8b286ac..738e5e2 100644 --- a/src/gui/itemviews/qitemdelegate.h +++ b/src/gui/itemviews/qitemdelegate.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemeditorfactory.cpp b/src/gui/itemviews/qitemeditorfactory.cpp index aefdea1..7a21170 100644 --- a/src/gui/itemviews/qitemeditorfactory.cpp +++ b/src/gui/itemviews/qitemeditorfactory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemeditorfactory.h b/src/gui/itemviews/qitemeditorfactory.h index 46c209a..e83113a 100644 --- a/src/gui/itemviews/qitemeditorfactory.h +++ b/src/gui/itemviews/qitemeditorfactory.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemeditorfactory_p.h b/src/gui/itemviews/qitemeditorfactory_p.h index 87f68c5..ef126f7 100644 --- a/src/gui/itemviews/qitemeditorfactory_p.h +++ b/src/gui/itemviews/qitemeditorfactory_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp index 1a3ae2d..4d5e362 100644 --- a/src/gui/itemviews/qitemselectionmodel.cpp +++ b/src/gui/itemviews/qitemselectionmodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/gui/itemviews/qitemselectionmodel.h index 24ecf7d..fae8156 100644 --- a/src/gui/itemviews/qitemselectionmodel.h +++ b/src/gui/itemviews/qitemselectionmodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qitemselectionmodel_p.h b/src/gui/itemviews/qitemselectionmodel_p.h index 4c11b9f..43cf617 100644 --- a/src/gui/itemviews/qitemselectionmodel_p.h +++ b/src/gui/itemviews/qitemselectionmodel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 07f0a38..2622904 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistview.h b/src/gui/itemviews/qlistview.h index dd719d9..ab2cd1a 100644 --- a/src/gui/itemviews/qlistview.h +++ b/src/gui/itemviews/qlistview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h index 4568d8c..453794d 100644 --- a/src/gui/itemviews/qlistview_p.h +++ b/src/gui/itemviews/qlistview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp index 7a366d1..e2ecd46 100644 --- a/src/gui/itemviews/qlistwidget.cpp +++ b/src/gui/itemviews/qlistwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistwidget.h b/src/gui/itemviews/qlistwidget.h index c13405d..33c8e16 100644 --- a/src/gui/itemviews/qlistwidget.h +++ b/src/gui/itemviews/qlistwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/gui/itemviews/qlistwidget_p.h index 8556047..6702bf0 100644 --- a/src/gui/itemviews/qlistwidget_p.h +++ b/src/gui/itemviews/qlistwidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qproxymodel.cpp b/src/gui/itemviews/qproxymodel.cpp index 1be5eff..a148dee 100644 --- a/src/gui/itemviews/qproxymodel.cpp +++ b/src/gui/itemviews/qproxymodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qproxymodel.h b/src/gui/itemviews/qproxymodel.h index 0644962..b6c3b85 100644 --- a/src/gui/itemviews/qproxymodel.h +++ b/src/gui/itemviews/qproxymodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qproxymodel_p.h b/src/gui/itemviews/qproxymodel_p.h index bfca274..fe6d3f5 100644 --- a/src/gui/itemviews/qproxymodel_p.h +++ b/src/gui/itemviews/qproxymodel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 10bcb9a..7cef88f 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qsortfilterproxymodel.h b/src/gui/itemviews/qsortfilterproxymodel.h index f537adb..4872654 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.h +++ b/src/gui/itemviews/qsortfilterproxymodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp index 10aac9a..6068cd3 100644 --- a/src/gui/itemviews/qstandarditemmodel.cpp +++ b/src/gui/itemviews/qstandarditemmodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/gui/itemviews/qstandarditemmodel.h index f24f0ab..9164a40 100644 --- a/src/gui/itemviews/qstandarditemmodel.h +++ b/src/gui/itemviews/qstandarditemmodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/gui/itemviews/qstandarditemmodel_p.h index 721194f..f117142 100644 --- a/src/gui/itemviews/qstandarditemmodel_p.h +++ b/src/gui/itemviews/qstandarditemmodel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstringlistmodel.cpp b/src/gui/itemviews/qstringlistmodel.cpp index 6d20907..1ff7c2b 100644 --- a/src/gui/itemviews/qstringlistmodel.cpp +++ b/src/gui/itemviews/qstringlistmodel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstringlistmodel.h b/src/gui/itemviews/qstringlistmodel.h index d2d0f70..85a8e2b 100644 --- a/src/gui/itemviews/qstringlistmodel.h +++ b/src/gui/itemviews/qstringlistmodel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp index be0971b..0891612 100644 --- a/src/gui/itemviews/qstyleditemdelegate.cpp +++ b/src/gui/itemviews/qstyleditemdelegate.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qstyleditemdelegate.h b/src/gui/itemviews/qstyleditemdelegate.h index dee3ca9..1f20893 100644 --- a/src/gui/itemviews/qstyleditemdelegate.h +++ b/src/gui/itemviews/qstyleditemdelegate.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp index 2902768..5b73a49 100644 --- a/src/gui/itemviews/qtableview.cpp +++ b/src/gui/itemviews/qtableview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtableview.h b/src/gui/itemviews/qtableview.h index 6654d7f..6f2304a 100644 --- a/src/gui/itemviews/qtableview.h +++ b/src/gui/itemviews/qtableview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtableview_p.h b/src/gui/itemviews/qtableview_p.h index b08eabd..38d805b 100644 --- a/src/gui/itemviews/qtableview_p.h +++ b/src/gui/itemviews/qtableview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp index e88301e..cbe5496 100644 --- a/src/gui/itemviews/qtablewidget.cpp +++ b/src/gui/itemviews/qtablewidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtablewidget.h b/src/gui/itemviews/qtablewidget.h index c97f6a6..5113168 100644 --- a/src/gui/itemviews/qtablewidget.h +++ b/src/gui/itemviews/qtablewidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtablewidget_p.h b/src/gui/itemviews/qtablewidget_p.h index 2e1dab6..2a4fe33 100644 --- a/src/gui/itemviews/qtablewidget_p.h +++ b/src/gui/itemviews/qtablewidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index 0117db2..f2dfb0b 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreeview.h b/src/gui/itemviews/qtreeview.h index 1e1a362..3ce0458 100644 --- a/src/gui/itemviews/qtreeview.h +++ b/src/gui/itemviews/qtreeview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h index 22155c7..380cc91 100644 --- a/src/gui/itemviews/qtreeview_p.h +++ b/src/gui/itemviews/qtreeview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp index 6103225..078d91b 100644 --- a/src/gui/itemviews/qtreewidget.cpp +++ b/src/gui/itemviews/qtreewidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidget.h b/src/gui/itemviews/qtreewidget.h index 4bacce7..00fc8bb 100644 --- a/src/gui/itemviews/qtreewidget.h +++ b/src/gui/itemviews/qtreewidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidget_p.h b/src/gui/itemviews/qtreewidget_p.h index a089cf5..15526d8 100644 --- a/src/gui/itemviews/qtreewidget_p.h +++ b/src/gui/itemviews/qtreewidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/gui/itemviews/qtreewidgetitemiterator.cpp index 3e30e03..02fcc66 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator.cpp +++ b/src/gui/itemviews/qtreewidgetitemiterator.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidgetitemiterator.h b/src/gui/itemviews/qtreewidgetitemiterator.h index 8a76c69..1507fec 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator.h +++ b/src/gui/itemviews/qtreewidgetitemiterator.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qtreewidgetitemiterator_p.h b/src/gui/itemviews/qtreewidgetitemiterator_p.h index cf800ec..4929e8f 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator_p.h +++ b/src/gui/itemviews/qtreewidgetitemiterator_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/itemviews/qwidgetitemdata_p.h b/src/gui/itemviews/qwidgetitemdata_p.h index 32297fb..22e96e1 100644 --- a/src/gui/itemviews/qwidgetitemdata_p.h +++ b/src/gui/itemviews/qwidgetitemdata_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index abb17d7..6e57c62 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index d7bf8c3..afe3596 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 0617ef5..7feb07f 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qactiongroup.cpp b/src/gui/kernel/qactiongroup.cpp index 2fd595e..7340db6 100644 --- a/src/gui/kernel/qactiongroup.cpp +++ b/src/gui/kernel/qactiongroup.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qactiongroup.h b/src/gui/kernel/qactiongroup.h index 3d1231f..1101628 100644 --- a/src/gui/kernel/qactiongroup.h +++ b/src/gui/kernel/qactiongroup.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 09f0f91..886e2bd 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index 1d6941d..dbea429 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 5f8c572..5dc7c0c 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 7487f0a..9055b33 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp index 2deda8e..728656e 100644 --- a/src/gui/kernel/qapplication_qws.cpp +++ b/src/gui/kernel/qapplication_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index fae0335..8eb24af 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index b1270bc..e21c573 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp index 49dd4a5..bd3d6e9 100644 --- a/src/gui/kernel/qboxlayout.cpp +++ b/src/gui/kernel/qboxlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qboxlayout.h b/src/gui/kernel/qboxlayout.h index f4ba0c7..64b2334 100644 --- a/src/gui/kernel/qboxlayout.h +++ b/src/gui/kernel/qboxlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 917b5d5..c020cd3 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h index fa3c6fa..b0fc1f9 100644 --- a/src/gui/kernel/qclipboard.h +++ b/src/gui/kernel/qclipboard.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard_mac.cpp b/src/gui/kernel/qclipboard_mac.cpp index aafa587..5330727 100644 --- a/src/gui/kernel/qclipboard_mac.cpp +++ b/src/gui/kernel/qclipboard_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard_p.h b/src/gui/kernel/qclipboard_p.h index ef6dc3f..eedbcc1 100644 --- a/src/gui/kernel/qclipboard_p.h +++ b/src/gui/kernel/qclipboard_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard_qws.cpp b/src/gui/kernel/qclipboard_qws.cpp index 1a03149..af69ac4 100644 --- a/src/gui/kernel/qclipboard_qws.cpp +++ b/src/gui/kernel/qclipboard_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard_win.cpp b/src/gui/kernel/qclipboard_win.cpp index 90d4362..d57c0a2 100644 --- a/src/gui/kernel/qclipboard_win.cpp +++ b/src/gui/kernel/qclipboard_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 089cc43..fe562a3 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm index f95f004f..17a9166 100644 --- a/src/gui/kernel/qcocoaapplication_mac.mm +++ b/src/gui/kernel/qcocoaapplication_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaapplication_mac_p.h b/src/gui/kernel/qcocoaapplication_mac_p.h index 15c64d5..a39eb5b 100644 --- a/src/gui/kernel/qcocoaapplication_mac_p.h +++ b/src/gui/kernel/qcocoaapplication_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm index e6bd511..809f96a 100644 --- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm +++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h b/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h index fca2a15..0f1e570 100644 --- a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h +++ b/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index 7ecb765..9b627ac 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h index cc7338c..601a092 100644 --- a/src/gui/kernel/qcocoamenuloader_mac_p.h +++ b/src/gui/kernel/qcocoamenuloader_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm index 95e20af..9a7237d 100644 --- a/src/gui/kernel/qcocoapanel_mac.mm +++ b/src/gui/kernel/qcocoapanel_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoapanel_mac_p.h b/src/gui/kernel/qcocoapanel_mac_p.h index 0d1f008..456940d 100644 --- a/src/gui/kernel/qcocoapanel_mac_p.h +++ b/src/gui/kernel/qcocoapanel_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 9b581c5..7c235c5 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/kernel/qcocoaview_mac_p.h index 9de94d5..05437e3 100644 --- a/src/gui/kernel/qcocoaview_mac_p.h +++ b/src/gui/kernel/qcocoaview_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm index e7b76a7..95659ed 100644 --- a/src/gui/kernel/qcocoawindow_mac.mm +++ b/src/gui/kernel/qcocoawindow_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindow_mac_p.h b/src/gui/kernel/qcocoawindow_mac_p.h index 4f207ac..cc55325 100644 --- a/src/gui/kernel/qcocoawindow_mac_p.h +++ b/src/gui/kernel/qcocoawindow_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm index 98625e4..799f4ac 100644 --- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm +++ b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h b/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h index c30b67a..8b944c3 100644 --- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h +++ b/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm index 8480179..ec9881b 100644 --- a/src/gui/kernel/qcocoawindowdelegate_mac.mm +++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcocoawindowdelegate_mac_p.h b/src/gui/kernel/qcocoawindowdelegate_mac_p.h index 7456ff7..540514c 100644 --- a/src/gui/kernel/qcocoawindowdelegate_mac_p.h +++ b/src/gui/kernel/qcocoawindowdelegate_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index ed7e020..72587b1 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 15b4597..1d0accf 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/kernel/qcursor_mac.mm index d632eb79..5440aa6 100644 --- a/src/gui/kernel/qcursor_mac.mm +++ b/src/gui/kernel/qcursor_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h index 42682ac..bbd62a2 100644 --- a/src/gui/kernel/qcursor_p.h +++ b/src/gui/kernel/qcursor_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor_qws.cpp b/src/gui/kernel/qcursor_qws.cpp index 097b982..283d889 100644 --- a/src/gui/kernel/qcursor_qws.cpp +++ b/src/gui/kernel/qcursor_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp index 85d5a11..c8293e8 100644 --- a/src/gui/kernel/qcursor_win.cpp +++ b/src/gui/kernel/qcursor_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp index 252b4ee..69c4b04 100644 --- a/src/gui/kernel/qcursor_x11.cpp +++ b/src/gui/kernel/qcursor_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h index c107ee0..ec2ff41 100644 --- a/src/gui/kernel/qdesktopwidget.h +++ b/src/gui/kernel/qdesktopwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/kernel/qdesktopwidget_mac.mm index 77989cb..9b50e83 100644 --- a/src/gui/kernel/qdesktopwidget_mac.mm +++ b/src/gui/kernel/qdesktopwidget_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget_mac_p.h b/src/gui/kernel/qdesktopwidget_mac_p.h index 09cbacc..be7a884 100644 --- a/src/gui/kernel/qdesktopwidget_mac_p.h +++ b/src/gui/kernel/qdesktopwidget_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget_qws.cpp b/src/gui/kernel/qdesktopwidget_qws.cpp index cfeaee9..e71e19d 100644 --- a/src/gui/kernel/qdesktopwidget_qws.cpp +++ b/src/gui/kernel/qdesktopwidget_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp index 725e985..1e1e8f4 100644 --- a/src/gui/kernel/qdesktopwidget_win.cpp +++ b/src/gui/kernel/qdesktopwidget_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdesktopwidget_x11.cpp b/src/gui/kernel/qdesktopwidget_x11.cpp index 7b823f0..9ba481f 100644 --- a/src/gui/kernel/qdesktopwidget_x11.cpp +++ b/src/gui/kernel/qdesktopwidget_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index a5092a0..c58e367 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd_mac.mm b/src/gui/kernel/qdnd_mac.mm index 0b8a485..ec8005c 100644 --- a/src/gui/kernel/qdnd_mac.mm +++ b/src/gui/kernel/qdnd_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index 7a0cb7a..1ba6609 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd_qws.cpp b/src/gui/kernel/qdnd_qws.cpp index 98a60a1..3485cf3 100644 --- a/src/gui/kernel/qdnd_qws.cpp +++ b/src/gui/kernel/qdnd_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp index 8bf5c84..e3b3789 100644 --- a/src/gui/kernel/qdnd_win.cpp +++ b/src/gui/kernel/qdnd_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 4c9c73c..954f6e4 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index e980d1c..6d7790d 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index 9f08544..8b7af19 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 8c7e47d..da8d579 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 449730d..5ec11d7 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index cc94aad..25beea8 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_glib_qws.cpp b/src/gui/kernel/qeventdispatcher_glib_qws.cpp index 1e740c3..ab2b87e 100644 --- a/src/gui/kernel/qeventdispatcher_glib_qws.cpp +++ b/src/gui/kernel/qeventdispatcher_glib_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_glib_qws_p.h b/src/gui/kernel/qeventdispatcher_glib_qws_p.h index 1589aef..a56e49d 100644 --- a/src/gui/kernel/qeventdispatcher_glib_qws_p.h +++ b/src/gui/kernel/qeventdispatcher_glib_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index e28f170..88e4a5d 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/kernel/qeventdispatcher_mac_p.h index 455d423..87290d8 100644 --- a/src/gui/kernel/qeventdispatcher_mac_p.h +++ b/src/gui/kernel/qeventdispatcher_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdispatcher_qws.cpp index 6e2cc2b..5ea14c9 100644 --- a/src/gui/kernel/qeventdispatcher_qws.cpp +++ b/src/gui/kernel/qeventdispatcher_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h index e0c00d1..d90d970 100644 --- a/src/gui/kernel/qeventdispatcher_qws_p.h +++ b/src/gui/kernel/qeventdispatcher_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/kernel/qeventdispatcher_x11.cpp index 2d4dbba..792baaa 100644 --- a/src/gui/kernel/qeventdispatcher_x11.cpp +++ b/src/gui/kernel/qeventdispatcher_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/kernel/qeventdispatcher_x11_p.h index 1b40a84..5af756f 100644 --- a/src/gui/kernel/qeventdispatcher_x11_p.h +++ b/src/gui/kernel/qeventdispatcher_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp index e2d6108..01dad40 100644 --- a/src/gui/kernel/qformlayout.cpp +++ b/src/gui/kernel/qformlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qformlayout.h b/src/gui/kernel/qformlayout.h index e787f0f..c2a499f 100644 --- a/src/gui/kernel/qformlayout.h +++ b/src/gui/kernel/qformlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp index f872829..a5bcfa3 100644 --- a/src/gui/kernel/qgridlayout.cpp +++ b/src/gui/kernel/qgridlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qgridlayout.h b/src/gui/kernel/qgridlayout.h index 8bc1570..ad9a467 100644 --- a/src/gui/kernel/qgridlayout.h +++ b/src/gui/kernel/qgridlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp index 6222240..ebe1d18 100644 --- a/src/gui/kernel/qguieventdispatcher_glib.cpp +++ b/src/gui/kernel/qguieventdispatcher_glib.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qguieventdispatcher_glib_p.h b/src/gui/kernel/qguieventdispatcher_glib_p.h index 06a11c7..4a96495 100644 --- a/src/gui/kernel/qguieventdispatcher_glib_p.h +++ b/src/gui/kernel/qguieventdispatcher_glib_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp index b6f825b..75238df 100644 --- a/src/gui/kernel/qguifunctions_wince.cpp +++ b/src/gui/kernel/qguifunctions_wince.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qguifunctions_wince.h b/src/gui/kernel/qguifunctions_wince.h index aca2253..3a10ab8 100644 --- a/src/gui/kernel/qguifunctions_wince.h +++ b/src/gui/kernel/qguifunctions_wince.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 7ad908f..4c5e751 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 535d009..d6daf52 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/kernel/qkeymapper.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp index 1a0fb08..0aaed50 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/kernel/qkeymapper_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index f1d938c..c838fd1 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_qws.cpp b/src/gui/kernel/qkeymapper_qws.cpp index 4bd18af..ec8df6c 100644 --- a/src/gui/kernel/qkeymapper_qws.cpp +++ b/src/gui/kernel/qkeymapper_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp index 5f84044..2c32fb9 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/kernel/qkeymapper_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index 49b8566..a7d111a 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeymapper_x11_p.cpp b/src/gui/kernel/qkeymapper_x11_p.cpp index cbf26ca..6342167 100644 --- a/src/gui/kernel/qkeymapper_x11_p.cpp +++ b/src/gui/kernel/qkeymapper_x11_p.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 352d26a..266a5a2 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 1c4776f..f0736df 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h index 197e62a..a636a2c 100644 --- a/src/gui/kernel/qkeysequence_p.h +++ b/src/gui/kernel/qkeysequence_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp index aa46249..e407288 100644 --- a/src/gui/kernel/qlayout.cpp +++ b/src/gui/kernel/qlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayout.h b/src/gui/kernel/qlayout.h index a68a96c..9b3b84d 100644 --- a/src/gui/kernel/qlayout.h +++ b/src/gui/kernel/qlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayout_p.h b/src/gui/kernel/qlayout_p.h index 5c2546d..c5cf758 100644 --- a/src/gui/kernel/qlayout_p.h +++ b/src/gui/kernel/qlayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/gui/kernel/qlayoutengine.cpp index fbaa388..961cd9c 100644 --- a/src/gui/kernel/qlayoutengine.cpp +++ b/src/gui/kernel/qlayoutengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayoutengine_p.h b/src/gui/kernel/qlayoutengine_p.h index 4a6b8bd..fa0275b 100644 --- a/src/gui/kernel/qlayoutengine_p.h +++ b/src/gui/kernel/qlayoutengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayoutitem.cpp b/src/gui/kernel/qlayoutitem.cpp index 0fd73b8..e78bc45 100644 --- a/src/gui/kernel/qlayoutitem.cpp +++ b/src/gui/kernel/qlayoutitem.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qlayoutitem.h b/src/gui/kernel/qlayoutitem.h index d913472..6ea878e 100644 --- a/src/gui/kernel/qlayoutitem.h +++ b/src/gui/kernel/qlayoutitem.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmacdefines_mac.h b/src/gui/kernel/qmacdefines_mac.h index 97ec544..59d58a1 100644 --- a/src/gui/kernel/qmacdefines_mac.h +++ b/src/gui/kernel/qmacdefines_mac.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmime.cpp b/src/gui/kernel/qmime.cpp index 1f071a7..a5a1f43 100644 --- a/src/gui/kernel/qmime.cpp +++ b/src/gui/kernel/qmime.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmime.h b/src/gui/kernel/qmime.h index 42347a5..89dd7f5 100644 --- a/src/gui/kernel/qmime.h +++ b/src/gui/kernel/qmime.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/kernel/qmime_mac.cpp index cf1d747..02db438 100644 --- a/src/gui/kernel/qmime_mac.cpp +++ b/src/gui/kernel/qmime_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp index cd0aae6..2abff09 100644 --- a/src/gui/kernel/qmime_win.cpp +++ b/src/gui/kernel/qmime_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp index 5c67904..26ada05 100644 --- a/src/gui/kernel/qmotifdnd_x11.cpp +++ b/src/gui/kernel/qmotifdnd_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qnsframeview_mac_p.h b/src/gui/kernel/qnsframeview_mac_p.h index 14e8763..0fde595 100644 --- a/src/gui/kernel/qnsframeview_mac_p.h +++ b/src/gui/kernel/qnsframeview_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qnsthemeframe_mac_p.h b/src/gui/kernel/qnsthemeframe_mac_p.h index 785a6a8..761698e 100644 --- a/src/gui/kernel/qnsthemeframe_mac_p.h +++ b/src/gui/kernel/qnsthemeframe_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qnstitledframe_mac_p.h b/src/gui/kernel/qnstitledframe_mac_p.h index 0eb431e..1fc56bd 100644 --- a/src/gui/kernel/qnstitledframe_mac_p.h +++ b/src/gui/kernel/qnstitledframe_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qole_win.cpp b/src/gui/kernel/qole_win.cpp index 143b931..905a309 100644 --- a/src/gui/kernel/qole_win.cpp +++ b/src/gui/kernel/qole_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 6541510..013ceab 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index e9534c3..c5b2728 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index 560741d..0cfe197 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsessionmanager_qws.cpp b/src/gui/kernel/qsessionmanager_qws.cpp index ae521bb..16e93a1 100644 --- a/src/gui/kernel/qsessionmanager_qws.cpp +++ b/src/gui/kernel/qsessionmanager_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index 50b6e59..e8ba8b3 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h index 1219f5a..b88a496 100644 --- a/src/gui/kernel/qshortcut.h +++ b/src/gui/kernel/qshortcut.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index ed9654b..8ca4378 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h index 3fe9546..6a60cfa 100644 --- a/src/gui/kernel/qshortcutmap_p.h +++ b/src/gui/kernel/qshortcutmap_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsizepolicy.h b/src/gui/kernel/qsizepolicy.h index 652fda1..21106b5 100644 --- a/src/gui/kernel/qsizepolicy.h +++ b/src/gui/kernel/qsizepolicy.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound.cpp b/src/gui/kernel/qsound.cpp index fb152cf..b129a45 100644 --- a/src/gui/kernel/qsound.cpp +++ b/src/gui/kernel/qsound.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound.h b/src/gui/kernel/qsound.h index 3a94653..ce785af 100644 --- a/src/gui/kernel/qsound.h +++ b/src/gui/kernel/qsound.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound_mac.mm b/src/gui/kernel/qsound_mac.mm index a58d48b..476c717 100644 --- a/src/gui/kernel/qsound_mac.mm +++ b/src/gui/kernel/qsound_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound_p.h b/src/gui/kernel/qsound_p.h index 44f5c03..ac66b5a 100644 --- a/src/gui/kernel/qsound_p.h +++ b/src/gui/kernel/qsound_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound_qws.cpp b/src/gui/kernel/qsound_qws.cpp index e83935f..cbc0463 100644 --- a/src/gui/kernel/qsound_qws.cpp +++ b/src/gui/kernel/qsound_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound_win.cpp b/src/gui/kernel/qsound_win.cpp index 9d03d18..9328c6a 100644 --- a/src/gui/kernel/qsound_win.cpp +++ b/src/gui/kernel/qsound_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qsound_x11.cpp b/src/gui/kernel/qsound_x11.cpp index f2aeea8..a6171da 100644 --- a/src/gui/kernel/qsound_x11.cpp +++ b/src/gui/kernel/qsound_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qstackedlayout.cpp b/src/gui/kernel/qstackedlayout.cpp index eb985b2..9f3640c 100644 --- a/src/gui/kernel/qstackedlayout.cpp +++ b/src/gui/kernel/qstackedlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qstackedlayout.h b/src/gui/kernel/qstackedlayout.h index 668c1cc..897002b 100644 --- a/src/gui/kernel/qstackedlayout.h +++ b/src/gui/kernel/qstackedlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 9c381b4..423898d 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index ef55aa4..eaa5868 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h index 9ce1a92..e7a05f0 100644 --- a/src/gui/kernel/qt_gui_pch.h +++ b/src/gui/kernel/qt_gui_pch.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp index b1247e8..801c532 100644 --- a/src/gui/kernel/qt_mac.cpp +++ b/src/gui/kernel/qt_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h index ca995dc..a14b9e7 100644 --- a/src/gui/kernel/qt_mac_p.h +++ b/src/gui/kernel/qt_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 563b7e9..aed953d 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qtooltip.cpp b/src/gui/kernel/qtooltip.cpp index 15a3dd2..ed1c7c4 100644 --- a/src/gui/kernel/qtooltip.cpp +++ b/src/gui/kernel/qtooltip.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qtooltip.h b/src/gui/kernel/qtooltip.h index 464a8ad..4496875 100644 --- a/src/gui/kernel/qtooltip.h +++ b/src/gui/kernel/qtooltip.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp index 4024777..e1c081e 100644 --- a/src/gui/kernel/qwhatsthis.cpp +++ b/src/gui/kernel/qwhatsthis.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwhatsthis.h b/src/gui/kernel/qwhatsthis.h index 5011c54..875c405 100644 --- a/src/gui/kernel/qwhatsthis.h +++ b/src/gui/kernel/qwhatsthis.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 6f2fec9..871a51f 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index f54ebf9..aa97338 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 5432c55..aa1f736 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 9e93f66..774e390 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp index 1445f57..6c651b3 100644 --- a/src/gui/kernel/qwidget_qws.cpp +++ b/src/gui/kernel/qwidget_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index ffbb341..15c0629 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp index bb9681e..76d48e1 100644 --- a/src/gui/kernel/qwidget_wince.cpp +++ b/src/gui/kernel/qwidget_wince.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index ea8af93..79ee8c9 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidgetaction.cpp b/src/gui/kernel/qwidgetaction.cpp index efdde5e..4bd947b 100644 --- a/src/gui/kernel/qwidgetaction.cpp +++ b/src/gui/kernel/qwidgetaction.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidgetaction.h b/src/gui/kernel/qwidgetaction.h index a762221..93d4107 100644 --- a/src/gui/kernel/qwidgetaction.h +++ b/src/gui/kernel/qwidgetaction.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidgetaction_p.h b/src/gui/kernel/qwidgetaction_p.h index 8099f9f..9424c1f 100644 --- a/src/gui/kernel/qwidgetaction_p.h +++ b/src/gui/kernel/qwidgetaction_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwidgetcreate_x11.cpp b/src/gui/kernel/qwidgetcreate_x11.cpp index 40546f1..adf657c 100644 --- a/src/gui/kernel/qwidgetcreate_x11.cpp +++ b/src/gui/kernel/qwidgetcreate_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index 8598030..7c21084 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h index 3899c23..5141d04 100644 --- a/src/gui/kernel/qwindowdefs_win.h +++ b/src/gui/kernel/qwindowdefs_win.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index e49c4d6..22cae87 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/kernel/qx11embed_x11.h index 7c8ab9c..8b0ea64 100644 --- a/src/gui/kernel/qx11embed_x11.h +++ b/src/gui/kernel/qx11embed_x11.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qx11info_x11.cpp b/src/gui/kernel/qx11info_x11.cpp index d8a5c5e..29a6ac8 100644 --- a/src/gui/kernel/qx11info_x11.cpp +++ b/src/gui/kernel/qx11info_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/kernel/qx11info_x11.h b/src/gui/kernel/qx11info_x11.h index cd1d996..f216a05 100644 --- a/src/gui/kernel/qx11info_x11.h +++ b/src/gui/kernel/qx11info_x11.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index fbac811a..126db60 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/painting/qbackingstore_p.h index 3413175..e73daea 100644 --- a/src/gui/painting/qbackingstore_p.h +++ b/src/gui/painting/qbackingstore_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index 8317dd8..37bd954 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h index 5c2ad5e..2fc4bbf 100644 --- a/src/gui/painting/qbezier_p.h +++ b/src/gui/painting/qbezier_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 6589439..ecf83fe 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 854d0aa..267d83f 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index d6d0da3..d3528b3 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 5d7d4ab..7b75c42 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index f63f9c4..d402fa7 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolor_p.cpp b/src/gui/painting/qcolor_p.cpp index 5bdbee4..95aadb2 100644 --- a/src/gui/painting/qcolor_p.cpp +++ b/src/gui/painting/qcolor_p.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolor_p.h b/src/gui/painting/qcolor_p.h index 5286701..8ca0110 100644 --- a/src/gui/painting/qcolor_p.h +++ b/src/gui/painting/qcolor_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolormap.h b/src/gui/painting/qcolormap.h index 8d8f964..d15a76f 100644 --- a/src/gui/painting/qcolormap.h +++ b/src/gui/painting/qcolormap.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolormap_mac.cpp b/src/gui/painting/qcolormap_mac.cpp index 96da90f..4e13700 100644 --- a/src/gui/painting/qcolormap_mac.cpp +++ b/src/gui/painting/qcolormap_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolormap_qws.cpp b/src/gui/painting/qcolormap_qws.cpp index a8bdebb..d6e415e 100644 --- a/src/gui/painting/qcolormap_qws.cpp +++ b/src/gui/painting/qcolormap_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolormap_win.cpp b/src/gui/painting/qcolormap_win.cpp index d61b933..d92d5bf 100644 --- a/src/gui/painting/qcolormap_win.cpp +++ b/src/gui/painting/qcolormap_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcolormap_x11.cpp b/src/gui/painting/qcolormap_x11.cpp index ccf6955..cd2e2d8 100644 --- a/src/gui/painting/qcolormap_x11.cpp +++ b/src/gui/painting/qcolormap_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp index 29fe373..c04f468 100644 --- a/src/gui/painting/qcssutil.cpp +++ b/src/gui/painting/qcssutil.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h index 1191ddb..c954313 100644 --- a/src/gui/painting/qcssutil_p.h +++ b/src/gui/painting/qcssutil_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp index e592d77..30ddaf1 100644 --- a/src/gui/painting/qcups.cpp +++ b/src/gui/painting/qcups.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qcups_p.h b/src/gui/painting/qcups_p.h index 6973ce0..97d8154 100644 --- a/src/gui/painting/qcups_p.h +++ b/src/gui/painting/qcups_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h index d6db2ac..fc9f6b4 100644 --- a/src/gui/painting/qdatabuffer_p.h +++ b/src/gui/painting/qdatabuffer_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index efdc778..e3b7095 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_iwmmxt.cpp b/src/gui/painting/qdrawhelper_iwmmxt.cpp index cde6bf9..54ea5c1 100644 --- a/src/gui/painting/qdrawhelper_iwmmxt.cpp +++ b/src/gui/painting/qdrawhelper_iwmmxt.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_mmx.cpp b/src/gui/painting/qdrawhelper_mmx.cpp index bb7f26d..2b67fc6 100644 --- a/src/gui/painting/qdrawhelper_mmx.cpp +++ b/src/gui/painting/qdrawhelper_mmx.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_mmx3dnow.cpp b/src/gui/painting/qdrawhelper_mmx3dnow.cpp index d233295..2cd9477 100644 --- a/src/gui/painting/qdrawhelper_mmx3dnow.cpp +++ b/src/gui/painting/qdrawhelper_mmx3dnow.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_mmx_p.h b/src/gui/painting/qdrawhelper_mmx_p.h index 3dea5de..5e888b5 100644 --- a/src/gui/painting/qdrawhelper_mmx_p.h +++ b/src/gui/painting/qdrawhelper_mmx_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index de97683..e3dd906 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_sse.cpp b/src/gui/painting/qdrawhelper_sse.cpp index 2f50c4d..7e49af5 100644 --- a/src/gui/painting/qdrawhelper_sse.cpp +++ b/src/gui/painting/qdrawhelper_sse.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index a66284e..6de2c66 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_sse3dnow.cpp b/src/gui/painting/qdrawhelper_sse3dnow.cpp index 74ad271..acca694 100644 --- a/src/gui/painting/qdrawhelper_sse3dnow.cpp +++ b/src/gui/painting/qdrawhelper_sse3dnow.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_sse_p.h b/src/gui/painting/qdrawhelper_sse_p.h index 1cb4cce..e618a11 100644 --- a/src/gui/painting/qdrawhelper_sse_p.h +++ b/src/gui/painting/qdrawhelper_sse_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h index ff43256..c158870 100644 --- a/src/gui/painting/qdrawhelper_x86_p.h +++ b/src/gui/painting/qdrawhelper_x86_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index 2beeb0e..98471dc 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h index 14901f3..d5cb714 100644 --- a/src/gui/painting/qdrawutil.h +++ b/src/gui/painting/qdrawutil.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qemulationpaintengine.cpp b/src/gui/painting/qemulationpaintengine.cpp index 3397c45..bf2af51 100644 --- a/src/gui/painting/qemulationpaintengine.cpp +++ b/src/gui/painting/qemulationpaintengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h index d4898c9..a2d5d24 100644 --- a/src/gui/painting/qemulationpaintengine_p.h +++ b/src/gui/painting/qemulationpaintengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h index 2e49615..dab6863 100644 --- a/src/gui/painting/qfixed_p.h +++ b/src/gui/painting/qfixed_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp index 7b1f637..292a5c0 100644 --- a/src/gui/painting/qgraphicssystem.cpp +++ b/src/gui/painting/qgraphicssystem.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_mac.cpp b/src/gui/painting/qgraphicssystem_mac.cpp index 555de2f..d17f28e 100644 --- a/src/gui/painting/qgraphicssystem_mac.cpp +++ b/src/gui/painting/qgraphicssystem_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_mac_p.h b/src/gui/painting/qgraphicssystem_mac_p.h index 5abfeea..1c01352 100644 --- a/src/gui/painting/qgraphicssystem_mac_p.h +++ b/src/gui/painting/qgraphicssystem_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h index 31bd636..322f304 100644 --- a/src/gui/painting/qgraphicssystem_p.h +++ b/src/gui/painting/qgraphicssystem_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_qws.cpp b/src/gui/painting/qgraphicssystem_qws.cpp index 2c7c6fd..967a8ac 100644 --- a/src/gui/painting/qgraphicssystem_qws.cpp +++ b/src/gui/painting/qgraphicssystem_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_qws_p.h b/src/gui/painting/qgraphicssystem_qws_p.h index cdee338..cc1f9c7 100644 --- a/src/gui/painting/qgraphicssystem_qws_p.h +++ b/src/gui/painting/qgraphicssystem_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_raster.cpp b/src/gui/painting/qgraphicssystem_raster.cpp index e4bfe39..5c2351e 100644 --- a/src/gui/painting/qgraphicssystem_raster.cpp +++ b/src/gui/painting/qgraphicssystem_raster.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystem_raster_p.h b/src/gui/painting/qgraphicssystem_raster_p.h index c3f78fa..4cabd8f 100644 --- a/src/gui/painting/qgraphicssystem_raster_p.h +++ b/src/gui/painting/qgraphicssystem_raster_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index d6afa53..b7245da 100644 --- a/src/gui/painting/qgraphicssystemfactory.cpp +++ b/src/gui/painting/qgraphicssystemfactory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystemfactory_p.h b/src/gui/painting/qgraphicssystemfactory_p.h index 9e95324..3862d99 100644 --- a/src/gui/painting/qgraphicssystemfactory_p.h +++ b/src/gui/painting/qgraphicssystemfactory_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystemplugin.cpp b/src/gui/painting/qgraphicssystemplugin.cpp index 5f3fc8e..0aa8955 100644 --- a/src/gui/painting/qgraphicssystemplugin.cpp +++ b/src/gui/painting/qgraphicssystemplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgraphicssystemplugin_p.h b/src/gui/painting/qgraphicssystemplugin_p.h index 2e70333..05ccffc 100644 --- a/src/gui/painting/qgraphicssystemplugin_p.h +++ b/src/gui/painting/qgraphicssystemplugin_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c index 73e50da..dcbb2c4 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.c @@ -3,11 +3,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qgrayraster_p.h b/src/gui/painting/qgrayraster_p.h index 06ba7e9..e9024f0 100644 --- a/src/gui/painting/qgrayraster_p.h +++ b/src/gui/painting/qgrayraster_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qimagescale.cpp b/src/gui/painting/qimagescale.cpp index c68942c..1a6150b 100644 --- a/src/gui/painting/qimagescale.cpp +++ b/src/gui/painting/qimagescale.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qimagescale_p.h b/src/gui/painting/qimagescale_p.h index 1f8fa49..b3dd30b 100644 --- a/src/gui/painting/qimagescale_p.h +++ b/src/gui/painting/qimagescale_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h index dcdfda3..b1a209b 100644 --- a/src/gui/painting/qmath_p.h +++ b/src/gui/painting/qmath_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index 4439d52..d8df641 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h index bf53c32..8437908 100644 --- a/src/gui/painting/qmatrix.h +++ b/src/gui/painting/qmatrix.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index 7ad0e42..582c101 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index bd6006b..e06a051 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index 4f90e71..313817c 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 129169e..b687cbc 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index e9d6d3f..f708256 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintdevice_mac.cpp b/src/gui/painting/qpaintdevice_mac.cpp index f0c5f58..e8dd360 100644 --- a/src/gui/painting/qpaintdevice_mac.cpp +++ b/src/gui/painting/qpaintdevice_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintdevice_qws.cpp b/src/gui/painting/qpaintdevice_qws.cpp index 6a68d28..1788b53 100644 --- a/src/gui/painting/qpaintdevice_qws.cpp +++ b/src/gui/painting/qpaintdevice_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintdevice_win.cpp b/src/gui/painting/qpaintdevice_win.cpp index 6cae744..33b98f1 100644 --- a/src/gui/painting/qpaintdevice_win.cpp +++ b/src/gui/painting/qpaintdevice_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/painting/qpaintdevice_x11.cpp index 4ea9f57..6dbfb94 100644 --- a/src/gui/painting/qpaintdevice_x11.cpp +++ b/src/gui/painting/qpaintdevice_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index ad09060..3edf17b 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index 520f71f..7ae4c7b 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/painting/qpaintengine_alpha.cpp index 74cbebe..6b9c01d 100644 --- a/src/gui/painting/qpaintengine_alpha.cpp +++ b/src/gui/painting/qpaintengine_alpha.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/painting/qpaintengine_alpha_p.h index f7d7a34..9df353f 100644 --- a/src/gui/painting/qpaintengine_alpha_p.h +++ b/src/gui/painting/qpaintengine_alpha_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_d3d.cpp b/src/gui/painting/qpaintengine_d3d.cpp index bb81623..d5a7d96 100644 --- a/src/gui/painting/qpaintengine_d3d.cpp +++ b/src/gui/painting/qpaintengine_d3d.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_d3d_p.h b/src/gui/painting/qpaintengine_d3d_p.h index 8fa5cf6..187cafe 100644 --- a/src/gui/painting/qpaintengine_d3d_p.h +++ b/src/gui/painting/qpaintengine_d3d_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp index 0644a02..2da4d02 100644 --- a/src/gui/painting/qpaintengine_mac.cpp +++ b/src/gui/painting/qpaintengine_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h index 298c145..19910ff 100644 --- a/src/gui/painting/qpaintengine_mac_p.h +++ b/src/gui/painting/qpaintengine_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h index eeba7ec..20c0bae 100644 --- a/src/gui/painting/qpaintengine_p.h +++ b/src/gui/painting/qpaintengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_preview.cpp b/src/gui/painting/qpaintengine_preview.cpp index 2137e6d..003c922 100644 --- a/src/gui/painting/qpaintengine_preview.cpp +++ b/src/gui/painting/qpaintengine_preview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/painting/qpaintengine_preview_p.h index 6c884f9..ee7de51 100644 --- a/src/gui/painting/qpaintengine_preview_p.h +++ b/src/gui/painting/qpaintengine_preview_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 6dd5682..7ecaca4 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 0f8060a..829b66b 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index d931f55..fbf2c62 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/painting/qpaintengine_x11_p.h index f277eeb..9ed4392 100644 --- a/src/gui/painting/qpaintengine_x11_p.h +++ b/src/gui/painting/qpaintengine_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 8eaad60..1b63d9b 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 593726c..a19e9ad 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index fe6cc69..415a8d3 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index f3df7a3..9e898a7 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 258b25a..1c9bb2f 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 70036e1..ee048ac 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 6cd2af8..f3ed62e 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h index 29c48df..7e42df0 100644 --- a/src/gui/painting/qpainterpath_p.h +++ b/src/gui/painting/qpainterpath_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index 297cdd3..f4adbbe 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h index 981ca84..6520843 100644 --- a/src/gui/painting/qpathclipper_p.h +++ b/src/gui/painting/qpathclipper_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 55006f6..b6c4bb2 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index 1d45ca1..e690dd9 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 1d68520..e8f8940 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h index 3d94b2b..0be8cd8 100644 --- a/src/gui/painting/qpen.h +++ b/src/gui/painting/qpen.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpen_p.h b/src/gui/painting/qpen_p.h index ca01097..70f6c7b 100644 --- a/src/gui/painting/qpen_p.h +++ b/src/gui/painting/qpen_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp index 87dae0f..c280653 100644 --- a/src/gui/painting/qpolygon.cpp +++ b/src/gui/painting/qpolygon.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index e5e0bd1..05d64fe 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/gui/painting/qpolygonclipper_p.h index b3083a4..7527a79 100644 --- a/src/gui/painting/qpolygonclipper_p.h +++ b/src/gui/painting/qpolygonclipper_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine.h b/src/gui/painting/qprintengine.h index bf77412..a0a81c5 100644 --- a/src/gui/painting/qprintengine.h +++ b/src/gui/painting/qprintengine.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/painting/qprintengine_mac.mm index 7a77e47..eeee310 100644 --- a/src/gui/painting/qprintengine_mac.mm +++ b/src/gui/painting/qprintengine_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/painting/qprintengine_mac_p.h index 5e18845..cb2bb13 100644 --- a/src/gui/painting/qprintengine_mac_p.h +++ b/src/gui/painting/qprintengine_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp index 2e063b7..50de754 100644 --- a/src/gui/painting/qprintengine_pdf.cpp +++ b/src/gui/painting/qprintengine_pdf.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h index 5f71819..b6718a9 100644 --- a/src/gui/painting/qprintengine_pdf_p.h +++ b/src/gui/painting/qprintengine_pdf_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp index 97ec640..baef232 100644 --- a/src/gui/painting/qprintengine_ps.cpp +++ b/src/gui/painting/qprintengine_ps.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h index 148c86f..b7e58b5 100644 --- a/src/gui/painting/qprintengine_ps_p.h +++ b/src/gui/painting/qprintengine_ps_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_qws.cpp b/src/gui/painting/qprintengine_qws.cpp index 1a8ffbc..3ded762 100644 --- a/src/gui/painting/qprintengine_qws.cpp +++ b/src/gui/painting/qprintengine_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_qws_p.h b/src/gui/painting/qprintengine_qws_p.h index c5472f3..e91c08d 100644 --- a/src/gui/painting/qprintengine_qws_p.h +++ b/src/gui/painting/qprintengine_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index c8674b7..a568466 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprintengine_win_p.h b/src/gui/painting/qprintengine_win_p.h index b3b3d4b..898f187 100644 --- a/src/gui/painting/qprintengine_win_p.h +++ b/src/gui/painting/qprintengine_win_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 6c309c7..54538e1 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h index 949c8f9..fa7aad7 100644 --- a/src/gui/painting/qprinter.h +++ b/src/gui/painting/qprinter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinter_p.h b/src/gui/painting/qprinter_p.h index adaeab4..9b422b3 100644 --- a/src/gui/painting/qprinter_p.h +++ b/src/gui/painting/qprinter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/painting/qprinterinfo.h index b826306..434a1c2 100644 --- a/src/gui/painting/qprinterinfo.h +++ b/src/gui/painting/qprinterinfo.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinterinfo_mac.cpp b/src/gui/painting/qprinterinfo_mac.cpp index ecd4b5b..629f987 100644 --- a/src/gui/painting/qprinterinfo_mac.cpp +++ b/src/gui/painting/qprinterinfo_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp index 0f33ea7..4b72792 100644 --- a/src/gui/painting/qprinterinfo_unix.cpp +++ b/src/gui/painting/qprinterinfo_unix.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinterinfo_unix_p.h b/src/gui/painting/qprinterinfo_unix_p.h index dc0181f..1abd44d 100644 --- a/src/gui/painting/qprinterinfo_unix_p.h +++ b/src/gui/painting/qprinterinfo_unix_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qprinterinfo_win.cpp b/src/gui/painting/qprinterinfo_win.cpp index 7cd3cf3..dcf64be 100644 --- a/src/gui/painting/qprinterinfo_win.cpp +++ b/src/gui/painting/qprinterinfo_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qrasterdefs_p.h b/src/gui/painting/qrasterdefs_p.h index cde98db..1341c50 100644 --- a/src/gui/painting/qrasterdefs_p.h +++ b/src/gui/painting/qrasterdefs_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 583885c..5c2471f 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qrasterizer_p.h b/src/gui/painting/qrasterizer_p.h index d7cd204..f8e2abb 100644 --- a/src/gui/painting/qrasterizer_p.h +++ b/src/gui/painting/qrasterizer_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index c88af7c..0fa2c2b 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index c090877..c5f55b9 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion_mac.cpp b/src/gui/painting/qregion_mac.cpp index f5c37d1..98a3d82 100644 --- a/src/gui/painting/qregion_mac.cpp +++ b/src/gui/painting/qregion_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion_qws.cpp b/src/gui/painting/qregion_qws.cpp index 3aea9a7..5347a09 100644 --- a/src/gui/painting/qregion_qws.cpp +++ b/src/gui/painting/qregion_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/painting/qregion_win.cpp index 1fab97b..0cfa03f 100644 --- a/src/gui/painting/qregion_win.cpp +++ b/src/gui/painting/qregion_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion_wince.cpp b/src/gui/painting/qregion_wince.cpp index 5adc943..2964ee6 100644 --- a/src/gui/painting/qregion_wince.cpp +++ b/src/gui/painting/qregion_wince.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qregion_x11.cpp b/src/gui/painting/qregion_x11.cpp index 77718b7..05da19f 100644 --- a/src/gui/painting/qregion_x11.cpp +++ b/src/gui/painting/qregion_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h index 25218c6..00efc18 100644 --- a/src/gui/painting/qrgb.h +++ b/src/gui/painting/qrgb.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index b894c62..1256253 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h index 72141aa..a2ae0a1 100644 --- a/src/gui/painting/qstroker_p.h +++ b/src/gui/painting/qstroker_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qstylepainter.cpp b/src/gui/painting/qstylepainter.cpp index 1427a7a..78e96af 100644 --- a/src/gui/painting/qstylepainter.cpp +++ b/src/gui/painting/qstylepainter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qstylepainter.h b/src/gui/painting/qstylepainter.h index 5fefdfe..1da8d3a 100644 --- a/src/gui/painting/qstylepainter.h +++ b/src/gui/painting/qstylepainter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp index e02f02d..69f4919 100644 --- a/src/gui/painting/qtessellator.cpp +++ b/src/gui/painting/qtessellator.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtessellator_p.h b/src/gui/painting/qtessellator_p.h index 4f476cb..0a73cd9 100644 --- a/src/gui/painting/qtessellator_p.h +++ b/src/gui/painting/qtessellator_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 1ea40ba..932b43b 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index 7f2c478..b760a3f 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index c70208c..1a86e06 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index de7ebcd..6c725b5 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h index 2713cda..30d3615 100644 --- a/src/gui/painting/qvectorpath_p.h +++ b/src/gui/painting/qvectorpath_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp index bcb0380..1adbcc5 100644 --- a/src/gui/painting/qwindowsurface.cpp +++ b/src/gui/painting/qwindowsurface.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_d3d.cpp b/src/gui/painting/qwindowsurface_d3d.cpp index 2b7f633..2e9f8d3 100644 --- a/src/gui/painting/qwindowsurface_d3d.cpp +++ b/src/gui/painting/qwindowsurface_d3d.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_d3d_p.h b/src/gui/painting/qwindowsurface_d3d_p.h index 9cdfe29..e1d59a9 100644 --- a/src/gui/painting/qwindowsurface_d3d_p.h +++ b/src/gui/painting/qwindowsurface_d3d_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_mac.cpp b/src/gui/painting/qwindowsurface_mac.cpp index d0ad029..3397f10 100644 --- a/src/gui/painting/qwindowsurface_mac.cpp +++ b/src/gui/painting/qwindowsurface_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_mac_p.h b/src/gui/painting/qwindowsurface_mac_p.h index 914b2df..f9da904 100644 --- a/src/gui/painting/qwindowsurface_mac_p.h +++ b/src/gui/painting/qwindowsurface_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h index 76e68e4..b392c0f 100644 --- a/src/gui/painting/qwindowsurface_p.h +++ b/src/gui/painting/qwindowsurface_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_qws.cpp b/src/gui/painting/qwindowsurface_qws.cpp index 1b7fd42..9341833 100644 --- a/src/gui/painting/qwindowsurface_qws.cpp +++ b/src/gui/painting/qwindowsurface_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_qws_p.h b/src/gui/painting/qwindowsurface_qws_p.h index 5eb5c8a..868ffad 100644 --- a/src/gui/painting/qwindowsurface_qws_p.h +++ b/src/gui/painting/qwindowsurface_qws_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp index 7a74fe0..6be803c 100644 --- a/src/gui/painting/qwindowsurface_raster.cpp +++ b/src/gui/painting/qwindowsurface_raster.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h index 2a3535f..9dd6778 100644 --- a/src/gui/painting/qwindowsurface_raster_p.h +++ b/src/gui/painting/qwindowsurface_raster_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp index 9e8b498..6b41cdc 100644 --- a/src/gui/painting/qwindowsurface_x11.cpp +++ b/src/gui/painting/qwindowsurface_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwindowsurface_x11_p.h b/src/gui/painting/qwindowsurface_x11_p.h index 4017c5b..2930946 100644 --- a/src/gui/painting/qwindowsurface_x11_p.h +++ b/src/gui/painting/qwindowsurface_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/painting/qwmatrix.h b/src/gui/painting/qwmatrix.h index ad8ec5d..eba640e 100644 --- a/src/gui/painting/qwmatrix.h +++ b/src/gui/painting/qwmatrix.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index f7af8f8..4210aaa 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/gtksymbols_p.h b/src/gui/styles/gtksymbols_p.h index 74c5dc3..e66da65 100644 --- a/src/gui/styles/gtksymbols_p.h +++ b/src/gui/styles/gtksymbols_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcdestyle.cpp b/src/gui/styles/qcdestyle.cpp index b58c41c..21e39f4 100644 --- a/src/gui/styles/qcdestyle.cpp +++ b/src/gui/styles/qcdestyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcdestyle.h b/src/gui/styles/qcdestyle.h index bb752d3..38d39f2 100644 --- a/src/gui/styles/qcdestyle.h +++ b/src/gui/styles/qcdestyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 468ada9..9d7e9a8 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcleanlooksstyle.h b/src/gui/styles/qcleanlooksstyle.h index 1da457e..52f7d77 100644 --- a/src/gui/styles/qcleanlooksstyle.h +++ b/src/gui/styles/qcleanlooksstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcleanlooksstyle_p.h b/src/gui/styles/qcleanlooksstyle_p.h index dfc4441..68b7e35 100644 --- a/src/gui/styles/qcleanlooksstyle_p.h +++ b/src/gui/styles/qcleanlooksstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 3cae08a..6fb91b5 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcommonstyle.h b/src/gui/styles/qcommonstyle.h index 367afc0..873b35a 100644 --- a/src/gui/styles/qcommonstyle.h +++ b/src/gui/styles/qcommonstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcommonstyle_p.h b/src/gui/styles/qcommonstyle_p.h index a941706..35ca972 100644 --- a/src/gui/styles/qcommonstyle_p.h +++ b/src/gui/styles/qcommonstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qcommonstylepixmaps_p.h b/src/gui/styles/qcommonstylepixmaps_p.h index c4adb76..7218b2c 100644 --- a/src/gui/styles/qcommonstylepixmaps_p.h +++ b/src/gui/styles/qcommonstylepixmaps_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp index 3d47b80..e26e131 100644 --- a/src/gui/styles/qgtkpainter.cpp +++ b/src/gui/styles/qgtkpainter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qgtkpainter_p.h b/src/gui/styles/qgtkpainter_p.h index dc0bc98..9fa9241 100644 --- a/src/gui/styles/qgtkpainter_p.h +++ b/src/gui/styles/qgtkpainter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b569b5c..64b7c85 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qgtkstyle.h b/src/gui/styles/qgtkstyle.h index b7d5bcf..564a081 100644 --- a/src/gui/styles/qgtkstyle.h +++ b/src/gui/styles/qgtkstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmacstyle_mac.h b/src/gui/styles/qmacstyle_mac.h index f043a66..1c1608c 100644 --- a/src/gui/styles/qmacstyle_mac.h +++ b/src/gui/styles/qmacstyle_mac.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 398e11d..695a83d 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmacstylepixmaps_mac_p.h b/src/gui/styles/qmacstylepixmaps_mac_p.h index 0754508..4cd7dcd 100644 --- a/src/gui/styles/qmacstylepixmaps_mac_p.h +++ b/src/gui/styles/qmacstylepixmaps_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp index 7d4fab8..30fb160 100644 --- a/src/gui/styles/qmotifstyle.cpp +++ b/src/gui/styles/qmotifstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmotifstyle.h b/src/gui/styles/qmotifstyle.h index e244dba..21e6a40 100644 --- a/src/gui/styles/qmotifstyle.h +++ b/src/gui/styles/qmotifstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qmotifstyle_p.h b/src/gui/styles/qmotifstyle_p.h index b42e0d9..7cf4ed4 100644 --- a/src/gui/styles/qmotifstyle_p.h +++ b/src/gui/styles/qmotifstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index 24d7748..779fdf5 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qplastiquestyle.h b/src/gui/styles/qplastiquestyle.h index 7e236b8..32c8d3c 100644 --- a/src/gui/styles/qplastiquestyle.h +++ b/src/gui/styles/qplastiquestyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 982f48f..fbf1ec1 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h index 6191d51..adccfde 100644 --- a/src/gui/styles/qstyle.h +++ b/src/gui/styles/qstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyle_p.h b/src/gui/styles/qstyle_p.h index 848bad6..e70a99b 100644 --- a/src/gui/styles/qstyle_p.h +++ b/src/gui/styles/qstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstylefactory.cpp b/src/gui/styles/qstylefactory.cpp index 70717db..87c2da3 100644 --- a/src/gui/styles/qstylefactory.cpp +++ b/src/gui/styles/qstylefactory.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstylefactory.h b/src/gui/styles/qstylefactory.h index c082cba..c3a407f 100644 --- a/src/gui/styles/qstylefactory.h +++ b/src/gui/styles/qstylefactory.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index ce053ae..4c32d71 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h index 5759a05..04e3951 100644 --- a/src/gui/styles/qstyleoption.h +++ b/src/gui/styles/qstyleoption.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyleplugin.cpp b/src/gui/styles/qstyleplugin.cpp index 19c08be..89791ca 100644 --- a/src/gui/styles/qstyleplugin.cpp +++ b/src/gui/styles/qstyleplugin.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstyleplugin.h b/src/gui/styles/qstyleplugin.h index c7d9202..054bda1 100644 --- a/src/gui/styles/qstyleplugin.h +++ b/src/gui/styles/qstyleplugin.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 49ac57a..81ed18e 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstylesheetstyle_default.cpp b/src/gui/styles/qstylesheetstyle_default.cpp index 742cfe1..94607dc 100644 --- a/src/gui/styles/qstylesheetstyle_default.cpp +++ b/src/gui/styles/qstylesheetstyle_default.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/gui/styles/qstylesheetstyle_p.h index 1f61445..f9d0cb2 100644 --- a/src/gui/styles/qstylesheetstyle_p.h +++ b/src/gui/styles/qstylesheetstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/gui/styles/qwindowscestyle.cpp index 5cb72f9..7d8d201 100644 --- a/src/gui/styles/qwindowscestyle.cpp +++ b/src/gui/styles/qwindowscestyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowscestyle.h b/src/gui/styles/qwindowscestyle.h index fbb6d69..40f1556 100644 --- a/src/gui/styles/qwindowscestyle.h +++ b/src/gui/styles/qwindowscestyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowscestyle_p.h b/src/gui/styles/qwindowscestyle_p.h index 177d930..a8e7502 100644 --- a/src/gui/styles/qwindowscestyle_p.h +++ b/src/gui/styles/qwindowscestyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp index c52c700..d9a5ac7 100644 --- a/src/gui/styles/qwindowsmobilestyle.cpp +++ b/src/gui/styles/qwindowsmobilestyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsmobilestyle.h b/src/gui/styles/qwindowsmobilestyle.h index f23ecc9..c6e59e3 100644 --- a/src/gui/styles/qwindowsmobilestyle.h +++ b/src/gui/styles/qwindowsmobilestyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsmobilestyle_p.h b/src/gui/styles/qwindowsmobilestyle_p.h index 83129cf..28d0e2b 100644 --- a/src/gui/styles/qwindowsmobilestyle_p.h +++ b/src/gui/styles/qwindowsmobilestyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 00c3f99..ccd2312 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsstyle.h b/src/gui/styles/qwindowsstyle.h index 7f45f20..6dd2b1b 100644 --- a/src/gui/styles/qwindowsstyle.h +++ b/src/gui/styles/qwindowsstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsstyle_p.h b/src/gui/styles/qwindowsstyle_p.h index 1d1bdf5..80d46bc 100644 --- a/src/gui/styles/qwindowsstyle_p.h +++ b/src/gui/styles/qwindowsstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index b14b8b3..a215156 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsvistastyle.h b/src/gui/styles/qwindowsvistastyle.h index 0d1f202..1d37beb 100644 --- a/src/gui/styles/qwindowsvistastyle.h +++ b/src/gui/styles/qwindowsvistastyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsvistastyle_p.h b/src/gui/styles/qwindowsvistastyle_p.h index 877bc50..9542a2d 100644 --- a/src/gui/styles/qwindowsvistastyle_p.h +++ b/src/gui/styles/qwindowsvistastyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp index 9d735a7..8df60d9 100644 --- a/src/gui/styles/qwindowsxpstyle.cpp +++ b/src/gui/styles/qwindowsxpstyle.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsxpstyle.h b/src/gui/styles/qwindowsxpstyle.h index 8faae82..387ed91 100644 --- a/src/gui/styles/qwindowsxpstyle.h +++ b/src/gui/styles/qwindowsxpstyle.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/styles/qwindowsxpstyle_p.h b/src/gui/styles/qwindowsxpstyle_p.h index 7171629..344c71c 100644 --- a/src/gui/styles/qwindowsxpstyle_p.h +++ b/src/gui/styles/qwindowsxpstyle_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstractfontengine_p.h b/src/gui/text/qabstractfontengine_p.h index 4752de5..fde4768 100644 --- a/src/gui/text/qabstractfontengine_p.h +++ b/src/gui/text/qabstractfontengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstractfontengine_qws.cpp b/src/gui/text/qabstractfontengine_qws.cpp index 3f2579a..73dd09a 100644 --- a/src/gui/text/qabstractfontengine_qws.cpp +++ b/src/gui/text/qabstractfontengine_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstractfontengine_qws.h b/src/gui/text/qabstractfontengine_qws.h index 3c6a1ea..423591d 100644 --- a/src/gui/text/qabstractfontengine_qws.h +++ b/src/gui/text/qabstractfontengine_qws.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp index 6ad5775..28903d5 100644 --- a/src/gui/text/qabstracttextdocumentlayout.cpp +++ b/src/gui/text/qabstracttextdocumentlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 4c376cc..e2e7740 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qabstracttextdocumentlayout_p.h b/src/gui/text/qabstracttextdocumentlayout_p.h index 5674e17..d229676 100644 --- a/src/gui/text/qabstracttextdocumentlayout_p.h +++ b/src/gui/text/qabstracttextdocumentlayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index db1e781..74eb31e 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 97a0aef..dc4d0fc 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp index 2f3fdb7..3ebf0c5 100644 --- a/src/gui/text/qcssscanner.cpp +++ b/src/gui/text/qcssscanner.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 43f5b1e..22a4c64 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index eec83b5..86c0ddc 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont_mac.cpp b/src/gui/text/qfont_mac.cpp index 8320f71..915d2a2 100644 --- a/src/gui/text/qfont_mac.cpp +++ b/src/gui/text/qfont_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 4e8a7b7..f883554 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont_qws.cpp b/src/gui/text/qfont_qws.cpp index f07341d..0b0712f 100644 --- a/src/gui/text/qfont_qws.cpp +++ b/src/gui/text/qfont_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont_win.cpp b/src/gui/text/qfont_win.cpp index 5db5a68..6bce51f 100644 --- a/src/gui/text/qfont_win.cpp +++ b/src/gui/text/qfont_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfont_x11.cpp b/src/gui/text/qfont_x11.cpp index 710792c..cdaba6e 100644 --- a/src/gui/text/qfont_x11.cpp +++ b/src/gui/text/qfont_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index c3fc9f5..d0b2280 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index eadb6ba..47f6dcd 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp index 80ddbd5..f8fb8cb 100644 --- a/src/gui/text/qfontdatabase_mac.cpp +++ b/src/gui/text/qfontdatabase_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp index eb8a0cf..7a89561 100644 --- a/src/gui/text/qfontdatabase_qws.cpp +++ b/src/gui/text/qfontdatabase_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/text/qfontdatabase_win.cpp index c9f5586..4c902b0 100644 --- a/src/gui/text/qfontdatabase_win.cpp +++ b/src/gui/text/qfontdatabase_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 15e626e..6ac8d33 100644 --- a/src/gui/text/qfontdatabase_x11.cpp +++ b/src/gui/text/qfontdatabase_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 47fe5c2..c0907b7 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index cb0b436..56129b0 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 284904b..33f6692 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 425cab2..23ad185 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 176c728..90c1669 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp index e9fcac4..9ad4246 100644 --- a/src/gui/text/qfontengine_qpf.cpp +++ b/src/gui/text/qfontengine_qpf.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_qpf_p.h b/src/gui/text/qfontengine_qpf_p.h index a9b87ff..3914c51 100644 --- a/src/gui/text/qfontengine_qpf_p.h +++ b/src/gui/text/qfontengine_qpf_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp index d776329..0bb3ecb 100644 --- a/src/gui/text/qfontengine_qws.cpp +++ b/src/gui/text/qfontengine_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 1996d44..7d5d699 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h index 6f37e91..3160a8a 100644 --- a/src/gui/text/qfontengine_win_p.h +++ b/src/gui/text/qfontengine_win_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index 0972b2b..aade4dd 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengine_x11_p.h b/src/gui/text/qfontengine_x11_p.h index eb00383..b38e629 100644 --- a/src/gui/text/qfontengine_x11_p.h +++ b/src/gui/text/qfontengine_x11_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h index 8589cc6..7b54283 100644 --- a/src/gui/text/qfontengineglyphcache_p.h +++ b/src/gui/text/qfontengineglyphcache_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index c1b0bb8..1f91234 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 88d0610..fd58ac8 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 95f71df..e8d5547 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 0d1a884..ff3d5d2 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h index 3106ba8..1e6fb8e 100644 --- a/src/gui/text/qfontsubset_p.h +++ b/src/gui/text/qfontsubset_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfragmentmap.cpp b/src/gui/text/qfragmentmap.cpp index c3ce685..a239aa4 100644 --- a/src/gui/text/qfragmentmap.cpp +++ b/src/gui/text/qfragmentmap.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h index 737a717..979562f 100644 --- a/src/gui/text/qfragmentmap_p.h +++ b/src/gui/text/qfragmentmap_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qpfutil.cpp b/src/gui/text/qpfutil.cpp index 6fba213..502af51 100644 --- a/src/gui/text/qpfutil.cpp +++ b/src/gui/text/qpfutil.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp index 87648d5..f92fb8b 100644 --- a/src/gui/text/qsyntaxhighlighter.cpp +++ b/src/gui/text/qsyntaxhighlighter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h index 481dfd4..9ee7d9b 100644 --- a/src/gui/text/qsyntaxhighlighter.h +++ b/src/gui/text/qsyntaxhighlighter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index f3d025c..a8b1eb3 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h index e50540a..2b25a5b 100644 --- a/src/gui/text/qtextcontrol_p.h +++ b/src/gui/text/qtextcontrol_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h index 06955ce..3ad3b96 100644 --- a/src/gui/text/qtextcontrol_p_p.h +++ b/src/gui/text/qtextcontrol_p_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index c327b9f..bf06f21 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h index 97af323..a763896 100644 --- a/src/gui/text/qtextcursor.h +++ b/src/gui/text/qtextcursor.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h index b16af21..f472b7f 100644 --- a/src/gui/text/qtextcursor_p.h +++ b/src/gui/text/qtextcursor_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index e84b324..b2ac73c 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index 9c3d6c2..d6c9ad7 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index 05ddf47..a9e3ccf 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index 25763e1..9563767 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 21958a6..f8e347a 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h index 269aca2..8b75fdf 100644 --- a/src/gui/text/qtextdocumentfragment.h +++ b/src/gui/text/qtextdocumentfragment.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h index 743ed9d..8a2f56a 100644 --- a/src/gui/text/qtextdocumentfragment_p.h +++ b/src/gui/text/qtextdocumentfragment_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index c66d0c1..769e694 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h index d0206ab..8c1e442 100644 --- a/src/gui/text/qtextdocumentlayout_p.h +++ b/src/gui/text/qtextdocumentlayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp index 08ee14e..f89273c 100644 --- a/src/gui/text/qtextdocumentwriter.cpp +++ b/src/gui/text/qtextdocumentwriter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h index 53d17ca..0708d3c 100644 --- a/src/gui/text/qtextdocumentwriter.h +++ b/src/gui/text/qtextdocumentwriter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 80a5425..d204593 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp index d122317..2e8e476 100644 --- a/src/gui/text/qtextengine_mac.cpp +++ b/src/gui/text/qtextengine_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index cf241fa..2262979 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 21bfc4d..9360bb5 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 0571d75..7672847 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h index 115bc80..1d3b224 100644 --- a/src/gui/text/qtextformat_p.h +++ b/src/gui/text/qtextformat_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index b1f1b75..c11d40d 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h index a27b2f2..8922d41 100644 --- a/src/gui/text/qtexthtmlparser_p.h +++ b/src/gui/text/qtexthtmlparser_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index c04f225..e4fdf4b 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h index f5426b5..e6ba079 100644 --- a/src/gui/text/qtextimagehandler_p.h +++ b/src/gui/text/qtextimagehandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 434d1ca..680c9a0 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index e5acb8e..e707fba 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index d1a3361..345fa79 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h index ab8d2d9..4aff711 100644 --- a/src/gui/text/qtextlist.h +++ b/src/gui/text/qtextlist.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 3f4c8e5..510d212 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index 5175441..5c49d21 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h index dd05eb4..49a792c 100644 --- a/src/gui/text/qtextobject_p.h +++ b/src/gui/text/qtextobject_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 1edc3b8..068c013 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h index 88e6b46..f8f3b3e 100644 --- a/src/gui/text/qtextodfwriter_p.h +++ b/src/gui/text/qtextodfwriter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index e1b9844..7032a6f 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 1c637a3..2288553 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index ba1c04f..5a8255d 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h index 76cd427..b0ee659 100644 --- a/src/gui/text/qtexttable.h +++ b/src/gui/text/qtexttable.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h index f2b45b6..1019045 100644 --- a/src/gui/text/qtexttable_p.h +++ b/src/gui/text/qtexttable_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index c6c2e69..139c3c0 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h index c2974a1..a62b5c9 100644 --- a/src/gui/text/qzipreader_p.h +++ b/src/gui/text/qzipreader_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h index b5072b7..aaf1e4f 100644 --- a/src/gui/text/qzipwriter_p.h +++ b/src/gui/text/qzipwriter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 7571dfe..218df6c 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h index 15df2b6..9c679c8 100644 --- a/src/gui/util/qcompleter.h +++ b/src/gui/util/qcompleter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qcompleter_p.h b/src/gui/util/qcompleter_p.h index 88dc2c0..0f3e639 100644 --- a/src/gui/util/qcompleter_p.h +++ b/src/gui/util/qcompleter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index 84aa16e..9b82acb 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h index 15774b4..2ead613 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices_mac.cpp b/src/gui/util/qdesktopservices_mac.cpp index 5124068..f880fa3 100644 --- a/src/gui/util/qdesktopservices_mac.cpp +++ b/src/gui/util/qdesktopservices_mac.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices_qws.cpp b/src/gui/util/qdesktopservices_qws.cpp index f40010a..61e0700 100644 --- a/src/gui/util/qdesktopservices_qws.cpp +++ b/src/gui/util/qdesktopservices_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 0449cba..af04e8a 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp index b3486e8..5f35aee 100644 --- a/src/gui/util/qdesktopservices_x11.cpp +++ b/src/gui/util/qdesktopservices_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon.cpp b/src/gui/util/qsystemtrayicon.cpp index 2e072c5..918e7c8 100644 --- a/src/gui/util/qsystemtrayicon.cpp +++ b/src/gui/util/qsystemtrayicon.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon.h b/src/gui/util/qsystemtrayicon.h index 2845717..02e227f 100644 --- a/src/gui/util/qsystemtrayicon.h +++ b/src/gui/util/qsystemtrayicon.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index f6e858a..00264f2 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h index 8c0732d..8e955b0 100644 --- a/src/gui/util/qsystemtrayicon_p.h +++ b/src/gui/util/qsystemtrayicon_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon_qws.cpp b/src/gui/util/qsystemtrayicon_qws.cpp index fc5fdbe..45dd7ae 100644 --- a/src/gui/util/qsystemtrayicon_qws.cpp +++ b/src/gui/util/qsystemtrayicon_qws.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 84f9de4..9a7a9ae 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp index 52c258a..4711091 100644 --- a/src/gui/util/qsystemtrayicon_x11.cpp +++ b/src/gui/util/qsystemtrayicon_x11.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundogroup.cpp b/src/gui/util/qundogroup.cpp index 6fc05fe..528dcda 100644 --- a/src/gui/util/qundogroup.cpp +++ b/src/gui/util/qundogroup.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundogroup.h b/src/gui/util/qundogroup.h index b2adb84..5f6276a 100644 --- a/src/gui/util/qundogroup.h +++ b/src/gui/util/qundogroup.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp index 11f65e3..e117e4b 100644 --- a/src/gui/util/qundostack.cpp +++ b/src/gui/util/qundostack.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundostack.h b/src/gui/util/qundostack.h index 9fec136..14d600c 100644 --- a/src/gui/util/qundostack.h +++ b/src/gui/util/qundostack.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundostack_p.h b/src/gui/util/qundostack_p.h index f1e1195..c1cbe57 100644 --- a/src/gui/util/qundostack_p.h +++ b/src/gui/util/qundostack_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundoview.cpp b/src/gui/util/qundoview.cpp index 6dbb2d4..4459bb1 100644 --- a/src/gui/util/qundoview.cpp +++ b/src/gui/util/qundoview.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/util/qundoview.h b/src/gui/util/qundoview.h index b776ad3..50020ac 100644 --- a/src/gui/util/qundoview.h +++ b/src/gui/util/qundoview.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp index 61ed0ea..f4ea5c7 100644 --- a/src/gui/widgets/qabstractbutton.cpp +++ b/src/gui/widgets/qabstractbutton.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractbutton.h b/src/gui/widgets/qabstractbutton.h index f0cbb05..01a7f83 100644 --- a/src/gui/widgets/qabstractbutton.h +++ b/src/gui/widgets/qabstractbutton.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractbutton_p.h b/src/gui/widgets/qabstractbutton_p.h index d250952..2be7d61 100644 --- a/src/gui/widgets/qabstractbutton_p.h +++ b/src/gui/widgets/qabstractbutton_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp index 9886969..0a4cf40 100644 --- a/src/gui/widgets/qabstractscrollarea.cpp +++ b/src/gui/widgets/qabstractscrollarea.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractscrollarea.h b/src/gui/widgets/qabstractscrollarea.h index eac32f3..6f031c8 100644 --- a/src/gui/widgets/qabstractscrollarea.h +++ b/src/gui/widgets/qabstractscrollarea.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h index e4c47e9..c8c58fb 100644 --- a/src/gui/widgets/qabstractscrollarea_p.h +++ b/src/gui/widgets/qabstractscrollarea_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index 8028fdc..fd70588 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractslider.h b/src/gui/widgets/qabstractslider.h index e94d047..5e90810 100644 --- a/src/gui/widgets/qabstractslider.h +++ b/src/gui/widgets/qabstractslider.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractslider_p.h b/src/gui/widgets/qabstractslider_p.h index 6438d30..b61ea79 100644 --- a/src/gui/widgets/qabstractslider_p.h +++ b/src/gui/widgets/qabstractslider_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index 347f89a..b7aea5a 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h index 4e7fc3f..59c1e25 100644 --- a/src/gui/widgets/qabstractspinbox.h +++ b/src/gui/widgets/qabstractspinbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/gui/widgets/qabstractspinbox_p.h index 5f7f896..cc2610b 100644 --- a/src/gui/widgets/qabstractspinbox_p.h +++ b/src/gui/widgets/qabstractspinbox_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qbuttongroup.cpp b/src/gui/widgets/qbuttongroup.cpp index 06bcf1e..5ed093f 100644 --- a/src/gui/widgets/qbuttongroup.cpp +++ b/src/gui/widgets/qbuttongroup.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qbuttongroup.h b/src/gui/widgets/qbuttongroup.h index e0b01ee..d89b0f7 100644 --- a/src/gui/widgets/qbuttongroup.h +++ b/src/gui/widgets/qbuttongroup.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcalendartextnavigator_p.h b/src/gui/widgets/qcalendartextnavigator_p.h index 0aaeffc..2de80c9 100644 --- a/src/gui/widgets/qcalendartextnavigator_p.h +++ b/src/gui/widgets/qcalendartextnavigator_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp index 92c12a5..2e05072 100644 --- a/src/gui/widgets/qcalendarwidget.cpp +++ b/src/gui/widgets/qcalendarwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcalendarwidget.h b/src/gui/widgets/qcalendarwidget.h index 05c2344..c6288fa 100644 --- a/src/gui/widgets/qcalendarwidget.h +++ b/src/gui/widgets/qcalendarwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcheckbox.cpp b/src/gui/widgets/qcheckbox.cpp index 1998f9f..142088c 100644 --- a/src/gui/widgets/qcheckbox.cpp +++ b/src/gui/widgets/qcheckbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcheckbox.h b/src/gui/widgets/qcheckbox.h index fcab7a7..3ad9514 100644 --- a/src/gui/widgets/qcheckbox.h +++ b/src/gui/widgets/qcheckbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index bae270a..e1490f6 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -6,36 +6,36 @@ ** 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 either Technology Preview License Agreement or the - ** Beta Release License Agreement. - ** - ** 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. - ** - ** In addition, as a special exception, Nokia gives you certain - ** additional rights. These rights are described in the Nokia Qt LGPL - ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this - ** package. - ** - ** 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. - ** - ** If you are unsure which license is appropriate for your use, please - ** contact the sales department at qt-sales@nokia.com. - ** $QT_END_LICENSE$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h index 1372f09..47e3ee4 100644 --- a/src/gui/widgets/qcocoamenu_mac_p.h +++ b/src/gui/widgets/qcocoamenu_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm index a0ccaf3..861cfac 100644 --- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm +++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h index a32e936..0a3a582 100644 --- a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h +++ b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index b9dbc62..f864224 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 2cb2e8f..0f1ff7f 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h index c39a231..2cb543c 100644 --- a/src/gui/widgets/qcombobox_p.h +++ b/src/gui/widgets/qcombobox_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp index 13ee6af..1034101 100644 --- a/src/gui/widgets/qcommandlinkbutton.cpp +++ b/src/gui/widgets/qcommandlinkbutton.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qcommandlinkbutton.h b/src/gui/widgets/qcommandlinkbutton.h index 93d91cb..774f5bd 100644 --- a/src/gui/widgets/qcommandlinkbutton.h +++ b/src/gui/widgets/qcommandlinkbutton.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 83bec68..e609e75 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdatetimeedit.h b/src/gui/widgets/qdatetimeedit.h index 26c0e66..a205d84 100644 --- a/src/gui/widgets/qdatetimeedit.h +++ b/src/gui/widgets/qdatetimeedit.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdatetimeedit_p.h b/src/gui/widgets/qdatetimeedit_p.h index 5710935..e87af09 100644 --- a/src/gui/widgets/qdatetimeedit_p.h +++ b/src/gui/widgets/qdatetimeedit_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp index e19ce6a..66f7511 100644 --- a/src/gui/widgets/qdial.cpp +++ b/src/gui/widgets/qdial.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdial.h b/src/gui/widgets/qdial.h index 1aa3d11..0606288 100644 --- a/src/gui/widgets/qdial.h +++ b/src/gui/widgets/qdial.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 4a95292..8a7f072 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdialogbuttonbox.h b/src/gui/widgets/qdialogbuttonbox.h index c4f3cf5..fb2c5c6 100644 --- a/src/gui/widgets/qdialogbuttonbox.h +++ b/src/gui/widgets/qdialogbuttonbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp index 4f0ec1e..df15d59 100644 --- a/src/gui/widgets/qdockarealayout.cpp +++ b/src/gui/widgets/qdockarealayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdockarealayout_p.h b/src/gui/widgets/qdockarealayout_p.h index 7c5bd18..083e54e 100644 --- a/src/gui/widgets/qdockarealayout_p.h +++ b/src/gui/widgets/qdockarealayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp index a5be5f8..fa45818 100644 --- a/src/gui/widgets/qdockwidget.cpp +++ b/src/gui/widgets/qdockwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdockwidget.h b/src/gui/widgets/qdockwidget.h index 938a2fd..31971f4 100644 --- a/src/gui/widgets/qdockwidget.h +++ b/src/gui/widgets/qdockwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qdockwidget_p.h b/src/gui/widgets/qdockwidget_p.h index 0bc619c..47bbd89 100644 --- a/src/gui/widgets/qdockwidget_p.h +++ b/src/gui/widgets/qdockwidget_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qeffects.cpp b/src/gui/widgets/qeffects.cpp index 140953d..aad624d 100644 --- a/src/gui/widgets/qeffects.cpp +++ b/src/gui/widgets/qeffects.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qeffects_p.h b/src/gui/widgets/qeffects_p.h index edff5a9..8fe9905 100644 --- a/src/gui/widgets/qeffects_p.h +++ b/src/gui/widgets/qeffects_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qfocusframe.cpp b/src/gui/widgets/qfocusframe.cpp index 4e5b630..88cc5bb 100644 --- a/src/gui/widgets/qfocusframe.cpp +++ b/src/gui/widgets/qfocusframe.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qfocusframe.h b/src/gui/widgets/qfocusframe.h index d886e09..d7c17ba 100644 --- a/src/gui/widgets/qfocusframe.h +++ b/src/gui/widgets/qfocusframe.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp index 3c7e691..52862f6 100644 --- a/src/gui/widgets/qfontcombobox.cpp +++ b/src/gui/widgets/qfontcombobox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qfontcombobox.h b/src/gui/widgets/qfontcombobox.h index 4929ff3..aeed440 100644 --- a/src/gui/widgets/qfontcombobox.h +++ b/src/gui/widgets/qfontcombobox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp index 6f81331..77fa76d 100644 --- a/src/gui/widgets/qframe.cpp +++ b/src/gui/widgets/qframe.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qframe.h b/src/gui/widgets/qframe.h index 7bffb59..37fd9f8 100644 --- a/src/gui/widgets/qframe.h +++ b/src/gui/widgets/qframe.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qframe_p.h b/src/gui/widgets/qframe_p.h index 4fd341d..6a56acb 100644 --- a/src/gui/widgets/qframe_p.h +++ b/src/gui/widgets/qframe_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qgroupbox.cpp b/src/gui/widgets/qgroupbox.cpp index 6a82483..7051a16 100644 --- a/src/gui/widgets/qgroupbox.cpp +++ b/src/gui/widgets/qgroupbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qgroupbox.h b/src/gui/widgets/qgroupbox.h index 85f1a0d..0bbe507 100644 --- a/src/gui/widgets/qgroupbox.h +++ b/src/gui/widgets/qgroupbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp index 63c1315..84db859 100644 --- a/src/gui/widgets/qlabel.cpp +++ b/src/gui/widgets/qlabel.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlabel.h b/src/gui/widgets/qlabel.h index 34f397f..b7660c6 100644 --- a/src/gui/widgets/qlabel.h +++ b/src/gui/widgets/qlabel.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlabel_p.h b/src/gui/widgets/qlabel_p.h index 4d83f35..c387797 100644 --- a/src/gui/widgets/qlabel_p.h +++ b/src/gui/widgets/qlabel_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlcdnumber.cpp b/src/gui/widgets/qlcdnumber.cpp index 0136f1a..37c9e52 100644 --- a/src/gui/widgets/qlcdnumber.cpp +++ b/src/gui/widgets/qlcdnumber.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlcdnumber.h b/src/gui/widgets/qlcdnumber.h index 626c85d..5d9b89a 100644 --- a/src/gui/widgets/qlcdnumber.h +++ b/src/gui/widgets/qlcdnumber.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index b03df9e..70c7d5c 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h index c0d9892..be33671 100644 --- a/src/gui/widgets/qlineedit.h +++ b/src/gui/widgets/qlineedit.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h index 532528b..b2d3c86 100644 --- a/src/gui/widgets/qlineedit_p.h +++ b/src/gui/widgets/qlineedit_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.h b/src/gui/widgets/qmaccocoaviewcontainer_mac.h index 19763ba..8e5aecb 100644 --- a/src/gui/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm index 710af6a..626dd76 100644 --- a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmacnativewidget_mac.h b/src/gui/widgets/qmacnativewidget_mac.h index 4db65e0..d2a2739 100644 --- a/src/gui/widgets/qmacnativewidget_mac.h +++ b/src/gui/widgets/qmacnativewidget_mac.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm index 1bc0430..5e7b73a 100644 --- a/src/gui/widgets/qmacnativewidget_mac.mm +++ b/src/gui/widgets/qmacnativewidget_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 46d6471..e945611 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmainwindow.h b/src/gui/widgets/qmainwindow.h index 9983c7a..0d27635 100644 --- a/src/gui/widgets/qmainwindow.h +++ b/src/gui/widgets/qmainwindow.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index eade633..c3c0130 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h index 1159aac..d741667 100644 --- a/src/gui/widgets/qmainwindowlayout_p.h +++ b/src/gui/widgets/qmainwindowlayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp index 598d3b5..65c7646 100644 --- a/src/gui/widgets/qmdiarea.cpp +++ b/src/gui/widgets/qmdiarea.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdiarea.h b/src/gui/widgets/qmdiarea.h index 8448c81..b3312ae 100644 --- a/src/gui/widgets/qmdiarea.h +++ b/src/gui/widgets/qmdiarea.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdiarea_p.h b/src/gui/widgets/qmdiarea_p.h index 645f0cc..1e35047 100644 --- a/src/gui/widgets/qmdiarea_p.h +++ b/src/gui/widgets/qmdiarea_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp index 6bf7633..3ec74a1 100644 --- a/src/gui/widgets/qmdisubwindow.cpp +++ b/src/gui/widgets/qmdisubwindow.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdisubwindow.h b/src/gui/widgets/qmdisubwindow.h index 3dcb1bb..534b6f7 100644 --- a/src/gui/widgets/qmdisubwindow.h +++ b/src/gui/widgets/qmdisubwindow.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmdisubwindow_p.h b/src/gui/widgets/qmdisubwindow_p.h index 2e672d6..b4a52df 100644 --- a/src/gui/widgets/qmdisubwindow_p.h +++ b/src/gui/widgets/qmdisubwindow_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index ed3e338..0dd1b8a 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h index 867baee..e037e15 100644 --- a/src/gui/widgets/qmenu.h +++ b/src/gui/widgets/qmenu.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index ad848c9..12ae9db 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index e3c4890..bda7cd3 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/gui/widgets/qmenu_wince.cpp index ea58d46..22030ee 100644 --- a/src/gui/widgets/qmenu_wince.cpp +++ b/src/gui/widgets/qmenu_wince.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenu_wince_resource_p.h b/src/gui/widgets/qmenu_wince_resource_p.h index cc944f4..b5b8fd6 100644 --- a/src/gui/widgets/qmenu_wince_resource_p.h +++ b/src/gui/widgets/qmenu_wince_resource_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index ccf37db..9343971 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenubar.h b/src/gui/widgets/qmenubar.h index 42f0c0c..9e56c8f 100644 --- a/src/gui/widgets/qmenubar.h +++ b/src/gui/widgets/qmenubar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h index 223346b..aee330a 100644 --- a/src/gui/widgets/qmenubar_p.h +++ b/src/gui/widgets/qmenubar_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenudata.cpp b/src/gui/widgets/qmenudata.cpp index 568b67f..e834026 100644 --- a/src/gui/widgets/qmenudata.cpp +++ b/src/gui/widgets/qmenudata.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qmenudata.h b/src/gui/widgets/qmenudata.h index 24d960a..8864af6 100644 --- a/src/gui/widgets/qmenudata.h +++ b/src/gui/widgets/qmenudata.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 2e9201d..ca1b815 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qplaintextedit.h b/src/gui/widgets/qplaintextedit.h index c00ff4e..97c895f 100644 --- a/src/gui/widgets/qplaintextedit.h +++ b/src/gui/widgets/qplaintextedit.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qplaintextedit_p.h b/src/gui/widgets/qplaintextedit_p.h index 0739d53..4ccb803 100644 --- a/src/gui/widgets/qplaintextedit_p.h +++ b/src/gui/widgets/qplaintextedit_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp index 16334b8..98bcfca 100644 --- a/src/gui/widgets/qprintpreviewwidget.cpp +++ b/src/gui/widgets/qprintpreviewwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/gui/widgets/qprintpreviewwidget.h index 27110a4..9063b45 100644 --- a/src/gui/widgets/qprintpreviewwidget.h +++ b/src/gui/widgets/qprintpreviewwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index cdb3836..d789d0e 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qprogressbar.h b/src/gui/widgets/qprogressbar.h index 57c83fe..e1784c4 100644 --- a/src/gui/widgets/qprogressbar.h +++ b/src/gui/widgets/qprogressbar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp index 03ca751..aa14d05 100644 --- a/src/gui/widgets/qpushbutton.cpp +++ b/src/gui/widgets/qpushbutton.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qpushbutton.h b/src/gui/widgets/qpushbutton.h index 3be304b..ccdec26 100644 --- a/src/gui/widgets/qpushbutton.h +++ b/src/gui/widgets/qpushbutton.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qpushbutton_p.h b/src/gui/widgets/qpushbutton_p.h index fc8f567..a0c7a76 100644 --- a/src/gui/widgets/qpushbutton_p.h +++ b/src/gui/widgets/qpushbutton_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qradiobutton.cpp b/src/gui/widgets/qradiobutton.cpp index da23150..776563c 100644 --- a/src/gui/widgets/qradiobutton.cpp +++ b/src/gui/widgets/qradiobutton.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qradiobutton.h b/src/gui/widgets/qradiobutton.h index 158998d..1997c94 100644 --- a/src/gui/widgets/qradiobutton.h +++ b/src/gui/widgets/qradiobutton.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qrubberband.cpp b/src/gui/widgets/qrubberband.cpp index a394f4a..ccd31a0 100644 --- a/src/gui/widgets/qrubberband.cpp +++ b/src/gui/widgets/qrubberband.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qrubberband.h b/src/gui/widgets/qrubberband.h index f4c3ffa..241f6f8 100644 --- a/src/gui/widgets/qrubberband.h +++ b/src/gui/widgets/qrubberband.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qscrollarea.cpp b/src/gui/widgets/qscrollarea.cpp index 6aca7d3..943e3be 100644 --- a/src/gui/widgets/qscrollarea.cpp +++ b/src/gui/widgets/qscrollarea.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qscrollarea.h b/src/gui/widgets/qscrollarea.h index f888aef..2135c95 100644 --- a/src/gui/widgets/qscrollarea.h +++ b/src/gui/widgets/qscrollarea.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qscrollarea_p.h b/src/gui/widgets/qscrollarea_p.h index bdb7ad7..3f38b04 100644 --- a/src/gui/widgets/qscrollarea_p.h +++ b/src/gui/widgets/qscrollarea_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qscrollbar.cpp b/src/gui/widgets/qscrollbar.cpp index 9bfe7a5..8195ca7 100644 --- a/src/gui/widgets/qscrollbar.cpp +++ b/src/gui/widgets/qscrollbar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qscrollbar.h b/src/gui/widgets/qscrollbar.h index 35aacf4..2009110 100644 --- a/src/gui/widgets/qscrollbar.h +++ b/src/gui/widgets/qscrollbar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp index 6458b15..e41c061 100644 --- a/src/gui/widgets/qsizegrip.cpp +++ b/src/gui/widgets/qsizegrip.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsizegrip.h b/src/gui/widgets/qsizegrip.h index cfd83a8..b6945a6 100644 --- a/src/gui/widgets/qsizegrip.h +++ b/src/gui/widgets/qsizegrip.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qslider.cpp b/src/gui/widgets/qslider.cpp index 32b9021..75bd0569 100644 --- a/src/gui/widgets/qslider.cpp +++ b/src/gui/widgets/qslider.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qslider.h b/src/gui/widgets/qslider.h index 14f763a..000fb41 100644 --- a/src/gui/widgets/qslider.h +++ b/src/gui/widgets/qslider.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp index c691eaf..bd1b727 100644 --- a/src/gui/widgets/qspinbox.cpp +++ b/src/gui/widgets/qspinbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qspinbox.h b/src/gui/widgets/qspinbox.h index 44c88cc..92fe7c2 100644 --- a/src/gui/widgets/qspinbox.h +++ b/src/gui/widgets/qspinbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp index 4240096..a138795 100644 --- a/src/gui/widgets/qsplashscreen.cpp +++ b/src/gui/widgets/qsplashscreen.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsplashscreen.h b/src/gui/widgets/qsplashscreen.h index 3a2be10..5315364 100644 --- a/src/gui/widgets/qsplashscreen.h +++ b/src/gui/widgets/qsplashscreen.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsplitter.cpp b/src/gui/widgets/qsplitter.cpp index bf8af35..a82b737 100644 --- a/src/gui/widgets/qsplitter.cpp +++ b/src/gui/widgets/qsplitter.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsplitter.h b/src/gui/widgets/qsplitter.h index 36e6e19..4cc40dc 100644 --- a/src/gui/widgets/qsplitter.h +++ b/src/gui/widgets/qsplitter.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qsplitter_p.h b/src/gui/widgets/qsplitter_p.h index 5cc43af..0a85405 100644 --- a/src/gui/widgets/qsplitter_p.h +++ b/src/gui/widgets/qsplitter_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp index c615630..cfce888 100644 --- a/src/gui/widgets/qstackedwidget.cpp +++ b/src/gui/widgets/qstackedwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qstackedwidget.h b/src/gui/widgets/qstackedwidget.h index 773f800..104990d 100644 --- a/src/gui/widgets/qstackedwidget.h +++ b/src/gui/widgets/qstackedwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp index c970838..65d3c05 100644 --- a/src/gui/widgets/qstatusbar.cpp +++ b/src/gui/widgets/qstatusbar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qstatusbar.h b/src/gui/widgets/qstatusbar.h index 4434f74..f54a83a 100644 --- a/src/gui/widgets/qstatusbar.h +++ b/src/gui/widgets/qstatusbar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index 7d970ad..419d456 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtabbar.h b/src/gui/widgets/qtabbar.h index 49931ad..b3f7a13 100644 --- a/src/gui/widgets/qtabbar.h +++ b/src/gui/widgets/qtabbar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h index a117aa3..dd9df21 100644 --- a/src/gui/widgets/qtabbar_p.h +++ b/src/gui/widgets/qtabbar_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp index c16e000..296849f 100644 --- a/src/gui/widgets/qtabwidget.cpp +++ b/src/gui/widgets/qtabwidget.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtabwidget.h b/src/gui/widgets/qtabwidget.h index 9307c48..355c0d6 100644 --- a/src/gui/widgets/qtabwidget.h +++ b/src/gui/widgets/qtabwidget.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/gui/widgets/qtextbrowser.cpp index a1f4d34..9c2e972 100644 --- a/src/gui/widgets/qtextbrowser.cpp +++ b/src/gui/widgets/qtextbrowser.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtextbrowser.h b/src/gui/widgets/qtextbrowser.h index 1cad463..f95426d2 100644 --- a/src/gui/widgets/qtextbrowser.h +++ b/src/gui/widgets/qtextbrowser.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index 1c4df93..d0c2eae 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtextedit.h b/src/gui/widgets/qtextedit.h index 0835cc1..7b62d34 100644 --- a/src/gui/widgets/qtextedit.h +++ b/src/gui/widgets/qtextedit.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtextedit_p.h b/src/gui/widgets/qtextedit_p.h index 3c37868..461b749 100644 --- a/src/gui/widgets/qtextedit_p.h +++ b/src/gui/widgets/qtextedit_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index 1babb6d..70fd7cd 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbar.h b/src/gui/widgets/qtoolbar.h index 33477d5..b4faf83 100644 --- a/src/gui/widgets/qtoolbar.h +++ b/src/gui/widgets/qtoolbar.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbar_p.h b/src/gui/widgets/qtoolbar_p.h index 598f054..c158c01 100644 --- a/src/gui/widgets/qtoolbar_p.h +++ b/src/gui/widgets/qtoolbar_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/gui/widgets/qtoolbararealayout.cpp index 49f4a9e..a1a28ea 100644 --- a/src/gui/widgets/qtoolbararealayout.cpp +++ b/src/gui/widgets/qtoolbararealayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/gui/widgets/qtoolbararealayout_p.h index 574e366..480b018 100644 --- a/src/gui/widgets/qtoolbararealayout_p.h +++ b/src/gui/widgets/qtoolbararealayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/gui/widgets/qtoolbarextension.cpp index a1c5fd6..179fd27 100644 --- a/src/gui/widgets/qtoolbarextension.cpp +++ b/src/gui/widgets/qtoolbarextension.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarextension_p.h b/src/gui/widgets/qtoolbarextension_p.h index 3f3a459..3cdcf29 100644 --- a/src/gui/widgets/qtoolbarextension_p.h +++ b/src/gui/widgets/qtoolbarextension_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp index 7771f46..e240d01 100644 --- a/src/gui/widgets/qtoolbarlayout.cpp +++ b/src/gui/widgets/qtoolbarlayout.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarlayout_p.h b/src/gui/widgets/qtoolbarlayout_p.h index 2eca773..6e2e5ec 100644 --- a/src/gui/widgets/qtoolbarlayout_p.h +++ b/src/gui/widgets/qtoolbarlayout_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarseparator.cpp b/src/gui/widgets/qtoolbarseparator.cpp index c242687..7592e3e 100644 --- a/src/gui/widgets/qtoolbarseparator.cpp +++ b/src/gui/widgets/qtoolbarseparator.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbarseparator_p.h b/src/gui/widgets/qtoolbarseparator_p.h index c3552e6..0116657 100644 --- a/src/gui/widgets/qtoolbarseparator_p.h +++ b/src/gui/widgets/qtoolbarseparator_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbox.cpp b/src/gui/widgets/qtoolbox.cpp index 81935a5..5f91684 100644 --- a/src/gui/widgets/qtoolbox.cpp +++ b/src/gui/widgets/qtoolbox.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbox.h b/src/gui/widgets/qtoolbox.h index 435fab9..288b1d4 100644 --- a/src/gui/widgets/qtoolbox.h +++ b/src/gui/widgets/qtoolbox.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 7390d04..8be7a8a 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qtoolbutton.h b/src/gui/widgets/qtoolbutton.h index d869081..dd50725 100644 --- a/src/gui/widgets/qtoolbutton.h +++ b/src/gui/widgets/qtoolbutton.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp index 3aca13d..2c01d43 100644 --- a/src/gui/widgets/qvalidator.cpp +++ b/src/gui/widgets/qvalidator.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h index 8114ca2..2510a6f 100644 --- a/src/gui/widgets/qvalidator.h +++ b/src/gui/widgets/qvalidator.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qwidgetanimator.cpp b/src/gui/widgets/qwidgetanimator.cpp index 5584ba1..8f85a4c 100644 --- a/src/gui/widgets/qwidgetanimator.cpp +++ b/src/gui/widgets/qwidgetanimator.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qwidgetanimator_p.h b/src/gui/widgets/qwidgetanimator_p.h index 7204983..6cedfff 100644 --- a/src/gui/widgets/qwidgetanimator_p.h +++ b/src/gui/widgets/qwidgetanimator_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qwidgetresizehandler.cpp b/src/gui/widgets/qwidgetresizehandler.cpp index 9171244..af9e7de 100644 --- a/src/gui/widgets/qwidgetresizehandler.cpp +++ b/src/gui/widgets/qwidgetresizehandler.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qwidgetresizehandler_p.h b/src/gui/widgets/qwidgetresizehandler_p.h index 1eab292..5dddc4f 100644 --- a/src/gui/widgets/qwidgetresizehandler_p.h +++ b/src/gui/widgets/qwidgetresizehandler_p.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp index 5221deb..908e999 100644 --- a/src/gui/widgets/qworkspace.cpp +++ b/src/gui/widgets/qworkspace.cpp @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/gui/widgets/qworkspace.h b/src/gui/widgets/qworkspace.h index 41caf37..7977522 100644 --- a/src/gui/widgets/qworkspace.h +++ b/src/gui/widgets/qworkspace.h @@ -6,11 +6,11 @@ ** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index 3a2dd4a..4bfdd43 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index a7eb2b1..49f3f0a 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qabstractnetworkcache_p.h b/src/network/access/qabstractnetworkcache_p.h index 9b6f7d1..7727a96 100644 --- a/src/network/access/qabstractnetworkcache_p.h +++ b/src/network/access/qabstractnetworkcache_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 569d2fd..075dc86 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qftp.h b/src/network/access/qftp.h index ba759e0..04cf43d 100644 --- a/src/network/access/qftp.h +++ b/src/network/access/qftp.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 96ccc91..d7dc669 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h index 771176a..7c656aa 100644 --- a/src/network/access/qhttp.h +++ b/src/network/access/qhttp.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index edb2988..4f0d968 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 8dbcb3d..5ccd061 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index df468b8..1dcf06e 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index 9012396..0a33cf9 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/src/network/access/qnetworkaccessbackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp index 9b2be3d..f494084 100644 --- a/src/network/access/qnetworkaccesscache.cpp +++ b/src/network/access/qnetworkaccesscache.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index 23d8828..9f2cd0e 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/src/network/access/qnetworkaccesscache_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp index fcb294f..9e446d1 100644 --- a/src/network/access/qnetworkaccesscachebackend.cpp +++ b/src/network/access/qnetworkaccesscachebackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h index 0d864f5..199a5b9 100644 --- a/src/network/access/qnetworkaccesscachebackend_p.h +++ b/src/network/access/qnetworkaccesscachebackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp index f31247c..aa3a124 100644 --- a/src/network/access/qnetworkaccessdatabackend.cpp +++ b/src/network/access/qnetworkaccessdatabackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessdatabackend_p.h b/src/network/access/qnetworkaccessdatabackend_p.h index 54eca3d..8bbc068 100644 --- a/src/network/access/qnetworkaccessdatabackend_p.h +++ b/src/network/access/qnetworkaccessdatabackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index 2e5f1b1..48b2136 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h index 73a35cf..8f6976b 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend_p.h +++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index 8a5a665..c5e406d 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h index ce7d351..68c7ea2 100644 --- a/src/network/access/qnetworkaccessfilebackend_p.h +++ b/src/network/access/qnetworkaccessfilebackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index ea39dec..d4e02be 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h index 9ec2dd8..9ab172e 100644 --- a/src/network/access/qnetworkaccessftpbackend_p.h +++ b/src/network/access/qnetworkaccessftpbackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index a52b5a0..9664f53 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h index 02915e7..6bc009c 100644 --- a/src/network/access/qnetworkaccesshttpbackend_p.h +++ b/src/network/access/qnetworkaccesshttpbackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 11e1e46..669d6cd 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 4fe218e..308c0ca 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h index 665d143..904e4dd 100644 --- a/src/network/access/qnetworkaccessmanager_p.h +++ b/src/network/access/qnetworkaccessmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp index 01a743b..79f537c 100644 --- a/src/network/access/qnetworkcookie.cpp +++ b/src/network/access/qnetworkcookie.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index e8dfab0..1c57655 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkcookie_p.h b/src/network/access/qnetworkcookie_p.h index 83ef14a..f325eb2 100644 --- a/src/network/access/qnetworkcookie_p.h +++ b/src/network/access/qnetworkcookie_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index fa0fccb..5e194e2 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index ca4bb94..50a244c 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h index bf6f37c..96813a2 100644 --- a/src/network/access/qnetworkdiskcache_p.h +++ b/src/network/access/qnetworkdiskcache_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index f4dad3c..10e57dd 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 6f763b3..3a8d2b7 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkreply_p.h b/src/network/access/qnetworkreply_p.h index f459e85..240b2f2 100644 --- a/src/network/access/qnetworkreply_p.h +++ b/src/network/access/qnetworkreply_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index eaa572f..aa5789a 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index ad06f78..99e82e8 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 56b793d..a6e88fa 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 6f34bce..1458829 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h index ff71f85..1772c2b 100644 --- a/src/network/access/qnetworkrequest_p.h +++ b/src/network/access/qnetworkrequest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index c9161f8..f949832 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h index aa78a56..581862b 100644 --- a/src/network/kernel/qauthenticator.h +++ b/src/network/kernel/qauthenticator.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h index 42583cf..93ad73a 100644 --- a/src/network/kernel/qauthenticator_p.h +++ b/src/network/kernel/qauthenticator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index b225c17..0e4a023 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 02a6f97..e880c05 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostaddress_p.h b/src/network/kernel/qhostaddress_p.h index e6634b7..3a770cb 100644 --- a/src/network/kernel/qhostaddress_p.h +++ b/src/network/kernel/qhostaddress_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index ca4124d..9721e09 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index 084ec89..d2937f5 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 1db00d3..e37dbb7 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index f987520..7d24f93 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qhostinfo_win.cpp b/src/network/kernel/qhostinfo_win.cpp index 0a34e2b..036068d 100644 --- a/src/network/kernel/qhostinfo_win.cpp +++ b/src/network/kernel/qhostinfo_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index 670745b..abe94fa 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index 09fbd0f..3e7844b 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface_p.h b/src/network/kernel/qnetworkinterface_p.h index c07e23c..68b6e40 100644 --- a/src/network/kernel/qnetworkinterface_p.h +++ b/src/network/kernel/qnetworkinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 34a44ac..004b773 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index de97629..072957f 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h index 07425d0..98bdf5f 100644 --- a/src/network/kernel/qnetworkinterface_win_p.h +++ b/src/network/kernel/qnetworkinterface_win_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index f4ece97..fac780b 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index abe4213..9c68b62 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkproxy_generic.cpp b/src/network/kernel/qnetworkproxy_generic.cpp index 866d63d..278c1cd 100644 --- a/src/network/kernel/qnetworkproxy_generic.cpp +++ b/src/network/kernel/qnetworkproxy_generic.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp index 5e6e3e8..a86e462 100644 --- a/src/network/kernel/qnetworkproxy_mac.cpp +++ b/src/network/kernel/qnetworkproxy_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 16d18cf..25300c1 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp index 255c9ea..d791c76 100644 --- a/src/network/kernel/qurlinfo.cpp +++ b/src/network/kernel/qurlinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo.h index 502fd34..c6a219d 100644 --- a/src/network/kernel/qurlinfo.h +++ b/src/network/kernel/qurlinfo.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 910e30a..9dbc054 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 1b86e92..22738a7 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 4cb7dcb..4f814fe 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp index 620cf8b..1bab29b 100644 --- a/src/network/socket/qabstractsocketengine.cpp +++ b/src/network/socket/qabstractsocketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h index 6bfa456..3859b25 100644 --- a/src/network/socket/qabstractsocketengine_p.h +++ b/src/network/socket/qabstractsocketengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 540c443..82324a7 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index d0c53d0..c6dab70 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/src/network/socket/qhttpsocketengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp index d6b1507..1446705 100644 --- a/src/network/socket/qlocalserver.cpp +++ b/src/network/socket/qlocalserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 8e8babd..5632072 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h index 8e96401..00c4c64 100644 --- a/src/network/socket/qlocalserver_p.h +++ b/src/network/socket/qlocalserver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index f85777b..1e14f8a 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 065a9de..6b0dec4 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp index 880cd7e..6dfd2c8 100644 --- a/src/network/socket/qlocalserver_win.cpp +++ b/src/network/socket/qlocalserver_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 327bfc6..efa292f 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index b8ad5c7..802ddf3 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index dd48d0a..d5b7ba4 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index a4c6aa9..232744f 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index a375e9b..85b89c4 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e759d0b..45b855b 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index b25b887..7f671fd 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 3366f2d..61388ca 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 73f6f84..2e8a715 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index d140be2..fa4c71a 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index c41e32d..e2bd8e0 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index e11b1b6..30a86aa 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index c1fedc3..25c5900 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 71fdde8..a6ec42b 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp index 086a420..bfe5265 100644 --- a/src/network/socket/qtcpsocket.cpp +++ b/src/network/socket/qtcpsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index ade70be..6001f66 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qtcpsocket_p.h b/src/network/socket/qtcpsocket_p.h index 3016cdb..48a9cfa 100644 --- a/src/network/socket/qtcpsocket_p.h +++ b/src/network/socket/qtcpsocket_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index 820404d..2ddafe0 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index 4e02f84..0c09125 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index e2d0743..bfd1c86 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index bd0d943..0fa2cb6 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index a2ba644..9694665 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index d4597cd..ca0ed88 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index cbf374b..915be84 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp index 505c662..2ece2d9 100644 --- a/src/network/ssl/qsslcipher.cpp +++ b/src/network/ssl/qsslcipher.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h index 404dc3d..333085c 100644 --- a/src/network/ssl/qsslcipher.h +++ b/src/network/ssl/qsslcipher.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslcipher_p.h b/src/network/ssl/qsslcipher_p.h index 46e5054..52de2bc 100644 --- a/src/network/ssl/qsslcipher_p.h +++ b/src/network/ssl/qsslcipher_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 4a0f226..351902a 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index fa3d646..8a61b3b 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index 3c4dbee..26d65b3 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/src/network/ssl/qsslconfiguration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index daa6533..4437b7c 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index c120215..c20b3cc 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp index 8d550c0..a3941af 100644 --- a/src/network/ssl/qsslkey.cpp +++ b/src/network/ssl/qsslkey.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index 45d03f7..0fd3d93 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h index c809015..90989e1 100644 --- a/src/network/ssl/qsslkey_p.h +++ b/src/network/ssl/qsslkey_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ea64042..22f1db5 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index b8db654..6911b8b 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f8cf42..8d1a9fc 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index b3be42a..9b88abd 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index e09e764..61e7f7c 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index c6ae91e..29fcfaa 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 825df46..6063a40 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtNetwork 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/glgc_shader_source.h b/src/opengl/gl2paintengineex/glgc_shader_source.h index 5b9d28b..e672f24 100644 --- a/src/opengl/gl2paintengineex/glgc_shader_source.h +++ b/src/opengl/gl2paintengineex/glgc_shader_source.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp index 0352d39..8858ae5 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h index c205022..6a1b3c0 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp index b4591b2..937201c 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache.cpp +++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h index 346ea13..357315c 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache_p.h +++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglpexshadermanager.cpp b/src/opengl/gl2paintengineex/qglpexshadermanager.cpp index e460e08..8856c42 100644 --- a/src/opengl/gl2paintengineex/qglpexshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglpexshadermanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglpexshadermanager_p.h b/src/opengl/gl2paintengineex/qglpexshadermanager_p.h index c8f47b2..4f9ecf4 100644 --- a/src/opengl/gl2paintengineex/qglpexshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglpexshadermanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglshader.cpp b/src/opengl/gl2paintengineex/qglshader.cpp index 634be84..530c0d2 100644 --- a/src/opengl/gl2paintengineex/qglshader.cpp +++ b/src/opengl/gl2paintengineex/qglshader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qglshader_p.h b/src/opengl/gl2paintengineex/qglshader_p.h index 1625b84..0b4adf5 100644 --- a/src/opengl/gl2paintengineex/qglshader_p.h +++ b/src/opengl/gl2paintengineex/qglshader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index a74f044..3bbdcd4 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index ce66e4b..51d1bc5 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qegl.cpp b/src/opengl/qegl.cpp index 165a0f3..d455fbc 100644 --- a/src/opengl/qegl.cpp +++ b/src/opengl/qegl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qegl_p.h b/src/opengl/qegl_p.h index 76cb573..1baa1fb 100644 --- a/src/opengl/qegl_p.h +++ b/src/opengl/qegl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qegl_qws.cpp b/src/opengl/qegl_qws.cpp index 9135c53..c9401d9 100644 --- a/src/opengl/qegl_qws.cpp +++ b/src/opengl/qegl_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qegl_wince.cpp b/src/opengl/qegl_wince.cpp index dbec385..6e48e06 100644 --- a/src/opengl/qegl_wince.cpp +++ b/src/opengl/qegl_wince.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qegl_x11egl.cpp b/src/opengl/qegl_x11egl.cpp index 8efe7e7..5f3917f 100644 --- a/src/opengl/qegl_x11egl.cpp +++ b/src/opengl/qegl_x11egl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 2d90342..19f8758 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 01b1d6f..64728b6 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_cl_p.h b/src/opengl/qgl_cl_p.h index e514ff5..cc2b8c7 100644 --- a/src/opengl/qgl_cl_p.h +++ b/src/opengl/qgl_cl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 98c5710..680fafe 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_egl_p.h b/src/opengl/qgl_egl_p.h index 39f25e2..eb60f91 100644 --- a/src/opengl/qgl_egl_p.h +++ b/src/opengl/qgl_egl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index 314c659..3c0134a 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index b8bbeaf..049d846 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp index cb9aa89..669fa6f 100644 --- a/src/opengl/qgl_qws.cpp +++ b/src/opengl/qgl_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index bd8569a..1b91405 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_wince.cpp b/src/opengl/qgl_wince.cpp index cb51598..9676763 100644 --- a/src/opengl/qgl_wince.cpp +++ b/src/opengl/qgl_wince.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 28c34de..e616695 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 480a2dc..d1e6574 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp index 02a2c13..f7807ed 100644 --- a/src/opengl/qglcolormap.cpp +++ b/src/opengl/qglcolormap.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index 6bdb0c4..d4d9390d 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index 8357cf9..49e8352 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index a0517f5..dbb9fbb 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index fb22272..f8b5580 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index a9e1b2f..3c30b47 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpaintdevice_qws.cpp b/src/opengl/qglpaintdevice_qws.cpp index 18905ab..62b4a66 100644 --- a/src/opengl/qglpaintdevice_qws.cpp +++ b/src/opengl/qglpaintdevice_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpaintdevice_qws_p.h b/src/opengl/qglpaintdevice_qws_p.h index 369de7f..77abb62 100644 --- a/src/opengl/qglpaintdevice_qws_p.h +++ b/src/opengl/qglpaintdevice_qws_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 5f74f26..fb23725 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index 0131570..1815ef2 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp index 964efa2..4b195d8 100644 --- a/src/opengl/qglpixelbuffer_egl.cpp +++ b/src/opengl/qglpixelbuffer_egl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer_mac.mm b/src/opengl/qglpixelbuffer_mac.mm index 14941ab..dbb073b 100644 --- a/src/opengl/qglpixelbuffer_mac.mm +++ b/src/opengl/qglpixelbuffer_mac.mm @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h index abdf838..7464569 100644 --- a/src/opengl/qglpixelbuffer_p.h +++ b/src/opengl/qglpixelbuffer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer_win.cpp b/src/opengl/qglpixelbuffer_win.cpp index e3228cc..40bf477 100644 --- a/src/opengl/qglpixelbuffer_win.cpp +++ b/src/opengl/qglpixelbuffer_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp index 0804503..a76fbfe 100644 --- a/src/opengl/qglpixelbuffer_x11.cpp +++ b/src/opengl/qglpixelbuffer_x11.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index ff23948..ba21079 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglpixmapfilter_p.h b/src/opengl/qglpixmapfilter_p.h index dc2eea6..d85e36b 100644 --- a/src/opengl/qglpixmapfilter_p.h +++ b/src/opengl/qglpixmapfilter_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglscreen_qws.cpp b/src/opengl/qglscreen_qws.cpp index a488b97..ad7720f 100644 --- a/src/opengl/qglscreen_qws.cpp +++ b/src/opengl/qglscreen_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglscreen_qws.h b/src/opengl/qglscreen_qws.h index d045bea..c007c3a 100644 --- a/src/opengl/qglscreen_qws.h +++ b/src/opengl/qglscreen_qws.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglwindowsurface_qws.cpp b/src/opengl/qglwindowsurface_qws.cpp index 40e549b..5a8bf0f 100644 --- a/src/opengl/qglwindowsurface_qws.cpp +++ b/src/opengl/qglwindowsurface_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qglwindowsurface_qws_p.h b/src/opengl/qglwindowsurface_qws_p.h index 740f879..bcfda44 100644 --- a/src/opengl/qglwindowsurface_qws_p.h +++ b/src/opengl/qglwindowsurface_qws_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp index ce8ad7a..99b633d 100644 --- a/src/opengl/qgraphicssystem_gl.cpp +++ b/src/opengl/qgraphicssystem_gl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qgraphicssystem_gl_p.h b/src/opengl/qgraphicssystem_gl_p.h index 9e36cdf..0885e3b 100644 --- a/src/opengl/qgraphicssystem_gl_p.h +++ b/src/opengl/qgraphicssystem_gl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 976a021..a60bce7 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h index ad5d56b..27ab70b 100644 --- a/src/opengl/qpaintengine_opengl_p.h +++ b/src/opengl/qpaintengine_opengl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 5d668cd..64b5549 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index 63703fd..c0d61fe 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 3dd3064..caa6da5 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index 0194378..344ba40 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h index ecf0bf8..7afa1c1 100644 --- a/src/opengl/util/fragmentprograms_p.h +++ b/src/opengl/util/fragmentprograms_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp index de2450d..3f859ef 100644 --- a/src/opengl/util/generator.cpp +++ b/src/opengl/util/generator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtOpenGL 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/main.cpp b/src/plugins/accessible/compat/main.cpp index fae5595..3a67365 100644 --- a/src/plugins/accessible/compat/main.cpp +++ b/src/plugins/accessible/compat/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/q3complexwidgets.cpp b/src/plugins/accessible/compat/q3complexwidgets.cpp index ab7e698..fb02cfc 100644 --- a/src/plugins/accessible/compat/q3complexwidgets.cpp +++ b/src/plugins/accessible/compat/q3complexwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/q3complexwidgets.h b/src/plugins/accessible/compat/q3complexwidgets.h index e434a16..78854cd 100644 --- a/src/plugins/accessible/compat/q3complexwidgets.h +++ b/src/plugins/accessible/compat/q3complexwidgets.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/q3simplewidgets.cpp b/src/plugins/accessible/compat/q3simplewidgets.cpp index 686e235..e6eab21 100644 --- a/src/plugins/accessible/compat/q3simplewidgets.cpp +++ b/src/plugins/accessible/compat/q3simplewidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/q3simplewidgets.h b/src/plugins/accessible/compat/q3simplewidgets.h index 5719e3a..ad5efd2 100644 --- a/src/plugins/accessible/compat/q3simplewidgets.h +++ b/src/plugins/accessible/compat/q3simplewidgets.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/qaccessiblecompat.cpp b/src/plugins/accessible/compat/qaccessiblecompat.cpp index 28637a3..e8e943f 100644 --- a/src/plugins/accessible/compat/qaccessiblecompat.cpp +++ b/src/plugins/accessible/compat/qaccessiblecompat.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/compat/qaccessiblecompat.h b/src/plugins/accessible/compat/qaccessiblecompat.h index 5417e4c..63663c3 100644 --- a/src/plugins/accessible/compat/qaccessiblecompat.h +++ b/src/plugins/accessible/compat/qaccessiblecompat.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index 68ca02b..c8daecf 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h index d5666a7..b985a09 100644 --- a/src/plugins/accessible/widgets/complexwidgets.h +++ b/src/plugins/accessible/widgets/complexwidgets.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp index 9c0806e..3078eb8 100644 --- a/src/plugins/accessible/widgets/main.cpp +++ b/src/plugins/accessible/widgets/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp index f9be483..7304065 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp +++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h index 748e6a3..95b9781 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.h +++ b/src/plugins/accessible/widgets/qaccessiblemenu.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index b2b3f9e..e79bf6b 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h index 648ed78..6dc19f8 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.h +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp index 9297d6e..a1cac3d 100644 --- a/src/plugins/accessible/widgets/rangecontrols.cpp +++ b/src/plugins/accessible/widgets/rangecontrols.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/rangecontrols.h b/src/plugins/accessible/widgets/rangecontrols.h index aea91e1..042c3f9 100644 --- a/src/plugins/accessible/widgets/rangecontrols.h +++ b/src/plugins/accessible/widgets/rangecontrols.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index e629505..d46a2e1 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/accessible/widgets/simplewidgets.h b/src/plugins/accessible/widgets/simplewidgets.h index d4552e3..9326e3b 100644 --- a/src/plugins/accessible/widgets/simplewidgets.h +++ b/src/plugins/accessible/widgets/simplewidgets.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp index 17c5cbf..ddd471d 100644 --- a/src/plugins/codecs/cn/main.cpp +++ b/src/plugins/codecs/cn/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp index a9e00d3..43b8b5e 100644 --- a/src/plugins/codecs/cn/qgb18030codec.cpp +++ b/src/plugins/codecs/cn/qgb18030codec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h index 09a322d..a2126a2 100644 --- a/src/plugins/codecs/cn/qgb18030codec.h +++ b/src/plugins/codecs/cn/qgb18030codec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp index e82f574..32e5daf 100644 --- a/src/plugins/codecs/jp/main.cpp +++ b/src/plugins/codecs/jp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp index 447b6ef..ed3df21 100644 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp +++ b/src/plugins/codecs/jp/qeucjpcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h index bce3522..bb54da5 100644 --- a/src/plugins/codecs/jp/qeucjpcodec.h +++ b/src/plugins/codecs/jp/qeucjpcodec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp index 9f027b7..2995e0d 100644 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp +++ b/src/plugins/codecs/jp/qfontjpcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h index 8578638..ac475ba 100644 --- a/src/plugins/codecs/jp/qfontjpcodec.h +++ b/src/plugins/codecs/jp/qfontjpcodec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp index 6dd90da..fc3d480 100644 --- a/src/plugins/codecs/jp/qjiscodec.cpp +++ b/src/plugins/codecs/jp/qjiscodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h index dcfdf5e..9b699b1 100644 --- a/src/plugins/codecs/jp/qjiscodec.h +++ b/src/plugins/codecs/jp/qjiscodec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp index 4028b68..5665a4b 100644 --- a/src/plugins/codecs/jp/qjpunicode.cpp +++ b/src/plugins/codecs/jp/qjpunicode.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h index 5fa2c1d..2fa1a24 100644 --- a/src/plugins/codecs/jp/qjpunicode.h +++ b/src/plugins/codecs/jp/qjpunicode.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp index 204571f..270a8cb 100644 --- a/src/plugins/codecs/jp/qsjiscodec.cpp +++ b/src/plugins/codecs/jp/qsjiscodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h index cba02b4..0989e9b 100644 --- a/src/plugins/codecs/jp/qsjiscodec.h +++ b/src/plugins/codecs/jp/qsjiscodec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h index 317f967..3a4b4f7 100644 --- a/src/plugins/codecs/kr/cp949codetbl.h +++ b/src/plugins/codecs/kr/cp949codetbl.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp index bfae5fc..3e43769 100644 --- a/src/plugins/codecs/kr/main.cpp +++ b/src/plugins/codecs/kr/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp index d867c1c..4411d7c 100644 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp +++ b/src/plugins/codecs/kr/qeuckrcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h index 78ae554..ffe0e3b 100644 --- a/src/plugins/codecs/kr/qeuckrcodec.h +++ b/src/plugins/codecs/kr/qeuckrcodec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp index 89f9f7e..463249f 100644 --- a/src/plugins/codecs/tw/main.cpp +++ b/src/plugins/codecs/tw/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp index fc1886e..0c6ae77 100644 --- a/src/plugins/codecs/tw/qbig5codec.cpp +++ b/src/plugins/codecs/tw/qbig5codec.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h index 985c81d..781be56 100644 --- a/src/plugins/codecs/tw/qbig5codec.h +++ b/src/plugins/codecs/tw/qbig5codec.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/decorations/default/main.cpp b/src/plugins/decorations/default/main.cpp index 5d090d8..7d2f9ce 100644 --- a/src/plugins/decorations/default/main.cpp +++ b/src/plugins/decorations/default/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/decorations/styled/main.cpp b/src/plugins/decorations/styled/main.cpp index ab5cb86..b7b2e28 100644 --- a/src/plugins/decorations/styled/main.cpp +++ b/src/plugins/decorations/styled/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/decorations/windows/main.cpp b/src/plugins/decorations/windows/main.cpp index 6d935bb..63404dc 100644 --- a/src/plugins/decorations/windows/main.cpp +++ b/src/plugins/decorations/windows/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp index 0f4a870..f4fa817 100644 --- a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp +++ b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h index 37f2872..ab2d10b 100644 --- a/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h +++ b/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp b/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp index c1a22fa..07978d4 100644 --- a/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp +++ b/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp index cd19f69..6e21e14 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h index 234a266..a44a4fc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp index f4d9b46..f7da344 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h index e81a4ba..a8cff79 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index edbfa7d..88d3d71 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h index a11064b..b2e2a31 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 3b6ea80..d6fb9a8 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 3c2cefa..f876232 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index 9f5c055..7a9806a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h index 32676f8..90965f0 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index fd6f48a..bba20fe 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index a1e93c6..4751dc5 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp index ca863d2..8a73d5c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp index ef208af..e8b2cde 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.h index 9e2791c..eb9ec22 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/hybrid/hybridplugin.cpp b/src/plugins/gfxdrivers/hybrid/hybridplugin.cpp index 803c4fc..faccb7c 100644 --- a/src/plugins/gfxdrivers/hybrid/hybridplugin.cpp +++ b/src/plugins/gfxdrivers/hybrid/hybridplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/hybrid/hybridscreen.cpp b/src/plugins/gfxdrivers/hybrid/hybridscreen.cpp index 3a40b4c..dd9a596 100644 --- a/src/plugins/gfxdrivers/hybrid/hybridscreen.cpp +++ b/src/plugins/gfxdrivers/hybrid/hybridscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/hybrid/hybridscreen.h b/src/plugins/gfxdrivers/hybrid/hybridscreen.h index d463e12..a252bcd 100644 --- a/src/plugins/gfxdrivers/hybrid/hybridscreen.h +++ b/src/plugins/gfxdrivers/hybrid/hybridscreen.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/hybrid/hybridsurface.cpp b/src/plugins/gfxdrivers/hybrid/hybridsurface.cpp index 7281328..5d1567a 100644 --- a/src/plugins/gfxdrivers/hybrid/hybridsurface.cpp +++ b/src/plugins/gfxdrivers/hybrid/hybridsurface.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/hybrid/hybridsurface.h b/src/plugins/gfxdrivers/hybrid/hybridsurface.h index d9be3b6..b93c978 100644 --- a/src/plugins/gfxdrivers/hybrid/hybridsurface.h +++ b/src/plugins/gfxdrivers/hybrid/hybridsurface.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/linuxfb/main.cpp b/src/plugins/gfxdrivers/linuxfb/main.cpp index a4bcbbf..52b747e 100644 --- a/src/plugins/gfxdrivers/linuxfb/main.cpp +++ b/src/plugins/gfxdrivers/linuxfb/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c index 5c37253..350a9cb 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h index 16872a9..c759675 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h index d6c42a6..064ac62 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c index f46448e..01ed046 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index b0ffbf1..f3960ea 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h index ee27e36..ca82a67 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp index e9748d6..afc0620 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp index e7f4987..25d9833 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h index 8bec796..dae1976 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/qvfb/main.cpp b/src/plugins/gfxdrivers/qvfb/main.cpp index e51e2af..b7dadb7 100644 --- a/src/plugins/gfxdrivers/qvfb/main.cpp +++ b/src/plugins/gfxdrivers/qvfb/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/transformed/main.cpp b/src/plugins/gfxdrivers/transformed/main.cpp index 34edce5..ab9004a 100644 --- a/src/plugins/gfxdrivers/transformed/main.cpp +++ b/src/plugins/gfxdrivers/transformed/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/vnc/main.cpp b/src/plugins/gfxdrivers/vnc/main.cpp index fe10a67..3a8d20e 100644 --- a/src/plugins/gfxdrivers/vnc/main.cpp +++ b/src/plugins/gfxdrivers/vnc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h index 6b2b315..4ddd549 100644 --- a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h +++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp index b7f03ba..e9cfdb6 100644 --- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp +++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h index 70ff067..71ea966 100644 --- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h +++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/graphicssystems/opengl/main.cpp b/src/plugins/graphicssystems/opengl/main.cpp index 063fcbf..5b3a2f5 100644 --- a/src/plugins/graphicssystems/opengl/main.cpp +++ b/src/plugins/graphicssystems/opengl/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index 96ebb91..1dbe529 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 7fdf81f..794bf3e 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h index 69e2d15..f44abfa 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/gif/main.cpp b/src/plugins/imageformats/gif/main.cpp index 075757b..347a543 100644 --- a/src/plugins/imageformats/gif/main.cpp +++ b/src/plugins/imageformats/gif/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index 495794e..733ad4a 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/gif/qgifhandler.h b/src/plugins/imageformats/gif/qgifhandler.h index c56c3ab..eb8fff1 100644 --- a/src/plugins/imageformats/gif/qgifhandler.h +++ b/src/plugins/imageformats/gif/qgifhandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/ico/main.cpp b/src/plugins/imageformats/ico/main.cpp index 5685c4e..c6e5b52 100644 --- a/src/plugins/imageformats/ico/main.cpp +++ b/src/plugins/imageformats/ico/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 299190b..d6ee9d4 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h index 0bba208..fe7150e 100644 --- a/src/plugins/imageformats/ico/qicohandler.h +++ b/src/plugins/imageformats/ico/qicohandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/jpeg/main.cpp b/src/plugins/imageformats/jpeg/main.cpp index e4e2892..5121a5d 100644 --- a/src/plugins/imageformats/jpeg/main.cpp +++ b/src/plugins/imageformats/jpeg/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index 6d0bc1f..e20f678 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.h b/src/plugins/imageformats/jpeg/qjpeghandler.h index 2a8debc..64b7969 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.h +++ b/src/plugins/imageformats/jpeg/qjpeghandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/mng/main.cpp b/src/plugins/imageformats/mng/main.cpp index 60936a7..2cb5561 100644 --- a/src/plugins/imageformats/mng/main.cpp +++ b/src/plugins/imageformats/mng/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/mng/qmnghandler.cpp b/src/plugins/imageformats/mng/qmnghandler.cpp index 19cc16d..fac86ed 100644 --- a/src/plugins/imageformats/mng/qmnghandler.cpp +++ b/src/plugins/imageformats/mng/qmnghandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h index 909be2d..6595173 100644 --- a/src/plugins/imageformats/mng/qmnghandler.h +++ b/src/plugins/imageformats/mng/qmnghandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/svg/main.cpp b/src/plugins/imageformats/svg/main.cpp index 978ae40..ab6d835 100644 --- a/src/plugins/imageformats/svg/main.cpp +++ b/src/plugins/imageformats/svg/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp index 41b247b..635c806 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.cpp +++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/svg/qsvgiohandler.h b/src/plugins/imageformats/svg/qsvgiohandler.h index a7a5528..83a5063 100644 --- a/src/plugins/imageformats/svg/qsvgiohandler.h +++ b/src/plugins/imageformats/svg/qsvgiohandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/tiff/main.cpp b/src/plugins/imageformats/tiff/main.cpp index f6590d4..955f874 100644 --- a/src/plugins/imageformats/tiff/main.cpp +++ b/src/plugins/imageformats/tiff/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index 518e6d1..4821e1c 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/imageformats/tiff/qtiffhandler.h b/src/plugins/imageformats/tiff/qtiffhandler.h index 0c0d9ef..93ad437 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.h +++ b/src/plugins/imageformats/tiff/qtiffhandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp index 730790e..e40f6c3 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h index d9a2294..6fd021f 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp index ca42d9d..dee84a3 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h index 0daea92..5c755d7 100644 --- a/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h +++ b/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.cpp b/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.cpp index 79cd298..d2c25c8 100644 --- a/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.cpp +++ b/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.h b/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.h index b5f599f..127c5a3 100644 --- a/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.h +++ b/src/plugins/kbddrivers/linuxis/linuxiskbddriverplugin.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp b/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp index 99b98b7..6818ac1 100644 --- a/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp +++ b/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.h b/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.h index 3211309..58916fa 100644 --- a/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.h +++ b/src/plugins/kbddrivers/linuxis/linuxiskbdhandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/sl5000/main.cpp b/src/plugins/kbddrivers/sl5000/main.cpp index 8986ebe..be51133 100644 --- a/src/plugins/kbddrivers/sl5000/main.cpp +++ b/src/plugins/kbddrivers/sl5000/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/usb/main.cpp b/src/plugins/kbddrivers/usb/main.cpp index 1d6ab89..4efdac0 100644 --- a/src/plugins/kbddrivers/usb/main.cpp +++ b/src/plugins/kbddrivers/usb/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/vr41xx/main.cpp b/src/plugins/kbddrivers/vr41xx/main.cpp index 9262fe7..c0c09c7 100644 --- a/src/plugins/kbddrivers/vr41xx/main.cpp +++ b/src/plugins/kbddrivers/vr41xx/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/kbddrivers/yopy/main.cpp b/src/plugins/kbddrivers/yopy/main.cpp index 766a263..ccca009 100644 --- a/src/plugins/kbddrivers/yopy/main.cpp +++ b/src/plugins/kbddrivers/yopy/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/bus/main.cpp b/src/plugins/mousedrivers/bus/main.cpp index f42657b..7b00ea0 100644 --- a/src/plugins/mousedrivers/bus/main.cpp +++ b/src/plugins/mousedrivers/bus/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp index 58afa2a..e19c6e1 100644 --- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp +++ b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h index cf7f0f0..c32a3a9 100644 --- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h +++ b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp b/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp index b7dc3b1..891fe40 100644 --- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp +++ b/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h b/src/plugins/mousedrivers/linuxis/linuxismousehandler.h index e94ac36..36c9e96 100644 --- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h +++ b/src/plugins/mousedrivers/linuxis/linuxismousehandler.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/linuxtp/main.cpp b/src/plugins/mousedrivers/linuxtp/main.cpp index a5cb6cb..fde96ff 100644 --- a/src/plugins/mousedrivers/linuxtp/main.cpp +++ b/src/plugins/mousedrivers/linuxtp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/pc/main.cpp b/src/plugins/mousedrivers/pc/main.cpp index cce6e86..5ced2d5 100644 --- a/src/plugins/mousedrivers/pc/main.cpp +++ b/src/plugins/mousedrivers/pc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/tslib/main.cpp b/src/plugins/mousedrivers/tslib/main.cpp index dba53a0..f5f674b 100644 --- a/src/plugins/mousedrivers/tslib/main.cpp +++ b/src/plugins/mousedrivers/tslib/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/vr41xx/main.cpp b/src/plugins/mousedrivers/vr41xx/main.cpp index 1ccf944..03e53c4 100644 --- a/src/plugins/mousedrivers/vr41xx/main.cpp +++ b/src/plugins/mousedrivers/vr41xx/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/mousedrivers/yopy/main.cpp b/src/plugins/mousedrivers/yopy/main.cpp index fa61bf8..0d5416e 100644 --- a/src/plugins/mousedrivers/yopy/main.cpp +++ b/src/plugins/mousedrivers/yopy/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp index 394c1f8..e0c290e 100644 --- a/src/plugins/script/qtdbus/main.cpp +++ b/src/plugins/script/qtdbus/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/script/qtdbus/main.h b/src/plugins/script/qtdbus/main.h index 1e14040..c11cbcb 100644 --- a/src/plugins/script/qtdbus/main.h +++ b/src/plugins/script/qtdbus/main.h @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/db2/main.cpp b/src/plugins/sqldrivers/db2/main.cpp index 1381820..b3ca5c4 100644 --- a/src/plugins/sqldrivers/db2/main.cpp +++ b/src/plugins/sqldrivers/db2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/ibase/main.cpp b/src/plugins/sqldrivers/ibase/main.cpp index 566f11f..6e608c2 100644 --- a/src/plugins/sqldrivers/ibase/main.cpp +++ b/src/plugins/sqldrivers/ibase/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 4557a28..a3f3003 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp index 1c47b21..524787b 100644 --- a/src/plugins/sqldrivers/oci/main.cpp +++ b/src/plugins/sqldrivers/oci/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/odbc/main.cpp b/src/plugins/sqldrivers/odbc/main.cpp index 9b4045d..22f111d 100644 --- a/src/plugins/sqldrivers/odbc/main.cpp +++ b/src/plugins/sqldrivers/odbc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index 968368e..7ab2b23 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/sqlite/smain.cpp b/src/plugins/sqldrivers/sqlite/smain.cpp index 47208e0..bfb47c8 100644 --- a/src/plugins/sqldrivers/sqlite/smain.cpp +++ b/src/plugins/sqldrivers/sqlite/smain.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/sqlite2/smain.cpp b/src/plugins/sqldrivers/sqlite2/smain.cpp index 1c5a19e..5b6a68d 100644 --- a/src/plugins/sqldrivers/sqlite2/smain.cpp +++ b/src/plugins/sqldrivers/sqlite2/smain.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp index de6f9ff..289d1f5 100644 --- a/src/plugins/sqldrivers/tds/main.cpp +++ b/src/plugins/sqldrivers/tds/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the plugins 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp index 89e1289..79ea56f 100644 --- a/src/qt3support/canvas/q3canvas.cpp +++ b/src/qt3support/canvas/q3canvas.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/canvas/q3canvas.h b/src/qt3support/canvas/q3canvas.h index 52d6d20..b1d2cf8 100644 --- a/src/qt3support/canvas/q3canvas.h +++ b/src/qt3support/canvas/q3canvas.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp index 4874b6d..e8e61aa 100644 --- a/src/qt3support/dialogs/q3filedialog.cpp +++ b/src/qt3support/dialogs/q3filedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3filedialog.h b/src/qt3support/dialogs/q3filedialog.h index c0a64cc..2c05b96 100644 --- a/src/qt3support/dialogs/q3filedialog.h +++ b/src/qt3support/dialogs/q3filedialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3filedialog_mac.cpp b/src/qt3support/dialogs/q3filedialog_mac.cpp index f1c749ec..8185f2d 100644 --- a/src/qt3support/dialogs/q3filedialog_mac.cpp +++ b/src/qt3support/dialogs/q3filedialog_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3filedialog_win.cpp b/src/qt3support/dialogs/q3filedialog_win.cpp index 1be797a..639071d 100644 --- a/src/qt3support/dialogs/q3filedialog_win.cpp +++ b/src/qt3support/dialogs/q3filedialog_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3progressdialog.cpp b/src/qt3support/dialogs/q3progressdialog.cpp index 3c9ccfd..0c0a992 100644 --- a/src/qt3support/dialogs/q3progressdialog.cpp +++ b/src/qt3support/dialogs/q3progressdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3progressdialog.h b/src/qt3support/dialogs/q3progressdialog.h index 4a4bc80..8580cc1 100644 --- a/src/qt3support/dialogs/q3progressdialog.h +++ b/src/qt3support/dialogs/q3progressdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3tabdialog.cpp b/src/qt3support/dialogs/q3tabdialog.cpp index 6242dce..5437429 100644 --- a/src/qt3support/dialogs/q3tabdialog.cpp +++ b/src/qt3support/dialogs/q3tabdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3tabdialog.h b/src/qt3support/dialogs/q3tabdialog.h index 3645df1..f66c44b 100644 --- a/src/qt3support/dialogs/q3tabdialog.h +++ b/src/qt3support/dialogs/q3tabdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3wizard.cpp b/src/qt3support/dialogs/q3wizard.cpp index 7a4af47..6d72a44 100644 --- a/src/qt3support/dialogs/q3wizard.cpp +++ b/src/qt3support/dialogs/q3wizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/dialogs/q3wizard.h b/src/qt3support/dialogs/q3wizard.h index 2d74a7e..19f3c1a 100644 --- a/src/qt3support/dialogs/q3wizard.h +++ b/src/qt3support/dialogs/q3wizard.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3iconview.cpp b/src/qt3support/itemviews/q3iconview.cpp index d1a9c1e..720f655 100644 --- a/src/qt3support/itemviews/q3iconview.cpp +++ b/src/qt3support/itemviews/q3iconview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3iconview.h b/src/qt3support/itemviews/q3iconview.h index d35a895..ea142e8 100644 --- a/src/qt3support/itemviews/q3iconview.h +++ b/src/qt3support/itemviews/q3iconview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3listbox.cpp b/src/qt3support/itemviews/q3listbox.cpp index da1b6f9..5a6e792 100644 --- a/src/qt3support/itemviews/q3listbox.cpp +++ b/src/qt3support/itemviews/q3listbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3listbox.h b/src/qt3support/itemviews/q3listbox.h index 376dd65..e01f4a9 100644 --- a/src/qt3support/itemviews/q3listbox.h +++ b/src/qt3support/itemviews/q3listbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3listview.cpp b/src/qt3support/itemviews/q3listview.cpp index 1effdaa..38b880c 100644 --- a/src/qt3support/itemviews/q3listview.cpp +++ b/src/qt3support/itemviews/q3listview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3listview.h b/src/qt3support/itemviews/q3listview.h index 8a1ceda..7937673 100644 --- a/src/qt3support/itemviews/q3listview.h +++ b/src/qt3support/itemviews/q3listview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp index 658b0ad..4e8752c 100644 --- a/src/qt3support/itemviews/q3table.cpp +++ b/src/qt3support/itemviews/q3table.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/itemviews/q3table.h b/src/qt3support/itemviews/q3table.h index 6331ca4..0a58bd6 100644 --- a/src/qt3support/itemviews/q3table.h +++ b/src/qt3support/itemviews/q3table.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp index c53f2ff..9882c0d 100644 --- a/src/qt3support/network/q3dns.cpp +++ b/src/qt3support/network/q3dns.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3dns.h b/src/qt3support/network/q3dns.h index bfe3e8b..7bd368c 100644 --- a/src/qt3support/network/q3dns.h +++ b/src/qt3support/network/q3dns.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3ftp.cpp b/src/qt3support/network/q3ftp.cpp index 5ab84cc..e135703 100644 --- a/src/qt3support/network/q3ftp.cpp +++ b/src/qt3support/network/q3ftp.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3ftp.h b/src/qt3support/network/q3ftp.h index 685a6af..690fcfd 100644 --- a/src/qt3support/network/q3ftp.h +++ b/src/qt3support/network/q3ftp.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp index f1590a6..84c2116 100644 --- a/src/qt3support/network/q3http.cpp +++ b/src/qt3support/network/q3http.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h index 95be15d..0f6600c 100644 --- a/src/qt3support/network/q3http.h +++ b/src/qt3support/network/q3http.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3localfs.cpp b/src/qt3support/network/q3localfs.cpp index 619d4c2..3d9e9e0 100644 --- a/src/qt3support/network/q3localfs.cpp +++ b/src/qt3support/network/q3localfs.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3localfs.h b/src/qt3support/network/q3localfs.h index 9ce4f8a..0450738 100644 --- a/src/qt3support/network/q3localfs.h +++ b/src/qt3support/network/q3localfs.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp index e3cbeb9..3bc0c8f 100644 --- a/src/qt3support/network/q3network.cpp +++ b/src/qt3support/network/q3network.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3network.h b/src/qt3support/network/q3network.h index b363b74..eac6e3e 100644 --- a/src/qt3support/network/q3network.h +++ b/src/qt3support/network/q3network.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3networkprotocol.cpp b/src/qt3support/network/q3networkprotocol.cpp index d02f4ea..df9a1dc 100644 --- a/src/qt3support/network/q3networkprotocol.cpp +++ b/src/qt3support/network/q3networkprotocol.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3networkprotocol.h b/src/qt3support/network/q3networkprotocol.h index efe2ecf..e06cd94 100644 --- a/src/qt3support/network/q3networkprotocol.h +++ b/src/qt3support/network/q3networkprotocol.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3serversocket.cpp b/src/qt3support/network/q3serversocket.cpp index f61b652..2b4d323 100644 --- a/src/qt3support/network/q3serversocket.cpp +++ b/src/qt3support/network/q3serversocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3serversocket.h b/src/qt3support/network/q3serversocket.h index e26e1a5..2efb6fb 100644 --- a/src/qt3support/network/q3serversocket.h +++ b/src/qt3support/network/q3serversocket.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socket.cpp b/src/qt3support/network/q3socket.cpp index 01585f0..62e2aba 100644 --- a/src/qt3support/network/q3socket.cpp +++ b/src/qt3support/network/q3socket.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socket.h b/src/qt3support/network/q3socket.h index 7922406..801df7a 100644 --- a/src/qt3support/network/q3socket.h +++ b/src/qt3support/network/q3socket.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socketdevice.cpp b/src/qt3support/network/q3socketdevice.cpp index 7e53163..0a7ffca 100644 --- a/src/qt3support/network/q3socketdevice.cpp +++ b/src/qt3support/network/q3socketdevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socketdevice.h b/src/qt3support/network/q3socketdevice.h index fde591d..47659e6 100644 --- a/src/qt3support/network/q3socketdevice.h +++ b/src/qt3support/network/q3socketdevice.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socketdevice_unix.cpp b/src/qt3support/network/q3socketdevice_unix.cpp index e83a789..b5b3cae 100644 --- a/src/qt3support/network/q3socketdevice_unix.cpp +++ b/src/qt3support/network/q3socketdevice_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp index f2d034b..addc250 100644 --- a/src/qt3support/network/q3socketdevice_win.cpp +++ b/src/qt3support/network/q3socketdevice_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3url.cpp b/src/qt3support/network/q3url.cpp index fc2fdb2..9073d3e 100644 --- a/src/qt3support/network/q3url.cpp +++ b/src/qt3support/network/q3url.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3url.h b/src/qt3support/network/q3url.h index 61c25b1..033a998 100644 --- a/src/qt3support/network/q3url.h +++ b/src/qt3support/network/q3url.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3urloperator.cpp b/src/qt3support/network/q3urloperator.cpp index 3f334a8..86e91b2 100644 --- a/src/qt3support/network/q3urloperator.cpp +++ b/src/qt3support/network/q3urloperator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/network/q3urloperator.h b/src/qt3support/network/q3urloperator.h index 071e506..3111d60 100644 --- a/src/qt3support/network/q3urloperator.h +++ b/src/qt3support/network/q3urloperator.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3accel.cpp b/src/qt3support/other/q3accel.cpp index a570a70..7551272 100644 --- a/src/qt3support/other/q3accel.cpp +++ b/src/qt3support/other/q3accel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3accel.h b/src/qt3support/other/q3accel.h index 36adfa7..518d357 100644 --- a/src/qt3support/other/q3accel.h +++ b/src/qt3support/other/q3accel.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3boxlayout.cpp b/src/qt3support/other/q3boxlayout.cpp index cc830bf..e0753ca 100644 --- a/src/qt3support/other/q3boxlayout.cpp +++ b/src/qt3support/other/q3boxlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3boxlayout.h b/src/qt3support/other/q3boxlayout.h index f0b527a..c542eb1 100644 --- a/src/qt3support/other/q3boxlayout.h +++ b/src/qt3support/other/q3boxlayout.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3dragobject.cpp b/src/qt3support/other/q3dragobject.cpp index fb57220..dcaba87 100644 --- a/src/qt3support/other/q3dragobject.cpp +++ b/src/qt3support/other/q3dragobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3dragobject.h b/src/qt3support/other/q3dragobject.h index 10645c8..cd1b2a8 100644 --- a/src/qt3support/other/q3dragobject.h +++ b/src/qt3support/other/q3dragobject.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3dropsite.cpp b/src/qt3support/other/q3dropsite.cpp index ef4ae29..c5001c7 100644 --- a/src/qt3support/other/q3dropsite.cpp +++ b/src/qt3support/other/q3dropsite.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3dropsite.h b/src/qt3support/other/q3dropsite.h index 211a6a9..2a5ac44 100644 --- a/src/qt3support/other/q3dropsite.h +++ b/src/qt3support/other/q3dropsite.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3gridlayout.h b/src/qt3support/other/q3gridlayout.h index 521920d..624843a 100644 --- a/src/qt3support/other/q3gridlayout.h +++ b/src/qt3support/other/q3gridlayout.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3membuf.cpp b/src/qt3support/other/q3membuf.cpp index 4305bb7..7709313 100644 --- a/src/qt3support/other/q3membuf.cpp +++ b/src/qt3support/other/q3membuf.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3membuf_p.h b/src/qt3support/other/q3membuf_p.h index 29a74f9..2a1e088 100644 --- a/src/qt3support/other/q3membuf_p.h +++ b/src/qt3support/other/q3membuf_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3mimefactory.cpp b/src/qt3support/other/q3mimefactory.cpp index 3fc3f61..92e320f 100644 --- a/src/qt3support/other/q3mimefactory.cpp +++ b/src/qt3support/other/q3mimefactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3mimefactory.h b/src/qt3support/other/q3mimefactory.h index e21f63b..9e36301 100644 --- a/src/qt3support/other/q3mimefactory.h +++ b/src/qt3support/other/q3mimefactory.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3polygonscanner.cpp b/src/qt3support/other/q3polygonscanner.cpp index da1af1e..36920f1 100644 --- a/src/qt3support/other/q3polygonscanner.cpp +++ b/src/qt3support/other/q3polygonscanner.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3polygonscanner.h b/src/qt3support/other/q3polygonscanner.h index 7071825..ad2f947 100644 --- a/src/qt3support/other/q3polygonscanner.h +++ b/src/qt3support/other/q3polygonscanner.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3process.cpp b/src/qt3support/other/q3process.cpp index 6eac812..a951bb2 100644 --- a/src/qt3support/other/q3process.cpp +++ b/src/qt3support/other/q3process.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3process.h b/src/qt3support/other/q3process.h index ac28390..d885e68 100644 --- a/src/qt3support/other/q3process.h +++ b/src/qt3support/other/q3process.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3process_unix.cpp b/src/qt3support/other/q3process_unix.cpp index 098c581..7ff3119 100644 --- a/src/qt3support/other/q3process_unix.cpp +++ b/src/qt3support/other/q3process_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/q3process_win.cpp b/src/qt3support/other/q3process_win.cpp index 3c862ee..57956c6 100644 --- a/src/qt3support/other/q3process_win.cpp +++ b/src/qt3support/other/q3process_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/qiconset.h b/src/qt3support/other/qiconset.h index 5bfc902..4673150 100644 --- a/src/qt3support/other/qiconset.h +++ b/src/qt3support/other/qiconset.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/other/qt_compat_pch.h b/src/qt3support/other/qt_compat_pch.h index 2b03003..0c91009 100644 --- a/src/qt3support/other/qt_compat_pch.h +++ b/src/qt3support/other/qt_compat_pch.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3paintdevicemetrics.cpp b/src/qt3support/painting/q3paintdevicemetrics.cpp index 440d5f2..d764c69 100644 --- a/src/qt3support/painting/q3paintdevicemetrics.cpp +++ b/src/qt3support/painting/q3paintdevicemetrics.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3paintdevicemetrics.h b/src/qt3support/painting/q3paintdevicemetrics.h index 931038e..14e18e9 100644 --- a/src/qt3support/painting/q3paintdevicemetrics.h +++ b/src/qt3support/painting/q3paintdevicemetrics.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3paintengine_svg.cpp b/src/qt3support/painting/q3paintengine_svg.cpp index 95528e8..02648ea 100644 --- a/src/qt3support/painting/q3paintengine_svg.cpp +++ b/src/qt3support/painting/q3paintengine_svg.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3paintengine_svg_p.h b/src/qt3support/painting/q3paintengine_svg_p.h index 6ce1d1f..da07dc1 100644 --- a/src/qt3support/painting/q3paintengine_svg_p.h +++ b/src/qt3support/painting/q3paintengine_svg_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3painter.cpp b/src/qt3support/painting/q3painter.cpp index 0b623f4..5d666f4 100644 --- a/src/qt3support/painting/q3painter.cpp +++ b/src/qt3support/painting/q3painter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3painter.h b/src/qt3support/painting/q3painter.h index 6fd17cb..97f3d12 100644 --- a/src/qt3support/painting/q3painter.h +++ b/src/qt3support/painting/q3painter.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3picture.cpp b/src/qt3support/painting/q3picture.cpp index c2aae07..ad573c8 100644 --- a/src/qt3support/painting/q3picture.cpp +++ b/src/qt3support/painting/q3picture.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3picture.h b/src/qt3support/painting/q3picture.h index cb85bef..cf7c3b0 100644 --- a/src/qt3support/painting/q3picture.h +++ b/src/qt3support/painting/q3picture.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3pointarray.cpp b/src/qt3support/painting/q3pointarray.cpp index 99a93fc..0235159 100644 --- a/src/qt3support/painting/q3pointarray.cpp +++ b/src/qt3support/painting/q3pointarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/painting/q3pointarray.h b/src/qt3support/painting/q3pointarray.h index 5022b02..7084d2b 100644 --- a/src/qt3support/painting/q3pointarray.h +++ b/src/qt3support/painting/q3pointarray.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3databrowser.cpp b/src/qt3support/sql/q3databrowser.cpp index fd20f66..af32b1e 100644 --- a/src/qt3support/sql/q3databrowser.cpp +++ b/src/qt3support/sql/q3databrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3databrowser.h b/src/qt3support/sql/q3databrowser.h index 5727a63..ade945a 100644 --- a/src/qt3support/sql/q3databrowser.h +++ b/src/qt3support/sql/q3databrowser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp index 559abaf..f81ed47 100644 --- a/src/qt3support/sql/q3datatable.cpp +++ b/src/qt3support/sql/q3datatable.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3datatable.h b/src/qt3support/sql/q3datatable.h index bbfd01c..f975759 100644 --- a/src/qt3support/sql/q3datatable.h +++ b/src/qt3support/sql/q3datatable.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3dataview.cpp b/src/qt3support/sql/q3dataview.cpp index fb44996..58ab517 100644 --- a/src/qt3support/sql/q3dataview.cpp +++ b/src/qt3support/sql/q3dataview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3dataview.h b/src/qt3support/sql/q3dataview.h index f1b29d1..316f5a7 100644 --- a/src/qt3support/sql/q3dataview.h +++ b/src/qt3support/sql/q3dataview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3editorfactory.cpp b/src/qt3support/sql/q3editorfactory.cpp index e5d97c7..28d49e3 100644 --- a/src/qt3support/sql/q3editorfactory.cpp +++ b/src/qt3support/sql/q3editorfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3editorfactory.h b/src/qt3support/sql/q3editorfactory.h index 476b683..b3f607a 100644 --- a/src/qt3support/sql/q3editorfactory.h +++ b/src/qt3support/sql/q3editorfactory.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlcursor.cpp b/src/qt3support/sql/q3sqlcursor.cpp index 5bc23c1..0bb591e 100644 --- a/src/qt3support/sql/q3sqlcursor.cpp +++ b/src/qt3support/sql/q3sqlcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlcursor.h b/src/qt3support/sql/q3sqlcursor.h index 9544fb5..b62c0ad 100644 --- a/src/qt3support/sql/q3sqlcursor.h +++ b/src/qt3support/sql/q3sqlcursor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqleditorfactory.cpp b/src/qt3support/sql/q3sqleditorfactory.cpp index 5d71ad7..85bc873 100644 --- a/src/qt3support/sql/q3sqleditorfactory.cpp +++ b/src/qt3support/sql/q3sqleditorfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqleditorfactory.h b/src/qt3support/sql/q3sqleditorfactory.h index 803d0eb..7354269 100644 --- a/src/qt3support/sql/q3sqleditorfactory.h +++ b/src/qt3support/sql/q3sqleditorfactory.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlfieldinfo.h b/src/qt3support/sql/q3sqlfieldinfo.h index e2b4db3..4efe2ca 100644 --- a/src/qt3support/sql/q3sqlfieldinfo.h +++ b/src/qt3support/sql/q3sqlfieldinfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlform.cpp b/src/qt3support/sql/q3sqlform.cpp index f02e85e..fbc66cc 100644 --- a/src/qt3support/sql/q3sqlform.cpp +++ b/src/qt3support/sql/q3sqlform.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlform.h b/src/qt3support/sql/q3sqlform.h index b6b76b7..65c06ea 100644 --- a/src/qt3support/sql/q3sqlform.h +++ b/src/qt3support/sql/q3sqlform.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlmanager_p.cpp b/src/qt3support/sql/q3sqlmanager_p.cpp index 146be96..dd3709e 100644 --- a/src/qt3support/sql/q3sqlmanager_p.cpp +++ b/src/qt3support/sql/q3sqlmanager_p.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlmanager_p.h b/src/qt3support/sql/q3sqlmanager_p.h index b9ea5c7..e7a1582 100644 --- a/src/qt3support/sql/q3sqlmanager_p.h +++ b/src/qt3support/sql/q3sqlmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlpropertymap.cpp b/src/qt3support/sql/q3sqlpropertymap.cpp index 6e55af0..112cabd 100644 --- a/src/qt3support/sql/q3sqlpropertymap.cpp +++ b/src/qt3support/sql/q3sqlpropertymap.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlpropertymap.h b/src/qt3support/sql/q3sqlpropertymap.h index 88660b4..fba10ab 100644 --- a/src/qt3support/sql/q3sqlpropertymap.h +++ b/src/qt3support/sql/q3sqlpropertymap.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlrecordinfo.h b/src/qt3support/sql/q3sqlrecordinfo.h index a81988d..fdafd2f 100644 --- a/src/qt3support/sql/q3sqlrecordinfo.h +++ b/src/qt3support/sql/q3sqlrecordinfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlselectcursor.cpp b/src/qt3support/sql/q3sqlselectcursor.cpp index 7726f02..d225bda 100644 --- a/src/qt3support/sql/q3sqlselectcursor.cpp +++ b/src/qt3support/sql/q3sqlselectcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/sql/q3sqlselectcursor.h b/src/qt3support/sql/q3sqlselectcursor.h index 26103ba..82feb7c 100644 --- a/src/qt3support/sql/q3sqlselectcursor.h +++ b/src/qt3support/sql/q3sqlselectcursor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3multilineedit.cpp b/src/qt3support/text/q3multilineedit.cpp index 23b9776..3117718 100644 --- a/src/qt3support/text/q3multilineedit.cpp +++ b/src/qt3support/text/q3multilineedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3multilineedit.h b/src/qt3support/text/q3multilineedit.h index d97e548..472de42 100644 --- a/src/qt3support/text/q3multilineedit.h +++ b/src/qt3support/text/q3multilineedit.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp index e508001..1351162 100644 --- a/src/qt3support/text/q3richtext.cpp +++ b/src/qt3support/text/q3richtext.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3richtext_p.cpp b/src/qt3support/text/q3richtext_p.cpp index 6249f1b..0d742db 100644 --- a/src/qt3support/text/q3richtext_p.cpp +++ b/src/qt3support/text/q3richtext_p.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3richtext_p.h b/src/qt3support/text/q3richtext_p.h index 2248e52..d754632 100644 --- a/src/qt3support/text/q3richtext_p.h +++ b/src/qt3support/text/q3richtext_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3simplerichtext.cpp b/src/qt3support/text/q3simplerichtext.cpp index 5abf04a..869822d 100644 --- a/src/qt3support/text/q3simplerichtext.cpp +++ b/src/qt3support/text/q3simplerichtext.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3simplerichtext.h b/src/qt3support/text/q3simplerichtext.h index 450ce62..e053712 100644 --- a/src/qt3support/text/q3simplerichtext.h +++ b/src/qt3support/text/q3simplerichtext.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3stylesheet.cpp b/src/qt3support/text/q3stylesheet.cpp index ec39f5d..3766844 100644 --- a/src/qt3support/text/q3stylesheet.cpp +++ b/src/qt3support/text/q3stylesheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3stylesheet.h b/src/qt3support/text/q3stylesheet.h index d13b3e9..8d69282 100644 --- a/src/qt3support/text/q3stylesheet.h +++ b/src/qt3support/text/q3stylesheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3syntaxhighlighter.cpp b/src/qt3support/text/q3syntaxhighlighter.cpp index b81a529..c08f2ea 100644 --- a/src/qt3support/text/q3syntaxhighlighter.cpp +++ b/src/qt3support/text/q3syntaxhighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3syntaxhighlighter.h b/src/qt3support/text/q3syntaxhighlighter.h index 432ce74..8570483 100644 --- a/src/qt3support/text/q3syntaxhighlighter.h +++ b/src/qt3support/text/q3syntaxhighlighter.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3syntaxhighlighter_p.h b/src/qt3support/text/q3syntaxhighlighter_p.h index 73820c7..e73903f 100644 --- a/src/qt3support/text/q3syntaxhighlighter_p.h +++ b/src/qt3support/text/q3syntaxhighlighter_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textbrowser.cpp b/src/qt3support/text/q3textbrowser.cpp index 8f4280f..043ece7 100644 --- a/src/qt3support/text/q3textbrowser.cpp +++ b/src/qt3support/text/q3textbrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textbrowser.h b/src/qt3support/text/q3textbrowser.h index 888685b..55b0e01 100644 --- a/src/qt3support/text/q3textbrowser.h +++ b/src/qt3support/text/q3textbrowser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textedit.cpp b/src/qt3support/text/q3textedit.cpp index 7577dce..a72d0b2 100644 --- a/src/qt3support/text/q3textedit.cpp +++ b/src/qt3support/text/q3textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textedit.h b/src/qt3support/text/q3textedit.h index fae22b0..8656504 100644 --- a/src/qt3support/text/q3textedit.h +++ b/src/qt3support/text/q3textedit.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textstream.cpp b/src/qt3support/text/q3textstream.cpp index 15fa6b0..f41e6da 100644 --- a/src/qt3support/text/q3textstream.cpp +++ b/src/qt3support/text/q3textstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textstream.h b/src/qt3support/text/q3textstream.h index 1c6e6d2..3c79542 100644 --- a/src/qt3support/text/q3textstream.h +++ b/src/qt3support/text/q3textstream.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textview.cpp b/src/qt3support/text/q3textview.cpp index 2625e8e..8956bac 100644 --- a/src/qt3support/text/q3textview.cpp +++ b/src/qt3support/text/q3textview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/text/q3textview.h b/src/qt3support/text/q3textview.h index 2846b09..50b5e84 100644 --- a/src/qt3support/text/q3textview.h +++ b/src/qt3support/text/q3textview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3asciicache.h b/src/qt3support/tools/q3asciicache.h index 1e10bff..d4e93da 100644 --- a/src/qt3support/tools/q3asciicache.h +++ b/src/qt3support/tools/q3asciicache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3asciidict.h b/src/qt3support/tools/q3asciidict.h index 4a304ac..31aaa81 100644 --- a/src/qt3support/tools/q3asciidict.h +++ b/src/qt3support/tools/q3asciidict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3cache.h b/src/qt3support/tools/q3cache.h index 64f67c4..95c6a5e 100644 --- a/src/qt3support/tools/q3cache.h +++ b/src/qt3support/tools/q3cache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3cleanuphandler.h b/src/qt3support/tools/q3cleanuphandler.h index c249ae9..d34c94a 100644 --- a/src/qt3support/tools/q3cleanuphandler.h +++ b/src/qt3support/tools/q3cleanuphandler.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3cstring.cpp b/src/qt3support/tools/q3cstring.cpp index aa7f345..3c20244 100644 --- a/src/qt3support/tools/q3cstring.cpp +++ b/src/qt3support/tools/q3cstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3cstring.h b/src/qt3support/tools/q3cstring.h index c1897aa..058b179 100644 --- a/src/qt3support/tools/q3cstring.h +++ b/src/qt3support/tools/q3cstring.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3deepcopy.cpp b/src/qt3support/tools/q3deepcopy.cpp index c026021..0722237 100644 --- a/src/qt3support/tools/q3deepcopy.cpp +++ b/src/qt3support/tools/q3deepcopy.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3deepcopy.h b/src/qt3support/tools/q3deepcopy.h index 1b6d13f..67796ca 100644 --- a/src/qt3support/tools/q3deepcopy.h +++ b/src/qt3support/tools/q3deepcopy.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3dict.h b/src/qt3support/tools/q3dict.h index 23f7048..a5dd37f 100644 --- a/src/qt3support/tools/q3dict.h +++ b/src/qt3support/tools/q3dict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3garray.cpp b/src/qt3support/tools/q3garray.cpp index 66e41e1..7e60f8e4 100644 --- a/src/qt3support/tools/q3garray.cpp +++ b/src/qt3support/tools/q3garray.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3garray.h b/src/qt3support/tools/q3garray.h index 5b09203..52413c5 100644 --- a/src/qt3support/tools/q3garray.h +++ b/src/qt3support/tools/q3garray.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gcache.cpp b/src/qt3support/tools/q3gcache.cpp index 446bc42..98b20d9 100644 --- a/src/qt3support/tools/q3gcache.cpp +++ b/src/qt3support/tools/q3gcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gcache.h b/src/qt3support/tools/q3gcache.h index dcb9822..8f103e5 100644 --- a/src/qt3support/tools/q3gcache.h +++ b/src/qt3support/tools/q3gcache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gdict.cpp b/src/qt3support/tools/q3gdict.cpp index 6a21f81..38e9117 100644 --- a/src/qt3support/tools/q3gdict.cpp +++ b/src/qt3support/tools/q3gdict.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gdict.h b/src/qt3support/tools/q3gdict.h index 079c322..b528a23 100644 --- a/src/qt3support/tools/q3gdict.h +++ b/src/qt3support/tools/q3gdict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3glist.cpp b/src/qt3support/tools/q3glist.cpp index 50ff2c9..9b3bdc4 100644 --- a/src/qt3support/tools/q3glist.cpp +++ b/src/qt3support/tools/q3glist.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3glist.h b/src/qt3support/tools/q3glist.h index 5415838..d67861e 100644 --- a/src/qt3support/tools/q3glist.h +++ b/src/qt3support/tools/q3glist.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gvector.cpp b/src/qt3support/tools/q3gvector.cpp index 5da08b5..4b6d248 100644 --- a/src/qt3support/tools/q3gvector.cpp +++ b/src/qt3support/tools/q3gvector.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3gvector.h b/src/qt3support/tools/q3gvector.h index 8d0f3ac..61e9d00 100644 --- a/src/qt3support/tools/q3gvector.h +++ b/src/qt3support/tools/q3gvector.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3intcache.h b/src/qt3support/tools/q3intcache.h index 72cbf75..4b27825 100644 --- a/src/qt3support/tools/q3intcache.h +++ b/src/qt3support/tools/q3intcache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3intdict.h b/src/qt3support/tools/q3intdict.h index d91162c..5314aa8 100644 --- a/src/qt3support/tools/q3intdict.h +++ b/src/qt3support/tools/q3intdict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3memarray.h b/src/qt3support/tools/q3memarray.h index 4152a7b..59d89a6 100644 --- a/src/qt3support/tools/q3memarray.h +++ b/src/qt3support/tools/q3memarray.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3objectdict.h b/src/qt3support/tools/q3objectdict.h index 46ca741..249265e 100644 --- a/src/qt3support/tools/q3objectdict.h +++ b/src/qt3support/tools/q3objectdict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrcollection.cpp b/src/qt3support/tools/q3ptrcollection.cpp index 1d00a64..f5acc5e 100644 --- a/src/qt3support/tools/q3ptrcollection.cpp +++ b/src/qt3support/tools/q3ptrcollection.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrcollection.h b/src/qt3support/tools/q3ptrcollection.h index 4c8071d..da12d86 100644 --- a/src/qt3support/tools/q3ptrcollection.h +++ b/src/qt3support/tools/q3ptrcollection.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrdict.h b/src/qt3support/tools/q3ptrdict.h index f162e7c..370b4f3 100644 --- a/src/qt3support/tools/q3ptrdict.h +++ b/src/qt3support/tools/q3ptrdict.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrlist.h b/src/qt3support/tools/q3ptrlist.h index ffad698..26f0505 100644 --- a/src/qt3support/tools/q3ptrlist.h +++ b/src/qt3support/tools/q3ptrlist.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrqueue.h b/src/qt3support/tools/q3ptrqueue.h index bb3210c..e6be039 100644 --- a/src/qt3support/tools/q3ptrqueue.h +++ b/src/qt3support/tools/q3ptrqueue.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrstack.h b/src/qt3support/tools/q3ptrstack.h index f303003..4a08321 100644 --- a/src/qt3support/tools/q3ptrstack.h +++ b/src/qt3support/tools/q3ptrstack.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3ptrvector.h b/src/qt3support/tools/q3ptrvector.h index 85cf372..2ff10f7 100644 --- a/src/qt3support/tools/q3ptrvector.h +++ b/src/qt3support/tools/q3ptrvector.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3semaphore.cpp b/src/qt3support/tools/q3semaphore.cpp index 7fc39d7..c691d17 100644 --- a/src/qt3support/tools/q3semaphore.cpp +++ b/src/qt3support/tools/q3semaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3semaphore.h b/src/qt3support/tools/q3semaphore.h index ea643bd..c3ffe71 100644 --- a/src/qt3support/tools/q3semaphore.h +++ b/src/qt3support/tools/q3semaphore.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3shared.cpp b/src/qt3support/tools/q3shared.cpp index fc9d060..7b3ea51 100644 --- a/src/qt3support/tools/q3shared.cpp +++ b/src/qt3support/tools/q3shared.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3shared.h b/src/qt3support/tools/q3shared.h index 59bf808..a46f774 100644 --- a/src/qt3support/tools/q3shared.h +++ b/src/qt3support/tools/q3shared.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3signal.cpp b/src/qt3support/tools/q3signal.cpp index 7d555b4..6ecaae3 100644 --- a/src/qt3support/tools/q3signal.cpp +++ b/src/qt3support/tools/q3signal.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3signal.h b/src/qt3support/tools/q3signal.h index a28b6fb..ea53c74 100644 --- a/src/qt3support/tools/q3signal.h +++ b/src/qt3support/tools/q3signal.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3sortedlist.h b/src/qt3support/tools/q3sortedlist.h index d5347b4..35f47df 100644 --- a/src/qt3support/tools/q3sortedlist.h +++ b/src/qt3support/tools/q3sortedlist.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3strlist.h b/src/qt3support/tools/q3strlist.h index 5a020c7..fab628f 100644 --- a/src/qt3support/tools/q3strlist.h +++ b/src/qt3support/tools/q3strlist.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3strvec.h b/src/qt3support/tools/q3strvec.h index 0ce9cbd..fc288e3 100644 --- a/src/qt3support/tools/q3strvec.h +++ b/src/qt3support/tools/q3strvec.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3tl.h b/src/qt3support/tools/q3tl.h index 418f81c..8297ff9 100644 --- a/src/qt3support/tools/q3tl.h +++ b/src/qt3support/tools/q3tl.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3valuelist.h b/src/qt3support/tools/q3valuelist.h index 0803525..3cabff6 100644 --- a/src/qt3support/tools/q3valuelist.h +++ b/src/qt3support/tools/q3valuelist.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3valuestack.h b/src/qt3support/tools/q3valuestack.h index a3d6a98..e90385e 100644 --- a/src/qt3support/tools/q3valuestack.h +++ b/src/qt3support/tools/q3valuestack.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/tools/q3valuevector.h b/src/qt3support/tools/q3valuevector.h index 92eab43..32ed5e8 100644 --- a/src/qt3support/tools/q3valuevector.h +++ b/src/qt3support/tools/q3valuevector.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3action.cpp b/src/qt3support/widgets/q3action.cpp index 4e1a1bf..226dfb0 100644 --- a/src/qt3support/widgets/q3action.cpp +++ b/src/qt3support/widgets/q3action.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3action.h b/src/qt3support/widgets/q3action.h index c079eac..007ffb0 100644 --- a/src/qt3support/widgets/q3action.h +++ b/src/qt3support/widgets/q3action.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3button.cpp b/src/qt3support/widgets/q3button.cpp index 3871f56..ac09c38 100644 --- a/src/qt3support/widgets/q3button.cpp +++ b/src/qt3support/widgets/q3button.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3button.h b/src/qt3support/widgets/q3button.h index fd6c0a1..179e38a 100644 --- a/src/qt3support/widgets/q3button.h +++ b/src/qt3support/widgets/q3button.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3buttongroup.cpp b/src/qt3support/widgets/q3buttongroup.cpp index b6021a1..a923a35 100644 --- a/src/qt3support/widgets/q3buttongroup.cpp +++ b/src/qt3support/widgets/q3buttongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3buttongroup.h b/src/qt3support/widgets/q3buttongroup.h index 680d351..f1130ab 100644 --- a/src/qt3support/widgets/q3buttongroup.h +++ b/src/qt3support/widgets/q3buttongroup.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3combobox.cpp b/src/qt3support/widgets/q3combobox.cpp index 3bac984..3a084a1 100644 --- a/src/qt3support/widgets/q3combobox.cpp +++ b/src/qt3support/widgets/q3combobox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3combobox.h b/src/qt3support/widgets/q3combobox.h index f9a0093..a3d1288 100644 --- a/src/qt3support/widgets/q3combobox.h +++ b/src/qt3support/widgets/q3combobox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3datetimeedit.cpp b/src/qt3support/widgets/q3datetimeedit.cpp index 3d02687..d9fbd1c 100644 --- a/src/qt3support/widgets/q3datetimeedit.cpp +++ b/src/qt3support/widgets/q3datetimeedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3datetimeedit.h b/src/qt3support/widgets/q3datetimeedit.h index 71edbdd..cbe3bac 100644 --- a/src/qt3support/widgets/q3datetimeedit.h +++ b/src/qt3support/widgets/q3datetimeedit.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp index 1609aa4..3367d58 100644 --- a/src/qt3support/widgets/q3dockarea.cpp +++ b/src/qt3support/widgets/q3dockarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3dockarea.h b/src/qt3support/widgets/q3dockarea.h index 20aba63..892f985 100644 --- a/src/qt3support/widgets/q3dockarea.h +++ b/src/qt3support/widgets/q3dockarea.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3dockwindow.cpp b/src/qt3support/widgets/q3dockwindow.cpp index 7bb2275..c330f0d 100644 --- a/src/qt3support/widgets/q3dockwindow.cpp +++ b/src/qt3support/widgets/q3dockwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3dockwindow.h b/src/qt3support/widgets/q3dockwindow.h index a857a66..90582d5 100644 --- a/src/qt3support/widgets/q3dockwindow.h +++ b/src/qt3support/widgets/q3dockwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3frame.cpp b/src/qt3support/widgets/q3frame.cpp index 49a8e28..dca8aca 100644 --- a/src/qt3support/widgets/q3frame.cpp +++ b/src/qt3support/widgets/q3frame.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3frame.h b/src/qt3support/widgets/q3frame.h index b94dd4c..b165b48 100644 --- a/src/qt3support/widgets/q3frame.h +++ b/src/qt3support/widgets/q3frame.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3grid.cpp b/src/qt3support/widgets/q3grid.cpp index 169e01e..aa637e8 100644 --- a/src/qt3support/widgets/q3grid.cpp +++ b/src/qt3support/widgets/q3grid.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3grid.h b/src/qt3support/widgets/q3grid.h index 365889d..be9e5e1 100644 --- a/src/qt3support/widgets/q3grid.h +++ b/src/qt3support/widgets/q3grid.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3gridview.cpp b/src/qt3support/widgets/q3gridview.cpp index af6f9aa..f5e47d1 100644 --- a/src/qt3support/widgets/q3gridview.cpp +++ b/src/qt3support/widgets/q3gridview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3gridview.h b/src/qt3support/widgets/q3gridview.h index 2f4f4ae..1adad5a 100644 --- a/src/qt3support/widgets/q3gridview.h +++ b/src/qt3support/widgets/q3gridview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3groupbox.cpp b/src/qt3support/widgets/q3groupbox.cpp index 1fa7e7c..00240ff 100644 --- a/src/qt3support/widgets/q3groupbox.cpp +++ b/src/qt3support/widgets/q3groupbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3groupbox.h b/src/qt3support/widgets/q3groupbox.h index 39dc7e3..99c0910 100644 --- a/src/qt3support/widgets/q3groupbox.h +++ b/src/qt3support/widgets/q3groupbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3hbox.cpp b/src/qt3support/widgets/q3hbox.cpp index 87fe2fa..30a947c 100644 --- a/src/qt3support/widgets/q3hbox.cpp +++ b/src/qt3support/widgets/q3hbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3hbox.h b/src/qt3support/widgets/q3hbox.h index 71a6d04..edb7a5b 100644 --- a/src/qt3support/widgets/q3hbox.h +++ b/src/qt3support/widgets/q3hbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3header.cpp b/src/qt3support/widgets/q3header.cpp index 69c5e8b..5518792 100644 --- a/src/qt3support/widgets/q3header.cpp +++ b/src/qt3support/widgets/q3header.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3header.h b/src/qt3support/widgets/q3header.h index 3768aa0..8627f4a 100644 --- a/src/qt3support/widgets/q3header.h +++ b/src/qt3support/widgets/q3header.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3hgroupbox.cpp b/src/qt3support/widgets/q3hgroupbox.cpp index cf08389..add2c45 100644 --- a/src/qt3support/widgets/q3hgroupbox.cpp +++ b/src/qt3support/widgets/q3hgroupbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3hgroupbox.h b/src/qt3support/widgets/q3hgroupbox.h index 71baf08..34aede0 100644 --- a/src/qt3support/widgets/q3hgroupbox.h +++ b/src/qt3support/widgets/q3hgroupbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3mainwindow.cpp b/src/qt3support/widgets/q3mainwindow.cpp index 2ee3bdc..00b9f35 100644 --- a/src/qt3support/widgets/q3mainwindow.cpp +++ b/src/qt3support/widgets/q3mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3mainwindow.h b/src/qt3support/widgets/q3mainwindow.h index d3a582d..a760d0e 100644 --- a/src/qt3support/widgets/q3mainwindow.h +++ b/src/qt3support/widgets/q3mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3mainwindow_p.h b/src/qt3support/widgets/q3mainwindow_p.h index 31bea4f..52049c8 100644 --- a/src/qt3support/widgets/q3mainwindow_p.h +++ b/src/qt3support/widgets/q3mainwindow_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3popupmenu.cpp b/src/qt3support/widgets/q3popupmenu.cpp index 7f890b5..2a63a00 100644 --- a/src/qt3support/widgets/q3popupmenu.cpp +++ b/src/qt3support/widgets/q3popupmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3popupmenu.h b/src/qt3support/widgets/q3popupmenu.h index baf5494..7112a04 100644 --- a/src/qt3support/widgets/q3popupmenu.h +++ b/src/qt3support/widgets/q3popupmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3progressbar.cpp b/src/qt3support/widgets/q3progressbar.cpp index caae460..ea7cbfa 100644 --- a/src/qt3support/widgets/q3progressbar.cpp +++ b/src/qt3support/widgets/q3progressbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3progressbar.h b/src/qt3support/widgets/q3progressbar.h index fdf7d9a..06c5a8d 100644 --- a/src/qt3support/widgets/q3progressbar.h +++ b/src/qt3support/widgets/q3progressbar.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3rangecontrol.cpp b/src/qt3support/widgets/q3rangecontrol.cpp index 1373f28..7615d84 100644 --- a/src/qt3support/widgets/q3rangecontrol.cpp +++ b/src/qt3support/widgets/q3rangecontrol.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3rangecontrol.h b/src/qt3support/widgets/q3rangecontrol.h index 651ca7a..08bd448 100644 --- a/src/qt3support/widgets/q3rangecontrol.h +++ b/src/qt3support/widgets/q3rangecontrol.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3scrollview.cpp b/src/qt3support/widgets/q3scrollview.cpp index 91a9203..7d96eef 100644 --- a/src/qt3support/widgets/q3scrollview.cpp +++ b/src/qt3support/widgets/q3scrollview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3scrollview.h b/src/qt3support/widgets/q3scrollview.h index 14c2720..a215c63 100644 --- a/src/qt3support/widgets/q3scrollview.h +++ b/src/qt3support/widgets/q3scrollview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3spinwidget.cpp b/src/qt3support/widgets/q3spinwidget.cpp index 8a6152b..6ab8df5 100644 --- a/src/qt3support/widgets/q3spinwidget.cpp +++ b/src/qt3support/widgets/q3spinwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3titlebar.cpp b/src/qt3support/widgets/q3titlebar.cpp index df53364..33f72ea 100644 --- a/src/qt3support/widgets/q3titlebar.cpp +++ b/src/qt3support/widgets/q3titlebar.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3titlebar_p.h b/src/qt3support/widgets/q3titlebar_p.h index fc52f34..7d7c1c3 100644 --- a/src/qt3support/widgets/q3titlebar_p.h +++ b/src/qt3support/widgets/q3titlebar_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3toolbar.cpp b/src/qt3support/widgets/q3toolbar.cpp index dc0a9fd..aa8bfa0 100644 --- a/src/qt3support/widgets/q3toolbar.cpp +++ b/src/qt3support/widgets/q3toolbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3toolbar.h b/src/qt3support/widgets/q3toolbar.h index a1fc471..61ad7db 100644 --- a/src/qt3support/widgets/q3toolbar.h +++ b/src/qt3support/widgets/q3toolbar.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3vbox.cpp b/src/qt3support/widgets/q3vbox.cpp index 7a72051..7d49fb6 100644 --- a/src/qt3support/widgets/q3vbox.cpp +++ b/src/qt3support/widgets/q3vbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3vbox.h b/src/qt3support/widgets/q3vbox.h index c3b334c..f25524a 100644 --- a/src/qt3support/widgets/q3vbox.h +++ b/src/qt3support/widgets/q3vbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3vgroupbox.cpp b/src/qt3support/widgets/q3vgroupbox.cpp index b7c58a7..2424bc3 100644 --- a/src/qt3support/widgets/q3vgroupbox.cpp +++ b/src/qt3support/widgets/q3vgroupbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3vgroupbox.h b/src/qt3support/widgets/q3vgroupbox.h index a0ec403..4af6e32 100644 --- a/src/qt3support/widgets/q3vgroupbox.h +++ b/src/qt3support/widgets/q3vgroupbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3whatsthis.cpp b/src/qt3support/widgets/q3whatsthis.cpp index 6037be7..c2e5acc 100644 --- a/src/qt3support/widgets/q3whatsthis.cpp +++ b/src/qt3support/widgets/q3whatsthis.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3whatsthis.h b/src/qt3support/widgets/q3whatsthis.h index 5080786..035931c 100644 --- a/src/qt3support/widgets/q3whatsthis.h +++ b/src/qt3support/widgets/q3whatsthis.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3widgetstack.cpp b/src/qt3support/widgets/q3widgetstack.cpp index 43263dc..0b2a572 100644 --- a/src/qt3support/widgets/q3widgetstack.cpp +++ b/src/qt3support/widgets/q3widgetstack.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qt3support/widgets/q3widgetstack.h b/src/qt3support/widgets/q3widgetstack.h index e63830f..f63c71b 100644 --- a/src/qt3support/widgets/q3widgetstack.h +++ b/src/qt3support/widgets/q3widgetstack.h @@ -6,11 +6,11 @@ ** This file is part of the Qt3Support 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscript.g b/src/script/qscript.g index 8bf0ce6..99db1d8 100644 --- a/src/script/qscript.g +++ b/src/script/qscript.g @@ -6,11 +6,11 @@ -- This file is part of the QtScript 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 either Technology Preview License Agreement or the --- Beta Release License Agreement. +-- Commercial Usage +-- Licensees holding valid Qt Commercial licenses may use this file in +-- accordance with the Qt Commercial License Agreement provided with the +-- Software or, alternatively, in accordance with the terms contained in +-- a written agreement between you and Nokia. -- -- GNU Lesser General Public License Usage -- Alternatively, this file may be used under the terms of the GNU Lesser @@ -90,11 +90,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -157,11 +157,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptable.cpp b/src/script/qscriptable.cpp index a6401d6..613c646 100644 --- a/src/script/qscriptable.cpp +++ b/src/script/qscriptable.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptable.h b/src/script/qscriptable.h index f990db2..64181d8 100644 --- a/src/script/qscriptable.h +++ b/src/script/qscriptable.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptable_p.h b/src/script/qscriptable_p.h index 2343fc4..ba0d5b2 100644 --- a/src/script/qscriptable_p.h +++ b/src/script/qscriptable_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptarray_p.h b/src/script/qscriptarray_p.h index 0079b30..4706f29 100644 --- a/src/script/qscriptarray_p.h +++ b/src/script/qscriptarray_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptasm.cpp b/src/script/qscriptasm.cpp index d898a38..b2df7e0 100644 --- a/src/script/qscriptasm.cpp +++ b/src/script/qscriptasm.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptasm_p.h b/src/script/qscriptasm_p.h index 3f0058d..3175e5b 100644 --- a/src/script/qscriptasm_p.h +++ b/src/script/qscriptasm_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptast.cpp b/src/script/qscriptast.cpp index defbd28..b9956b8 100644 --- a/src/script/qscriptast.cpp +++ b/src/script/qscriptast.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptast_p.h b/src/script/qscriptast_p.h index 3d3128a..d9c3baa 100644 --- a/src/script/qscriptast_p.h +++ b/src/script/qscriptast_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptastfwd_p.h b/src/script/qscriptastfwd_p.h index 192ede1..4059f6b 100644 --- a/src/script/qscriptastfwd_p.h +++ b/src/script/qscriptastfwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptastvisitor.cpp b/src/script/qscriptastvisitor.cpp index 8502bc5..922854d 100644 --- a/src/script/qscriptastvisitor.cpp +++ b/src/script/qscriptastvisitor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptastvisitor_p.h b/src/script/qscriptastvisitor_p.h index de5528c..8785ddb 100644 --- a/src/script/qscriptastvisitor_p.h +++ b/src/script/qscriptastvisitor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptbuffer_p.h b/src/script/qscriptbuffer_p.h index 92fe6db..6988f5b 100644 --- a/src/script/qscriptbuffer_p.h +++ b/src/script/qscriptbuffer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclass.cpp b/src/script/qscriptclass.cpp index 14b8add..9caa572 100644 --- a/src/script/qscriptclass.cpp +++ b/src/script/qscriptclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclass.h b/src/script/qscriptclass.h index 9c06ea2..20d0155 100644 --- a/src/script/qscriptclass.h +++ b/src/script/qscriptclass.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclass_p.h b/src/script/qscriptclass_p.h index 79c1a99..66c58cd 100644 --- a/src/script/qscriptclass_p.h +++ b/src/script/qscriptclass_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclassdata.cpp b/src/script/qscriptclassdata.cpp index aed6fea..f15337d 100644 --- a/src/script/qscriptclassdata.cpp +++ b/src/script/qscriptclassdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclassdata_p.h b/src/script/qscriptclassdata_p.h index e801ed8..060bac0 100644 --- a/src/script/qscriptclassdata_p.h +++ b/src/script/qscriptclassdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclassinfo_p.h b/src/script/qscriptclassinfo_p.h index 8eab8a3..2b217c3 100644 --- a/src/script/qscriptclassinfo_p.h +++ b/src/script/qscriptclassinfo_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclasspropertyiterator.cpp b/src/script/qscriptclasspropertyiterator.cpp index 96f34d5..046cbe1 100644 --- a/src/script/qscriptclasspropertyiterator.cpp +++ b/src/script/qscriptclasspropertyiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclasspropertyiterator.h b/src/script/qscriptclasspropertyiterator.h index 2041a65..10afde3 100644 --- a/src/script/qscriptclasspropertyiterator.h +++ b/src/script/qscriptclasspropertyiterator.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptclasspropertyiterator_p.h b/src/script/qscriptclasspropertyiterator_p.h index b1d7467..7a9ba9b 100644 --- a/src/script/qscriptclasspropertyiterator_p.h +++ b/src/script/qscriptclasspropertyiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcompiler.cpp b/src/script/qscriptcompiler.cpp index 157e466..899d566 100644 --- a/src/script/qscriptcompiler.cpp +++ b/src/script/qscriptcompiler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcompiler_p.h b/src/script/qscriptcompiler_p.h index 67fa60f..4d310b1 100644 --- a/src/script/qscriptcompiler_p.h +++ b/src/script/qscriptcompiler_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontext.cpp b/src/script/qscriptcontext.cpp index 020601b..21f0a52 100644 --- a/src/script/qscriptcontext.cpp +++ b/src/script/qscriptcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontext.h b/src/script/qscriptcontext.h index 1e1f987..82494d7 100644 --- a/src/script/qscriptcontext.h +++ b/src/script/qscriptcontext.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontext_p.cpp b/src/script/qscriptcontext_p.cpp index 199c9d4..45272e1 100644 --- a/src/script/qscriptcontext_p.cpp +++ b/src/script/qscriptcontext_p.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontext_p.h b/src/script/qscriptcontext_p.h index b5be471..7a4848c 100644 --- a/src/script/qscriptcontext_p.h +++ b/src/script/qscriptcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontextfwd_p.h b/src/script/qscriptcontextfwd_p.h index 9b486d6..36e08cf 100644 --- a/src/script/qscriptcontextfwd_p.h +++ b/src/script/qscriptcontextfwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontextinfo.cpp b/src/script/qscriptcontextinfo.cpp index 260d19f..0385f99 100644 --- a/src/script/qscriptcontextinfo.cpp +++ b/src/script/qscriptcontextinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontextinfo.h b/src/script/qscriptcontextinfo.h index a683733..729907e 100644 --- a/src/script/qscriptcontextinfo.h +++ b/src/script/qscriptcontextinfo.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptcontextinfo_p.h b/src/script/qscriptcontextinfo_p.h index 775a81c..f67915b 100644 --- a/src/script/qscriptcontextinfo_p.h +++ b/src/script/qscriptcontextinfo_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaarray.cpp b/src/script/qscriptecmaarray.cpp index d068ba6..39eacf8 100644 --- a/src/script/qscriptecmaarray.cpp +++ b/src/script/qscriptecmaarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaarray_p.h b/src/script/qscriptecmaarray_p.h index 7230a92..6602eb9 100644 --- a/src/script/qscriptecmaarray_p.h +++ b/src/script/qscriptecmaarray_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaboolean.cpp b/src/script/qscriptecmaboolean.cpp index 08cad66..b26a009 100644 --- a/src/script/qscriptecmaboolean.cpp +++ b/src/script/qscriptecmaboolean.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaboolean_p.h b/src/script/qscriptecmaboolean_p.h index 4dbaa27..00c898c 100644 --- a/src/script/qscriptecmaboolean_p.h +++ b/src/script/qscriptecmaboolean_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmacore.cpp b/src/script/qscriptecmacore.cpp index ed0fce1..f900c62 100644 --- a/src/script/qscriptecmacore.cpp +++ b/src/script/qscriptecmacore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmacore_p.h b/src/script/qscriptecmacore_p.h index b4c1780..c8910e7 100644 --- a/src/script/qscriptecmacore_p.h +++ b/src/script/qscriptecmacore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmadate.cpp b/src/script/qscriptecmadate.cpp index cc80383..3ba6fc1 100644 --- a/src/script/qscriptecmadate.cpp +++ b/src/script/qscriptecmadate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmadate_p.h b/src/script/qscriptecmadate_p.h index 4d705a5..ad5344d 100644 --- a/src/script/qscriptecmadate_p.h +++ b/src/script/qscriptecmadate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaerror.cpp b/src/script/qscriptecmaerror.cpp index fc39bf9..4cc6cb9 100644 --- a/src/script/qscriptecmaerror.cpp +++ b/src/script/qscriptecmaerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaerror_p.h b/src/script/qscriptecmaerror_p.h index dddcb3e..76d590f 100644 --- a/src/script/qscriptecmaerror_p.h +++ b/src/script/qscriptecmaerror_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmafunction.cpp b/src/script/qscriptecmafunction.cpp index ec45ae4..30de7b9 100644 --- a/src/script/qscriptecmafunction.cpp +++ b/src/script/qscriptecmafunction.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmafunction_p.h b/src/script/qscriptecmafunction_p.h index 23b56f9..4e85f41 100644 --- a/src/script/qscriptecmafunction_p.h +++ b/src/script/qscriptecmafunction_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaglobal.cpp b/src/script/qscriptecmaglobal.cpp index da7ab9e..ce14059 100644 --- a/src/script/qscriptecmaglobal.cpp +++ b/src/script/qscriptecmaglobal.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaglobal_p.h b/src/script/qscriptecmaglobal_p.h index 3df1c0a..80de4bc 100644 --- a/src/script/qscriptecmaglobal_p.h +++ b/src/script/qscriptecmaglobal_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmamath.cpp b/src/script/qscriptecmamath.cpp index e0fcf0a..86d6d4b 100644 --- a/src/script/qscriptecmamath.cpp +++ b/src/script/qscriptecmamath.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmamath_p.h b/src/script/qscriptecmamath_p.h index 3a850c2..e4623b9 100644 --- a/src/script/qscriptecmamath_p.h +++ b/src/script/qscriptecmamath_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmanumber.cpp b/src/script/qscriptecmanumber.cpp index 7d3d903..ba3e89c 100644 --- a/src/script/qscriptecmanumber.cpp +++ b/src/script/qscriptecmanumber.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmanumber_p.h b/src/script/qscriptecmanumber_p.h index 55e2cf9..4022a69 100644 --- a/src/script/qscriptecmanumber_p.h +++ b/src/script/qscriptecmanumber_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaobject.cpp b/src/script/qscriptecmaobject.cpp index 694f479..0463154 100644 --- a/src/script/qscriptecmaobject.cpp +++ b/src/script/qscriptecmaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaobject_p.h b/src/script/qscriptecmaobject_p.h index d55a425..2832f56 100644 --- a/src/script/qscriptecmaobject_p.h +++ b/src/script/qscriptecmaobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaregexp.cpp b/src/script/qscriptecmaregexp.cpp index 4aef611..bcf4c66 100644 --- a/src/script/qscriptecmaregexp.cpp +++ b/src/script/qscriptecmaregexp.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmaregexp_p.h b/src/script/qscriptecmaregexp_p.h index 77fe467..08520df 100644 --- a/src/script/qscriptecmaregexp_p.h +++ b/src/script/qscriptecmaregexp_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmastring.cpp b/src/script/qscriptecmastring.cpp index 3c04375..a39fcfa 100644 --- a/src/script/qscriptecmastring.cpp +++ b/src/script/qscriptecmastring.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptecmastring_p.h b/src/script/qscriptecmastring_p.h index 9ddd659..37b89a7 100644 --- a/src/script/qscriptecmastring_p.h +++ b/src/script/qscriptecmastring_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index d8908ed..cc2d732 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h index afd551b..282eb59 100644 --- a/src/script/qscriptengine.h +++ b/src/script/qscriptengine.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengine_p.cpp b/src/script/qscriptengine_p.cpp index a2e58de..6b4961a 100644 --- a/src/script/qscriptengine_p.cpp +++ b/src/script/qscriptengine_p.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengine_p.h b/src/script/qscriptengine_p.h index 3d13628..164273c 100644 --- a/src/script/qscriptengine_p.h +++ b/src/script/qscriptengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengineagent.cpp b/src/script/qscriptengineagent.cpp index bda94ae..038037a 100644 --- a/src/script/qscriptengineagent.cpp +++ b/src/script/qscriptengineagent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengineagent.h b/src/script/qscriptengineagent.h index 3334bc0..5b57c12 100644 --- a/src/script/qscriptengineagent.h +++ b/src/script/qscriptengineagent.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptengineagent_p.h b/src/script/qscriptengineagent_p.h index f0b3969..f620071 100644 --- a/src/script/qscriptengineagent_p.h +++ b/src/script/qscriptengineagent_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptenginefwd_p.h b/src/script/qscriptenginefwd_p.h index 2ea66c5..bc6be95 100644 --- a/src/script/qscriptenginefwd_p.h +++ b/src/script/qscriptenginefwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextensioninterface.h b/src/script/qscriptextensioninterface.h index 35dc7ed..35519ed 100644 --- a/src/script/qscriptextensioninterface.h +++ b/src/script/qscriptextensioninterface.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextensionplugin.cpp b/src/script/qscriptextensionplugin.cpp index 1c85606..b517a39 100644 --- a/src/script/qscriptextensionplugin.cpp +++ b/src/script/qscriptextensionplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextensionplugin.h b/src/script/qscriptextensionplugin.h index e646b54..643ceb1 100644 --- a/src/script/qscriptextensionplugin.h +++ b/src/script/qscriptextensionplugin.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextenumeration.cpp b/src/script/qscriptextenumeration.cpp index 4b043a9..c1fbb80 100644 --- a/src/script/qscriptextenumeration.cpp +++ b/src/script/qscriptextenumeration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextenumeration_p.h b/src/script/qscriptextenumeration_p.h index 4c49f74..24816e3 100644 --- a/src/script/qscriptextenumeration_p.h +++ b/src/script/qscriptextenumeration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextqobject.cpp b/src/script/qscriptextqobject.cpp index d18c3da..04fe86e 100644 --- a/src/script/qscriptextqobject.cpp +++ b/src/script/qscriptextqobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextqobject_p.h b/src/script/qscriptextqobject_p.h index 537fa49..7a139ca 100644 --- a/src/script/qscriptextqobject_p.h +++ b/src/script/qscriptextqobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextvariant.cpp b/src/script/qscriptextvariant.cpp index 33c5edd..5d072b3 100644 --- a/src/script/qscriptextvariant.cpp +++ b/src/script/qscriptextvariant.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptextvariant_p.h b/src/script/qscriptextvariant_p.h index cac17e5..c7b8d28 100644 --- a/src/script/qscriptextvariant_p.h +++ b/src/script/qscriptextvariant_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptfunction.cpp b/src/script/qscriptfunction.cpp index 55d5e61..8efaa0c 100644 --- a/src/script/qscriptfunction.cpp +++ b/src/script/qscriptfunction.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptfunction_p.h b/src/script/qscriptfunction_p.h index ec79f32..f94478e 100644 --- a/src/script/qscriptfunction_p.h +++ b/src/script/qscriptfunction_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptgc_p.h b/src/script/qscriptgc_p.h index 6ded5bd..cd6974d 100644 --- a/src/script/qscriptgc_p.h +++ b/src/script/qscriptgc_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptglobals_p.h b/src/script/qscriptglobals_p.h index c4bec42..0df30d4 100644 --- a/src/script/qscriptglobals_p.h +++ b/src/script/qscriptglobals_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptgrammar.cpp b/src/script/qscriptgrammar.cpp index 8b8a05d..a7c77c7 100644 --- a/src/script/qscriptgrammar.cpp +++ b/src/script/qscriptgrammar.cpp @@ -7,11 +7,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptgrammar_p.h b/src/script/qscriptgrammar_p.h index 90c11fd..9294d2d 100644 --- a/src/script/qscriptgrammar_p.h +++ b/src/script/qscriptgrammar_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptlexer.cpp b/src/script/qscriptlexer.cpp index f93b905..f6bbc0b 100644 --- a/src/script/qscriptlexer.cpp +++ b/src/script/qscriptlexer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptlexer_p.h b/src/script/qscriptlexer_p.h index acf242c..c8a0d5b 100644 --- a/src/script/qscriptlexer_p.h +++ b/src/script/qscriptlexer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptmember_p.h b/src/script/qscriptmember_p.h index ac98432..aa95da4 100644 --- a/src/script/qscriptmember_p.h +++ b/src/script/qscriptmember_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptmemberfwd_p.h b/src/script/qscriptmemberfwd_p.h index 023815a..fe9d6ca 100644 --- a/src/script/qscriptmemberfwd_p.h +++ b/src/script/qscriptmemberfwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptmemorypool_p.h b/src/script/qscriptmemorypool_p.h index 2f069ec..509fccc 100644 --- a/src/script/qscriptmemorypool_p.h +++ b/src/script/qscriptmemorypool_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptnameid_p.h b/src/script/qscriptnameid_p.h index c0d8f6b..5998163 100644 --- a/src/script/qscriptnameid_p.h +++ b/src/script/qscriptnameid_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptnodepool_p.h b/src/script/qscriptnodepool_p.h index 5e1876c..5c8dac1 100644 --- a/src/script/qscriptnodepool_p.h +++ b/src/script/qscriptnodepool_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptobject_p.h b/src/script/qscriptobject_p.h index 1ac3c65..9a46bf4 100644 --- a/src/script/qscriptobject_p.h +++ b/src/script/qscriptobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptobjectdata_p.h b/src/script/qscriptobjectdata_p.h index ed4e5fd..98eb8e6 100644 --- a/src/script/qscriptobjectdata_p.h +++ b/src/script/qscriptobjectdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptobjectfwd_p.h b/src/script/qscriptobjectfwd_p.h index 0cbec1f..2136ab7 100644 --- a/src/script/qscriptobjectfwd_p.h +++ b/src/script/qscriptobjectfwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptparser.cpp b/src/script/qscriptparser.cpp index 0b04df1..30aa64d 100644 --- a/src/script/qscriptparser.cpp +++ b/src/script/qscriptparser.cpp @@ -8,11 +8,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptparser_p.h b/src/script/qscriptparser_p.h index 98317c7..a8f6d26 100644 --- a/src/script/qscriptparser_p.h +++ b/src/script/qscriptparser_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptprettypretty.cpp b/src/script/qscriptprettypretty.cpp index 6ee1e55..09a13de 100644 --- a/src/script/qscriptprettypretty.cpp +++ b/src/script/qscriptprettypretty.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptprettypretty_p.h b/src/script/qscriptprettypretty_p.h index b757cc0..c639557 100644 --- a/src/script/qscriptprettypretty_p.h +++ b/src/script/qscriptprettypretty_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptrepository_p.h b/src/script/qscriptrepository_p.h index 64dbac0..ed26a23 100644 --- a/src/script/qscriptrepository_p.h +++ b/src/script/qscriptrepository_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptstring.cpp b/src/script/qscriptstring.cpp index 69b0796..79c5e4e 100644 --- a/src/script/qscriptstring.cpp +++ b/src/script/qscriptstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptstring.h b/src/script/qscriptstring.h index d2fecd8..4b64c17 100644 --- a/src/script/qscriptstring.h +++ b/src/script/qscriptstring.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptstring_p.h b/src/script/qscriptstring_p.h index 34f9dec..38ff400 100644 --- a/src/script/qscriptstring_p.h +++ b/src/script/qscriptstring_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptsyntaxchecker.cpp b/src/script/qscriptsyntaxchecker.cpp index 9653bc1..63da673 100644 --- a/src/script/qscriptsyntaxchecker.cpp +++ b/src/script/qscriptsyntaxchecker.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptsyntaxchecker_p.h b/src/script/qscriptsyntaxchecker_p.h index 0c02d24..8a81c79 100644 --- a/src/script/qscriptsyntaxchecker_p.h +++ b/src/script/qscriptsyntaxchecker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptsyntaxcheckresult_p.h b/src/script/qscriptsyntaxcheckresult_p.h index fc5cb42..c7fdfc0 100644 --- a/src/script/qscriptsyntaxcheckresult_p.h +++ b/src/script/qscriptsyntaxcheckresult_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp index a253985..cf34ca4 100644 --- a/src/script/qscriptvalue.cpp +++ b/src/script/qscriptvalue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalue.h b/src/script/qscriptvalue.h index 306da53..bce2c02 100644 --- a/src/script/qscriptvalue.h +++ b/src/script/qscriptvalue.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalue_p.h b/src/script/qscriptvalue_p.h index 8463ed2..fd70969 100644 --- a/src/script/qscriptvalue_p.h +++ b/src/script/qscriptvalue_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvaluefwd_p.h b/src/script/qscriptvaluefwd_p.h index d57786d..80456dc 100644 --- a/src/script/qscriptvaluefwd_p.h +++ b/src/script/qscriptvaluefwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueimpl.cpp b/src/script/qscriptvalueimpl.cpp index 15d1b8a..c7311db 100644 --- a/src/script/qscriptvalueimpl.cpp +++ b/src/script/qscriptvalueimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueimpl_p.h b/src/script/qscriptvalueimpl_p.h index 09dd6cd..bd55ce5 100644 --- a/src/script/qscriptvalueimpl_p.h +++ b/src/script/qscriptvalueimpl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueimplfwd_p.h b/src/script/qscriptvalueimplfwd_p.h index 059842e..548271b 100644 --- a/src/script/qscriptvalueimplfwd_p.h +++ b/src/script/qscriptvalueimplfwd_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueiterator.cpp b/src/script/qscriptvalueiterator.cpp index fe5ef9f..8e1589b 100644 --- a/src/script/qscriptvalueiterator.cpp +++ b/src/script/qscriptvalueiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueiterator.h b/src/script/qscriptvalueiterator.h index 91561e8..8376e71 100644 --- a/src/script/qscriptvalueiterator.h +++ b/src/script/qscriptvalueiterator.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueiterator_p.h b/src/script/qscriptvalueiterator_p.h index e1f2815..3c03053 100644 --- a/src/script/qscriptvalueiterator_p.h +++ b/src/script/qscriptvalueiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueiteratorimpl.cpp b/src/script/qscriptvalueiteratorimpl.cpp index bfe3946..6eb99b6 100644 --- a/src/script/qscriptvalueiteratorimpl.cpp +++ b/src/script/qscriptvalueiteratorimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptvalueiteratorimpl_p.h b/src/script/qscriptvalueiteratorimpl_p.h index 4ee7b11..c07d978 100644 --- a/src/script/qscriptvalueiteratorimpl_p.h +++ b/src/script/qscriptvalueiteratorimpl_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptxmlgenerator.cpp b/src/script/qscriptxmlgenerator.cpp index 131882b..1cd01e1 100644 --- a/src/script/qscriptxmlgenerator.cpp +++ b/src/script/qscriptxmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/script/qscriptxmlgenerator_p.h b/src/script/qscriptxmlgenerator_p.h index c496816..932d4bd 100644 --- a/src/script/qscriptxmlgenerator_p.h +++ b/src/script/qscriptxmlgenerator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtScript 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointdata.cpp b/src/scripttools/debugging/qscriptbreakpointdata.cpp index 9762ca4..8648d1c 100644 --- a/src/scripttools/debugging/qscriptbreakpointdata.cpp +++ b/src/scripttools/debugging/qscriptbreakpointdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointdata_p.h b/src/scripttools/debugging/qscriptbreakpointdata_p.h index c1ff033..070b456 100644 --- a/src/scripttools/debugging/qscriptbreakpointdata_p.h +++ b/src/scripttools/debugging/qscriptbreakpointdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp index aea38aa..ad532ec 100644 --- a/src/scripttools/debugging/qscriptbreakpointsmodel.cpp +++ b/src/scripttools/debugging/qscriptbreakpointsmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h index 7bdc696..46d572e 100644 --- a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h +++ b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp index aea1fe7..575350e 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointswidget_p.h b/src/scripttools/debugging/qscriptbreakpointswidget_p.h index 458883e..da7ec8e 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp b/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp index 6f23e01..e349bcc 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h index c86f3e8..f7bfc7f 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h index f25afcb..fb70f08 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h b/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h index db2077f..f02a07d 100644 --- a/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h +++ b/src/scripttools/debugging/qscriptcompletionproviderinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp index 3767505..19cb717 100644 --- a/src/scripttools/debugging/qscriptcompletiontask.cpp +++ b/src/scripttools/debugging/qscriptcompletiontask.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletiontask_p.h b/src/scripttools/debugging/qscriptcompletiontask_p.h index dd82250..ed0a67d 100644 --- a/src/scripttools/debugging/qscriptcompletiontask_p.h +++ b/src/scripttools/debugging/qscriptcompletiontask_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp b/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp index 8757fe1..f9d8290 100644 --- a/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp +++ b/src/scripttools/debugging/qscriptcompletiontaskinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h index acd24d1..501c721 100644 --- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h +++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h index c9e93d3..8819c0a 100644 --- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h +++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index 5a356ae..8870931 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h index 8f14f4d..ba0da75 100644 --- a/src/scripttools/debugging/qscriptdebugger_p.h +++ b/src/scripttools/debugging/qscriptdebugger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp index fcba033..207ae83 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent.cpp +++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h index 556b17b..3a9c821 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h index cf6fd1a..b72638c 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerbackend.cpp b/src/scripttools/debugging/qscriptdebuggerbackend.cpp index 24a3847..b75a5e5 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend.cpp +++ b/src/scripttools/debugging/qscriptdebuggerbackend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h index 6d593a6..3c81a09 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend_p.h +++ b/src/scripttools/debugging/qscriptdebuggerbackend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h index 98d9c85..c8fe777 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerbackend_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp index 21f8b2c..41198b6 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h index eb5b388..465f25e 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp index 3e602a6..cb5f87a 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h index 0c20487..5fa3c17 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h index e269384..9f2d5f2 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp index bc493e0..b1e6e90 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodeview_p.h b/src/scripttools/debugging/qscriptdebuggercodeview_p.h index a9cd615..66dff93 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeview_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp index 489fdfd..ecae989 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h index ac67da8..a786a28 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h index 55c7b58..eb0bd8c 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp index 14ce0fe..0418e5a 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h index bc01eb9..a265562 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp index 573874e..c75339f 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h index 9fc39a7..4ca19f3 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h index 7f65c67..638afe3 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommand.cpp b/src/scripttools/debugging/qscriptdebuggercommand.cpp index c40bfc4..a9553e2 100644 --- a/src/scripttools/debugging/qscriptdebuggercommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h index 260e3ec..a77fce4 100644 --- a/src/scripttools/debugging/qscriptdebuggercommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index e36386d..635e6a5 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h index 8fff5e5..d82a3a0 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp index 1e20ab4..5cb71bd 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h index ed9cbf9..32186d4 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerfrontend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h index 02a5097..58ca8dc 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp index 8421641..41e308f 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h index 1d9ba63..5a70b96 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h index 53f22e9..ac1f7c2 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp index 70bb8b1..eec8eda 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h index b5ebf44..38d79d4 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsole_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp index 6cbf58c..a7386fc 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h index fbf285f..1a9ad13 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h index 3e1807a..a0511ab 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp index 9cfac97..19a6a52 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h index c32277f..2f91e02 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp index 69e8247..c5c861e 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h index 8d3ddaa..7c473ef 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h index ef52517..eb3f347 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp index ef9687e..5f6e059 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h index b5c9842..ca7b483 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp index 0018b92..458f32d 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h index b14e6c0..240462e 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h index 6de0a98..96a9f77 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolehistorianinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp index 479487b..c0b22f5 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h index 4fc1290..6677925 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp index 071bae6..e905376 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h index 6cfe8be..c3cdcd3 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h index 2dca798..57199d1 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp index 9d971a9..dc91e93 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent.cpp +++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h index d9c073c..ee16744 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent_p.h +++ b/src/scripttools/debugging/qscriptdebuggerevent_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h b/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h index 612233e..bf1692d 100644 --- a/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggereventhandlerinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp index ced20b1..63389b9 100644 --- a/src/scripttools/debugging/qscriptdebuggerfrontend.cpp +++ b/src/scripttools/debugging/qscriptdebuggerfrontend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h index a763463..fb7f0f5 100644 --- a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h +++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h index aebcad2..b906f26 100644 --- a/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerjob.cpp b/src/scripttools/debugging/qscriptdebuggerjob.cpp index 109c805..9d5fe88 100644 --- a/src/scripttools/debugging/qscriptdebuggerjob.cpp +++ b/src/scripttools/debugging/qscriptdebuggerjob.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h index e84d6d5..8b230cd 100644 --- a/src/scripttools/debugging/qscriptdebuggerjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggerjob_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p_p.h index 58d258a..3f99646 100644 --- a/src/scripttools/debugging/qscriptdebuggerjob_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerjob_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h b/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h index 282e4c0..2260fe6 100644 --- a/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerjobschedulerinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp index caeb971..c3ce1eb 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h index fc75aa3..b8c8bd2 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index a4919be..ad5529d 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h index 960e8cb..0088731 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp index 6aabd06..34356bc 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h index ba31363..8dd922e 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h index 9bfe5a4..0f4ea59 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h b/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h index e3ec541..9cf4f8e 100644 --- a/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h +++ b/src/scripttools/debugging/qscriptdebuggerobjectsnapshotdelta_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerresponse.cpp b/src/scripttools/debugging/qscriptdebuggerresponse.cpp index 82bfff2..7820ee1 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponse.cpp +++ b/src/scripttools/debugging/qscriptdebuggerresponse.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h index dd65ffd..bcaa390 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponse_p.h +++ b/src/scripttools/debugging/qscriptdebuggerresponse_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h b/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h index 9a13e05..8ffc809 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerresponsehandlerinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp index 20350f6..260da6a 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h index 5537604..22d26ef 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp b/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp index 17bee59..aa96328 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h index 42afd4e..22f1db0 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp index 63d604d..05c058c 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h index b983a45..9a4a566 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp index 5120395..477bf61 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h index 1dcd626..6a04a7b 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h index e3b0cd8..17c3d99 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp index aecd2f8..505d74b 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h index 37f5457..2a051b6 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp index 63ccb2b..9c9ca2f 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h index ffcbf8a..9077d72 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp index d9612a7..a0427a1 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h index 1e3e6f0..74c7e76 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h index 2662d7c..3149fea 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp index bb41ee8..ec7d84a 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h index 0142de0..d3f3d0b 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp index 723e304..1603957 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h index f67bafd..c1c5550 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h b/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h index 9ad1eeb..7836afe 100644 --- a/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerwidgetfactoryinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp index 40c7aae..a33fa47 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget.cpp +++ b/src/scripttools/debugging/qscriptdebugoutputwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h index d4cfd71..75645ce 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp index 6052ccc..356196c 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h index ec3f88c..8b155b6 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h index 0536b89..34bd400 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index 2bc0a40..89aa9a7 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptedit_p.h b/src/scripttools/debugging/qscriptedit_p.h index f2bdf14..00f3441 100644 --- a/src/scripttools/debugging/qscriptedit_p.h +++ b/src/scripttools/debugging/qscriptedit_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index e35bd1d..c2f5576 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index d5e127f..645c3a8 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp index d35a86b..2347faf 100644 --- a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp +++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h index 3c74d5e..fa1f117 100644 --- a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h +++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripterrorlogwidget.cpp b/src/scripttools/debugging/qscripterrorlogwidget.cpp index 425f4a7..b5601b5 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget.cpp +++ b/src/scripttools/debugging/qscripterrorlogwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripterrorlogwidget_p.h b/src/scripttools/debugging/qscripterrorlogwidget_p.h index 1c206bb..f8d1869 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp b/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp index 727450c..0555d1f 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h index d720ec2..77311a2 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h index 59261f4..d31ad89 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h b/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h index eb77096..39916b3 100644 --- a/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h +++ b/src/scripttools/debugging/qscriptmessagehandlerinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptobjectsnapshot.cpp b/src/scripttools/debugging/qscriptobjectsnapshot.cpp index 88649f1..7f466cb 100644 --- a/src/scripttools/debugging/qscriptobjectsnapshot.cpp +++ b/src/scripttools/debugging/qscriptobjectsnapshot.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptobjectsnapshot_p.h b/src/scripttools/debugging/qscriptobjectsnapshot_p.h index 3082a60..07cf74b 100644 --- a/src/scripttools/debugging/qscriptobjectsnapshot_p.h +++ b/src/scripttools/debugging/qscriptobjectsnapshot_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptscriptdata.cpp b/src/scripttools/debugging/qscriptscriptdata.cpp index 068748f..28fc2c4 100644 --- a/src/scripttools/debugging/qscriptscriptdata.cpp +++ b/src/scripttools/debugging/qscriptscriptdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h index 50cad32..f42cf88 100644 --- a/src/scripttools/debugging/qscriptscriptdata_p.h +++ b/src/scripttools/debugging/qscriptscriptdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptstdmessagehandler.cpp b/src/scripttools/debugging/qscriptstdmessagehandler.cpp index 4e0f12c..58cb9b8 100644 --- a/src/scripttools/debugging/qscriptstdmessagehandler.cpp +++ b/src/scripttools/debugging/qscriptstdmessagehandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h index 8b75f6a..b8f6b59 100644 --- a/src/scripttools/debugging/qscriptstdmessagehandler_p.h +++ b/src/scripttools/debugging/qscriptstdmessagehandler_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp index 85ccf4e..e7e76e7 100644 --- a/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp +++ b/src/scripttools/debugging/qscriptsyntaxhighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h b/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h index 53e3397..a4d6f03 100644 --- a/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h +++ b/src/scripttools/debugging/qscriptsyntaxhighlighter_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscripttooltipproviderinterface_p.h b/src/scripttools/debugging/qscripttooltipproviderinterface_p.h index 0a273d9..650aced 100644 --- a/src/scripttools/debugging/qscripttooltipproviderinterface_p.h +++ b/src/scripttools/debugging/qscripttooltipproviderinterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp index 245edc3..806e7f1 100644 --- a/src/scripttools/debugging/qscriptvalueproperty.cpp +++ b/src/scripttools/debugging/qscriptvalueproperty.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h index 938ab83..04f5f5d 100644 --- a/src/scripttools/debugging/qscriptvalueproperty_p.h +++ b/src/scripttools/debugging/qscriptvalueproperty_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptxmlparser.cpp b/src/scripttools/debugging/qscriptxmlparser.cpp index 1082759..b689c36 100644 --- a/src/scripttools/debugging/qscriptxmlparser.cpp +++ b/src/scripttools/debugging/qscriptxmlparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/scripttools/debugging/qscriptxmlparser_p.h b/src/scripttools/debugging/qscriptxmlparser_p.h index 0bfccbf..388ceff 100644 --- a/src/scripttools/debugging/qscriptxmlparser_p.h +++ b/src/scripttools/debugging/qscriptxmlparser_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSCriptTools 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp index 69383f7..fc500c0 100644 --- a/src/sql/drivers/db2/qsql_db2.cpp +++ b/src/sql/drivers/db2/qsql_db2.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/db2/qsql_db2.h b/src/sql/drivers/db2/qsql_db2.h index 6923027..565a2bb 100644 --- a/src/sql/drivers/db2/qsql_db2.h +++ b/src/sql/drivers/db2/qsql_db2.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 64f13b5..89a49c8 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h index bf883b9..adceb7e 100644 --- a/src/sql/drivers/ibase/qsql_ibase.h +++ b/src/sql/drivers/ibase/qsql_ibase.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 9b57f3c..ed0407f 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index 97aa346..ca133ce 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 7017d6c..5890c35 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/oci/qsql_oci.h b/src/sql/drivers/oci/qsql_oci.h index 069bfdc..e6568eb 100644 --- a/src/sql/drivers/oci/qsql_oci.h +++ b/src/sql/drivers/oci/qsql_oci.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index f6710db..1ad25e5 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 4148007..daab38a 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index afe45fc..31484e6 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index ca4dedf..88235a3 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 605c4e8..9883b4d 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h index 459ea3b..efd9911 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.h +++ b/src/sql/drivers/sqlite/qsql_sqlite.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index ff73caa..fe56bc9 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.h b/src/sql/drivers/sqlite2/qsql_sqlite2.h index 9f039e2..a32d7ea 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.h +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp index 46e4a0b..a71d8be 100644 --- a/src/sql/drivers/tds/qsql_tds.cpp +++ b/src/sql/drivers/tds/qsql_tds.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h index 3a5dc65..cd96fa1 100644 --- a/src/sql/drivers/tds/qsql_tds.h +++ b/src/sql/drivers/tds/qsql_tds.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h index 0e3388a..75f64de 100644 --- a/src/sql/kernel/qsql.h +++ b/src/sql/kernel/qsql.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp index e85229f..cecec4d 100644 --- a/src/sql/kernel/qsqlcachedresult.cpp +++ b/src/sql/kernel/qsqlcachedresult.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h index 8a4869c..35369a8 100644 --- a/src/sql/kernel/qsqlcachedresult_p.h +++ b/src/sql/kernel/qsqlcachedresult_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 6232452..0e0e3ba 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index ca6f0b0..f2bc42f 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index ddebe45..f24d866 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h index e763719..642cf63 100644 --- a/src/sql/kernel/qsqldriver.h +++ b/src/sql/kernel/qsqldriver.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldriverplugin.cpp b/src/sql/kernel/qsqldriverplugin.cpp index b3de2cd..4572fa9 100644 --- a/src/sql/kernel/qsqldriverplugin.cpp +++ b/src/sql/kernel/qsqldriverplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h index 1150360..c406572 100644 --- a/src/sql/kernel/qsqldriverplugin.h +++ b/src/sql/kernel/qsqldriverplugin.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp index 14fc050..15e28bd 100644 --- a/src/sql/kernel/qsqlerror.cpp +++ b/src/sql/kernel/qsqlerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 9e09c27..01890b9 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp index 8a808b6..34d3fc3 100644 --- a/src/sql/kernel/qsqlfield.cpp +++ b/src/sql/kernel/qsqlfield.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index 58b3616..acaf254 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlindex.cpp b/src/sql/kernel/qsqlindex.cpp index 02cdfb3..08b7380 100644 --- a/src/sql/kernel/qsqlindex.cpp +++ b/src/sql/kernel/qsqlindex.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h index 82c0fb9..08434ee 100644 --- a/src/sql/kernel/qsqlindex.h +++ b/src/sql/kernel/qsqlindex.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlnulldriver_p.h b/src/sql/kernel/qsqlnulldriver_p.h index e899a0b..9c1b819 100644 --- a/src/sql/kernel/qsqlnulldriver_p.h +++ b/src/sql/kernel/qsqlnulldriver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp index e6729a5..4c0b9a1 100644 --- a/src/sql/kernel/qsqlquery.cpp +++ b/src/sql/kernel/qsqlquery.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h index e042fbd..93a87cb 100644 --- a/src/sql/kernel/qsqlquery.h +++ b/src/sql/kernel/qsqlquery.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp index 0162664..933b38e 100644 --- a/src/sql/kernel/qsqlrecord.cpp +++ b/src/sql/kernel/qsqlrecord.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h index 239ecdd..5b248ee 100644 --- a/src/sql/kernel/qsqlrecord.h +++ b/src/sql/kernel/qsqlrecord.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index 180bfc7..68c8568 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 0a3d8b9..96e5398 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp index 973d715..bca6f5d 100644 --- a/src/sql/models/qsqlquerymodel.cpp +++ b/src/sql/models/qsqlquerymodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index 14e01c0..d834ef1 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h index ef331d7..76509d6 100644 --- a/src/sql/models/qsqlquerymodel_p.h +++ b/src/sql/models/qsqlquerymodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlrelationaldelegate.cpp b/src/sql/models/qsqlrelationaldelegate.cpp index 1043ef9..da9077f 100644 --- a/src/sql/models/qsqlrelationaldelegate.cpp +++ b/src/sql/models/qsqlrelationaldelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index dd9ad8f..1f9bddf 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 935466b..6064da8 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index fb11bae..ee90f73 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 2fb9b0f..1c3c04a 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 14c4c4f..c97da2d 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h index fa3b44b..a285212 100644 --- a/src/sql/models/qsqltablemodel_p.h +++ b/src/sql/models/qsqltablemodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSql 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index e17df03..e6055c4 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/src/svg/qgraphicssvgitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index c6ab0f7..105ed11 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgfont.cpp b/src/svg/qsvgfont.cpp index cf90fb7..7907073 100644 --- a/src/svg/qsvgfont.cpp +++ b/src/svg/qsvgfont.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index 069d8be..c9fdf5a 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index e822da5..7345043 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 723a220..bf75583 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 9ff9c26..f3b01fc 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 4d0d318..c7af70a 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 433a3ad..f1153e7 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index c4c2f3c..b324ac3 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index f1c1b38..55a1f58 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h index 708b4c9..c7801bd 100644 --- a/src/svg/qsvgnode_p.h +++ b/src/svg/qsvgnode_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp index d33b70c..eec5f63 100644 --- a/src/svg/qsvgrenderer.cpp +++ b/src/svg/qsvgrenderer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index 43d0cd4..44fab65 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index 3551fec..a027f3b 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index 7cfd280..c7c9866 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index b065395..5899b96 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 058ba35..80fc2ca 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index b6b8526..afc5f64 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index 0d54804..dfbe10f 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index a4200ca..d6bf18d 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 75eef32..8915ec1 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -6,11 +6,11 @@ ** This file is part of the QtSvg 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp index e5d5d59..80006b2 100644 --- a/src/testlib/qabstracttestlogger.cpp +++ b/src/testlib/qabstracttestlogger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h index 298fbad..f7b1b29 100644 --- a/src/testlib/qabstracttestlogger_p.h +++ b/src/testlib/qabstracttestlogger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qasciikey.cpp b/src/testlib/qasciikey.cpp index c02a8ad..2b26d82 100644 --- a/src/testlib/qasciikey.cpp +++ b/src/testlib/qasciikey.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index 7687fec..2a3e11e 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -7,11 +7,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h index e2b0a74..2e3e664 100644 --- a/src/testlib/qbenchmark.h +++ b/src/testlib/qbenchmark.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h index 8bb6e84..76dd625 100644 --- a/src/testlib/qbenchmark_p.h +++ b/src/testlib/qbenchmark_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index fdd81ff2..0ade1b2 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h index e027163..94dece6 100644 --- a/src/testlib/qbenchmarkevent_p.h +++ b/src/testlib/qbenchmarkevent_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp index 9307450..28a5503 100644 --- a/src/testlib/qbenchmarkmeasurement.cpp +++ b/src/testlib/qbenchmarkmeasurement.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 693a315..a8b25ad 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/src/testlib/qbenchmarkmeasurement_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp index 4b4ccd7..1cdee82 100644 --- a/src/testlib/qbenchmarkvalgrind.cpp +++ b/src/testlib/qbenchmarkvalgrind.cpp @@ -7,11 +7,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h index 39dc77e..7be24cd 100644 --- a/src/testlib/qbenchmarkvalgrind_p.h +++ b/src/testlib/qbenchmarkvalgrind_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 6f10d72..ef698a1 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qplaintestlogger_p.h b/src/testlib/qplaintestlogger_p.h index fac6415..0830d77 100644 --- a/src/testlib/qplaintestlogger_p.h +++ b/src/testlib/qplaintestlogger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp index 0a32a6d..c7d403c 100644 --- a/src/testlib/qsignaldumper.cpp +++ b/src/testlib/qsignaldumper.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qsignaldumper_p.h b/src/testlib/qsignaldumper_p.h index 8d8bbc9..dc0b514 100644 --- a/src/testlib/qsignaldumper_p.h +++ b/src/testlib/qsignaldumper_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index d37bd6f..ef37925 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 6ea38f7..7a6c080 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index d6b0655..c4e5a6f 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index d389f1c..b73fca3 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 557690b..951fe6e 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index 1425ceb..bab518b 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index f17d95d..c4febc5 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 4e5deff..7c82e47 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestdata.cpp b/src/testlib/qtestdata.cpp index 3f766b4..fcda84e 100644 --- a/src/testlib/qtestdata.cpp +++ b/src/testlib/qtestdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h index b673bb9..22ffc63 100644 --- a/src/testlib/qtestdata.h +++ b/src/testlib/qtestdata.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index 1eefd7b..19f6108 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index 2a675d2..8a53aca 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 68dc53c..3e9a358 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index aa56e6c..715d45d 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index fa49a38..d39130f 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 48b9a6c..e729e11 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 39759b5..afcff12 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index 0f1e64b..eb3f085 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h index e125329..dc7a55b 100644 --- a/src/testlib/qtestspontaneevent.h +++ b/src/testlib/qtestspontaneevent.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index c1b5fc1..822583d 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp index 7c1cce0..af18cca 100644 --- a/src/testlib/qtesttable.cpp +++ b/src/testlib/qtesttable.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h index 4b20170..109ff17 100644 --- a/src/testlib/qtesttable_p.h +++ b/src/testlib/qtesttable_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp index bba98da..8d7ff55 100644 --- a/src/testlib/qxmltestlogger.cpp +++ b/src/testlib/qxmltestlogger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/testlib/qxmltestlogger_p.h b/src/testlib/qxmltestlogger_p.h index 3e78969..722bc66 100644 --- a/src/testlib/qxmltestlogger_p.h +++ b/src/testlib/qxmltestlogger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtTest 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp index eb04114..f5463d2 100644 --- a/src/tools/idc/main.cpp +++ b/src/tools/idc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index ae8a76e..74f0f03 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h index d64eddb..b711c4e 100644 --- a/src/tools/moc/generator.h +++ b/src/tools/moc/generator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp index 2a4fbf9..6e1612e 100644 --- a/src/tools/moc/keywords.cpp +++ b/src/tools/moc/keywords.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 4aa362d..d519b09 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index a6a0ba1..22b4828 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 689104c..ba0fd6b 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/mwerks_mac.cpp b/src/tools/moc/mwerks_mac.cpp index ae8defa..2b20202 100644 --- a/src/tools/moc/mwerks_mac.cpp +++ b/src/tools/moc/mwerks_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/mwerks_mac.h b/src/tools/moc/mwerks_mac.h index bca0829..425b0af 100644 --- a/src/tools/moc/mwerks_mac.h +++ b/src/tools/moc/mwerks_mac.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h index 1e1d640..c260a15 100644 --- a/src/tools/moc/outputrevision.h +++ b/src/tools/moc/outputrevision.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/parser.cpp b/src/tools/moc/parser.cpp index b6c3f63..0c9982f 100644 --- a/src/tools/moc/parser.cpp +++ b/src/tools/moc/parser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h index c49f3cf..d054c0b 100644 --- a/src/tools/moc/parser.h +++ b/src/tools/moc/parser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/ppkeywords.cpp b/src/tools/moc/ppkeywords.cpp index 1e4f063..d80d7f6 100644 --- a/src/tools/moc/ppkeywords.cpp +++ b/src/tools/moc/ppkeywords.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index 45cbbfd..f1b119c 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index cb713d2..d79e675 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index b8ccf78..51d1a7a 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp index 46345e7..e860565 100644 --- a/src/tools/moc/token.cpp +++ b/src/tools/moc/token.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h index 13c9a1d..bb8b7c3 100644 --- a/src/tools/moc/token.h +++ b/src/tools/moc/token.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index 116be2b..8bd099f 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt index 6812109..44bdea0 100644 --- a/src/tools/moc/util/licenseheader.txt +++ b/src/tools/moc/util/licenseheader.txt @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h index 2dffc43..c5d7171 100644 --- a/src/tools/moc/utils.h +++ b/src/tools/moc/utils.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 2999e3b..9ab3331 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 2a0f8c3..4cd155d 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index a802fa0..66b8339 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp index 69390ce..bdc8431 100644 --- a/src/tools/uic/cpp/cppextractimages.cpp +++ b/src/tools/uic/cpp/cppextractimages.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h index d864369..b212a0a 100644 --- a/src/tools/uic/cpp/cppextractimages.h +++ b/src/tools/uic/cpp/cppextractimages.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp index a3d3fa3..528dfbd 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.cpp +++ b/src/tools/uic/cpp/cppwritedeclaration.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index c8f3590..b7a558a 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp index 53b108f..da1d82b 100644 --- a/src/tools/uic/cpp/cppwriteicondata.cpp +++ b/src/tools/uic/cpp/cppwriteicondata.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteicondata.h b/src/tools/uic/cpp/cppwriteicondata.h index d7f8f8f..583486d 100644 --- a/src/tools/uic/cpp/cppwriteicondata.h +++ b/src/tools/uic/cpp/cppwriteicondata.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.cpp b/src/tools/uic/cpp/cppwriteicondeclaration.cpp index ffe4046..43d060c 100644 --- a/src/tools/uic/cpp/cppwriteicondeclaration.cpp +++ b/src/tools/uic/cpp/cppwriteicondeclaration.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.h b/src/tools/uic/cpp/cppwriteicondeclaration.h index b30d5f5..f2400cc 100644 --- a/src/tools/uic/cpp/cppwriteicondeclaration.h +++ b/src/tools/uic/cpp/cppwriteicondeclaration.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.cpp b/src/tools/uic/cpp/cppwriteiconinitialization.cpp index b5a9e12..533e83a 100644 --- a/src/tools/uic/cpp/cppwriteiconinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteiconinitialization.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.h b/src/tools/uic/cpp/cppwriteiconinitialization.h index 2afd3f6..24e2a80 100644 --- a/src/tools/uic/cpp/cppwriteiconinitialization.h +++ b/src/tools/uic/cpp/cppwriteiconinitialization.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 8b061cd..396c0a4 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 8b79041..1516c3e 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index ed06006..bc20475 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index a2b54b1..0558496 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp index d221278..3fce391 100644 --- a/src/tools/uic/customwidgetsinfo.cpp +++ b/src/tools/uic/customwidgetsinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 5890335..970acbb 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/databaseinfo.cpp b/src/tools/uic/databaseinfo.cpp index d8d8aea..de23025 100644 --- a/src/tools/uic/databaseinfo.cpp +++ b/src/tools/uic/databaseinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index 854c8fb..db1222e 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index b587890..aa397b8 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h index b440632..339d7b9 100644 --- a/src/tools/uic/driver.h +++ b/src/tools/uic/driver.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/globaldefs.h index ed16a7a..46ca8f8 100644 --- a/src/tools/uic/globaldefs.h +++ b/src/tools/uic/globaldefs.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 3d0a6f1..f88fc2d 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index 931ca59..296e881 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/treewalker.cpp b/src/tools/uic/treewalker.cpp index 0bb60e9..5991ab7 100644 --- a/src/tools/uic/treewalker.cpp +++ b/src/tools/uic/treewalker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 6c1777f..2dcddd7 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index d6cd759..a2e66ea 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h index df02a39..73859c0 100644 --- a/src/tools/uic/ui4.h +++ b/src/tools/uic/ui4.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 6e0d731..fec7087 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h index 902626f..2ab8a33 100644 --- a/src/tools/uic/uic.h +++ b/src/tools/uic/uic.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h index fe2d8ed..df6db3f 100644 --- a/src/tools/uic/utils.h +++ b/src/tools/uic/utils.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/validator.cpp b/src/tools/uic/validator.cpp index e44ca13..e66dd67 100644 --- a/src/tools/uic/validator.cpp +++ b/src/tools/uic/validator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h index 804c47e..cbb57c1 100644 --- a/src/tools/uic/validator.h +++ b/src/tools/uic/validator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/converter.cpp b/src/tools/uic3/converter.cpp index a5723dd..37964f7 100644 --- a/src/tools/uic3/converter.cpp +++ b/src/tools/uic3/converter.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/deps.cpp b/src/tools/uic3/deps.cpp index e621f25..c8192d1 100644 --- a/src/tools/uic3/deps.cpp +++ b/src/tools/uic3/deps.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/domtool.cpp b/src/tools/uic3/domtool.cpp index ce2e2f6..97c0bd9 100644 --- a/src/tools/uic3/domtool.cpp +++ b/src/tools/uic3/domtool.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/domtool.h b/src/tools/uic3/domtool.h index 811c1f9..e00d6e0 100644 --- a/src/tools/uic3/domtool.h +++ b/src/tools/uic3/domtool.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/embed.cpp b/src/tools/uic3/embed.cpp index 882328a..8d3cdc2 100644 --- a/src/tools/uic3/embed.cpp +++ b/src/tools/uic3/embed.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/form.cpp b/src/tools/uic3/form.cpp index d9e968b..b913e0c 100644 --- a/src/tools/uic3/form.cpp +++ b/src/tools/uic3/form.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/main.cpp b/src/tools/uic3/main.cpp index d581016..70ce26a 100644 --- a/src/tools/uic3/main.cpp +++ b/src/tools/uic3/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/object.cpp b/src/tools/uic3/object.cpp index b20f3c4..0bfef90 100644 --- a/src/tools/uic3/object.cpp +++ b/src/tools/uic3/object.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/parser.cpp b/src/tools/uic3/parser.cpp index 744dd30..0c9f4fd 100644 --- a/src/tools/uic3/parser.cpp +++ b/src/tools/uic3/parser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/parser.h b/src/tools/uic3/parser.h index 32eb2f7..6daf901 100644 --- a/src/tools/uic3/parser.h +++ b/src/tools/uic3/parser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/qt3to4.cpp b/src/tools/uic3/qt3to4.cpp index 9e5b64b..852575a 100644 --- a/src/tools/uic3/qt3to4.cpp +++ b/src/tools/uic3/qt3to4.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/qt3to4.h b/src/tools/uic3/qt3to4.h index 806a209..dc2d587 100644 --- a/src/tools/uic3/qt3to4.h +++ b/src/tools/uic3/qt3to4.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/subclassing.cpp b/src/tools/uic3/subclassing.cpp index e590ab7..3d05b3e 100644 --- a/src/tools/uic3/subclassing.cpp +++ b/src/tools/uic3/subclassing.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/ui3reader.cpp b/src/tools/uic3/ui3reader.cpp index 1ba4b2f..3091350 100644 --- a/src/tools/uic3/ui3reader.cpp +++ b/src/tools/uic3/ui3reader.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/ui3reader.h b/src/tools/uic3/ui3reader.h index 60e0cee..fc93c41 100644 --- a/src/tools/uic3/ui3reader.h +++ b/src/tools/uic3/ui3reader.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/uic.cpp b/src/tools/uic3/uic.cpp index d042abd..011bc0f 100644 --- a/src/tools/uic3/uic.cpp +++ b/src/tools/uic3/uic.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/uic.h b/src/tools/uic3/uic.h index 33b897c..8def7ac 100644 --- a/src/tools/uic3/uic.h +++ b/src/tools/uic3/uic.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/widgetinfo.cpp b/src/tools/uic3/widgetinfo.cpp index 355b3bd..33322bb 100644 --- a/src/tools/uic3/widgetinfo.cpp +++ b/src/tools/uic3/widgetinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/tools/uic3/widgetinfo.h b/src/tools/uic3/widgetinfo.h index 98b01d8..7892969 100644 --- a/src/tools/uic3/widgetinfo.h +++ b/src/tools/uic3/widgetinfo.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 550abc9..0c44ada 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXml 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index f72361f..ebb0f23 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -6,11 +6,11 @@ ** This file is part of the QtXml 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index c78d4ba..56f3e71 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXml 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index e0165d3..78fea3d 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -6,11 +6,11 @@ ** This file is part of the QtXml 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xml/stream/qxmlstream.h b/src/xml/stream/qxmlstream.h index 11fd148..6e6849ac 100644 --- a/src/xml/stream/qxmlstream.h +++ b/src/xml/stream/qxmlstream.h @@ -6,11 +6,11 @@ ** This file is part of the QtXml 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/Mainpage.dox b/src/xmlpatterns/Mainpage.dox index 6d77e9c..8601937 100644 --- a/src/xmlpatterns/Mainpage.dox +++ b/src/xmlpatterns/Mainpage.dox @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceliterators.cpp b/src/xmlpatterns/acceltree/qacceliterators.cpp index 152c5d8..7b31725 100644 --- a/src/xmlpatterns/acceltree/qacceliterators.cpp +++ b/src/xmlpatterns/acceltree/qacceliterators.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h index 545ff73..94d3b3e 100644 --- a/src/xmlpatterns/acceltree/qacceliterators_p.h +++ b/src/xmlpatterns/acceltree/qacceliterators_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 60e6e27..158057f 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h index 10320ba..aed7afb 100644 --- a/src/xmlpatterns/acceltree/qacceltree_p.h +++ b/src/xmlpatterns/acceltree/qacceltree_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp index 5b16cc3..15e1d48 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp +++ b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h index 653eb85..8c89ab8 100644 --- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h +++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index 4a5c219..7ac02e6 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h index 863fd65..0f90616 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp index 730d1d9..dfa211a 100644 --- a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp +++ b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h index 92bc0a5..f62b850 100644 --- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h +++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractmessagehandler.cpp b/src/xmlpatterns/api/qabstractmessagehandler.cpp index 1792bb5..e783239 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.cpp +++ b/src/xmlpatterns/api/qabstractmessagehandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h index efc2237..8fa3ab9 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.h +++ b/src/xmlpatterns/api/qabstractmessagehandler.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstracturiresolver.cpp b/src/xmlpatterns/api/qabstracturiresolver.cpp index b1f708b..72e966e 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.cpp +++ b/src/xmlpatterns/api/qabstracturiresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h index ec85027..5bc61bf 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.h +++ b/src/xmlpatterns/api/qabstracturiresolver.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp index 5bddeee..dd31d7b 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index 836218e..a8b79a2 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 0caa8c4..6225ebb 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 6c9574c..ffcc1b5 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h index 16ce613..6911ef0 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.cpp b/src/xmlpatterns/api/qabstractxmlreceiver.cpp index ddd01e4..23a9779 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver.cpp +++ b/src/xmlpatterns/api/qabstractxmlreceiver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h index 355576a..b186548 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver.h +++ b/src/xmlpatterns/api/qabstractxmlreceiver.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h index 3954a4f..5f5e702 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h +++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h index be88a76..2cdfb1a 100644 --- a/src/xmlpatterns/api/qdeviceresourceloader_p.h +++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qiodevicedelegate.cpp b/src/xmlpatterns/api/qiodevicedelegate.cpp index 05820a7..a54582e 100644 --- a/src/xmlpatterns/api/qiodevicedelegate.cpp +++ b/src/xmlpatterns/api/qiodevicedelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qiodevicedelegate_p.h b/src/xmlpatterns/api/qiodevicedelegate_p.h index bf4e882..cc1f18f 100644 --- a/src/xmlpatterns/api/qiodevicedelegate_p.h +++ b/src/xmlpatterns/api/qiodevicedelegate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator.cpp b/src/xmlpatterns/api/qnetworkaccessdelegator.cpp index 3ca0383..5f198cb 100644 --- a/src/xmlpatterns/api/qnetworkaccessdelegator.cpp +++ b/src/xmlpatterns/api/qnetworkaccessdelegator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h index 7b7c0a4..3cf8d69 100644 --- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h +++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h index 49437f2..57b9179 100644 --- a/src/xmlpatterns/api/qreferencecountedvalue_p.h +++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qresourcedelegator.cpp b/src/xmlpatterns/api/qresourcedelegator.cpp index 9d43419..08d1fa5 100644 --- a/src/xmlpatterns/api/qresourcedelegator.cpp +++ b/src/xmlpatterns/api/qresourcedelegator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h index d0f832e..db5c475 100644 --- a/src/xmlpatterns/api/qresourcedelegator_p.h +++ b/src/xmlpatterns/api/qresourcedelegator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.cpp b/src/xmlpatterns/api/qsimplexmlnodemodel.cpp index 119a4b1..b09ff32 100644 --- a/src/xmlpatterns/api/qsimplexmlnodemodel.cpp +++ b/src/xmlpatterns/api/qsimplexmlnodemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h index 14e2faf..2e4fca7 100644 --- a/src/xmlpatterns/api/qsimplexmlnodemodel.h +++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qsourcelocation.cpp b/src/xmlpatterns/api/qsourcelocation.cpp index 4eee39c..132fdc3 100644 --- a/src/xmlpatterns/api/qsourcelocation.cpp +++ b/src/xmlpatterns/api/qsourcelocation.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h index d970edd..cf156c6 100644 --- a/src/xmlpatterns/api/qsourcelocation.h +++ b/src/xmlpatterns/api/qsourcelocation.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/quriloader.cpp b/src/xmlpatterns/api/quriloader.cpp index 8b29b3c..7547530 100644 --- a/src/xmlpatterns/api/quriloader.cpp +++ b/src/xmlpatterns/api/quriloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/quriloader_p.h b/src/xmlpatterns/api/quriloader_p.h index c5ba375..35be957 100644 --- a/src/xmlpatterns/api/quriloader_p.h +++ b/src/xmlpatterns/api/quriloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qvariableloader.cpp b/src/xmlpatterns/api/qvariableloader.cpp index 076adc3..ef4a505 100644 --- a/src/xmlpatterns/api/qvariableloader.cpp +++ b/src/xmlpatterns/api/qvariableloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h index 7c02d9f..ae584ed 100644 --- a/src/xmlpatterns/api/qvariableloader_p.h +++ b/src/xmlpatterns/api/qvariableloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlformatter.cpp b/src/xmlpatterns/api/qxmlformatter.cpp index 7e1c1f5..9ac1c18 100644 --- a/src/xmlpatterns/api/qxmlformatter.cpp +++ b/src/xmlpatterns/api/qxmlformatter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h index a839751..d6b25be 100644 --- a/src/xmlpatterns/api/qxmlformatter.h +++ b/src/xmlpatterns/api/qxmlformatter.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlname.cpp b/src/xmlpatterns/api/qxmlname.cpp index 82350b2..6072732 100644 --- a/src/xmlpatterns/api/qxmlname.cpp +++ b/src/xmlpatterns/api/qxmlname.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h index f5dcddf..690a3f0 100644 --- a/src/xmlpatterns/api/qxmlname.h +++ b/src/xmlpatterns/api/qxmlname.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlnamepool.cpp b/src/xmlpatterns/api/qxmlnamepool.cpp index 2337f8d..0f85251 100644 --- a/src/xmlpatterns/api/qxmlnamepool.cpp +++ b/src/xmlpatterns/api/qxmlnamepool.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h index 3c1e112..ee6004f 100644 --- a/src/xmlpatterns/api/qxmlnamepool.h +++ b/src/xmlpatterns/api/qxmlnamepool.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp index 5f9d87d..66c5781 100644 --- a/src/xmlpatterns/api/qxmlquery.cpp +++ b/src/xmlpatterns/api/qxmlquery.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h index 138819c..e8a29ed 100644 --- a/src/xmlpatterns/api/qxmlquery.h +++ b/src/xmlpatterns/api/qxmlquery.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h index c8ed441..a96d253 100644 --- a/src/xmlpatterns/api/qxmlquery_p.h +++ b/src/xmlpatterns/api/qxmlquery_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlresultitems.cpp b/src/xmlpatterns/api/qxmlresultitems.cpp index a2253c9..9f79b2d 100644 --- a/src/xmlpatterns/api/qxmlresultitems.cpp +++ b/src/xmlpatterns/api/qxmlresultitems.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h index aeb7d2c..fcd1811 100644 --- a/src/xmlpatterns/api/qxmlresultitems.h +++ b/src/xmlpatterns/api/qxmlresultitems.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlresultitems_p.h b/src/xmlpatterns/api/qxmlresultitems_p.h index af3e2d3..340728d 100644 --- a/src/xmlpatterns/api/qxmlresultitems_p.h +++ b/src/xmlpatterns/api/qxmlresultitems_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlserializer.cpp b/src/xmlpatterns/api/qxmlserializer.cpp index 0c2f92d..0797156 100644 --- a/src/xmlpatterns/api/qxmlserializer.cpp +++ b/src/xmlpatterns/api/qxmlserializer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h index a24b42b..3ca3c11 100644 --- a/src/xmlpatterns/api/qxmlserializer.h +++ b/src/xmlpatterns/api/qxmlserializer.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h index 0bdff21..845db19 100644 --- a/src/xmlpatterns/api/qxmlserializer_p.h +++ b/src/xmlpatterns/api/qxmlserializer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 819f033..a7f0d10 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h index 2786adf..406f0e6 100644 --- a/src/xmlpatterns/data/qabstractdatetime_p.h +++ b/src/xmlpatterns/data/qabstractdatetime_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractduration.cpp b/src/xmlpatterns/data/qabstractduration.cpp index 4f34ff3..6c95a5b 100644 --- a/src/xmlpatterns/data/qabstractduration.cpp +++ b/src/xmlpatterns/data/qabstractduration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h index af2a985..317cd69 100644 --- a/src/xmlpatterns/data/qabstractduration_p.h +++ b/src/xmlpatterns/data/qabstractduration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloat.cpp b/src/xmlpatterns/data/qabstractfloat.cpp index b6226b5..fa7fa75 100644 --- a/src/xmlpatterns/data/qabstractfloat.cpp +++ b/src/xmlpatterns/data/qabstractfloat.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h index 61ec9c1..32628af 100644 --- a/src/xmlpatterns/data/qabstractfloat_p.h +++ b/src/xmlpatterns/data/qabstractfloat_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloatcasters.cpp b/src/xmlpatterns/data/qabstractfloatcasters.cpp index bf53fa4..01bde51 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters.cpp +++ b/src/xmlpatterns/data/qabstractfloatcasters.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h index 36a5116..bcf8cb6 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters_p.h +++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloatmathematician.cpp b/src/xmlpatterns/data/qabstractfloatmathematician.cpp index 767fa47..0801cc0 100644 --- a/src/xmlpatterns/data/qabstractfloatmathematician.cpp +++ b/src/xmlpatterns/data/qabstractfloatmathematician.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h index eb9eb11..af78ba1 100644 --- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h +++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qanyuri.cpp b/src/xmlpatterns/data/qanyuri.cpp index 0c6288b..2c2409f 100644 --- a/src/xmlpatterns/data/qanyuri.cpp +++ b/src/xmlpatterns/data/qanyuri.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h index 3272635..24e6a66 100644 --- a/src/xmlpatterns/data/qanyuri_p.h +++ b/src/xmlpatterns/data/qanyuri_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccaster.cpp b/src/xmlpatterns/data/qatomiccaster.cpp index a087725..b299a9b 100644 --- a/src/xmlpatterns/data/qatomiccaster.cpp +++ b/src/xmlpatterns/data/qatomiccaster.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h index 6680dc5..e052e34 100644 --- a/src/xmlpatterns/data/qatomiccaster_p.h +++ b/src/xmlpatterns/data/qatomiccaster_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccasters.cpp b/src/xmlpatterns/data/qatomiccasters.cpp index 893dce4..382bb43 100644 --- a/src/xmlpatterns/data/qatomiccasters.cpp +++ b/src/xmlpatterns/data/qatomiccasters.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h index 888ad32..1079d07 100644 --- a/src/xmlpatterns/data/qatomiccasters_p.h +++ b/src/xmlpatterns/data/qatomiccasters_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccomparator.cpp b/src/xmlpatterns/data/qatomiccomparator.cpp index 34395fa..d4673dd 100644 --- a/src/xmlpatterns/data/qatomiccomparator.cpp +++ b/src/xmlpatterns/data/qatomiccomparator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h index 2ec7815..e61af59 100644 --- a/src/xmlpatterns/data/qatomiccomparator_p.h +++ b/src/xmlpatterns/data/qatomiccomparator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccomparators.cpp b/src/xmlpatterns/data/qatomiccomparators.cpp index af28b42..7de7d68 100644 --- a/src/xmlpatterns/data/qatomiccomparators.cpp +++ b/src/xmlpatterns/data/qatomiccomparators.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h index 82a6068..5e61323 100644 --- a/src/xmlpatterns/data/qatomiccomparators_p.h +++ b/src/xmlpatterns/data/qatomiccomparators_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicmathematician.cpp b/src/xmlpatterns/data/qatomicmathematician.cpp index 816f731..61905a3 100644 --- a/src/xmlpatterns/data/qatomicmathematician.cpp +++ b/src/xmlpatterns/data/qatomicmathematician.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h index 37d0cc5..3e6bee8 100644 --- a/src/xmlpatterns/data/qatomicmathematician_p.h +++ b/src/xmlpatterns/data/qatomicmathematician_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicmathematicians.cpp b/src/xmlpatterns/data/qatomicmathematicians.cpp index bd138a8..df29f28 100644 --- a/src/xmlpatterns/data/qatomicmathematicians.cpp +++ b/src/xmlpatterns/data/qatomicmathematicians.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h index 7bbdaef..878c41a 100644 --- a/src/xmlpatterns/data/qatomicmathematicians_p.h +++ b/src/xmlpatterns/data/qatomicmathematicians_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicstring.cpp b/src/xmlpatterns/data/qatomicstring.cpp index 5e92e94..3acc78c 100644 --- a/src/xmlpatterns/data/qatomicstring.cpp +++ b/src/xmlpatterns/data/qatomicstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h index bbdc66d..3ff61a2 100644 --- a/src/xmlpatterns/data/qatomicstring_p.h +++ b/src/xmlpatterns/data/qatomicstring_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp index a68643f..be70de6 100644 --- a/src/xmlpatterns/data/qatomicvalue.cpp +++ b/src/xmlpatterns/data/qatomicvalue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qbase64binary.cpp b/src/xmlpatterns/data/qbase64binary.cpp index 0f805c0..f85e574 100644 --- a/src/xmlpatterns/data/qbase64binary.cpp +++ b/src/xmlpatterns/data/qbase64binary.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h index 9eaa23b..07078e4 100644 --- a/src/xmlpatterns/data/qbase64binary_p.h +++ b/src/xmlpatterns/data/qbase64binary_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qboolean.cpp b/src/xmlpatterns/data/qboolean.cpp index e87d6c2..bc63dc3 100644 --- a/src/xmlpatterns/data/qboolean.cpp +++ b/src/xmlpatterns/data/qboolean.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h index 10b1515..1e89bcc 100644 --- a/src/xmlpatterns/data/qboolean_p.h +++ b/src/xmlpatterns/data/qboolean_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qcommonvalues.cpp b/src/xmlpatterns/data/qcommonvalues.cpp index 07a273d..2884a83 100644 --- a/src/xmlpatterns/data/qcommonvalues.cpp +++ b/src/xmlpatterns/data/qcommonvalues.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h index 6b9cf64..b98f6e1 100644 --- a/src/xmlpatterns/data/qcommonvalues_p.h +++ b/src/xmlpatterns/data/qcommonvalues_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdate.cpp b/src/xmlpatterns/data/qdate.cpp index d451e29..9a08f79 100644 --- a/src/xmlpatterns/data/qdate.cpp +++ b/src/xmlpatterns/data/qdate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h index e804bfa..bab2154 100644 --- a/src/xmlpatterns/data/qdate_p.h +++ b/src/xmlpatterns/data/qdate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdaytimeduration.cpp b/src/xmlpatterns/data/qdaytimeduration.cpp index 3555e59..c1d369a 100644 --- a/src/xmlpatterns/data/qdaytimeduration.cpp +++ b/src/xmlpatterns/data/qdaytimeduration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h index f6a3117..84485c3 100644 --- a/src/xmlpatterns/data/qdaytimeduration_p.h +++ b/src/xmlpatterns/data/qdaytimeduration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdecimal.cpp b/src/xmlpatterns/data/qdecimal.cpp index 05f84b4..4db62bc 100644 --- a/src/xmlpatterns/data/qdecimal.cpp +++ b/src/xmlpatterns/data/qdecimal.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h index 2552b21..2e6be21 100644 --- a/src/xmlpatterns/data/qdecimal_p.h +++ b/src/xmlpatterns/data/qdecimal_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index 4a394b3..35fbd97 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h index a9d4f16..c4f1862 100644 --- a/src/xmlpatterns/data/qderivedstring_p.h +++ b/src/xmlpatterns/data/qderivedstring_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qduration.cpp b/src/xmlpatterns/data/qduration.cpp index c36adc4..d8ddbe1 100644 --- a/src/xmlpatterns/data/qduration.cpp +++ b/src/xmlpatterns/data/qduration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h index fe58317..61e6aee 100644 --- a/src/xmlpatterns/data/qduration_p.h +++ b/src/xmlpatterns/data/qduration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgday.cpp b/src/xmlpatterns/data/qgday.cpp index e2bd2e5..6b6edc4 100644 --- a/src/xmlpatterns/data/qgday.cpp +++ b/src/xmlpatterns/data/qgday.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h index 1d69494..2b332bf 100644 --- a/src/xmlpatterns/data/qgday_p.h +++ b/src/xmlpatterns/data/qgday_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgmonth.cpp b/src/xmlpatterns/data/qgmonth.cpp index ddac353..ec3de7c 100644 --- a/src/xmlpatterns/data/qgmonth.cpp +++ b/src/xmlpatterns/data/qgmonth.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h index 9b1a2c8..577c2f2 100644 --- a/src/xmlpatterns/data/qgmonth_p.h +++ b/src/xmlpatterns/data/qgmonth_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgmonthday.cpp b/src/xmlpatterns/data/qgmonthday.cpp index d7df81b..5f9b6bf 100644 --- a/src/xmlpatterns/data/qgmonthday.cpp +++ b/src/xmlpatterns/data/qgmonthday.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h index dbb507d..4334239 100644 --- a/src/xmlpatterns/data/qgmonthday_p.h +++ b/src/xmlpatterns/data/qgmonthday_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgyear.cpp b/src/xmlpatterns/data/qgyear.cpp index a58e1c1..706575c 100644 --- a/src/xmlpatterns/data/qgyear.cpp +++ b/src/xmlpatterns/data/qgyear.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h index eef81dc..b936af6 100644 --- a/src/xmlpatterns/data/qgyear_p.h +++ b/src/xmlpatterns/data/qgyear_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgyearmonth.cpp b/src/xmlpatterns/data/qgyearmonth.cpp index f8f2131..5259e51 100644 --- a/src/xmlpatterns/data/qgyearmonth.cpp +++ b/src/xmlpatterns/data/qgyearmonth.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h index 134c795..e7c5e96 100644 --- a/src/xmlpatterns/data/qgyearmonth_p.h +++ b/src/xmlpatterns/data/qgyearmonth_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qhexbinary.cpp b/src/xmlpatterns/data/qhexbinary.cpp index 00028e7..1d1a313 100644 --- a/src/xmlpatterns/data/qhexbinary.cpp +++ b/src/xmlpatterns/data/qhexbinary.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h index e1a7639..4ad2ba8 100644 --- a/src/xmlpatterns/data/qhexbinary_p.h +++ b/src/xmlpatterns/data/qhexbinary_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qinteger.cpp b/src/xmlpatterns/data/qinteger.cpp index 0a8c9cc..9757da3 100644 --- a/src/xmlpatterns/data/qinteger.cpp +++ b/src/xmlpatterns/data/qinteger.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h index c70f04b..470a9bf 100644 --- a/src/xmlpatterns/data/qinteger_p.h +++ b/src/xmlpatterns/data/qinteger_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qitem.cpp b/src/xmlpatterns/data/qitem.cpp index eaf47ef..45fa5dc 100644 --- a/src/xmlpatterns/data/qitem.cpp +++ b/src/xmlpatterns/data/qitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h index 987a1c2..56850c9 100644 --- a/src/xmlpatterns/data/qitem_p.h +++ b/src/xmlpatterns/data/qitem_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qnodebuilder.cpp b/src/xmlpatterns/data/qnodebuilder.cpp index c848216..5e5d97e 100644 --- a/src/xmlpatterns/data/qnodebuilder.cpp +++ b/src/xmlpatterns/data/qnodebuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h index 4057e5e..88e2621 100644 --- a/src/xmlpatterns/data/qnodebuilder_p.h +++ b/src/xmlpatterns/data/qnodebuilder_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qnodemodel.cpp b/src/xmlpatterns/data/qnodemodel.cpp index b44f58b..35e1c30 100644 --- a/src/xmlpatterns/data/qnodemodel.cpp +++ b/src/xmlpatterns/data/qnodemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qqnamevalue.cpp b/src/xmlpatterns/data/qqnamevalue.cpp index ae93cd2..1e4ffce 100644 --- a/src/xmlpatterns/data/qqnamevalue.cpp +++ b/src/xmlpatterns/data/qqnamevalue.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h index d038f74..4b815c1 100644 --- a/src/xmlpatterns/data/qqnamevalue_p.h +++ b/src/xmlpatterns/data/qqnamevalue_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qresourceloader.cpp b/src/xmlpatterns/data/qresourceloader.cpp index 8633381..0702dbf 100644 --- a/src/xmlpatterns/data/qresourceloader.cpp +++ b/src/xmlpatterns/data/qresourceloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h index c11304f..17b1684 100644 --- a/src/xmlpatterns/data/qresourceloader_p.h +++ b/src/xmlpatterns/data/qresourceloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschemadatetime.cpp b/src/xmlpatterns/data/qschemadatetime.cpp index 425af7d..f7fd9fc 100644 --- a/src/xmlpatterns/data/qschemadatetime.cpp +++ b/src/xmlpatterns/data/qschemadatetime.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h index c974242..8455d54 100644 --- a/src/xmlpatterns/data/qschemadatetime_p.h +++ b/src/xmlpatterns/data/qschemadatetime_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschemanumeric.cpp b/src/xmlpatterns/data/qschemanumeric.cpp index 4f42db9..b3a2a6c 100644 --- a/src/xmlpatterns/data/qschemanumeric.cpp +++ b/src/xmlpatterns/data/qschemanumeric.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h index 8654b57..1b29bbf 100644 --- a/src/xmlpatterns/data/qschemanumeric_p.h +++ b/src/xmlpatterns/data/qschemanumeric_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschematime.cpp b/src/xmlpatterns/data/qschematime.cpp index cd6f17e..68ca9c0 100644 --- a/src/xmlpatterns/data/qschematime.cpp +++ b/src/xmlpatterns/data/qschematime.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h index a5a9549..b52e154 100644 --- a/src/xmlpatterns/data/qschematime_p.h +++ b/src/xmlpatterns/data/qschematime_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qsequencereceiver.cpp b/src/xmlpatterns/data/qsequencereceiver.cpp index 4e9fdfe..175206c 100644 --- a/src/xmlpatterns/data/qsequencereceiver.cpp +++ b/src/xmlpatterns/data/qsequencereceiver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h index e508acb..c5ed006 100644 --- a/src/xmlpatterns/data/qsequencereceiver_p.h +++ b/src/xmlpatterns/data/qsequencereceiver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qsorttuple.cpp b/src/xmlpatterns/data/qsorttuple.cpp index 93f9b30..ef8a2f7 100644 --- a/src/xmlpatterns/data/qsorttuple.cpp +++ b/src/xmlpatterns/data/qsorttuple.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h index fa4fa9c..baf269e 100644 --- a/src/xmlpatterns/data/qsorttuple_p.h +++ b/src/xmlpatterns/data/qsorttuple_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/quntypedatomic.cpp b/src/xmlpatterns/data/quntypedatomic.cpp index 6b39827..bb7cd52 100644 --- a/src/xmlpatterns/data/quntypedatomic.cpp +++ b/src/xmlpatterns/data/quntypedatomic.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h index 4f578e8..a71f3c9 100644 --- a/src/xmlpatterns/data/quntypedatomic_p.h +++ b/src/xmlpatterns/data/quntypedatomic_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qvalidationerror.cpp b/src/xmlpatterns/data/qvalidationerror.cpp index 1a6063b..ad119f0 100644 --- a/src/xmlpatterns/data/qvalidationerror.cpp +++ b/src/xmlpatterns/data/qvalidationerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h index e525a54..a334d91 100644 --- a/src/xmlpatterns/data/qvalidationerror_p.h +++ b/src/xmlpatterns/data/qvalidationerror_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qyearmonthduration.cpp b/src/xmlpatterns/data/qyearmonthduration.cpp index 45bab3d..64b47ad 100644 --- a/src/xmlpatterns/data/qyearmonthduration.cpp +++ b/src/xmlpatterns/data/qyearmonthduration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h index 59996f0..d509328 100644 --- a/src/xmlpatterns/data/qyearmonthduration_p.h +++ b/src/xmlpatterns/data/qyearmonthduration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/documentationGroups.dox b/src/xmlpatterns/documentationGroups.dox index fabbad3..31f6d54 100644 --- a/src/xmlpatterns/documentationGroups.dox +++ b/src/xmlpatterns/documentationGroups.dox @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/createReportContext.xsl b/src/xmlpatterns/environment/createReportContext.xsl index e648c56..46d556e 100644 --- a/src/xmlpatterns/environment/createReportContext.xsl +++ b/src/xmlpatterns/environment/createReportContext.xsl @@ -8,11 +8,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -97,11 +97,11 @@ NOTE: Be aware of binary compatibility when using this stylesheet. ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qcurrentitemcontext.cpp b/src/xmlpatterns/environment/qcurrentitemcontext.cpp index 117988f..234d65d 100644 --- a/src/xmlpatterns/environment/qcurrentitemcontext.cpp +++ b/src/xmlpatterns/environment/qcurrentitemcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h index 44ad245..25867d7 100644 --- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h +++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp index 197dc0d..f83947d 100644 --- a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp +++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h index c269a90..ecb23c2 100644 --- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp index 51aeee8..4da2080 100644 --- a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp +++ b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h index 527cda2..719b930 100644 --- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h +++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdynamiccontext.cpp b/src/xmlpatterns/environment/qdynamiccontext.cpp index 8276b77..3ebd35b 100644 --- a/src/xmlpatterns/environment/qdynamiccontext.cpp +++ b/src/xmlpatterns/environment/qdynamiccontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h index 61b0f56..17796d6a 100644 --- a/src/xmlpatterns/environment/qdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qdynamiccontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qfocus.cpp b/src/xmlpatterns/environment/qfocus.cpp index 1ce3e0f..e3313f0 100644 --- a/src/xmlpatterns/environment/qfocus.cpp +++ b/src/xmlpatterns/environment/qfocus.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h index 08b9d26..a1b02ea 100644 --- a/src/xmlpatterns/environment/qfocus_p.h +++ b/src/xmlpatterns/environment/qfocus_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp index 86db046..df8c40f 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp +++ b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h index 619c54f..be2785f 100644 --- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qgenericstaticcontext.cpp b/src/xmlpatterns/environment/qgenericstaticcontext.cpp index 61a979f..504b187 100644 --- a/src/xmlpatterns/environment/qgenericstaticcontext.cpp +++ b/src/xmlpatterns/environment/qgenericstaticcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h index 42204ea..f16493a 100644 --- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h +++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp index 909b471..7d9f244 100644 --- a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp +++ b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h index b4bb9c1..ba65a4f 100644 --- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h +++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qreportcontext.cpp b/src/xmlpatterns/environment/qreportcontext.cpp index 9704a54..f7e6a43 100644 --- a/src/xmlpatterns/environment/qreportcontext.cpp +++ b/src/xmlpatterns/environment/qreportcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h index bea2a97..c6dc865 100644 --- a/src/xmlpatterns/environment/qreportcontext_p.h +++ b/src/xmlpatterns/environment/qreportcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstackcontextbase.cpp b/src/xmlpatterns/environment/qstackcontextbase.cpp index fbed9cd..5e70039 100644 --- a/src/xmlpatterns/environment/qstackcontextbase.cpp +++ b/src/xmlpatterns/environment/qstackcontextbase.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h index ac1f038..e58a010 100644 --- a/src/xmlpatterns/environment/qstackcontextbase_p.h +++ b/src/xmlpatterns/environment/qstackcontextbase_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp index 280763a..595e1a1 100644 --- a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp +++ b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h index db0d85c..da83f72 100644 --- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h +++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp index c437ba1..0047e62 100644 --- a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp +++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h index 4fbeff7..ef9bb71 100644 --- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h +++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcontext.cpp b/src/xmlpatterns/environment/qstaticcontext.cpp index 69067de..7444c18 100644 --- a/src/xmlpatterns/environment/qstaticcontext.cpp +++ b/src/xmlpatterns/environment/qstaticcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h index bda7a99..b83c843 100644 --- a/src/xmlpatterns/environment/qstaticcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp index 31bb40e..293b2a1 100644 --- a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp +++ b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h index 137463e..a2729ce 100644 --- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h +++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticfocuscontext.cpp b/src/xmlpatterns/environment/qstaticfocuscontext.cpp index bb0fd62..db5bb67 100644 --- a/src/xmlpatterns/environment/qstaticfocuscontext.cpp +++ b/src/xmlpatterns/environment/qstaticfocuscontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h index 69bb598..3a8cd35 100644 --- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h +++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp index 10344bd..a74dc13 100644 --- a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp +++ b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h index 705c718..d066d71 100644 --- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h +++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qandexpression.cpp b/src/xmlpatterns/expr/qandexpression.cpp index 3ffd6b8..bcf0dc0 100644 --- a/src/xmlpatterns/expr/qandexpression.cpp +++ b/src/xmlpatterns/expr/qandexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index c83d301..624c7f4 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qapplytemplate.cpp b/src/xmlpatterns/expr/qapplytemplate.cpp index 95f4fdf..50f1779 100644 --- a/src/xmlpatterns/expr/qapplytemplate.cpp +++ b/src/xmlpatterns/expr/qapplytemplate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index ef2424c..addb9f3 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qargumentreference.cpp b/src/xmlpatterns/expr/qargumentreference.cpp index 6eb683f..ad70e4b 100644 --- a/src/xmlpatterns/expr/qargumentreference.cpp +++ b/src/xmlpatterns/expr/qargumentreference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index a29ae08..a18e064 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp index f8cde0c..1d40529 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression.cpp +++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index 3356352..885c956 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qattributeconstructor.cpp b/src/xmlpatterns/expr/qattributeconstructor.cpp index 4cc357a..3788843 100644 --- a/src/xmlpatterns/expr/qattributeconstructor.cpp +++ b/src/xmlpatterns/expr/qattributeconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index ac42e7b..776ad59 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qattributenamevalidator.cpp b/src/xmlpatterns/expr/qattributenamevalidator.cpp index abca6b9..b85a29c 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator.cpp +++ b/src/xmlpatterns/expr/qattributenamevalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index 3e2c43b..28f98c4 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qaxisstep.cpp b/src/xmlpatterns/expr/qaxisstep.cpp index 5297dab..4aaf8fc 100644 --- a/src/xmlpatterns/expr/qaxisstep.cpp +++ b/src/xmlpatterns/expr/qaxisstep.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 620824b..d7c5bcf 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h index c9f78a6..5ed5082 100644 --- a/src/xmlpatterns/expr/qcachecells_p.h +++ b/src/xmlpatterns/expr/qcachecells_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcallsite.cpp b/src/xmlpatterns/expr/qcallsite.cpp index 6d3f052..e2737c1 100644 --- a/src/xmlpatterns/expr/qcallsite.cpp +++ b/src/xmlpatterns/expr/qcallsite.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h index 558e83c..9bc5d78 100644 --- a/src/xmlpatterns/expr/qcallsite_p.h +++ b/src/xmlpatterns/expr/qcallsite_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcalltargetdescription.cpp b/src/xmlpatterns/expr/qcalltargetdescription.cpp index 8c8bfdf..20cd548 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription.cpp +++ b/src/xmlpatterns/expr/qcalltargetdescription.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h index 1e44980..a4bda1f 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription_p.h +++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcalltemplate.cpp b/src/xmlpatterns/expr/qcalltemplate.cpp index d0ae017..fe75c8f 100644 --- a/src/xmlpatterns/expr/qcalltemplate.cpp +++ b/src/xmlpatterns/expr/qcalltemplate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index c49ec21..19f27d1 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastableas.cpp b/src/xmlpatterns/expr/qcastableas.cpp index 8ba015b..88c3379 100644 --- a/src/xmlpatterns/expr/qcastableas.cpp +++ b/src/xmlpatterns/expr/qcastableas.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index b1b2ecf..6333369 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastas.cpp b/src/xmlpatterns/expr/qcastas.cpp index b8771ba..9185fb0 100644 --- a/src/xmlpatterns/expr/qcastas.cpp +++ b/src/xmlpatterns/expr/qcastas.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index 8f4690e..ea17614 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastingplatform.cpp b/src/xmlpatterns/expr/qcastingplatform.cpp index 9e96fd8..46ca3e6 100644 --- a/src/xmlpatterns/expr/qcastingplatform.cpp +++ b/src/xmlpatterns/expr/qcastingplatform.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h index 458e9eb..a94d36c 100644 --- a/src/xmlpatterns/expr/qcastingplatform_p.h +++ b/src/xmlpatterns/expr/qcastingplatform_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcollationchecker.cpp b/src/xmlpatterns/expr/qcollationchecker.cpp index 2d8e49a..64c351c 100644 --- a/src/xmlpatterns/expr/qcollationchecker.cpp +++ b/src/xmlpatterns/expr/qcollationchecker.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index b79f0e8..61dba0f 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcombinenodes.cpp b/src/xmlpatterns/expr/qcombinenodes.cpp index c953322..71e3f6b 100644 --- a/src/xmlpatterns/expr/qcombinenodes.cpp +++ b/src/xmlpatterns/expr/qcombinenodes.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index 9d1dc87..5be4071 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcommentconstructor.cpp b/src/xmlpatterns/expr/qcommentconstructor.cpp index f8f5688..0c6b319 100644 --- a/src/xmlpatterns/expr/qcommentconstructor.cpp +++ b/src/xmlpatterns/expr/qcommentconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index 2503641..03fd4af 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcomparisonplatform.cpp b/src/xmlpatterns/expr/qcomparisonplatform.cpp index 5d10905..c4ffda8 100644 --- a/src/xmlpatterns/expr/qcomparisonplatform.cpp +++ b/src/xmlpatterns/expr/qcomparisonplatform.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h index fb088a8..33332f5 100644 --- a/src/xmlpatterns/expr/qcomparisonplatform_p.h +++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp index f782d04..1ea79c6 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index 48e79f5..53f5290 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcontextitem.cpp b/src/xmlpatterns/expr/qcontextitem.cpp index 769dd4d..8bacc5b 100644 --- a/src/xmlpatterns/expr/qcontextitem.cpp +++ b/src/xmlpatterns/expr/qcontextitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 42df859..181377c 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcopyof.cpp b/src/xmlpatterns/expr/qcopyof.cpp index 448ce5e..908d81c 100644 --- a/src/xmlpatterns/expr/qcopyof.cpp +++ b/src/xmlpatterns/expr/qcopyof.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index 64b0f98..cc09191 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcurrentitemstore.cpp b/src/xmlpatterns/expr/qcurrentitemstore.cpp index 8ab3ea5..1d2517f 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore.cpp +++ b/src/xmlpatterns/expr/qcurrentitemstore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index 6223b2f..bdc2720 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdocumentconstructor.cpp b/src/xmlpatterns/expr/qdocumentconstructor.cpp index 3c4a147..449f0d0 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor.cpp +++ b/src/xmlpatterns/expr/qdocumentconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index bc74a27..9b249ee 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp index 37df40a..70ed6f4 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index 2053a05..9436d92 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdynamiccontextstore.cpp b/src/xmlpatterns/expr/qdynamiccontextstore.cpp index 9dbedf2..234eaa6 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore.cpp +++ b/src/xmlpatterns/expr/qdynamiccontextstore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index b971f96..a507d4c 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qelementconstructor.cpp b/src/xmlpatterns/expr/qelementconstructor.cpp index 57da1ac..a2cbaff 100644 --- a/src/xmlpatterns/expr/qelementconstructor.cpp +++ b/src/xmlpatterns/expr/qelementconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index 7eacb2b..0ac160f 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qemptycontainer.cpp b/src/xmlpatterns/expr/qemptycontainer.cpp index d66f167..489c6ed 100644 --- a/src/xmlpatterns/expr/qemptycontainer.cpp +++ b/src/xmlpatterns/expr/qemptycontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index de42e9b..a83929d 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qemptysequence.cpp b/src/xmlpatterns/expr/qemptysequence.cpp index ef8130d..53dc2ed 100644 --- a/src/xmlpatterns/expr/qemptysequence.cpp +++ b/src/xmlpatterns/expr/qemptysequence.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index f5de6db..591754d 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qevaluationcache.cpp b/src/xmlpatterns/expr/qevaluationcache.cpp index 5e0826d..3a5a5a5 100644 --- a/src/xmlpatterns/expr/qevaluationcache.cpp +++ b/src/xmlpatterns/expr/qevaluationcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index 7daed76..a476a93 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpression.cpp b/src/xmlpatterns/expr/qexpression.cpp index 493086b..ff20923 100644 --- a/src/xmlpatterns/expr/qexpression.cpp +++ b/src/xmlpatterns/expr/qexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 5eb63de..26eedaa 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h index 5ab1a0f..7020cec 100644 --- a/src/xmlpatterns/expr/qexpressiondispatch_p.h +++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp index ec86be0..6dac0d9 100644 --- a/src/xmlpatterns/expr/qexpressionfactory.cpp +++ b/src/xmlpatterns/expr/qexpressionfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h index c06a7e5..0907a0e 100644 --- a/src/xmlpatterns/expr/qexpressionfactory_p.h +++ b/src/xmlpatterns/expr/qexpressionfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp index d052400..83d9a09 100644 --- a/src/xmlpatterns/expr/qexpressionsequence.cpp +++ b/src/xmlpatterns/expr/qexpressionsequence.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 7b5ad69..89bf3bb 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionvariablereference.cpp b/src/xmlpatterns/expr/qexpressionvariablereference.cpp index c327971..50d0d1f 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference.cpp +++ b/src/xmlpatterns/expr/qexpressionvariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index a7d63e7..8a9a8f3 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexternalvariableloader.cpp b/src/xmlpatterns/expr/qexternalvariableloader.cpp index ac7a9c0..18f1dc7 100644 --- a/src/xmlpatterns/expr/qexternalvariableloader.cpp +++ b/src/xmlpatterns/expr/qexternalvariableloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h index 4eacd99..687f5be 100644 --- a/src/xmlpatterns/expr/qexternalvariableloader_p.h +++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexternalvariablereference.cpp b/src/xmlpatterns/expr/qexternalvariablereference.cpp index bbbef86..f2cf36a 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference.cpp +++ b/src/xmlpatterns/expr/qexternalvariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index 928af9d..2a9b8d0 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qfirstitempredicate.cpp b/src/xmlpatterns/expr/qfirstitempredicate.cpp index 03b8bad..a4dd368 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate.cpp +++ b/src/xmlpatterns/expr/qfirstitempredicate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index 7e3f310..eddaeec 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qforclause.cpp b/src/xmlpatterns/expr/qforclause.cpp index cf9e634..45f1325 100644 --- a/src/xmlpatterns/expr/qforclause.cpp +++ b/src/xmlpatterns/expr/qforclause.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index d1cee33..1251e99 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qgeneralcomparison.cpp b/src/xmlpatterns/expr/qgeneralcomparison.cpp index b564c84..bc1e556 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison.cpp +++ b/src/xmlpatterns/expr/qgeneralcomparison.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index 9ff2435..b885075 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qgenericpredicate.cpp b/src/xmlpatterns/expr/qgenericpredicate.cpp index 839a5f8..bd61a99 100644 --- a/src/xmlpatterns/expr/qgenericpredicate.cpp +++ b/src/xmlpatterns/expr/qgenericpredicate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index fe0eda6..3b3072c 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qifthenclause.cpp b/src/xmlpatterns/expr/qifthenclause.cpp index 454df9a..71e3dd2 100644 --- a/src/xmlpatterns/expr/qifthenclause.cpp +++ b/src/xmlpatterns/expr/qifthenclause.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index 26aabb0..2c6ec42 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qinstanceof.cpp b/src/xmlpatterns/expr/qinstanceof.cpp index 41f1305..2cd43e0 100644 --- a/src/xmlpatterns/expr/qinstanceof.cpp +++ b/src/xmlpatterns/expr/qinstanceof.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 3d6b53c..0f440a6 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qletclause.cpp b/src/xmlpatterns/expr/qletclause.cpp index 5dc5148..49bd98b 100644 --- a/src/xmlpatterns/expr/qletclause.cpp +++ b/src/xmlpatterns/expr/qletclause.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index c9c0180..80a5d6e 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qliteral.cpp b/src/xmlpatterns/expr/qliteral.cpp index 2b1bdde..0b250e8 100644 --- a/src/xmlpatterns/expr/qliteral.cpp +++ b/src/xmlpatterns/expr/qliteral.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 3da667d..cbfdbee 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qliteralsequence.cpp b/src/xmlpatterns/expr/qliteralsequence.cpp index 15c25ca..bdc99a0 100644 --- a/src/xmlpatterns/expr/qliteralsequence.cpp +++ b/src/xmlpatterns/expr/qliteralsequence.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index e5b4556..e64ab55 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnamespaceconstructor.cpp b/src/xmlpatterns/expr/qnamespaceconstructor.cpp index d596e0f..c13c5b7 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor.cpp +++ b/src/xmlpatterns/expr/qnamespaceconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index 0807c14..c425070 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qncnameconstructor.cpp b/src/xmlpatterns/expr/qncnameconstructor.cpp index 2e9f71d..c82e580 100644 --- a/src/xmlpatterns/expr/qncnameconstructor.cpp +++ b/src/xmlpatterns/expr/qncnameconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index 8632a24..d82c5c8 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnodecomparison.cpp b/src/xmlpatterns/expr/qnodecomparison.cpp index 2b70bf9..d6626a6 100644 --- a/src/xmlpatterns/expr/qnodecomparison.cpp +++ b/src/xmlpatterns/expr/qnodecomparison.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 82a7d07..a013e3e 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnodesort.cpp b/src/xmlpatterns/expr/qnodesort.cpp index 0f0d9a2..7387b5f 100644 --- a/src/xmlpatterns/expr/qnodesort.cpp +++ b/src/xmlpatterns/expr/qnodesort.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index 225fbb9..06c743e 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h index 195c512..2398ab0 100644 --- a/src/xmlpatterns/expr/qoperandsiterator_p.h +++ b/src/xmlpatterns/expr/qoperandsiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizationpasses.cpp b/src/xmlpatterns/expr/qoptimizationpasses.cpp index aafe660..8c6dcfe 100644 --- a/src/xmlpatterns/expr/qoptimizationpasses.cpp +++ b/src/xmlpatterns/expr/qoptimizationpasses.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h index 178ca27..42ae628 100644 --- a/src/xmlpatterns/expr/qoptimizationpasses_p.h +++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizerblocks.cpp b/src/xmlpatterns/expr/qoptimizerblocks.cpp index e0d0ff6..67e36b0 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks.cpp +++ b/src/xmlpatterns/expr/qoptimizerblocks.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index 123a655..096bd3f 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizerframework.cpp b/src/xmlpatterns/expr/qoptimizerframework.cpp index 5e470ec..9767223 100644 --- a/src/xmlpatterns/expr/qoptimizerframework.cpp +++ b/src/xmlpatterns/expr/qoptimizerframework.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h index 6a67483..b7e58d2 100644 --- a/src/xmlpatterns/expr/qoptimizerframework_p.h +++ b/src/xmlpatterns/expr/qoptimizerframework_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qorderby.cpp b/src/xmlpatterns/expr/qorderby.cpp index af1d52b..6841fe6 100644 --- a/src/xmlpatterns/expr/qorderby.cpp +++ b/src/xmlpatterns/expr/qorderby.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index d817f8e..16b291b 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qorexpression.cpp b/src/xmlpatterns/expr/qorexpression.cpp index 58c0527..71214c4 100644 --- a/src/xmlpatterns/expr/qorexpression.cpp +++ b/src/xmlpatterns/expr/qorexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index 06471ed..603a16c 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpaircontainer.cpp b/src/xmlpatterns/expr/qpaircontainer.cpp index 74de69c..4466d95 100644 --- a/src/xmlpatterns/expr/qpaircontainer.cpp +++ b/src/xmlpatterns/expr/qpaircontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index 0311c89..a30861d 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qparentnodeaxis.cpp b/src/xmlpatterns/expr/qparentnodeaxis.cpp index f75aefd..e9a6ba8 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis.cpp +++ b/src/xmlpatterns/expr/qparentnodeaxis.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index 6c1c5dd..c47bdbc 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpath.cpp b/src/xmlpatterns/expr/qpath.cpp index 33bfa0f..1a1fd78 100644 --- a/src/xmlpatterns/expr/qpath.cpp +++ b/src/xmlpatterns/expr/qpath.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index cc2d5d5..7602ee1 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpositionalvariablereference.cpp b/src/xmlpatterns/expr/qpositionalvariablereference.cpp index c0316c9..073cca3 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference.cpp +++ b/src/xmlpatterns/expr/qpositionalvariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index 2bf933b..90bd3dd 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp index 379d9f7..71a804a 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index 64a9f80..cc797ea 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qqnameconstructor.cpp b/src/xmlpatterns/expr/qqnameconstructor.cpp index a0cc85b..df80020 100644 --- a/src/xmlpatterns/expr/qqnameconstructor.cpp +++ b/src/xmlpatterns/expr/qqnameconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index 95ea5b9..7bf0071 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qquantifiedexpression.cpp b/src/xmlpatterns/expr/qquantifiedexpression.cpp index d8037df..5426fbf 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression.cpp +++ b/src/xmlpatterns/expr/qquantifiedexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index acdfc15..557f291 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qrangeexpression.cpp b/src/xmlpatterns/expr/qrangeexpression.cpp index 2313880..b11e0b1 100644 --- a/src/xmlpatterns/expr/qrangeexpression.cpp +++ b/src/xmlpatterns/expr/qrangeexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index 7a87514..3e8d65f 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qrangevariablereference.cpp b/src/xmlpatterns/expr/qrangevariablereference.cpp index 057fa38..35f0b56 100644 --- a/src/xmlpatterns/expr/qrangevariablereference.cpp +++ b/src/xmlpatterns/expr/qrangevariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index 97c2b72..6c8fdad 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qreturnorderby.cpp b/src/xmlpatterns/expr/qreturnorderby.cpp index 9c3ee82..54bc893 100644 --- a/src/xmlpatterns/expr/qreturnorderby.cpp +++ b/src/xmlpatterns/expr/qreturnorderby.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index 1c2d952..a3317fe 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp index e2006b0..f6688f1 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp +++ b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index ba9b86d..60595c0 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsinglecontainer.cpp b/src/xmlpatterns/expr/qsinglecontainer.cpp index a0a0c01..ad1ec40 100644 --- a/src/xmlpatterns/expr/qsinglecontainer.cpp +++ b/src/xmlpatterns/expr/qsinglecontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 0d9f97e..fe696cb 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsourcelocationreflection.cpp b/src/xmlpatterns/expr/qsourcelocationreflection.cpp index fca711f..9393d36 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection.cpp +++ b/src/xmlpatterns/expr/qsourcelocationreflection.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 79faeef..7801d6c 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qstaticbaseuristore.cpp b/src/xmlpatterns/expr/qstaticbaseuristore.cpp index 0abd6a8..1e3ee0b 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore.cpp +++ b/src/xmlpatterns/expr/qstaticbaseuristore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index 3d7573f..af128af 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp index 8f6f025..fc6ccd5 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index 168b1cf..81fc097 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplate.cpp b/src/xmlpatterns/expr/qtemplate.cpp index 1b9d904..1faff71 100644 --- a/src/xmlpatterns/expr/qtemplate.cpp +++ b/src/xmlpatterns/expr/qtemplate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index d4f37a7..7fac4eb 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplateinvoker.cpp b/src/xmlpatterns/expr/qtemplateinvoker.cpp index 227feba..2cf7765 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker.cpp +++ b/src/xmlpatterns/expr/qtemplateinvoker.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index 84908f1..dd73ba1 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplatemode.cpp b/src/xmlpatterns/expr/qtemplatemode.cpp index 23de18f..0d9ba2a 100644 --- a/src/xmlpatterns/expr/qtemplatemode.cpp +++ b/src/xmlpatterns/expr/qtemplatemode.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h index 16d09e2..27b0afe 100644 --- a/src/xmlpatterns/expr/qtemplatemode_p.h +++ b/src/xmlpatterns/expr/qtemplatemode_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplateparameterreference.cpp b/src/xmlpatterns/expr/qtemplateparameterreference.cpp index 3b295e9..502c414 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference.cpp +++ b/src/xmlpatterns/expr/qtemplateparameterreference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index 594253b..048f1dc 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h index 6ea9866..3ee2259 100644 --- a/src/xmlpatterns/expr/qtemplatepattern_p.h +++ b/src/xmlpatterns/expr/qtemplatepattern_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtextnodeconstructor.cpp b/src/xmlpatterns/expr/qtextnodeconstructor.cpp index 085a909..3f27f90 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor.cpp +++ b/src/xmlpatterns/expr/qtextnodeconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 46c92ac..bffae7e 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtreatas.cpp b/src/xmlpatterns/expr/qtreatas.cpp index 13d2946..8700a4c 100644 --- a/src/xmlpatterns/expr/qtreatas.cpp +++ b/src/xmlpatterns/expr/qtreatas.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index ce43e9a..18e827e 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtriplecontainer.cpp b/src/xmlpatterns/expr/qtriplecontainer.cpp index de4ba78..fc633d2 100644 --- a/src/xmlpatterns/expr/qtriplecontainer.cpp +++ b/src/xmlpatterns/expr/qtriplecontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index 84627f8..1ca7461 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtruthpredicate.cpp b/src/xmlpatterns/expr/qtruthpredicate.cpp index 34e12e5..bd4ab3d 100644 --- a/src/xmlpatterns/expr/qtruthpredicate.cpp +++ b/src/xmlpatterns/expr/qtruthpredicate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 0618997..a5296a4 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunaryexpression.cpp b/src/xmlpatterns/expr/qunaryexpression.cpp index df30241..73d9609 100644 --- a/src/xmlpatterns/expr/qunaryexpression.cpp +++ b/src/xmlpatterns/expr/qunaryexpression.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index 70a29ad..37ce8a1 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunlimitedcontainer.cpp b/src/xmlpatterns/expr/qunlimitedcontainer.cpp index 3a1d7ca..f0b1cae 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer.cpp +++ b/src/xmlpatterns/expr/qunlimitedcontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index 6c9917e..a1990bc 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp index 2b98f99..062eee0 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp +++ b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index 272b654..4000a75 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/quserfunction.cpp b/src/xmlpatterns/expr/quserfunction.cpp index fe96b1e..eea6e79 100644 --- a/src/xmlpatterns/expr/quserfunction.cpp +++ b/src/xmlpatterns/expr/quserfunction.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h index 86d6648..6d67ce0 100644 --- a/src/xmlpatterns/expr/quserfunction_p.h +++ b/src/xmlpatterns/expr/quserfunction_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/quserfunctioncallsite.cpp b/src/xmlpatterns/expr/quserfunctioncallsite.cpp index ec88175..d0e58f2 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite.cpp +++ b/src/xmlpatterns/expr/quserfunctioncallsite.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index 50ae8f4..465b901 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvalidate.cpp b/src/xmlpatterns/expr/qvalidate.cpp index 0184a47..3727e9b 100644 --- a/src/xmlpatterns/expr/qvalidate.cpp +++ b/src/xmlpatterns/expr/qvalidate.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h index cf1654d..215dfbd 100644 --- a/src/xmlpatterns/expr/qvalidate_p.h +++ b/src/xmlpatterns/expr/qvalidate_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvaluecomparison.cpp b/src/xmlpatterns/expr/qvaluecomparison.cpp index a0a88da..81706b8 100644 --- a/src/xmlpatterns/expr/qvaluecomparison.cpp +++ b/src/xmlpatterns/expr/qvaluecomparison.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 01663de..6a8529b 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvariabledeclaration.cpp b/src/xmlpatterns/expr/qvariabledeclaration.cpp index c59f344..361cad2 100644 --- a/src/xmlpatterns/expr/qvariabledeclaration.cpp +++ b/src/xmlpatterns/expr/qvariabledeclaration.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h index efc5c57..2260a9c 100644 --- a/src/xmlpatterns/expr/qvariabledeclaration_p.h +++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvariablereference.cpp b/src/xmlpatterns/expr/qvariablereference.cpp index 0692a3e..0fffaf0 100644 --- a/src/xmlpatterns/expr/qvariablereference.cpp +++ b/src/xmlpatterns/expr/qvariablereference.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index da8bfe6..a859e70 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h index af8c406..2f0d943 100644 --- a/src/xmlpatterns/expr/qwithparam_p.h +++ b/src/xmlpatterns/expr/qwithparam_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp index ef77c76..895cac1 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index 93d8e74..84d0bb0 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory.cpp b/src/xmlpatterns/functions/qabstractfunctionfactory.cpp index 6d901aa..0bc7dce 100644 --- a/src/xmlpatterns/functions/qabstractfunctionfactory.cpp +++ b/src/xmlpatterns/functions/qabstractfunctionfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h index b988658..0097555 100644 --- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaccessorfns.cpp b/src/xmlpatterns/functions/qaccessorfns.cpp index 8ff9ef4..5bd43d9 100644 --- a/src/xmlpatterns/functions/qaccessorfns.cpp +++ b/src/xmlpatterns/functions/qaccessorfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h index 61c986a..822f32a 100644 --- a/src/xmlpatterns/functions/qaccessorfns_p.h +++ b/src/xmlpatterns/functions/qaccessorfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaggregatefns.cpp b/src/xmlpatterns/functions/qaggregatefns.cpp index 99302ba..669cf39 100644 --- a/src/xmlpatterns/functions/qaggregatefns.cpp +++ b/src/xmlpatterns/functions/qaggregatefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h index 9e4eb94..a49e1cd 100644 --- a/src/xmlpatterns/functions/qaggregatefns_p.h +++ b/src/xmlpatterns/functions/qaggregatefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaggregator.cpp b/src/xmlpatterns/functions/qaggregator.cpp index b585e77..c497ee4 100644 --- a/src/xmlpatterns/functions/qaggregator.cpp +++ b/src/xmlpatterns/functions/qaggregator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h index 7b7e90b..aea7521 100644 --- a/src/xmlpatterns/functions/qaggregator_p.h +++ b/src/xmlpatterns/functions/qaggregator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qassemblestringfns.cpp b/src/xmlpatterns/functions/qassemblestringfns.cpp index 513ba67..c1bbddb 100644 --- a/src/xmlpatterns/functions/qassemblestringfns.cpp +++ b/src/xmlpatterns/functions/qassemblestringfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h index 832e283..049a2e8 100644 --- a/src/xmlpatterns/functions/qassemblestringfns_p.h +++ b/src/xmlpatterns/functions/qassemblestringfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qbooleanfns.cpp b/src/xmlpatterns/functions/qbooleanfns.cpp index c20b0e3..d51561c 100644 --- a/src/xmlpatterns/functions/qbooleanfns.cpp +++ b/src/xmlpatterns/functions/qbooleanfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h index 9890981..2e528ba 100644 --- a/src/xmlpatterns/functions/qbooleanfns_p.h +++ b/src/xmlpatterns/functions/qbooleanfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparescaseaware.cpp b/src/xmlpatterns/functions/qcomparescaseaware.cpp index 2fee0f7..6bb9a36 100644 --- a/src/xmlpatterns/functions/qcomparescaseaware.cpp +++ b/src/xmlpatterns/functions/qcomparescaseaware.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h index 7791949..948f991 100644 --- a/src/xmlpatterns/functions/qcomparescaseaware_p.h +++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparestringfns.cpp b/src/xmlpatterns/functions/qcomparestringfns.cpp index 1f2fcee6..0825f3d 100644 --- a/src/xmlpatterns/functions/qcomparestringfns.cpp +++ b/src/xmlpatterns/functions/qcomparestringfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h index 11ebd2a..a0d4ee6 100644 --- a/src/xmlpatterns/functions/qcomparestringfns_p.h +++ b/src/xmlpatterns/functions/qcomparestringfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparingaggregator.cpp b/src/xmlpatterns/functions/qcomparingaggregator.cpp index a87e659..0b48a87 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator.cpp +++ b/src/xmlpatterns/functions/qcomparingaggregator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h index 374fa7a..21feab1 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator_p.h +++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp index 529cab9..1db0fa5 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h index 9861f7c..c152647 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcontextfns.cpp b/src/xmlpatterns/functions/qcontextfns.cpp index 89da9db..3090eb8 100644 --- a/src/xmlpatterns/functions/qcontextfns.cpp +++ b/src/xmlpatterns/functions/qcontextfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h index 08698e7..e8bb447 100644 --- a/src/xmlpatterns/functions/qcontextfns_p.h +++ b/src/xmlpatterns/functions/qcontextfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcontextnodechecker.cpp b/src/xmlpatterns/functions/qcontextnodechecker.cpp index 2d1df49..23b6fd3 100644 --- a/src/xmlpatterns/functions/qcontextnodechecker.cpp +++ b/src/xmlpatterns/functions/qcontextnodechecker.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h index 5745bc4..0c2cf61 100644 --- a/src/xmlpatterns/functions/qcontextnodechecker_p.h +++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcurrentfn.cpp b/src/xmlpatterns/functions/qcurrentfn.cpp index f4ae778..1095d93 100644 --- a/src/xmlpatterns/functions/qcurrentfn.cpp +++ b/src/xmlpatterns/functions/qcurrentfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h index cc9d295..e262fda 100644 --- a/src/xmlpatterns/functions/qcurrentfn_p.h +++ b/src/xmlpatterns/functions/qcurrentfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdatetimefn.cpp b/src/xmlpatterns/functions/qdatetimefn.cpp index 5727794..ea5e498 100644 --- a/src/xmlpatterns/functions/qdatetimefn.cpp +++ b/src/xmlpatterns/functions/qdatetimefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h index 69567d2..3d8664c 100644 --- a/src/xmlpatterns/functions/qdatetimefn_p.h +++ b/src/xmlpatterns/functions/qdatetimefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdatetimefns.cpp b/src/xmlpatterns/functions/qdatetimefns.cpp index 756504b..961a353 100644 --- a/src/xmlpatterns/functions/qdatetimefns.cpp +++ b/src/xmlpatterns/functions/qdatetimefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h index 0adb3f3..089004f 100644 --- a/src/xmlpatterns/functions/qdatetimefns_p.h +++ b/src/xmlpatterns/functions/qdatetimefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdeepequalfn.cpp b/src/xmlpatterns/functions/qdeepequalfn.cpp index 133ab60..b40a1a3 100644 --- a/src/xmlpatterns/functions/qdeepequalfn.cpp +++ b/src/xmlpatterns/functions/qdeepequalfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h index 6272b08..cb5e4a7 100644 --- a/src/xmlpatterns/functions/qdeepequalfn_p.h +++ b/src/xmlpatterns/functions/qdeepequalfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdocumentfn.cpp b/src/xmlpatterns/functions/qdocumentfn.cpp index 02f28d9..66400f5 100644 --- a/src/xmlpatterns/functions/qdocumentfn.cpp +++ b/src/xmlpatterns/functions/qdocumentfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h index 74dcd31..ee04204 100644 --- a/src/xmlpatterns/functions/qdocumentfn_p.h +++ b/src/xmlpatterns/functions/qdocumentfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qelementavailablefn.cpp b/src/xmlpatterns/functions/qelementavailablefn.cpp index 853b2d0..57da06b 100644 --- a/src/xmlpatterns/functions/qelementavailablefn.cpp +++ b/src/xmlpatterns/functions/qelementavailablefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h index 3ea1650..8932433 100644 --- a/src/xmlpatterns/functions/qelementavailablefn_p.h +++ b/src/xmlpatterns/functions/qelementavailablefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qerrorfn.cpp b/src/xmlpatterns/functions/qerrorfn.cpp index 5cef1b6..d409945 100644 --- a/src/xmlpatterns/functions/qerrorfn.cpp +++ b/src/xmlpatterns/functions/qerrorfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h index 2598589..2066e95 100644 --- a/src/xmlpatterns/functions/qerrorfn_p.h +++ b/src/xmlpatterns/functions/qerrorfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionargument.cpp b/src/xmlpatterns/functions/qfunctionargument.cpp index 63cf00f..e25ecaf 100644 --- a/src/xmlpatterns/functions/qfunctionargument.cpp +++ b/src/xmlpatterns/functions/qfunctionargument.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h index 2703e56..3787fa3 100644 --- a/src/xmlpatterns/functions/qfunctionargument_p.h +++ b/src/xmlpatterns/functions/qfunctionargument_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionavailablefn.cpp b/src/xmlpatterns/functions/qfunctionavailablefn.cpp index 20c08fa..869a047 100644 --- a/src/xmlpatterns/functions/qfunctionavailablefn.cpp +++ b/src/xmlpatterns/functions/qfunctionavailablefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h index b8ed8d2..e55e0f3 100644 --- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h +++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctioncall.cpp b/src/xmlpatterns/functions/qfunctioncall.cpp index edea72f..cafed24 100644 --- a/src/xmlpatterns/functions/qfunctioncall.cpp +++ b/src/xmlpatterns/functions/qfunctioncall.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h index 4d1123a..96daaea 100644 --- a/src/xmlpatterns/functions/qfunctioncall_p.h +++ b/src/xmlpatterns/functions/qfunctioncall_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionfactory.cpp b/src/xmlpatterns/functions/qfunctionfactory.cpp index 6809bb2..a07e51c 100644 --- a/src/xmlpatterns/functions/qfunctionfactory.cpp +++ b/src/xmlpatterns/functions/qfunctionfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h index e0a7d4a..54ce348 100644 --- a/src/xmlpatterns/functions/qfunctionfactory_p.h +++ b/src/xmlpatterns/functions/qfunctionfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp index 00856f4..a62ad44 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp +++ b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h index f83aaac..fc22818 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h +++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionsignature.cpp b/src/xmlpatterns/functions/qfunctionsignature.cpp index 15f9cff..e3761e7 100644 --- a/src/xmlpatterns/functions/qfunctionsignature.cpp +++ b/src/xmlpatterns/functions/qfunctionsignature.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h index 4dcd4cc..e46480d 100644 --- a/src/xmlpatterns/functions/qfunctionsignature_p.h +++ b/src/xmlpatterns/functions/qfunctionsignature_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qgenerateidfn.cpp b/src/xmlpatterns/functions/qgenerateidfn.cpp index c1913da..d4cf6d4 100644 --- a/src/xmlpatterns/functions/qgenerateidfn.cpp +++ b/src/xmlpatterns/functions/qgenerateidfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h index 54b94cd..84f5b3a 100644 --- a/src/xmlpatterns/functions/qgenerateidfn_p.h +++ b/src/xmlpatterns/functions/qgenerateidfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qnodefns.cpp b/src/xmlpatterns/functions/qnodefns.cpp index 5230a6c..555638f 100644 --- a/src/xmlpatterns/functions/qnodefns.cpp +++ b/src/xmlpatterns/functions/qnodefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h index e762fe8..de7796a 100644 --- a/src/xmlpatterns/functions/qnodefns_p.h +++ b/src/xmlpatterns/functions/qnodefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qnumericfns.cpp b/src/xmlpatterns/functions/qnumericfns.cpp index 73e7eda..8a9cd26 100644 --- a/src/xmlpatterns/functions/qnumericfns.cpp +++ b/src/xmlpatterns/functions/qnumericfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h index 51c9b71..5e29ee1 100644 --- a/src/xmlpatterns/functions/qnumericfns_p.h +++ b/src/xmlpatterns/functions/qnumericfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp index f930955..e76719e 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp +++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h index 50bb450..e82c133 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h +++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qpatternplatform.cpp b/src/xmlpatterns/functions/qpatternplatform.cpp index 0052a07..0cccd93 100644 --- a/src/xmlpatterns/functions/qpatternplatform.cpp +++ b/src/xmlpatterns/functions/qpatternplatform.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index ce0dbd4..b4eb71f 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qqnamefns.cpp b/src/xmlpatterns/functions/qqnamefns.cpp index 8074db8..972badd 100644 --- a/src/xmlpatterns/functions/qqnamefns.cpp +++ b/src/xmlpatterns/functions/qqnamefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h index 6d22d06..70c1f55 100644 --- a/src/xmlpatterns/functions/qqnamefns_p.h +++ b/src/xmlpatterns/functions/qqnamefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qresolveurifn.cpp b/src/xmlpatterns/functions/qresolveurifn.cpp index 6068e8f..c0656b7 100644 --- a/src/xmlpatterns/functions/qresolveurifn.cpp +++ b/src/xmlpatterns/functions/qresolveurifn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h index d49007a..b8a9fc3 100644 --- a/src/xmlpatterns/functions/qresolveurifn_p.h +++ b/src/xmlpatterns/functions/qresolveurifn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsequencefns.cpp b/src/xmlpatterns/functions/qsequencefns.cpp index f6d5391..10f15de 100644 --- a/src/xmlpatterns/functions/qsequencefns.cpp +++ b/src/xmlpatterns/functions/qsequencefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index 3f79a5f..8c9dbb7 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp index c77a3e7..09360ea 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp +++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h index 881a4d9..6ef85ac 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h +++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h index ab21f24..d5bf9584 100644 --- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h +++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp b/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp index d3dcf99..2a45ba7 100644 --- a/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp +++ b/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h index 3d21e15..81d2a4f 100644 --- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h +++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qstringvaluefns.cpp b/src/xmlpatterns/functions/qstringvaluefns.cpp index d57dd4c..43ee6e4 100644 --- a/src/xmlpatterns/functions/qstringvaluefns.cpp +++ b/src/xmlpatterns/functions/qstringvaluefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h index b677d40..acdd912 100644 --- a/src/xmlpatterns/functions/qstringvaluefns_p.h +++ b/src/xmlpatterns/functions/qstringvaluefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsubstringfns.cpp b/src/xmlpatterns/functions/qsubstringfns.cpp index 301f56a..8dd541c 100644 --- a/src/xmlpatterns/functions/qsubstringfns.cpp +++ b/src/xmlpatterns/functions/qsubstringfns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h index 2926764..ded0c38 100644 --- a/src/xmlpatterns/functions/qsubstringfns_p.h +++ b/src/xmlpatterns/functions/qsubstringfns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsystempropertyfn.cpp b/src/xmlpatterns/functions/qsystempropertyfn.cpp index edd413d..d0f11cc 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn.cpp +++ b/src/xmlpatterns/functions/qsystempropertyfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h index 3b12edb..d76bbc5 100644 --- a/src/xmlpatterns/functions/qsystempropertyfn_p.h +++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtimezonefns.cpp b/src/xmlpatterns/functions/qtimezonefns.cpp index 1968ffb..c7d4eee 100644 --- a/src/xmlpatterns/functions/qtimezonefns.cpp +++ b/src/xmlpatterns/functions/qtimezonefns.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h index a6373e4..0d7ace4 100644 --- a/src/xmlpatterns/functions/qtimezonefns_p.h +++ b/src/xmlpatterns/functions/qtimezonefns_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtracefn.cpp b/src/xmlpatterns/functions/qtracefn.cpp index c7f193e..d4995fa 100644 --- a/src/xmlpatterns/functions/qtracefn.cpp +++ b/src/xmlpatterns/functions/qtracefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h index 667d5c2..84de145 100644 --- a/src/xmlpatterns/functions/qtracefn_p.h +++ b/src/xmlpatterns/functions/qtracefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtypeavailablefn.cpp b/src/xmlpatterns/functions/qtypeavailablefn.cpp index d120df8..c3270f8 100644 --- a/src/xmlpatterns/functions/qtypeavailablefn.cpp +++ b/src/xmlpatterns/functions/qtypeavailablefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h index d37c306..ceffdeb 100644 --- a/src/xmlpatterns/functions/qtypeavailablefn_p.h +++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp b/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp index 269b81e..7127551 100644 --- a/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp +++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h index e9af810..a6d95eb 100644 --- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h +++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedentityurifn.cpp b/src/xmlpatterns/functions/qunparsedentityurifn.cpp index 8058012..f117072 100644 --- a/src/xmlpatterns/functions/qunparsedentityurifn.cpp +++ b/src/xmlpatterns/functions/qunparsedentityurifn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h index 7dcd69f..61a884e 100644 --- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h +++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp b/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp index c092240..ef7d235 100644 --- a/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp +++ b/src/xmlpatterns/functions/qunparsedtextavailablefn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h index 938a68a..3cb5f77 100644 --- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedtextfn.cpp b/src/xmlpatterns/functions/qunparsedtextfn.cpp index 0400c94..a2a05ed 100644 --- a/src/xmlpatterns/functions/qunparsedtextfn.cpp +++ b/src/xmlpatterns/functions/qunparsedtextfn.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h index 0661c27..a8293a2 100644 --- a/src/xmlpatterns/functions/qunparsedtextfn_p.h +++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxpath10corefunctions.cpp b/src/xmlpatterns/functions/qxpath10corefunctions.cpp index 787eac0..ddb409b 100644 --- a/src/xmlpatterns/functions/qxpath10corefunctions.cpp +++ b/src/xmlpatterns/functions/qxpath10corefunctions.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h index 3887495..76968e8 100644 --- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxpath20corefunctions.cpp b/src/xmlpatterns/functions/qxpath20corefunctions.cpp index 384a77c..1c8c93f 100644 --- a/src/xmlpatterns/functions/qxpath20corefunctions.cpp +++ b/src/xmlpatterns/functions/qxpath20corefunctions.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h index fb5bee5..162c1af 100644 --- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxslt20corefunctions.cpp b/src/xmlpatterns/functions/qxslt20corefunctions.cpp index 8e9ee17..172699c 100644 --- a/src/xmlpatterns/functions/qxslt20corefunctions.cpp +++ b/src/xmlpatterns/functions/qxslt20corefunctions.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h index bbacf93..9c7174b 100644 --- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h +++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qcachingiterator.cpp b/src/xmlpatterns/iterators/qcachingiterator.cpp index a1f6ade..d96d37a 100644 --- a/src/xmlpatterns/iterators/qcachingiterator.cpp +++ b/src/xmlpatterns/iterators/qcachingiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h index ebf5fda..e92fa76 100644 --- a/src/xmlpatterns/iterators/qcachingiterator_p.h +++ b/src/xmlpatterns/iterators/qcachingiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp index 43088d5..0f27b28 100644 --- a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp +++ b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h index 07881c5..3d69ab9 100644 --- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h +++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qdistinctiterator.cpp b/src/xmlpatterns/iterators/qdistinctiterator.cpp index 43951ea..3e79b03 100644 --- a/src/xmlpatterns/iterators/qdistinctiterator.cpp +++ b/src/xmlpatterns/iterators/qdistinctiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h index 86fbd79..8703215 100644 --- a/src/xmlpatterns/iterators/qdistinctiterator_p.h +++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h index 310512e..6824c4a 100644 --- a/src/xmlpatterns/iterators/qemptyiterator_p.h +++ b/src/xmlpatterns/iterators/qemptyiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qexceptiterator.cpp b/src/xmlpatterns/iterators/qexceptiterator.cpp index 68609f7..15e1e3b 100644 --- a/src/xmlpatterns/iterators/qexceptiterator.cpp +++ b/src/xmlpatterns/iterators/qexceptiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h index 7528ef6..2e7fe0d 100644 --- a/src/xmlpatterns/iterators/qexceptiterator_p.h +++ b/src/xmlpatterns/iterators/qexceptiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qindexofiterator.cpp b/src/xmlpatterns/iterators/qindexofiterator.cpp index df7edeb..45e4c34 100644 --- a/src/xmlpatterns/iterators/qindexofiterator.cpp +++ b/src/xmlpatterns/iterators/qindexofiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h index 62594f9..47075a7 100644 --- a/src/xmlpatterns/iterators/qindexofiterator_p.h +++ b/src/xmlpatterns/iterators/qindexofiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qinsertioniterator.cpp b/src/xmlpatterns/iterators/qinsertioniterator.cpp index 7d4eb98..a316dfd 100644 --- a/src/xmlpatterns/iterators/qinsertioniterator.cpp +++ b/src/xmlpatterns/iterators/qinsertioniterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h index 4d89c26..ffaf056 100644 --- a/src/xmlpatterns/iterators/qinsertioniterator_p.h +++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qintersectiterator.cpp b/src/xmlpatterns/iterators/qintersectiterator.cpp index 3073810..63098b5 100644 --- a/src/xmlpatterns/iterators/qintersectiterator.cpp +++ b/src/xmlpatterns/iterators/qintersectiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h index c8ada57..0d7605c 100644 --- a/src/xmlpatterns/iterators/qintersectiterator_p.h +++ b/src/xmlpatterns/iterators/qintersectiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h index 284296c..ef297b1 100644 --- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h +++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qrangeiterator.cpp b/src/xmlpatterns/iterators/qrangeiterator.cpp index 7f8f629..ccb7a22 100644 --- a/src/xmlpatterns/iterators/qrangeiterator.cpp +++ b/src/xmlpatterns/iterators/qrangeiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h index 0a0f294..d2b2253 100644 --- a/src/xmlpatterns/iterators/qrangeiterator_p.h +++ b/src/xmlpatterns/iterators/qrangeiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qremovaliterator.cpp b/src/xmlpatterns/iterators/qremovaliterator.cpp index eb27ce7..5209f5d 100644 --- a/src/xmlpatterns/iterators/qremovaliterator.cpp +++ b/src/xmlpatterns/iterators/qremovaliterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h index e5f8ad3..b0b27af 100644 --- a/src/xmlpatterns/iterators/qremovaliterator_p.h +++ b/src/xmlpatterns/iterators/qremovaliterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h index 2e203fb..46be4c4 100644 --- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h +++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h index d37f057..a81c45c 100644 --- a/src/xmlpatterns/iterators/qsingletoniterator_p.h +++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp index 4d9ee96..5b04ad9 100644 --- a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp +++ b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h index 1217069..87db9ec 100644 --- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h +++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp index 63d92ab..8c18bba 100644 --- a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp +++ b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h index 2c9f481..c56cb7f 100644 --- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h +++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qunioniterator.cpp b/src/xmlpatterns/iterators/qunioniterator.cpp index 7a54a0d..7206fc7 100644 --- a/src/xmlpatterns/iterators/qunioniterator.cpp +++ b/src/xmlpatterns/iterators/qunioniterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h index 6db0889..74dde71 100644 --- a/src/xmlpatterns/iterators/qunioniterator_p.h +++ b/src/xmlpatterns/iterators/qunioniterator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qargumentconverter.cpp b/src/xmlpatterns/janitors/qargumentconverter.cpp index f067089..e75300a 100644 --- a/src/xmlpatterns/janitors/qargumentconverter.cpp +++ b/src/xmlpatterns/janitors/qargumentconverter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h index aa89d95..b6132a1 100644 --- a/src/xmlpatterns/janitors/qargumentconverter_p.h +++ b/src/xmlpatterns/janitors/qargumentconverter_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qatomizer.cpp b/src/xmlpatterns/janitors/qatomizer.cpp index 929f22d..b29ff92 100644 --- a/src/xmlpatterns/janitors/qatomizer.cpp +++ b/src/xmlpatterns/janitors/qatomizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h index a1b7dfa..815e130 100644 --- a/src/xmlpatterns/janitors/qatomizer_p.h +++ b/src/xmlpatterns/janitors/qatomizer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qcardinalityverifier.cpp b/src/xmlpatterns/janitors/qcardinalityverifier.cpp index 0d51d2c..3564914 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier.cpp +++ b/src/xmlpatterns/janitors/qcardinalityverifier.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h index c51f1e1..1d220eb 100644 --- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h +++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qebvextractor.cpp b/src/xmlpatterns/janitors/qebvextractor.cpp index 8ed3068..b93cbeb 100644 --- a/src/xmlpatterns/janitors/qebvextractor.cpp +++ b/src/xmlpatterns/janitors/qebvextractor.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h index 443560b..80b381b 100644 --- a/src/xmlpatterns/janitors/qebvextractor_p.h +++ b/src/xmlpatterns/janitors/qebvextractor_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qitemverifier.cpp b/src/xmlpatterns/janitors/qitemverifier.cpp index cf88cee..8279b85 100644 --- a/src/xmlpatterns/janitors/qitemverifier.cpp +++ b/src/xmlpatterns/janitors/qitemverifier.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h index 3da9ad9..1e56a21 100644 --- a/src/xmlpatterns/janitors/qitemverifier_p.h +++ b/src/xmlpatterns/janitors/qitemverifier_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter.cpp b/src/xmlpatterns/janitors/quntypedatomicconverter.cpp index 937a8f9..8b775cc 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter.cpp +++ b/src/xmlpatterns/janitors/quntypedatomicconverter.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h index 0d475b4..466587e 100644 --- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h +++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/TokenLookup.gperf b/src/xmlpatterns/parser/TokenLookup.gperf index e55007e..52e2e2f 100644 --- a/src/xmlpatterns/parser/TokenLookup.gperf +++ b/src/xmlpatterns/parser/TokenLookup.gperf @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp index 0ac0804..2cbf374 100644 --- a/src/xmlpatterns/parser/qmaintainingreader.cpp +++ b/src/xmlpatterns/parser/qmaintainingreader.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h index 2fab61f..cfa1bce 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qparsercontext.cpp b/src/xmlpatterns/parser/qparsercontext.cpp index 7c48dee..33def21 100644 --- a/src/xmlpatterns/parser/qparsercontext.cpp +++ b/src/xmlpatterns/parser/qparsercontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h index 941b6d3..080afc6 100644 --- a/src/xmlpatterns/parser/qparsercontext_p.h +++ b/src/xmlpatterns/parser/qparsercontext_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index 60e3a0c..a6bbd36 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -131,11 +131,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qquerytransformparser_p.h b/src/xmlpatterns/parser/qquerytransformparser_p.h index fcf8896..272191b 100644 --- a/src/xmlpatterns/parser/qquerytransformparser_p.h +++ b/src/xmlpatterns/parser/qquerytransformparser_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h index eecd5b2..cd5293e 100644 --- a/src/xmlpatterns/parser/qtokenizer_p.h +++ b/src/xmlpatterns/parser/qtokenizer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qtokenrevealer.cpp b/src/xmlpatterns/parser/qtokenrevealer.cpp index 15852d9..384f07f 100644 --- a/src/xmlpatterns/parser/qtokenrevealer.cpp +++ b/src/xmlpatterns/parser/qtokenrevealer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h index a1530b0..9ecef14 100644 --- a/src/xmlpatterns/parser/qtokenrevealer_p.h +++ b/src/xmlpatterns/parser/qtokenrevealer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qtokensource.cpp b/src/xmlpatterns/parser/qtokensource.cpp index 5393f12..9625f0e 100644 --- a/src/xmlpatterns/parser/qtokensource.cpp +++ b/src/xmlpatterns/parser/qtokensource.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h index 41b7be6..5c844dc 100644 --- a/src/xmlpatterns/parser/qtokensource_p.h +++ b/src/xmlpatterns/parser/qtokensource_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index 93974a4..98146e0 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -58,11 +58,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp index 7e96f13..fa37c42 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer.cpp +++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h index 4ef7a5f..ed38ece 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer_p.h +++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxslttokenizer.cpp b/src/xmlpatterns/parser/qxslttokenizer.cpp index 11d12f8..d59d89e 100644 --- a/src/xmlpatterns/parser/qxslttokenizer.cpp +++ b/src/xmlpatterns/parser/qxslttokenizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h index 9fb43c7..671c80f 100644 --- a/src/xmlpatterns/parser/qxslttokenizer_p.h +++ b/src/xmlpatterns/parser/qxslttokenizer_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxslttokenlookup.cpp b/src/xmlpatterns/parser/qxslttokenlookup.cpp index 9184de7..79cb7ad 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup.cpp +++ b/src/xmlpatterns/parser/qxslttokenlookup.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxslttokenlookup.xml b/src/xmlpatterns/parser/qxslttokenlookup.xml index 228eae2..33fe0a8 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup.xml +++ b/src/xmlpatterns/parser/qxslttokenlookup.xml @@ -116,11 +116,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/qxslttokenlookup_p.h b/src/xmlpatterns/parser/qxslttokenlookup_p.h index c9551e3..13ae54c 100644 --- a/src/xmlpatterns/parser/qxslttokenlookup_p.h +++ b/src/xmlpatterns/parser/qxslttokenlookup_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/parser/trolltechHeader.txt b/src/xmlpatterns/parser/trolltechHeader.txt index 8ec655d..dbc2d48 100644 --- a/src/xmlpatterns/parser/trolltechHeader.txt +++ b/src/xmlpatterns/parser/trolltechHeader.txt @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/projection/qdocumentprojector.cpp b/src/xmlpatterns/projection/qdocumentprojector.cpp index fd0ef29..d365b7f 100644 --- a/src/xmlpatterns/projection/qdocumentprojector.cpp +++ b/src/xmlpatterns/projection/qdocumentprojector.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h index 39e74e4..d60e29d 100644 --- a/src/xmlpatterns/projection/qdocumentprojector_p.h +++ b/src/xmlpatterns/projection/qdocumentprojector_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h index 8f54902..e3a62de 100644 --- a/src/xmlpatterns/projection/qprojectedexpression_p.h +++ b/src/xmlpatterns/projection/qprojectedexpression_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/qtokenautomaton/exampleFile.xml b/src/xmlpatterns/qtokenautomaton/exampleFile.xml index d62a42a..808443f 100644 --- a/src/xmlpatterns/qtokenautomaton/exampleFile.xml +++ b/src/xmlpatterns/qtokenautomaton/exampleFile.xml @@ -25,11 +25,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qabstractnodetest.cpp b/src/xmlpatterns/type/qabstractnodetest.cpp index 12860ca..9e38ff6 100644 --- a/src/xmlpatterns/type/qabstractnodetest.cpp +++ b/src/xmlpatterns/type/qabstractnodetest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h index c1abbb5..57d46c9 100644 --- a/src/xmlpatterns/type/qabstractnodetest_p.h +++ b/src/xmlpatterns/type/qabstractnodetest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanyitemtype.cpp b/src/xmlpatterns/type/qanyitemtype.cpp index 80b7010..f027b1f 100644 --- a/src/xmlpatterns/type/qanyitemtype.cpp +++ b/src/xmlpatterns/type/qanyitemtype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h index 04f82b2..0903f22 100644 --- a/src/xmlpatterns/type/qanyitemtype_p.h +++ b/src/xmlpatterns/type/qanyitemtype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanynodetype.cpp b/src/xmlpatterns/type/qanynodetype.cpp index baf4226..6819162 100644 --- a/src/xmlpatterns/type/qanynodetype.cpp +++ b/src/xmlpatterns/type/qanynodetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h index f34b4a1..8479bd5 100644 --- a/src/xmlpatterns/type/qanynodetype_p.h +++ b/src/xmlpatterns/type/qanynodetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanysimpletype.cpp b/src/xmlpatterns/type/qanysimpletype.cpp index c685d54..44d4916 100644 --- a/src/xmlpatterns/type/qanysimpletype.cpp +++ b/src/xmlpatterns/type/qanysimpletype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h index b91c7d0..265d582 100644 --- a/src/xmlpatterns/type/qanysimpletype_p.h +++ b/src/xmlpatterns/type/qanysimpletype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanytype.cpp b/src/xmlpatterns/type/qanytype.cpp index 95ad2b3..7232416 100644 --- a/src/xmlpatterns/type/qanytype.cpp +++ b/src/xmlpatterns/type/qanytype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h index 70477af..15a165a 100644 --- a/src/xmlpatterns/type/qanytype_p.h +++ b/src/xmlpatterns/type/qanytype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccasterlocator.cpp b/src/xmlpatterns/type/qatomiccasterlocator.cpp index 5376d6f..1e4eb34 100644 --- a/src/xmlpatterns/type/qatomiccasterlocator.cpp +++ b/src/xmlpatterns/type/qatomiccasterlocator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h index 14e6360..3075999 100644 --- a/src/xmlpatterns/type/qatomiccasterlocator_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccasterlocators.cpp b/src/xmlpatterns/type/qatomiccasterlocators.cpp index 9e1e444..2ac4952 100644 --- a/src/xmlpatterns/type/qatomiccasterlocators.cpp +++ b/src/xmlpatterns/type/qatomiccasterlocators.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h index aa905de..049fe6d 100644 --- a/src/xmlpatterns/type/qatomiccasterlocators_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator.cpp b/src/xmlpatterns/type/qatomiccomparatorlocator.cpp index 5aa55b1..b8e287d 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocator.cpp +++ b/src/xmlpatterns/type/qatomiccomparatorlocator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h index d18e6d9..4c760c6 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp index d400a5e..428d9c7 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp +++ b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h index b9aa36f..3a7c282 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h +++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator.cpp b/src/xmlpatterns/type/qatomicmathematicianlocator.cpp index c7650c9..12084d2 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocator.cpp +++ b/src/xmlpatterns/type/qatomicmathematicianlocator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h index 19ee6e7..887c03f 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp index 92d7b2c..0ae737f 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp +++ b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h index 5ef958a..3e7277c 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h +++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomictype.cpp b/src/xmlpatterns/type/qatomictype.cpp index 45f291a..721d608 100644 --- a/src/xmlpatterns/type/qatomictype.cpp +++ b/src/xmlpatterns/type/qatomictype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h index 92b7853..b294ca4 100644 --- a/src/xmlpatterns/type/qatomictype_p.h +++ b/src/xmlpatterns/type/qatomictype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h index 2158fd8..61568d6 100644 --- a/src/xmlpatterns/type/qatomictypedispatch_p.h +++ b/src/xmlpatterns/type/qatomictypedispatch_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbasictypesfactory.cpp b/src/xmlpatterns/type/qbasictypesfactory.cpp index 662308c..9005c61 100644 --- a/src/xmlpatterns/type/qbasictypesfactory.cpp +++ b/src/xmlpatterns/type/qbasictypesfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h index 9b2db3e..aabb562 100644 --- a/src/xmlpatterns/type/qbasictypesfactory_p.h +++ b/src/xmlpatterns/type/qbasictypesfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinatomictype.cpp b/src/xmlpatterns/type/qbuiltinatomictype.cpp index 48106a7..3291d46 100644 --- a/src/xmlpatterns/type/qbuiltinatomictype.cpp +++ b/src/xmlpatterns/type/qbuiltinatomictype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h index de94fa1..20604ce 100644 --- a/src/xmlpatterns/type/qbuiltinatomictype_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinatomictypes.cpp b/src/xmlpatterns/type/qbuiltinatomictypes.cpp index ac38f5e..22f03ab 100644 --- a/src/xmlpatterns/type/qbuiltinatomictypes.cpp +++ b/src/xmlpatterns/type/qbuiltinatomictypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h index 3906978..dd37515 100644 --- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h +++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinnodetype.cpp b/src/xmlpatterns/type/qbuiltinnodetype.cpp index d3d55ad..5fe982a 100644 --- a/src/xmlpatterns/type/qbuiltinnodetype.cpp +++ b/src/xmlpatterns/type/qbuiltinnodetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h index edb4c74..acddca4 100644 --- a/src/xmlpatterns/type/qbuiltinnodetype_p.h +++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltintypes.cpp b/src/xmlpatterns/type/qbuiltintypes.cpp index 7c350ae..f40fc23 100644 --- a/src/xmlpatterns/type/qbuiltintypes.cpp +++ b/src/xmlpatterns/type/qbuiltintypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h index 4271d7d..0e9ac72 100644 --- a/src/xmlpatterns/type/qbuiltintypes_p.h +++ b/src/xmlpatterns/type/qbuiltintypes_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qcardinality.cpp b/src/xmlpatterns/type/qcardinality.cpp index 9d62d86..74aa56a 100644 --- a/src/xmlpatterns/type/qcardinality.cpp +++ b/src/xmlpatterns/type/qcardinality.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h index 9beecc3..33bd228 100644 --- a/src/xmlpatterns/type/qcardinality_p.h +++ b/src/xmlpatterns/type/qcardinality_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qcommonsequencetypes.cpp b/src/xmlpatterns/type/qcommonsequencetypes.cpp index 42ca749..3701f95 100644 --- a/src/xmlpatterns/type/qcommonsequencetypes.cpp +++ b/src/xmlpatterns/type/qcommonsequencetypes.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h index a4e61ab..d787670 100644 --- a/src/xmlpatterns/type/qcommonsequencetypes_p.h +++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qebvtype.cpp b/src/xmlpatterns/type/qebvtype.cpp index 0e240dc..f015dd1 100644 --- a/src/xmlpatterns/type/qebvtype.cpp +++ b/src/xmlpatterns/type/qebvtype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h index 555842e..9fd81cb 100644 --- a/src/xmlpatterns/type/qebvtype_p.h +++ b/src/xmlpatterns/type/qebvtype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qemptysequencetype.cpp b/src/xmlpatterns/type/qemptysequencetype.cpp index 3696ef6..a72da3f 100644 --- a/src/xmlpatterns/type/qemptysequencetype.cpp +++ b/src/xmlpatterns/type/qemptysequencetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h index badd231..b5cc1d2 100644 --- a/src/xmlpatterns/type/qemptysequencetype_p.h +++ b/src/xmlpatterns/type/qemptysequencetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qgenericsequencetype.cpp b/src/xmlpatterns/type/qgenericsequencetype.cpp index 4db2583..c4508a4 100644 --- a/src/xmlpatterns/type/qgenericsequencetype.cpp +++ b/src/xmlpatterns/type/qgenericsequencetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h index e4302cf..6b58316 100644 --- a/src/xmlpatterns/type/qgenericsequencetype_p.h +++ b/src/xmlpatterns/type/qgenericsequencetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qitemtype.cpp b/src/xmlpatterns/type/qitemtype.cpp index 862f37f..7c926c1 100644 --- a/src/xmlpatterns/type/qitemtype.cpp +++ b/src/xmlpatterns/type/qitemtype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h index c396149..9943f30 100644 --- a/src/xmlpatterns/type/qitemtype_p.h +++ b/src/xmlpatterns/type/qitemtype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qlocalnametest.cpp b/src/xmlpatterns/type/qlocalnametest.cpp index 92f677a..c05b4c4 100644 --- a/src/xmlpatterns/type/qlocalnametest.cpp +++ b/src/xmlpatterns/type/qlocalnametest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h index d15ccae..758c1e6 100644 --- a/src/xmlpatterns/type/qlocalnametest_p.h +++ b/src/xmlpatterns/type/qlocalnametest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qmultiitemtype.cpp b/src/xmlpatterns/type/qmultiitemtype.cpp index e7481ca..6cc2f6d 100644 --- a/src/xmlpatterns/type/qmultiitemtype.cpp +++ b/src/xmlpatterns/type/qmultiitemtype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h index 06a1348..fff89c4 100644 --- a/src/xmlpatterns/type/qmultiitemtype_p.h +++ b/src/xmlpatterns/type/qmultiitemtype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnamespacenametest.cpp b/src/xmlpatterns/type/qnamespacenametest.cpp index 95f19a5..56786e7 100644 --- a/src/xmlpatterns/type/qnamespacenametest.cpp +++ b/src/xmlpatterns/type/qnamespacenametest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h index 2b1ee46..1893dda 100644 --- a/src/xmlpatterns/type/qnamespacenametest_p.h +++ b/src/xmlpatterns/type/qnamespacenametest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnonetype.cpp b/src/xmlpatterns/type/qnonetype.cpp index b7d42d8..8298e50 100644 --- a/src/xmlpatterns/type/qnonetype.cpp +++ b/src/xmlpatterns/type/qnonetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h index aa739d2..bb8f716 100644 --- a/src/xmlpatterns/type/qnonetype_p.h +++ b/src/xmlpatterns/type/qnonetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnumerictype.cpp b/src/xmlpatterns/type/qnumerictype.cpp index 6df26c2..2f0077e 100644 --- a/src/xmlpatterns/type/qnumerictype.cpp +++ b/src/xmlpatterns/type/qnumerictype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h index a6e249b..ca81308 100644 --- a/src/xmlpatterns/type/qnumerictype_p.h +++ b/src/xmlpatterns/type/qnumerictype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h index 354b690..c078ac8 100644 --- a/src/xmlpatterns/type/qprimitives_p.h +++ b/src/xmlpatterns/type/qprimitives_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qqnametest.cpp b/src/xmlpatterns/type/qqnametest.cpp index 929ed5a..5cc63f1 100644 --- a/src/xmlpatterns/type/qqnametest.cpp +++ b/src/xmlpatterns/type/qqnametest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h index 9166c87..658919a 100644 --- a/src/xmlpatterns/type/qqnametest_p.h +++ b/src/xmlpatterns/type/qqnametest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschemacomponent.cpp b/src/xmlpatterns/type/qschemacomponent.cpp index e828cac..560513c 100644 --- a/src/xmlpatterns/type/qschemacomponent.cpp +++ b/src/xmlpatterns/type/qschemacomponent.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h index 749210a..7fbc3ad 100644 --- a/src/xmlpatterns/type/qschemacomponent_p.h +++ b/src/xmlpatterns/type/qschemacomponent_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschematype.cpp b/src/xmlpatterns/type/qschematype.cpp index b4d6bc0..7623d47 100644 --- a/src/xmlpatterns/type/qschematype.cpp +++ b/src/xmlpatterns/type/qschematype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h index 30f63c8..2115488 100644 --- a/src/xmlpatterns/type/qschematype_p.h +++ b/src/xmlpatterns/type/qschematype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschematypefactory.cpp b/src/xmlpatterns/type/qschematypefactory.cpp index fae1c46..59b8dc8 100644 --- a/src/xmlpatterns/type/qschematypefactory.cpp +++ b/src/xmlpatterns/type/qschematypefactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h index 72ce9fe..534dac9 100644 --- a/src/xmlpatterns/type/qschematypefactory_p.h +++ b/src/xmlpatterns/type/qschematypefactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qsequencetype.cpp b/src/xmlpatterns/type/qsequencetype.cpp index 31efa62..b69c01a 100644 --- a/src/xmlpatterns/type/qsequencetype.cpp +++ b/src/xmlpatterns/type/qsequencetype.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h index 016bffd..270335b 100644 --- a/src/xmlpatterns/type/qsequencetype_p.h +++ b/src/xmlpatterns/type/qsequencetype_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qtypechecker.cpp b/src/xmlpatterns/type/qtypechecker.cpp index c419af6..bd6e5f1 100644 --- a/src/xmlpatterns/type/qtypechecker.cpp +++ b/src/xmlpatterns/type/qtypechecker.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h index d9ca1a1..ff83923 100644 --- a/src/xmlpatterns/type/qtypechecker_p.h +++ b/src/xmlpatterns/type/qtypechecker_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/quntyped.cpp b/src/xmlpatterns/type/quntyped.cpp index 33042c1..6d9a8f9 100644 --- a/src/xmlpatterns/type/quntyped.cpp +++ b/src/xmlpatterns/type/quntyped.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h index 1b7f48b..15920c8 100644 --- a/src/xmlpatterns/type/quntyped_p.h +++ b/src/xmlpatterns/type/quntyped_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qxsltnodetest.cpp b/src/xmlpatterns/type/qxsltnodetest.cpp index 1ec67bf..20248c0 100644 --- a/src/xmlpatterns/type/qxsltnodetest.cpp +++ b/src/xmlpatterns/type/qxsltnodetest.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h index 1f75a88..3b8b068 100644 --- a/src/xmlpatterns/type/qxsltnodetest_p.h +++ b/src/xmlpatterns/type/qxsltnodetest_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qautoptr.cpp b/src/xmlpatterns/utils/qautoptr.cpp index 1e3d773..d177ab3 100644 --- a/src/xmlpatterns/utils/qautoptr.cpp +++ b/src/xmlpatterns/utils/qautoptr.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qautoptr_p.h b/src/xmlpatterns/utils/qautoptr_p.h index 9f40400..09fbe60 100644 --- a/src/xmlpatterns/utils/qautoptr_p.h +++ b/src/xmlpatterns/utils/qautoptr_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h index 6c9cf57..a475cb1 100644 --- a/src/xmlpatterns/utils/qcommonnamespaces_p.h +++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h index 7979bf0..1400ccd 100644 --- a/src/xmlpatterns/utils/qcppcastinghelper_p.h +++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qdebug_p.h b/src/xmlpatterns/utils/qdebug_p.h index d270250..0706241 100644 --- a/src/xmlpatterns/utils/qdebug_p.h +++ b/src/xmlpatterns/utils/qdebug_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp b/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp index fd67cf3..3e6503b 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h index ef7d4de..81f6f72 100644 --- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp b/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp index dd1ab9f..e56812b 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h index 2bb6aff..68595b8 100644 --- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnamepool.cpp b/src/xmlpatterns/utils/qnamepool.cpp index a6f1b21..a881dd0 100644 --- a/src/xmlpatterns/utils/qnamepool.cpp +++ b/src/xmlpatterns/utils/qnamepool.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnamepool_p.h b/src/xmlpatterns/utils/qnamepool_p.h index f348d1b..4c85446 100644 --- a/src/xmlpatterns/utils/qnamepool_p.h +++ b/src/xmlpatterns/utils/qnamepool_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h index 7fa3a6d..502de79 100644 --- a/src/xmlpatterns/utils/qnamespacebinding_p.h +++ b/src/xmlpatterns/utils/qnamespacebinding_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnamespaceresolver.cpp b/src/xmlpatterns/utils/qnamespaceresolver.cpp index 0c837d0..cac636b 100644 --- a/src/xmlpatterns/utils/qnamespaceresolver.cpp +++ b/src/xmlpatterns/utils/qnamespaceresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h index d76f709..2eedebe 100644 --- a/src/xmlpatterns/utils/qnamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver.cpp b/src/xmlpatterns/utils/qnodenamespaceresolver.cpp index c694ad4..8d6829a 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver.cpp +++ b/src/xmlpatterns/utils/qnodenamespaceresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h index 123cfbe..a5e6733 100644 --- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h +++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qoutputvalidator.cpp b/src/xmlpatterns/utils/qoutputvalidator.cpp index 51e8063..6a2c3c3 100644 --- a/src/xmlpatterns/utils/qoutputvalidator.cpp +++ b/src/xmlpatterns/utils/qoutputvalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h index 15734ff..7e3a0f4e 100644 --- a/src/xmlpatterns/utils/qoutputvalidator_p.h +++ b/src/xmlpatterns/utils/qoutputvalidator_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qpatternistlocale.cpp b/src/xmlpatterns/utils/qpatternistlocale.cpp index 990867d..8deb1b3 100644 --- a/src/xmlpatterns/utils/qpatternistlocale.cpp +++ b/src/xmlpatterns/utils/qpatternistlocale.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h index e3f645f..7e03a08 100644 --- a/src/xmlpatterns/utils/qpatternistlocale_p.h +++ b/src/xmlpatterns/utils/qpatternistlocale_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qxpathhelper.cpp b/src/xmlpatterns/utils/qxpathhelper.cpp index 127e21f..53a4581 100644 --- a/src/xmlpatterns/utils/qxpathhelper.cpp +++ b/src/xmlpatterns/utils/qxpathhelper.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h index 7bf33e6..c31fe16 100644 --- a/src/xmlpatterns/utils/qxpathhelper_p.h +++ b/src/xmlpatterns/utils/qxpathhelper_p.h @@ -6,11 +6,11 @@ ** This file is part of the QtXmlPatterns 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/framework.cpp b/tests/arthur/common/framework.cpp index b2f008f..06c9669 100644 --- a/tests/arthur/common/framework.cpp +++ b/tests/arthur/common/framework.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/framework.h b/tests/arthur/common/framework.h index e5f41c5..3e0f63a 100644 --- a/tests/arthur/common/framework.h +++ b/tests/arthur/common/framework.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index a72e689..c3b4aa7 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h index 9eafe02..d06098c 100644 --- a/tests/arthur/common/paintcommands.h +++ b/tests/arthur/common/paintcommands.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp index 46f4e6b..3423327 100644 --- a/tests/arthur/common/qengines.cpp +++ b/tests/arthur/common/qengines.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/qengines.h b/tests/arthur/common/qengines.h index 6366d90..5738a08 100644 --- a/tests/arthur/common/qengines.h +++ b/tests/arthur/common/qengines.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/xmldata.cpp b/tests/arthur/common/xmldata.cpp index a45ff70..4221b02 100644 --- a/tests/arthur/common/xmldata.cpp +++ b/tests/arthur/common/xmldata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/common/xmldata.h b/tests/arthur/common/xmldata.h index 2780011..30dc854 100644 --- a/tests/arthur/common/xmldata.h +++ b/tests/arthur/common/xmldata.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/datagenerator/datagenerator.cpp b/tests/arthur/datagenerator/datagenerator.cpp index 6544218..8c94c20 100644 --- a/tests/arthur/datagenerator/datagenerator.cpp +++ b/tests/arthur/datagenerator/datagenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/datagenerator/datagenerator.h b/tests/arthur/datagenerator/datagenerator.h index fe6c23d..9ea2fb7 100644 --- a/tests/arthur/datagenerator/datagenerator.h +++ b/tests/arthur/datagenerator/datagenerator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/datagenerator/main.cpp b/tests/arthur/datagenerator/main.cpp index 1d515ba..768a63e 100644 --- a/tests/arthur/datagenerator/main.cpp +++ b/tests/arthur/datagenerator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/datagenerator/xmlgenerator.cpp b/tests/arthur/datagenerator/xmlgenerator.cpp index 2c773bc..a34fa81 100644 --- a/tests/arthur/datagenerator/xmlgenerator.cpp +++ b/tests/arthur/datagenerator/xmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/datagenerator/xmlgenerator.h b/tests/arthur/datagenerator/xmlgenerator.h index 4022cc7..0bb3541 100644 --- a/tests/arthur/datagenerator/xmlgenerator.h +++ b/tests/arthur/datagenerator/xmlgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/htmlgenerator/htmlgenerator.cpp b/tests/arthur/htmlgenerator/htmlgenerator.cpp index 5928dc7..d5ceca3 100644 --- a/tests/arthur/htmlgenerator/htmlgenerator.cpp +++ b/tests/arthur/htmlgenerator/htmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/htmlgenerator/htmlgenerator.h b/tests/arthur/htmlgenerator/htmlgenerator.h index 2a91fe5..79dd5b0 100644 --- a/tests/arthur/htmlgenerator/htmlgenerator.h +++ b/tests/arthur/htmlgenerator/htmlgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/htmlgenerator/main.cpp b/tests/arthur/htmlgenerator/main.cpp index 537e570..b4b9a22 100644 --- a/tests/arthur/htmlgenerator/main.cpp +++ b/tests/arthur/htmlgenerator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/lance/interactivewidget.cpp b/tests/arthur/lance/interactivewidget.cpp index 11c89c4..40e404d 100644 --- a/tests/arthur/lance/interactivewidget.cpp +++ b/tests/arthur/lance/interactivewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/lance/interactivewidget.h b/tests/arthur/lance/interactivewidget.h index 80a92cb..4f23337 100644 --- a/tests/arthur/lance/interactivewidget.h +++ b/tests/arthur/lance/interactivewidget.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp index 3f1d112..a35f22b 100644 --- a/tests/arthur/lance/main.cpp +++ b/tests/arthur/lance/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/lance/widgets.h b/tests/arthur/lance/widgets.h index 8594850..d5a14a9 100644 --- a/tests/arthur/lance/widgets.h +++ b/tests/arthur/lance/widgets.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/performancediff/main.cpp b/tests/arthur/performancediff/main.cpp index 9a35f90..a6c2255 100644 --- a/tests/arthur/performancediff/main.cpp +++ b/tests/arthur/performancediff/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/performancediff/performancediff.cpp b/tests/arthur/performancediff/performancediff.cpp index 437dacb..5bdc37b 100644 --- a/tests/arthur/performancediff/performancediff.cpp +++ b/tests/arthur/performancediff/performancediff.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/performancediff/performancediff.h b/tests/arthur/performancediff/performancediff.h index cc62dab..2e95cf6 100644 --- a/tests/arthur/performancediff/performancediff.h +++ b/tests/arthur/performancediff/performancediff.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/shower/main.cpp b/tests/arthur/shower/main.cpp index 5064d6e..1c474f2 100644 --- a/tests/arthur/shower/main.cpp +++ b/tests/arthur/shower/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/shower/shower.cpp b/tests/arthur/shower/shower.cpp index 634fd5c..ac664c0 100644 --- a/tests/arthur/shower/shower.cpp +++ b/tests/arthur/shower/shower.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/arthur/shower/shower.h b/tests/arthur/shower/shower.h index c6f0fd4..b2a77e4 100644 --- a/tests/arthur/shower/shower.h +++ b/tests/arthur/shower/shower.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/atwrapper/atWrapper.cpp b/tests/auto/atwrapper/atWrapper.cpp index fa991d4..0932623 100644 --- a/tests/auto/atwrapper/atWrapper.cpp +++ b/tests/auto/atwrapper/atWrapper.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/atwrapper/atWrapper.h b/tests/auto/atwrapper/atWrapper.h index a222fe0..40ee592 100644 --- a/tests/auto/atwrapper/atWrapper.h +++ b/tests/auto/atwrapper/atWrapper.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/atwrapper/atWrapperAutotest.cpp b/tests/auto/atwrapper/atWrapperAutotest.cpp index 1f7d48e..174ba6d 100644 --- a/tests/auto/atwrapper/atWrapperAutotest.cpp +++ b/tests/auto/atwrapper/atWrapperAutotest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/bic/qbic.cpp b/tests/auto/bic/qbic.cpp index 6a8d415..dc3636c 100644 --- a/tests/auto/bic/qbic.cpp +++ b/tests/auto/bic/qbic.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/bic/qbic.h b/tests/auto/bic/qbic.h index 7d61f4b..91cf452 100644 --- a/tests/auto/bic/qbic.h +++ b/tests/auto/bic/qbic.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp index e0f42f0..53f1c14 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp index ccaa0b2..997d334 100644 --- a/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp +++ b/tests/auto/checkxmlfiles/tst_checkxmlfiles.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index 6d3d1df..14aaee2 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compile/baseclass.cpp b/tests/auto/compile/baseclass.cpp index e977aad..47e1e94 100644 --- a/tests/auto/compile/baseclass.cpp +++ b/tests/auto/compile/baseclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compile/baseclass.h b/tests/auto/compile/baseclass.h index 2b416a0..ef436ce 100644 --- a/tests/auto/compile/baseclass.h +++ b/tests/auto/compile/baseclass.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compile/derivedclass.cpp b/tests/auto/compile/derivedclass.cpp index 27c5649..757418e 100644 --- a/tests/auto/compile/derivedclass.cpp +++ b/tests/auto/compile/derivedclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compile/derivedclass.h b/tests/auto/compile/derivedclass.h index 8430cd7..6df74e2 100644 --- a/tests/auto/compile/derivedclass.h +++ b/tests/auto/compile/derivedclass.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compile/tst_compile.cpp b/tests/auto/compile/tst_compile.cpp index 1d8dc63..18a384f 100644 --- a/tests/auto/compile/tst_compile.cpp +++ b/tests/auto/compile/tst_compile.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compilerwarnings/test.cpp b/tests/auto/compilerwarnings/test.cpp index d5dd2ee..baef665 100644 --- a/tests/auto/compilerwarnings/test.cpp +++ b/tests/auto/compilerwarnings/test.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index 232af55..299576e 100644 --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp index 9c4f78d..53fc7af 100644 --- a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp +++ b/tests/auto/exceptionsafety/tst_exceptionsafety.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index 607d655..f57da78 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp index b71d341..e521c08 100644 --- a/tests/auto/languagechange/tst_languagechange.cpp +++ b/tests/auto/languagechange/tst_languagechange.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/macgui/guitest.cpp b/tests/auto/macgui/guitest.cpp index 49f726c..81539b0 100644 --- a/tests/auto/macgui/guitest.cpp +++ b/tests/auto/macgui/guitest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/macgui/guitest.h b/tests/auto/macgui/guitest.h index 1b65361..2344be2 100644 --- a/tests/auto/macgui/guitest.h +++ b/tests/auto/macgui/guitest.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/macgui/tst_gui.cpp b/tests/auto/macgui/tst_gui.cpp index b302f8b..33b552d 100644 --- a/tests/auto/macgui/tst_gui.cpp +++ b/tests/auto/macgui/tst_gui.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/macplist/app/main.cpp b/tests/auto/macplist/app/main.cpp index 670e9cc..fbedfc5 100644 --- a/tests/auto/macplist/app/main.cpp +++ b/tests/auto/macplist/app/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/macplist/tst_macplist.cpp b/tests/auto/macplist/tst_macplist.cpp index d280425..cd187d6 100644 --- a/tests/auto/macplist/tst_macplist.cpp +++ b/tests/auto/macplist/tst_macplist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/mediaobject/qtesthelper.h b/tests/auto/mediaobject/qtesthelper.h index a7f3989..1447048 100644 --- a/tests/auto/mediaobject/qtesthelper.h +++ b/tests/auto/mediaobject/qtesthelper.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index e0275de..ae9c33c 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/mediaobject_wince_ds9/dummy.cpp b/tests/auto/mediaobject_wince_ds9/dummy.cpp index 2a34bb9..0c45c0a 100644 --- a/tests/auto/mediaobject_wince_ds9/dummy.cpp +++ b/tests/auto/mediaobject_wince_ds9/dummy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/Test.framework/Headers/testinterface.h b/tests/auto/moc/Test.framework/Headers/testinterface.h index 2b52a39..779b6f9 100644 --- a/tests/auto/moc/Test.framework/Headers/testinterface.h +++ b/tests/auto/moc/Test.framework/Headers/testinterface.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/assign-namespace.h b/tests/auto/moc/assign-namespace.h index b766269..81e3dfb 100644 --- a/tests/auto/moc/assign-namespace.h +++ b/tests/auto/moc/assign-namespace.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/backslash-newlines.h b/tests/auto/moc/backslash-newlines.h index fc4a998..3f548eb 100644 --- a/tests/auto/moc/backslash-newlines.h +++ b/tests/auto/moc/backslash-newlines.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/c-comments.h b/tests/auto/moc/c-comments.h index c200e25..1762174 100644 --- a/tests/auto/moc/c-comments.h +++ b/tests/auto/moc/c-comments.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/cstyle-enums.h b/tests/auto/moc/cstyle-enums.h index b21b688..e71860e 100644 --- a/tests/auto/moc/cstyle-enums.h +++ b/tests/auto/moc/cstyle-enums.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/dir-in-include-path.h b/tests/auto/moc/dir-in-include-path.h index 06914e2..5d49408 100644 --- a/tests/auto/moc/dir-in-include-path.h +++ b/tests/auto/moc/dir-in-include-path.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/escapes-in-string-literals.h b/tests/auto/moc/escapes-in-string-literals.h index 76f420d..30d9551 100644 --- a/tests/auto/moc/escapes-in-string-literals.h +++ b/tests/auto/moc/escapes-in-string-literals.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/extraqualification.h b/tests/auto/moc/extraqualification.h index 5e1075a..efc9129 100644 --- a/tests/auto/moc/extraqualification.h +++ b/tests/auto/moc/extraqualification.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/forgotten-qinterface.h b/tests/auto/moc/forgotten-qinterface.h index 370a3d0..f696941 100644 --- a/tests/auto/moc/forgotten-qinterface.h +++ b/tests/auto/moc/forgotten-qinterface.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/gadgetwithnoenums.h b/tests/auto/moc/gadgetwithnoenums.h index 34df110..aa00645 100644 --- a/tests/auto/moc/gadgetwithnoenums.h +++ b/tests/auto/moc/gadgetwithnoenums.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/interface-from-framework.h b/tests/auto/moc/interface-from-framework.h index d921664..853e201 100644 --- a/tests/auto/moc/interface-from-framework.h +++ b/tests/auto/moc/interface-from-framework.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/macro-on-cmdline.h b/tests/auto/moc/macro-on-cmdline.h index 655dd82..d486251 100644 --- a/tests/auto/moc/macro-on-cmdline.h +++ b/tests/auto/moc/macro-on-cmdline.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/namespaced-flags.h b/tests/auto/moc/namespaced-flags.h index f6ad649..bbe8a9e 100644 --- a/tests/auto/moc/namespaced-flags.h +++ b/tests/auto/moc/namespaced-flags.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index 37333e5..09bf5fa 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/oldstyle-casts.h b/tests/auto/moc/oldstyle-casts.h index e434f4c..30e56e2 100644 --- a/tests/auto/moc/oldstyle-casts.h +++ b/tests/auto/moc/oldstyle-casts.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/os9-newlines.h b/tests/auto/moc/os9-newlines.h index 8dd8058..ebe188f 100644 --- a/tests/auto/moc/os9-newlines.h +++ b/tests/auto/moc/os9-newlines.h @@ -1 +1,31 @@ -/**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** ** This file is part of the test suite 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 either Technology Preview License Agreement or the ** Beta Release License Agreement. ** ** 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. ** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ** package. ** ** 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. ** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ #include class Os9Newlines : public QObject { Q_OBJECT public Q_SLOTS: inline void testSlot() {} }; \ No newline at end of file +/**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ #include class Os9Newlines : public QObject { Q_OBJECT public Q_SLOTS: inline void testSlot() {} }; \ No newline at end of file diff --git a/tests/auto/moc/parse-boost.h b/tests/auto/moc/parse-boost.h index 2baa7b0..0e67b84 100644 --- a/tests/auto/moc/parse-boost.h +++ b/tests/auto/moc/parse-boost.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/pure-virtual-signals.h b/tests/auto/moc/pure-virtual-signals.h index 2f6206e..80bf701 100644 --- a/tests/auto/moc/pure-virtual-signals.h +++ b/tests/auto/moc/pure-virtual-signals.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/qinvokable.h b/tests/auto/moc/qinvokable.h index b223671..52ffca2 100644 --- a/tests/auto/moc/qinvokable.h +++ b/tests/auto/moc/qinvokable.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/qprivateslots.h b/tests/auto/moc/qprivateslots.h index b61e21b..74685e7 100644 --- a/tests/auto/moc/qprivateslots.h +++ b/tests/auto/moc/qprivateslots.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/single_function_keyword.h b/tests/auto/moc/single_function_keyword.h index 71e0d74..0fc9193 100644 --- a/tests/auto/moc/single_function_keyword.h +++ b/tests/auto/moc/single_function_keyword.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/slots-with-void-template.h b/tests/auto/moc/slots-with-void-template.h index 01004e4..eeb269a 100644 --- a/tests/auto/moc/slots-with-void-template.h +++ b/tests/auto/moc/slots-with-void-template.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/task189996.h b/tests/auto/moc/task189996.h index 86a8efb..d68c38c 100644 --- a/tests/auto/moc/task189996.h +++ b/tests/auto/moc/task189996.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/task192552.h b/tests/auto/moc/task192552.h index 679282c..06c0884 100644 --- a/tests/auto/moc/task192552.h +++ b/tests/auto/moc/task192552.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/task234909.h b/tests/auto/moc/task234909.h index fe68995..2c82417 100644 --- a/tests/auto/moc/task234909.h +++ b/tests/auto/moc/task234909.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/task240368.h b/tests/auto/moc/task240368.h index 4d435d0..7bf5817 100644 --- a/tests/auto/moc/task240368.h +++ b/tests/auto/moc/task240368.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/task87883.h b/tests/auto/moc/task87883.h index c1b533c..2fe5730 100644 --- a/tests/auto/moc/task87883.h +++ b/tests/auto/moc/task87883.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/template-gtgt.h b/tests/auto/moc/template-gtgt.h index 5090e93..c9a015a 100644 --- a/tests/auto/moc/template-gtgt.h +++ b/tests/auto/moc/template-gtgt.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/testproject/Plugin/Plugin.h b/tests/auto/moc/testproject/Plugin/Plugin.h index 554d7a6..d33f443 100644 --- a/tests/auto/moc/testproject/Plugin/Plugin.h +++ b/tests/auto/moc/testproject/Plugin/Plugin.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/trigraphs.h b/tests/auto/moc/trigraphs.h index 2a4c0a1..cb6346e 100644 --- a/tests/auto/moc/trigraphs.h +++ b/tests/auto/moc/trigraphs.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 4e4f6e7..5eeb328 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/using-namespaces.h b/tests/auto/moc/using-namespaces.h index 77bcf59..7cded8a 100644 --- a/tests/auto/moc/using-namespaces.h +++ b/tests/auto/moc/using-namespaces.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h b/tests/auto/moc/warn-on-multiple-qobject-subclasses.h index 2cc5bed..986585a 100644 --- a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h +++ b/tests/auto/moc/warn-on-multiple-qobject-subclasses.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/warn-on-property-without-read.h b/tests/auto/moc/warn-on-property-without-read.h index 939d8c8..c552da5 100644 --- a/tests/auto/moc/warn-on-property-without-read.h +++ b/tests/auto/moc/warn-on-property-without-read.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/moc/win-newlines.h b/tests/auto/moc/win-newlines.h index ae8aad8..6a8e727 100644 --- a/tests/auto/moc/win-newlines.h +++ b/tests/auto/moc/win-newlines.h @@ -5,36 +5,36 @@ ** ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/modeltest/modeltest.cpp index d51decc..3a8ef35 100644 --- a/tests/auto/modeltest/modeltest.cpp +++ b/tests/auto/modeltest/modeltest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/modeltest/modeltest.h b/tests/auto/modeltest/modeltest.h index c4169ab..22096b8 100644 --- a/tests/auto/modeltest/modeltest.h +++ b/tests/auto/modeltest/modeltest.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp index af7f245..970b80e 100644 --- a/tests/auto/modeltest/tst_modeltest.cpp +++ b/tests/auto/modeltest/tst_modeltest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index b2a449a..6387b88 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp index d7e7789..58d7bf1 100644 --- a/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp +++ b/tests/auto/patternistexamplefiletree/tst_patternistexamplefiletree.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/patternistexamples/tst_patternistexamples.cpp b/tests/auto/patternistexamples/tst_patternistexamples.cpp index 2b728f9..46f0996 100644 --- a/tests/auto/patternistexamples/tst_patternistexamples.cpp +++ b/tests/auto/patternistexamples/tst_patternistexamples.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/patternistheaders/tst_patternistheaders.cpp b/tests/auto/patternistheaders/tst_patternistheaders.cpp index ba7623e..a53e63b 100644 --- a/tests/auto/patternistheaders/tst_patternistheaders.cpp +++ b/tests/auto/patternistheaders/tst_patternistheaders.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3accel/tst_q3accel.cpp b/tests/auto/q3accel/tst_q3accel.cpp index c2ba9dd..cf7e303 100644 --- a/tests/auto/q3accel/tst_q3accel.cpp +++ b/tests/auto/q3accel/tst_q3accel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3action/tst_q3action.cpp b/tests/auto/q3action/tst_q3action.cpp index 0a5fa77..40d8a82 100644 --- a/tests/auto/q3action/tst_q3action.cpp +++ b/tests/auto/q3action/tst_q3action.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3actiongroup/tst_q3actiongroup.cpp b/tests/auto/q3actiongroup/tst_q3actiongroup.cpp index ef0eb5b..8eb853b 100644 --- a/tests/auto/q3actiongroup/tst_q3actiongroup.cpp +++ b/tests/auto/q3actiongroup/tst_q3actiongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3buttongroup/clickLock/main.cpp b/tests/auto/q3buttongroup/clickLock/main.cpp index 934ad36..8b593af 100644 --- a/tests/auto/q3buttongroup/clickLock/main.cpp +++ b/tests/auto/q3buttongroup/clickLock/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3buttongroup/tst_q3buttongroup.cpp b/tests/auto/q3buttongroup/tst_q3buttongroup.cpp index 986903b..d4b3180 100644 --- a/tests/auto/q3buttongroup/tst_q3buttongroup.cpp +++ b/tests/auto/q3buttongroup/tst_q3buttongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3canvas/tst_q3canvas.cpp b/tests/auto/q3canvas/tst_q3canvas.cpp index a1cfe18..b440b51 100644 --- a/tests/auto/q3canvas/tst_q3canvas.cpp +++ b/tests/auto/q3canvas/tst_q3canvas.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp index 1435c42..e2c622b 100644 --- a/tests/auto/q3checklistitem/tst_q3checklistitem.cpp +++ b/tests/auto/q3checklistitem/tst_q3checklistitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3combobox/tst_q3combobox.cpp b/tests/auto/q3combobox/tst_q3combobox.cpp index f0a6b1c..ea30396 100644 --- a/tests/auto/q3combobox/tst_q3combobox.cpp +++ b/tests/auto/q3combobox/tst_q3combobox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3cstring/tst_q3cstring.cpp b/tests/auto/q3cstring/tst_q3cstring.cpp index f9bdf6b..0258bb0 100644 --- a/tests/auto/q3cstring/tst_q3cstring.cpp +++ b/tests/auto/q3cstring/tst_q3cstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3databrowser/tst_q3databrowser.cpp b/tests/auto/q3databrowser/tst_q3databrowser.cpp index 26d9fc7..2d640b1 100644 --- a/tests/auto/q3databrowser/tst_q3databrowser.cpp +++ b/tests/auto/q3databrowser/tst_q3databrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3dateedit/tst_q3dateedit.cpp b/tests/auto/q3dateedit/tst_q3dateedit.cpp index 7f80385..d966bfb 100644 --- a/tests/auto/q3dateedit/tst_q3dateedit.cpp +++ b/tests/auto/q3dateedit/tst_q3dateedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp b/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp index 9ac12be..db7c8a9 100644 --- a/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp +++ b/tests/auto/q3datetimeedit/tst_q3datetimeedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3deepcopy/tst_q3deepcopy.cpp b/tests/auto/q3deepcopy/tst_q3deepcopy.cpp index c159350..19d981b 100644 --- a/tests/auto/q3deepcopy/tst_q3deepcopy.cpp +++ b/tests/auto/q3deepcopy/tst_q3deepcopy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3dict/tst_q3dict.cpp b/tests/auto/q3dict/tst_q3dict.cpp index cace9a8..8396a03 100644 --- a/tests/auto/q3dict/tst_q3dict.cpp +++ b/tests/auto/q3dict/tst_q3dict.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp index e71045c..0ed13a3 100644 --- a/tests/auto/q3dns/tst_q3dns.cpp +++ b/tests/auto/q3dns/tst_q3dns.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3dockwindow/tst_q3dockwindow.cpp b/tests/auto/q3dockwindow/tst_q3dockwindow.cpp index 00d8a81..f14fcb3 100644 --- a/tests/auto/q3dockwindow/tst_q3dockwindow.cpp +++ b/tests/auto/q3dockwindow/tst_q3dockwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3filedialog/tst_q3filedialog.cpp b/tests/auto/q3filedialog/tst_q3filedialog.cpp index 74e2894..57a5d12 100644 --- a/tests/auto/q3filedialog/tst_q3filedialog.cpp +++ b/tests/auto/q3filedialog/tst_q3filedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3frame/tst_q3frame.cpp b/tests/auto/q3frame/tst_q3frame.cpp index fee2007..524248b 100644 --- a/tests/auto/q3frame/tst_q3frame.cpp +++ b/tests/auto/q3frame/tst_q3frame.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3groupbox/tst_q3groupbox.cpp b/tests/auto/q3groupbox/tst_q3groupbox.cpp index 6e43c72..a97b5e9 100644 --- a/tests/auto/q3groupbox/tst_q3groupbox.cpp +++ b/tests/auto/q3groupbox/tst_q3groupbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3hbox/tst_q3hbox.cpp b/tests/auto/q3hbox/tst_q3hbox.cpp index 5685003..6947cf2 100644 --- a/tests/auto/q3hbox/tst_q3hbox.cpp +++ b/tests/auto/q3hbox/tst_q3hbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3header/tst_q3header.cpp b/tests/auto/q3header/tst_q3header.cpp index f0ad9d4..af23959 100644 --- a/tests/auto/q3header/tst_q3header.cpp +++ b/tests/auto/q3header/tst_q3header.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3iconview/tst_q3iconview.cpp b/tests/auto/q3iconview/tst_q3iconview.cpp index 1776e70..a82776e 100644 --- a/tests/auto/q3iconview/tst_q3iconview.cpp +++ b/tests/auto/q3iconview/tst_q3iconview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3listbox/tst_qlistbox.cpp b/tests/auto/q3listbox/tst_qlistbox.cpp index 1ca21e0..9a8968b 100644 --- a/tests/auto/q3listbox/tst_qlistbox.cpp +++ b/tests/auto/q3listbox/tst_qlistbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3listview/tst_q3listview.cpp b/tests/auto/q3listview/tst_q3listview.cpp index df805c0..1a0844a 100644 --- a/tests/auto/q3listview/tst_q3listview.cpp +++ b/tests/auto/q3listview/tst_q3listview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp b/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp index e98ceb1..ae2f138 100644 --- a/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp +++ b/tests/auto/q3listviewitemiterator/tst_q3listviewitemiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3mainwindow/tst_q3mainwindow.cpp b/tests/auto/q3mainwindow/tst_q3mainwindow.cpp index 0123d2f..f89be43 100644 --- a/tests/auto/q3mainwindow/tst_q3mainwindow.cpp +++ b/tests/auto/q3mainwindow/tst_q3mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp index 810ec1f..472cd15 100644 --- a/tests/auto/q3popupmenu/tst_q3popupmenu.cpp +++ b/tests/auto/q3popupmenu/tst_q3popupmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3process/cat/main.cpp b/tests/auto/q3process/cat/main.cpp index a1f6910..8556f20 100644 --- a/tests/auto/q3process/cat/main.cpp +++ b/tests/auto/q3process/cat/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3process/echo/main.cpp b/tests/auto/q3process/echo/main.cpp index 8e11052..4fc1388 100644 --- a/tests/auto/q3process/echo/main.cpp +++ b/tests/auto/q3process/echo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3process/tst_q3process.cpp b/tests/auto/q3process/tst_q3process.cpp index f5bc59b..c1a935c 100644 --- a/tests/auto/q3process/tst_q3process.cpp +++ b/tests/auto/q3process/tst_q3process.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3progressbar/tst_q3progressbar.cpp b/tests/auto/q3progressbar/tst_q3progressbar.cpp index 88cfabf..4829a25 100644 --- a/tests/auto/q3progressbar/tst_q3progressbar.cpp +++ b/tests/auto/q3progressbar/tst_q3progressbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3progressdialog/tst_q3progressdialog.cpp b/tests/auto/q3progressdialog/tst_q3progressdialog.cpp index 85a6781..e0f7e0a 100644 --- a/tests/auto/q3progressdialog/tst_q3progressdialog.cpp +++ b/tests/auto/q3progressdialog/tst_q3progressdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp index 49b5a3e..043e417 100644 --- a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp +++ b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3richtext/tst_q3richtext.cpp b/tests/auto/q3richtext/tst_q3richtext.cpp index c5447eb..4e7ebd6 100644 --- a/tests/auto/q3richtext/tst_q3richtext.cpp +++ b/tests/auto/q3richtext/tst_q3richtext.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3scrollview/tst_qscrollview.cpp b/tests/auto/q3scrollview/tst_qscrollview.cpp index c411fa5..37e61c9 100644 --- a/tests/auto/q3scrollview/tst_qscrollview.cpp +++ b/tests/auto/q3scrollview/tst_qscrollview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3semaphore/tst_q3semaphore.cpp b/tests/auto/q3semaphore/tst_q3semaphore.cpp index 3567b0e..3ac97b1 100644 --- a/tests/auto/q3semaphore/tst_q3semaphore.cpp +++ b/tests/auto/q3semaphore/tst_q3semaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3serversocket/tst_q3serversocket.cpp b/tests/auto/q3serversocket/tst_q3serversocket.cpp index dd61864..87b6442 100644 --- a/tests/auto/q3serversocket/tst_q3serversocket.cpp +++ b/tests/auto/q3serversocket/tst_q3serversocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3socket/tst_qsocket.cpp b/tests/auto/q3socket/tst_qsocket.cpp index 3d16471..1d9f5ff 100644 --- a/tests/auto/q3socket/tst_qsocket.cpp +++ b/tests/auto/q3socket/tst_qsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3socketdevice/tst_q3socketdevice.cpp b/tests/auto/q3socketdevice/tst_q3socketdevice.cpp index 2b0c606..6b65d87 100644 --- a/tests/auto/q3socketdevice/tst_q3socketdevice.cpp +++ b/tests/auto/q3socketdevice/tst_q3socketdevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp index 2d91186..2b66db8 100644 --- a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp +++ b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp index 9ab74f0..f796dd6 100644 --- a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp +++ b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3stylesheet/tst_q3stylesheet.cpp b/tests/auto/q3stylesheet/tst_q3stylesheet.cpp index 8215c67..9081c87 100644 --- a/tests/auto/q3stylesheet/tst_q3stylesheet.cpp +++ b/tests/auto/q3stylesheet/tst_q3stylesheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3tabdialog/tst_q3tabdialog.cpp b/tests/auto/q3tabdialog/tst_q3tabdialog.cpp index 6de68fa..1debdf8b4 100644 --- a/tests/auto/q3tabdialog/tst_q3tabdialog.cpp +++ b/tests/auto/q3tabdialog/tst_q3tabdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3table/tst_q3table.cpp b/tests/auto/q3table/tst_q3table.cpp index 2fab3eb..ee71c6c 100644 --- a/tests/auto/q3table/tst_q3table.cpp +++ b/tests/auto/q3table/tst_q3table.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3textbrowser/tst_q3textbrowser.cpp b/tests/auto/q3textbrowser/tst_q3textbrowser.cpp index 728fbb1..f60f3f9 100644 --- a/tests/auto/q3textbrowser/tst_q3textbrowser.cpp +++ b/tests/auto/q3textbrowser/tst_q3textbrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3textedit/tst_q3textedit.cpp b/tests/auto/q3textedit/tst_q3textedit.cpp index 21bc8b5..eaa1f3e 100644 --- a/tests/auto/q3textedit/tst_q3textedit.cpp +++ b/tests/auto/q3textedit/tst_q3textedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3textstream/tst_q3textstream.cpp b/tests/auto/q3textstream/tst_q3textstream.cpp index 7932b79..2409d82 100644 --- a/tests/auto/q3textstream/tst_q3textstream.cpp +++ b/tests/auto/q3textstream/tst_q3textstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3timeedit/tst_q3timeedit.cpp b/tests/auto/q3timeedit/tst_q3timeedit.cpp index 967bb51..0920204 100644 --- a/tests/auto/q3timeedit/tst_q3timeedit.cpp +++ b/tests/auto/q3timeedit/tst_q3timeedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3toolbar/tst_q3toolbar.cpp b/tests/auto/q3toolbar/tst_q3toolbar.cpp index c12d8a9..84233f3 100644 --- a/tests/auto/q3toolbar/tst_q3toolbar.cpp +++ b/tests/auto/q3toolbar/tst_q3toolbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3uridrag/tst_q3uridrag.cpp b/tests/auto/q3uridrag/tst_q3uridrag.cpp index 1c6ba2b..57026fa 100644 --- a/tests/auto/q3uridrag/tst_q3uridrag.cpp +++ b/tests/auto/q3uridrag/tst_q3uridrag.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3urloperator/tst_q3urloperator.cpp b/tests/auto/q3urloperator/tst_q3urloperator.cpp index d8711fa..fccbd16 100644 --- a/tests/auto/q3urloperator/tst_q3urloperator.cpp +++ b/tests/auto/q3urloperator/tst_q3urloperator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3valuelist/tst_q3valuelist.cpp b/tests/auto/q3valuelist/tst_q3valuelist.cpp index 8abeee2..450eba9 100644 --- a/tests/auto/q3valuelist/tst_q3valuelist.cpp +++ b/tests/auto/q3valuelist/tst_q3valuelist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3valuevector/tst_q3valuevector.cpp b/tests/auto/q3valuevector/tst_q3valuevector.cpp index 84c8316..9ece6a3 100644 --- a/tests/auto/q3valuevector/tst_q3valuevector.cpp +++ b/tests/auto/q3valuevector/tst_q3valuevector.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q3widgetstack/tst_q3widgetstack.cpp b/tests/auto/q3widgetstack/tst_q3widgetstack.cpp index 7aea508..5c6ecd4 100644 --- a/tests/auto/q3widgetstack/tst_q3widgetstack.cpp +++ b/tests/auto/q3widgetstack/tst_q3widgetstack.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/q_func_info/tst_q_func_info.cpp b/tests/auto/q_func_info/tst_q_func_info.cpp index 4d74c27..7306656 100644 --- a/tests/auto/q_func_info/tst_q_func_info.cpp +++ b/tests/auto/q_func_info/tst_q_func_info.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp index 5d4bd5b..901d850 100644 --- a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/qabstractbutton/tst_qabstractbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp index b613b81..400d6ca 100644 --- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp index 3337a49..360a0eb 100644 --- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp index eac4dec..ca18f4d 100644 --- a/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp +++ b/tests/auto/qabstractmessagehandler/tst_qabstractmessagehandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index d7ee5b7..5d284a9 100644 --- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp index 67848dc..69d2b86 100644 --- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp index 2fa304c..3a99326 100644 --- a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp +++ b/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp index 6a58dd6..609385c 100644 --- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index 9e3acb8..06f48b1 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp b/tests/auto/qabstractsocket/tst_qabstractsocket.cpp index befb5e7..e92fe39 100644 --- a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp +++ b/tests/auto/qabstractsocket/tst_qabstractsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp index 90574cb..0938bc0 100644 --- a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp +++ b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp index 48101e8..21d01e3 100644 --- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp +++ b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstracturiresolver/TestURIResolver.h b/tests/auto/qabstracturiresolver/TestURIResolver.h index a7ce172..72db017 100644 --- a/tests/auto/qabstracturiresolver/TestURIResolver.h +++ b/tests/auto/qabstracturiresolver/TestURIResolver.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp index 389ac04..1d55c7e 100644 --- a/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp +++ b/tests/auto/qabstracturiresolver/tst_qabstracturiresolver.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp index a6d8e95..64ad5c3 100644 --- a/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp +++ b/tests/auto/qabstractxmlforwarditerator/tst_qabstractxmlforwarditerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index 5cc33d6..83ada8d 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.h b/tests/auto/qabstractxmlnodemodel/LoadingModel.h index 1b4967b..b35f782 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.h +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlnodemodel/TestNodeModel.h b/tests/auto/qabstractxmlnodemodel/TestNodeModel.h index d4532d7..0daad75 100644 --- a/tests/auto/qabstractxmlnodemodel/TestNodeModel.h +++ b/tests/auto/qabstractxmlnodemodel/TestNodeModel.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp index 72b43ee..673285b 100644 --- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp +++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h b/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h index 09029a6..8118fff 100644 --- a/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h +++ b/tests/auto/qabstractxmlreceiver/TestAbstractXmlReceiver.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp index c9dc2c2..d029b87 100644 --- a/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp +++ b/tests/auto/qabstractxmlreceiver/tst_qabstractxmlreceiver.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index d023557..a1a57f2 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp index b0b8c8b..8237429 100644 --- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp +++ b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp index 34f2dfd..937d3dd 100644 --- a/tests/auto/qaction/tst_qaction.cpp +++ b/tests/auto/qaction/tst_qaction.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qactiongroup/tst_qactiongroup.cpp b/tests/auto/qactiongroup/tst_qactiongroup.cpp index acdb089..edfe3c5 100644 --- a/tests/auto/qactiongroup/tst_qactiongroup.cpp +++ b/tests/auto/qactiongroup/tst_qactiongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp index 9c2fa50..097ba4d 100644 --- a/tests/auto/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qapplication/desktopsettingsaware/main.cpp b/tests/auto/qapplication/desktopsettingsaware/main.cpp index 9af9319..3618b20 100644 --- a/tests/auto/qapplication/desktopsettingsaware/main.cpp +++ b/tests/auto/qapplication/desktopsettingsaware/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp index cee3125..406c244 100644 --- a/tests/auto/qapplication/tst_qapplication.cpp +++ b/tests/auto/qapplication/tst_qapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qapplication/wincmdline/main.cpp b/tests/auto/qapplication/wincmdline/main.cpp index e54f2d9..783651a 100644 --- a/tests/auto/qapplication/wincmdline/main.cpp +++ b/tests/auto/qapplication/wincmdline/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp index a2a2dcb..aeaa1d2 100644 --- a/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp +++ b/tests/auto/qapplicationargumentparser/tst_qapplicationargumentparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp index f8379c0..23db32d 100644 --- a/tests/auto/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/qatomicint/tst_qatomicint.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp index 1d573c5..beb654e 100644 --- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qautoptr/tst_qautoptr.cpp b/tests/auto/qautoptr/tst_qautoptr.cpp index b920d37..0223de2 100644 --- a/tests/auto/qautoptr/tst_qautoptr.cpp +++ b/tests/auto/qautoptr/tst_qautoptr.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qbitarray/tst_qbitarray.cpp b/tests/auto/qbitarray/tst_qbitarray.cpp index bbcb087..aa7783c 100644 --- a/tests/auto/qbitarray/tst_qbitarray.cpp +++ b/tests/auto/qbitarray/tst_qbitarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp index 28e58e8..e5d317b 100644 --- a/tests/auto/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp index 11f715a..ce0a02a 100644 --- a/tests/auto/qbrush/tst_qbrush.cpp +++ b/tests/auto/qbrush/tst_qbrush.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp index fae5cdb..672b6ae 100644 --- a/tests/auto/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/qbuffer/tst_qbuffer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp index c38fb66..945ff2a 100644 --- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp index 4da8c5c..96d25e9 100644 --- a/tests/auto/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/qbytearray/tst_qbytearray.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcache/tst_qcache.cpp b/tests/auto/qcache/tst_qcache.cpp index f0d0454..52e6866 100644 --- a/tests/auto/qcache/tst_qcache.cpp +++ b/tests/auto/qcache/tst_qcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp index 67a822f..da994ef 100644 --- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp index 96b3b27..1abdccc 100644 --- a/tests/auto/qchar/tst_qchar.cpp +++ b/tests/auto/qchar/tst_qchar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcheckbox/tst_qcheckbox.cpp b/tests/auto/qcheckbox/tst_qcheckbox.cpp index be1095a..c573151 100644 --- a/tests/auto/qcheckbox/tst_qcheckbox.cpp +++ b/tests/auto/qcheckbox/tst_qcheckbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qclipboard/copier/main.cpp b/tests/auto/qclipboard/copier/main.cpp index 9870f41..6ba4231 100644 --- a/tests/auto/qclipboard/copier/main.cpp +++ b/tests/auto/qclipboard/copier/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qclipboard/paster/main.cpp b/tests/auto/qclipboard/paster/main.cpp index 7cd3bc0..5f4504f 100644 --- a/tests/auto/qclipboard/paster/main.cpp +++ b/tests/auto/qclipboard/paster/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp index 3a98153..636e4cf 100644 --- a/tests/auto/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/qclipboard/tst_qclipboard.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp index 7608a15..9671a4a 100644 --- a/tests/auto/qcolor/tst_qcolor.cpp +++ b/tests/auto/qcolor/tst_qcolor.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/qcolordialog/tst_qcolordialog.cpp index e51dfcc..8a92682 100644 --- a/tests/auto/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/qcolordialog/tst_qcolordialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp index 998d273..a24c8fd4 100644 --- a/tests/auto/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 70059f2..d6b387d 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index 5665e6e..10122cb 100644 --- a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 656995a..c42805a 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcomplextext/bidireorderstring.h b/tests/auto/qcomplextext/bidireorderstring.h index 1181474..1da30f1 100644 --- a/tests/auto/qcomplextext/bidireorderstring.h +++ b/tests/auto/qcomplextext/bidireorderstring.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/qcomplextext/tst_qcomplextext.cpp index b228854..18aa458 100644 --- a/tests/auto/qcomplextext/tst_qcomplextext.cpp +++ b/tests/auto/qcomplextext/tst_qcomplextext.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp index e906ff4..b2c2004 100644 --- a/tests/auto/qcopchannel/testSend/main.cpp +++ b/tests/auto/qcopchannel/testSend/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp index a900373..5287778 100644 --- a/tests/auto/qcopchannel/tst_qcopchannel.cpp +++ b/tests/auto/qcopchannel/tst_qcopchannel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp index e695592..1bc43b2 100644 --- a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/qcryptographichash/tst_qcryptographichash.cpp index 04b1ac6..b5f3e97 100644 --- a/tests/auto/qcryptographichash/tst_qcryptographichash.cpp +++ b/tests/auto/qcryptographichash/tst_qcryptographichash.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp index 6e277d3..b59a9ab 100644 --- a/tests/auto/qcssparser/tst_cssparser.cpp +++ b/tests/auto/qcssparser/tst_cssparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index a112c10..e5e5ec1 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp index 0aaa1b3..f347ce3 100644 --- a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp +++ b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdate/tst_qdate.cpp b/tests/auto/qdate/tst_qdate.cpp index 121167a..75f0720 100644 --- a/tests/auto/qdate/tst_qdate.cpp +++ b/tests/auto/qdate/tst_qdate.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp index 9e73d6d..a09c93e 100644 --- a/tests/auto/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/qdatetime/tst_qdatetime.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp index b975405..c51da20 100644 --- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp b/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp index 142b820..ca8bd9d 100644 --- a/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp +++ b/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp index e04df2a..50776a1 100644 --- a/tests/auto/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/qdbusconnection/tst_qdbusconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbuscontext/tst_qdbuscontext.cpp b/tests/auto/qdbuscontext/tst_qdbuscontext.cpp index 2d6c0f1..ba08325 100644 --- a/tests/auto/qdbuscontext/tst_qdbuscontext.cpp +++ b/tests/auto/qdbuscontext/tst_qdbuscontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp index c3ff034..faecd7c 100644 --- a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 2b512d4..7c977f9 100644 --- a/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmarshall/common.h b/tests/auto/qdbusmarshall/common.h index 4c728ef..6bd7fc5 100644 --- a/tests/auto/qdbusmarshall/common.h +++ b/tests/auto/qdbusmarshall/common.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmarshall/dummy.cpp b/tests/auto/qdbusmarshall/dummy.cpp index 2a34bb9..0c45c0a 100644 --- a/tests/auto/qdbusmarshall/dummy.cpp +++ b/tests/auto/qdbusmarshall/dummy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmarshall/qpong/qpong.cpp b/tests/auto/qdbusmarshall/qpong/qpong.cpp index 9a5753d..69a1b3a 100644 --- a/tests/auto/qdbusmarshall/qpong/qpong.cpp +++ b/tests/auto/qdbusmarshall/qpong/qpong.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp index ad1a1b8..45781aa 100644 --- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp +++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp index b887148..dca90ad 100644 --- a/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp +++ b/tests/auto/qdbusmetaobject/tst_qdbusmetaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp index be7b923..97bad43 100644 --- a/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp +++ b/tests/auto/qdbusmetatype/tst_qdbusmetatype.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp b/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp index 58707f1..c4b91bf 100644 --- a/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp +++ b/tests/auto/qdbuspendingcall/tst_qdbuspendingcall.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp index 7247168..863a2c0 100644 --- a/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp +++ b/tests/auto/qdbuspendingreply/tst_qdbuspendingreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusperformance/server/server.cpp b/tests/auto/qdbusperformance/server/server.cpp index 06087bd..3744b39 100644 --- a/tests/auto/qdbusperformance/server/server.cpp +++ b/tests/auto/qdbusperformance/server/server.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusperformance/serverobject.h b/tests/auto/qdbusperformance/serverobject.h index e4c881a..f036de2 100644 --- a/tests/auto/qdbusperformance/serverobject.h +++ b/tests/auto/qdbusperformance/serverobject.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp index 0e10312..da1acc2 100644 --- a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusreply/tst_qdbusreply.cpp b/tests/auto/qdbusreply/tst_qdbusreply.cpp index 96592ad..f4d119a 100644 --- a/tests/auto/qdbusreply/tst_qdbusreply.cpp +++ b/tests/auto/qdbusreply/tst_qdbusreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusserver/server.cpp b/tests/auto/qdbusserver/server.cpp index 65ea53d..7dc4eda 100644 --- a/tests/auto/qdbusserver/server.cpp +++ b/tests/auto/qdbusserver/server.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusserver/tst_qdbusserver.cpp b/tests/auto/qdbusserver/tst_qdbusserver.cpp index 4c2761b..bd58a36 100644 --- a/tests/auto/qdbusserver/tst_qdbusserver.cpp +++ b/tests/auto/qdbusserver/tst_qdbusserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp index a6cb29b..a10b3ca 100644 --- a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp index 8d3bea9..0e96159 100644 --- a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp +++ b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdebug/tst_qdebug.cpp b/tests/auto/qdebug/tst_qdebug.cpp index 11da29d..b3e9390 100644 --- a/tests/auto/qdebug/tst_qdebug.cpp +++ b/tests/auto/qdebug/tst_qdebug.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp index 49f8922..e1afbec 100644 --- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp index c433c4b..e1b0caa 100644 --- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp +++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdial/tst_qdial.cpp b/tests/auto/qdial/tst_qdial.cpp index d8e797d..41e7953 100644 --- a/tests/auto/qdial/tst_qdial.cpp +++ b/tests/auto/qdial/tst_qdial.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp index e77167e..c5d4179 100644 --- a/tests/auto/qdialog/tst_qdialog.cpp +++ b/tests/auto/qdialog/tst_qdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index bc8c5b0..cfa7cf0 100644 --- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdir/testdir/dir/qrc_qdir.cpp b/tests/auto/qdir/testdir/dir/qrc_qdir.cpp index 27771c3..af2b566 100644 --- a/tests/auto/qdir/testdir/dir/qrc_qdir.cpp +++ b/tests/auto/qdir/testdir/dir/qrc_qdir.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdir/testdir/dir/tst_qdir.cpp b/tests/auto/qdir/testdir/dir/tst_qdir.cpp index 27771c3..af2b566 100644 --- a/tests/auto/qdir/testdir/dir/tst_qdir.cpp +++ b/tests/auto/qdir/testdir/dir/tst_qdir.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index f680f46..4846649 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/qdirectpainter/runDirectPainter/main.cpp index 3a806f5..bf24751 100644 --- a/tests/auto/qdirectpainter/runDirectPainter/main.cpp +++ b/tests/auto/qdirectpainter/runDirectPainter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp index 7767539..0957e38 100644 --- a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp +++ b/tests/auto/qdirectpainter/tst_qdirectpainter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index 6aa1d95..e25b616 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index f6887da..7379994 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp index af11133..abde018 100644 --- a/tests/auto/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 3e34aaf..877c26b 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp index d900ff4..1c9d1f7 100644 --- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp index 7dff29a..ad6f550 100644 --- a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp +++ b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qdrag/tst_qdrag.cpp b/tests/auto/qdrag/tst_qdrag.cpp index 16ab72d..5200c4e 100644 --- a/tests/auto/qdrag/tst_qdrag.cpp +++ b/tests/auto/qdrag/tst_qdrag.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qerrormessage/tst_qerrormessage.cpp b/tests/auto/qerrormessage/tst_qerrormessage.cpp index c31c97e..6c99346 100644 --- a/tests/auto/qerrormessage/tst_qerrormessage.cpp +++ b/tests/auto/qerrormessage/tst_qerrormessage.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qevent/tst_qevent.cpp b/tests/auto/qevent/tst_qevent.cpp index cf88b84..dce14bd 100644 --- a/tests/auto/qevent/tst_qevent.cpp +++ b/tests/auto/qevent/tst_qevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp index d7e458b..ba5537f 100644 --- a/tests/auto/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/qeventloop/tst_qeventloop.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp index 85fe9ef..faac773 100644 --- a/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp +++ b/tests/auto/qexplicitlyshareddatapointer/tst_qexplicitlyshareddatapointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfile/stdinprocess/main.cpp b/tests/auto/qfile/stdinprocess/main.cpp index d7908f8..cde5527 100644 --- a/tests/auto/qfile/stdinprocess/main.cpp +++ b/tests/auto/qfile/stdinprocess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index 829e0b3..35eb001 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index bade586..025914b 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp index ced1057..4409104 100644 --- a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp +++ b/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 3d7e6f8..9486f1d 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index 826d278..a6ff4a5 100644 --- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 87f9ba3..28a20cd 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qflags/tst_qflags.cpp b/tests/auto/qflags/tst_qflags.cpp index 71e23c1..875fa95 100644 --- a/tests/auto/qflags/tst_qflags.cpp +++ b/tests/auto/qflags/tst_qflags.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/qfocusevent/tst_qfocusevent.cpp index 3f0f4db..1d361e9 100644 --- a/tests/auto/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/qfocusevent/tst_qfocusevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfocusframe/tst_qfocusframe.cpp b/tests/auto/qfocusframe/tst_qfocusframe.cpp index 7e6e2e1..daac88c 100644 --- a/tests/auto/qfocusframe/tst_qfocusframe.cpp +++ b/tests/auto/qfocusframe/tst_qfocusframe.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp index 58e837e..8afe48d 100644 --- a/tests/auto/qfont/tst_qfont.cpp +++ b/tests/auto/qfont/tst_qfont.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp index 58b01c5..d7b5f6f 100644 --- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp +++ b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp index 28f490a..bf0e012 100644 --- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfontdialog/tst_qfontdialog.cpp b/tests/auto/qfontdialog/tst_qfontdialog.cpp index c0a1cc5..855ca00 100644 --- a/tests/auto/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/qfontdialog/tst_qfontdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index 20de456..7d434ea 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp index c4c6f70..7b843f4 100644 --- a/tests/auto/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/qformlayout/tst_qformlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index 7204a4c..9f550ed 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfuture/tst_qfuture.cpp b/tests/auto/qfuture/tst_qfuture.cpp index 43fd614..c36c883 100644 --- a/tests/auto/qfuture/tst_qfuture.cpp +++ b/tests/auto/qfuture/tst_qfuture.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfuture/versioncheck.h b/tests/auto/qfuture/versioncheck.h index 118aee1..f389077 100644 --- a/tests/auto/qfuture/versioncheck.h +++ b/tests/auto/qfuture/versioncheck.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp index 1c76b0d..366b699 100644 --- a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgetputenv/tst_qgetputenv.cpp b/tests/auto/qgetputenv/tst_qgetputenv.cpp index 44303aa..8ba8c5d 100644 --- a/tests/auto/qgetputenv/tst_qgetputenv.cpp +++ b/tests/auto/qgetputenv/tst_qgetputenv.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index a64dfc4..79af6f9 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qglobal/tst_qglobal.cpp b/tests/auto/qglobal/tst_qglobal.cpp index 88fbcd2..4565e6a 100644 --- a/tests/auto/qglobal/tst_qglobal.cpp +++ b/tests/auto/qglobal/tst_qglobal.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 3e543bd..cfc3224 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 0f2d671..bc90bf9 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp index d43d0ae..35e01ec 100644 --- a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp +++ b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp index f2a6bfd..6f4518d 100644 --- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp index 7ab61a1..c04e43c 100644 --- a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp +++ b/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 6e317f0..aefd2b9 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index 6f0caaa..85f546e 100644 --- a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index b77fe38..ed695f0 100644 --- a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index d1d1857..3e71517 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 91ed851..ad3b167 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 4368e76..e046514 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp index 702b253..d654843 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index f25a079..720c4ef 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp index f5f4ca0..c8e71f5 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/qgroupbox/tst_qgroupbox.cpp index 618cde4..fb43ddc 100644 --- a/tests/auto/qgroupbox/tst_qgroupbox.cpp +++ b/tests/auto/qgroupbox/tst_qgroupbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qguivariant/tst_qguivariant.cpp b/tests/auto/qguivariant/tst_qguivariant.cpp index c18ae38..2d6a28a 100644 --- a/tests/auto/qguivariant/tst_qguivariant.cpp +++ b/tests/auto/qguivariant/tst_qguivariant.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/qhash/tst_qhash.cpp index 9343504..1b65ed9 100644 --- a/tests/auto/qhash/tst_qhash.cpp +++ b/tests/auto/qhash/tst_qhash.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 0867e48..e12a3a3 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp index 80f1595..c1ae40a 100644 --- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp +++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp index d114955..b4598e7 100644 --- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp +++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp index 207fdbe..6ab20e4 100644 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp +++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp index 0260d8b..ec0e828 100644 --- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp +++ b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp index e7db5aa..eb7541a 100644 --- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp +++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/qhostaddress/tst_qhostaddress.cpp index 748b34e..1cbbc49 100644 --- a/tests/auto/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/qhostaddress/tst_qhostaddress.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index 3a7698b..67e68a7 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhttp/dummyserver.h b/tests/auto/qhttp/dummyserver.h index fe883c7..8e7e69b 100644 --- a/tests/auto/qhttp/dummyserver.h +++ b/tests/auto/qhttp/dummyserver.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index e4a798e..66f203f 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index b22397f..fa3f242 100644 --- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp index 9e13610..a0b9fbe 100644 --- a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp +++ b/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp index 9ef8f9a..177a820 100644 --- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp +++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp index 9fca6df..8eacbdf 100644 --- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp +++ b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp index 7e515a5..654af45 100644 --- a/tests/auto/qicon/tst_qicon.cpp +++ b/tests/auto/qicon/tst_qicon.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index 132e373..ce8b375 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/qimageiohandler/tst_qimageiohandler.cpp index 4121ecf..b9a021e 100644 --- a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp +++ b/tests/auto/qimageiohandler/tst_qimageiohandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index e256227..c3731ed 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/qimagewriter/tst_qimagewriter.cpp index 878d398..a7f0da4 100644 --- a/tests/auto/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/qimagewriter/tst_qimagewriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp index 0f763fc..1133e54 100644 --- a/tests/auto/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qintvalidator/tst_qintvalidator.cpp b/tests/auto/qintvalidator/tst_qintvalidator.cpp index 34843cf..944b22c 100644 --- a/tests/auto/qintvalidator/tst_qintvalidator.cpp +++ b/tests/auto/qintvalidator/tst_qintvalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 6a8ff73..774b862 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp index befe0eb..2c1fbe8 100644 --- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp index c12c583..d2b8810 100644 --- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp +++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp index 61fc480..bc62934 100644 --- a/tests/auto/qitemmodel/modelstotest.cpp +++ b/tests/auto/qitemmodel/modelstotest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp index ea1972e..24f441f 100644 --- a/tests/auto/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp index 15b36b8..2ca3888 100644 --- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index b248aa8..6680106 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/qitemview/viewstotest.cpp index 09b0f4f..02914e3 100644 --- a/tests/auto/qitemview/viewstotest.cpp +++ b/tests/auto/qitemview/viewstotest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qkeyevent/tst_qkeyevent.cpp b/tests/auto/qkeyevent/tst_qkeyevent.cpp index 804b873..a79840b 100644 --- a/tests/auto/qkeyevent/tst_qkeyevent.cpp +++ b/tests/auto/qkeyevent/tst_qkeyevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp index 33de82a..97914bc 100644 --- a/tests/auto/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp index 1783a3d..af0b871 100644 --- a/tests/auto/qlabel/tst_qlabel.cpp +++ b/tests/auto/qlabel/tst_qlabel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 3eec918..cb40657 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp b/tests/auto/qlcdnumber/tst_qlcdnumber.cpp index a03e1ce..f68e6c5 100644 --- a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp +++ b/tests/auto/qlcdnumber/tst_qlcdnumber.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp index dea0c54e..b4545c9 100644 --- a/tests/auto/qlibrary/tst_qlibrary.cpp +++ b/tests/auto/qlibrary/tst_qlibrary.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qline/tst_qline.cpp b/tests/auto/qline/tst_qline.cpp index 932ec8e..1d741d5 100644 --- a/tests/auto/qline/tst_qline.cpp +++ b/tests/auto/qline/tst_qline.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 87e966f..d146c6a 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlist/tst_qlist.cpp b/tests/auto/qlist/tst_qlist.cpp index 81e9078..2f5ac13 100644 --- a/tests/auto/qlist/tst_qlist.cpp +++ b/tests/auto/qlist/tst_qlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index 2e7f412..eb36c2a 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp index 8d15aa4..368cff6 100644 --- a/tests/auto/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp index 3200f7b..57bdcb5 100644 --- a/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp +++ b/tests/auto/qlocale/syslocaleapp/syslocaleapp.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index b8f7c22..182477e 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocalsocket/example/client/main.cpp b/tests/auto/qlocalsocket/example/client/main.cpp index 76050af..ae93a60 100644 --- a/tests/auto/qlocalsocket/example/client/main.cpp +++ b/tests/auto/qlocalsocket/example/client/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocalsocket/example/server/main.cpp b/tests/auto/qlocalsocket/example/server/main.cpp index bb2fc77..a59b2d3 100644 --- a/tests/auto/qlocalsocket/example/server/main.cpp +++ b/tests/auto/qlocalsocket/example/server/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/qlocalsocket/lackey/main.cpp index 4ddb9c3..1a36a3b 100644 --- a/tests/auto/qlocalsocket/lackey/main.cpp +++ b/tests/auto/qlocalsocket/lackey/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index f741b96..e37b3a4 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp index 0171773..d87bf36 100644 --- a/tests/auto/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index 4529bd5..9dfc738 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/qmake/testcompiler.cpp index 122a2b8..dbc01d8f 100644 --- a/tests/auto/qmake/testcompiler.cpp +++ b/tests/auto/qmake/testcompiler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testcompiler.h b/tests/auto/qmake/testcompiler.h index 41e5177..d59ab1c 100644 --- a/tests/auto/qmake/testcompiler.h +++ b/tests/auto/qmake/testcompiler.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/main.cpp b/tests/auto/qmake/testdata/findDeps/main.cpp index 9fd9ea0..e9f517d 100644 --- a/tests/auto/qmake/testdata/findDeps/main.cpp +++ b/tests/auto/qmake/testdata/findDeps/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object1.h b/tests/auto/qmake/testdata/findDeps/object1.h index 403e510..c34cddf 100644 --- a/tests/auto/qmake/testdata/findDeps/object1.h +++ b/tests/auto/qmake/testdata/findDeps/object1.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object2.h b/tests/auto/qmake/testdata/findDeps/object2.h index 2f790e7..8cb9bae 100644 --- a/tests/auto/qmake/testdata/findDeps/object2.h +++ b/tests/auto/qmake/testdata/findDeps/object2.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object3.h b/tests/auto/qmake/testdata/findDeps/object3.h index 3aad6f6..dc6ef95 100644 --- a/tests/auto/qmake/testdata/findDeps/object3.h +++ b/tests/auto/qmake/testdata/findDeps/object3.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object4.h b/tests/auto/qmake/testdata/findDeps/object4.h index 92c7ac0..6056e6d 100644 --- a/tests/auto/qmake/testdata/findDeps/object4.h +++ b/tests/auto/qmake/testdata/findDeps/object4.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object5.h b/tests/auto/qmake/testdata/findDeps/object5.h index 0bee050..11c9a42 100644 --- a/tests/auto/qmake/testdata/findDeps/object5.h +++ b/tests/auto/qmake/testdata/findDeps/object5.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object6.h b/tests/auto/qmake/testdata/findDeps/object6.h index 55f39ca..1cdb1ae 100644 --- a/tests/auto/qmake/testdata/findDeps/object6.h +++ b/tests/auto/qmake/testdata/findDeps/object6.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object7.h b/tests/auto/qmake/testdata/findDeps/object7.h index 99c5ae3..472e4e6 100644 --- a/tests/auto/qmake/testdata/findDeps/object7.h +++ b/tests/auto/qmake/testdata/findDeps/object7.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object8.h b/tests/auto/qmake/testdata/findDeps/object8.h index 6ae3c08..270fcfc 100644 --- a/tests/auto/qmake/testdata/findDeps/object8.h +++ b/tests/auto/qmake/testdata/findDeps/object8.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findDeps/object9.h b/tests/auto/qmake/testdata/findDeps/object9.h index 4cbcf13..bc5fd9c 100644 --- a/tests/auto/qmake/testdata/findDeps/object9.h +++ b/tests/auto/qmake/testdata/findDeps/object9.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/main.cpp b/tests/auto/qmake/testdata/findMocs/main.cpp index 8530b1b..ec9d653 100644 --- a/tests/auto/qmake/testdata/findMocs/main.cpp +++ b/tests/auto/qmake/testdata/findMocs/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object1.h b/tests/auto/qmake/testdata/findMocs/object1.h index 55675d6..b3c90d6 100644 --- a/tests/auto/qmake/testdata/findMocs/object1.h +++ b/tests/auto/qmake/testdata/findMocs/object1.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object2.h b/tests/auto/qmake/testdata/findMocs/object2.h index bd38f7d..b518472 100644 --- a/tests/auto/qmake/testdata/findMocs/object2.h +++ b/tests/auto/qmake/testdata/findMocs/object2.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object3.h b/tests/auto/qmake/testdata/findMocs/object3.h index b543b26..8d6f306 100644 --- a/tests/auto/qmake/testdata/findMocs/object3.h +++ b/tests/auto/qmake/testdata/findMocs/object3.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object4.h b/tests/auto/qmake/testdata/findMocs/object4.h index d06d629..d28e9f3 100644 --- a/tests/auto/qmake/testdata/findMocs/object4.h +++ b/tests/auto/qmake/testdata/findMocs/object4.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object5.h b/tests/auto/qmake/testdata/findMocs/object5.h index 39191c4..77d7d7b 100644 --- a/tests/auto/qmake/testdata/findMocs/object5.h +++ b/tests/auto/qmake/testdata/findMocs/object5.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object6.h b/tests/auto/qmake/testdata/findMocs/object6.h index 10f1686..a439b22 100644 --- a/tests/auto/qmake/testdata/findMocs/object6.h +++ b/tests/auto/qmake/testdata/findMocs/object6.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/findMocs/object7.h b/tests/auto/qmake/testdata/findMocs/object7.h index a7b23ff..31d28a9 100644 --- a/tests/auto/qmake/testdata/findMocs/object7.h +++ b/tests/auto/qmake/testdata/findMocs/object7.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/1.cpp b/tests/auto/qmake/testdata/functions/1.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/1.cpp +++ b/tests/auto/qmake/testdata/functions/1.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/2.cpp b/tests/auto/qmake/testdata/functions/2.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/2.cpp +++ b/tests/auto/qmake/testdata/functions/2.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/one/1.cpp b/tests/auto/qmake/testdata/functions/one/1.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/one/1.cpp +++ b/tests/auto/qmake/testdata/functions/one/1.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/one/2.cpp b/tests/auto/qmake/testdata/functions/one/2.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/one/2.cpp +++ b/tests/auto/qmake/testdata/functions/one/2.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp b/tests/auto/qmake/testdata/functions/three/wildcard21.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp +++ b/tests/auto/qmake/testdata/functions/three/wildcard21.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp b/tests/auto/qmake/testdata/functions/three/wildcard22.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp +++ b/tests/auto/qmake/testdata/functions/three/wildcard22.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/two/1.cpp b/tests/auto/qmake/testdata/functions/two/1.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/two/1.cpp +++ b/tests/auto/qmake/testdata/functions/two/1.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/two/2.cpp b/tests/auto/qmake/testdata/functions/two/2.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/two/2.cpp +++ b/tests/auto/qmake/testdata/functions/two/2.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/wildcard21.cpp b/tests/auto/qmake/testdata/functions/wildcard21.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/wildcard21.cpp +++ b/tests/auto/qmake/testdata/functions/wildcard21.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/functions/wildcard22.cpp b/tests/auto/qmake/testdata/functions/wildcard22.cpp index edd459d..3f3571c 100644 --- a/tests/auto/qmake/testdata/functions/wildcard22.cpp +++ b/tests/auto/qmake/testdata/functions/wildcard22.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/include_dir/main.cpp b/tests/auto/qmake/testdata/include_dir/main.cpp index 494bbee..7fffce8 100644 --- a/tests/auto/qmake/testdata/include_dir/main.cpp +++ b/tests/auto/qmake/testdata/include_dir/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/include_dir/test_file.cpp b/tests/auto/qmake/testdata/include_dir/test_file.cpp index c6ddcba..5ba3f39 100644 --- a/tests/auto/qmake/testdata/include_dir/test_file.cpp +++ b/tests/auto/qmake/testdata/include_dir/test_file.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/include_dir/test_file.h b/tests/auto/qmake/testdata/include_dir/test_file.h index a869281..87ffaf3 100644 --- a/tests/auto/qmake/testdata/include_dir/test_file.h +++ b/tests/auto/qmake/testdata/include_dir/test_file.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/install_depends/main.cpp b/tests/auto/qmake/testdata/install_depends/main.cpp index 494bbee..7fffce8 100644 --- a/tests/auto/qmake/testdata/install_depends/main.cpp +++ b/tests/auto/qmake/testdata/install_depends/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/install_depends/test_file.cpp b/tests/auto/qmake/testdata/install_depends/test_file.cpp index fd4cdb5..235d534 100644 --- a/tests/auto/qmake/testdata/install_depends/test_file.cpp +++ b/tests/auto/qmake/testdata/install_depends/test_file.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/install_depends/test_file.h b/tests/auto/qmake/testdata/install_depends/test_file.h index a35b0de..067cb59 100644 --- a/tests/auto/qmake/testdata/install_depends/test_file.h +++ b/tests/auto/qmake/testdata/install_depends/test_file.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/one_space/main.cpp b/tests/auto/qmake/testdata/one_space/main.cpp index 78242a3..77151e6 100644 --- a/tests/auto/qmake/testdata/one_space/main.cpp +++ b/tests/auto/qmake/testdata/one_space/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/quotedfilenames/main.cpp b/tests/auto/qmake/testdata/quotedfilenames/main.cpp index 40a402e..689cec3 100644 --- a/tests/auto/qmake/testdata/quotedfilenames/main.cpp +++ b/tests/auto/qmake/testdata/quotedfilenames/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/shadow_files/main.cpp b/tests/auto/qmake/testdata/shadow_files/main.cpp index 494bbee..7fffce8 100644 --- a/tests/auto/qmake/testdata/shadow_files/main.cpp +++ b/tests/auto/qmake/testdata/shadow_files/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.cpp b/tests/auto/qmake/testdata/shadow_files/test_file.cpp index fd4cdb5..235d534 100644 --- a/tests/auto/qmake/testdata/shadow_files/test_file.cpp +++ b/tests/auto/qmake/testdata/shadow_files/test_file.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.h b/tests/auto/qmake/testdata/shadow_files/test_file.h index a35b0de..067cb59 100644 --- a/tests/auto/qmake/testdata/shadow_files/test_file.h +++ b/tests/auto/qmake/testdata/shadow_files/test_file.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_app/main.cpp b/tests/auto/qmake/testdata/simple_app/main.cpp index 3fd8456..f857a12 100644 --- a/tests/auto/qmake/testdata/simple_app/main.cpp +++ b/tests/auto/qmake/testdata/simple_app/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_app/test_file.cpp b/tests/auto/qmake/testdata/simple_app/test_file.cpp index fd4cdb5..235d534 100644 --- a/tests/auto/qmake/testdata/simple_app/test_file.cpp +++ b/tests/auto/qmake/testdata/simple_app/test_file.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_app/test_file.h b/tests/auto/qmake/testdata/simple_app/test_file.h index a35b0de..067cb59 100644 --- a/tests/auto/qmake/testdata/simple_app/test_file.h +++ b/tests/auto/qmake/testdata/simple_app/test_file.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_dll/simple.cpp b/tests/auto/qmake/testdata/simple_dll/simple.cpp index e1acaff..62700ad 100644 --- a/tests/auto/qmake/testdata/simple_dll/simple.cpp +++ b/tests/auto/qmake/testdata/simple_dll/simple.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_dll/simple.h b/tests/auto/qmake/testdata/simple_dll/simple.h index 2ecef0b..116a34b 100644 --- a/tests/auto/qmake/testdata/simple_dll/simple.h +++ b/tests/auto/qmake/testdata/simple_dll/simple.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_lib/simple.cpp b/tests/auto/qmake/testdata/simple_lib/simple.cpp index e1acaff..62700ad 100644 --- a/tests/auto/qmake/testdata/simple_lib/simple.cpp +++ b/tests/auto/qmake/testdata/simple_lib/simple.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/simple_lib/simple.h b/tests/auto/qmake/testdata/simple_lib/simple.h index 0072cd4..6a86bc4 100644 --- a/tests/auto/qmake/testdata/simple_lib/simple.h +++ b/tests/auto/qmake/testdata/simple_lib/simple.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp b/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp index 3fd8456..f857a12 100644 --- a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp +++ b/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp index fd4cdb5..235d534 100644 --- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp +++ b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h index a35b0de..067cb59 100644 --- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h +++ b/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp index e1acaff..62700ad 100644 --- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp +++ b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h index 2ecef0b..116a34b 100644 --- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h +++ b/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp index 70f1f3c..bb3810d 100644 --- a/tests/auto/qmake/tst_qmake.cpp +++ b/tests/auto/qmake/tst_qmake.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/qmap/tst_qmap.cpp index ce413c5..d1e1e7f 100644 --- a/tests/auto/qmap/tst_qmap.cpp +++ b/tests/auto/qmap/tst_qmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp index 5b1eea5..92e1136 100644 --- a/tests/auto/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp index 9249308..be05ff2 100644 --- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 7607838..4d4a233 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index e0a9f42..853692a 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index 63c1f36..5bc5375 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index b3b7f33..cc57d83 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp index eccf7e6..2c819cd 100644 --- a/tests/auto/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/qmetatype/tst_qmetatype.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/qmouseevent/tst_qmouseevent.cpp index 49c7686..0e7c5f8 100644 --- a/tests/auto/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/qmouseevent/tst_qmouseevent.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp index 9c0cbe4..f25e690 100644 --- a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp +++ b/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/qmovie/tst_qmovie.cpp index dd24f97..23c9c38 100644 --- a/tests/auto/qmovie/tst_qmovie.cpp +++ b/tests/auto/qmovie/tst_qmovie.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp index d3112d3..64c79df 100644 --- a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp +++ b/tests/auto/qmultiscreen/tst_qmultiscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/qmutex/tst_qmutex.cpp index 16f3cba..884078b 100644 --- a/tests/auto/qmutex/tst_qmutex.cpp +++ b/tests/auto/qmutex/tst_qmutex.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp index cb5112d..3a59be6 100644 --- a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp +++ b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp index a28c49a..b3b9972 100644 --- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp +++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp b/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp index 9bb3f5d..9eba8ff 100644 --- a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp +++ b/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp b/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp index 1d1979d..3c4f540 100644 --- a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp +++ b/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp index 36a4b45..bfe6f72 100644 --- a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp +++ b/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp index e87a3bf..f4bc152 100644 --- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp +++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp index fc15437..b7f4fcd 100644 --- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp +++ b/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp index 6e5afd2..bf0d548 100644 --- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp b/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp index 31a5391..db942ec 100644 --- a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp +++ b/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkreply/echo/main.cpp b/tests/auto/qnetworkreply/echo/main.cpp index cf39788..de861b7 100644 --- a/tests/auto/qnetworkreply/echo/main.cpp +++ b/tests/auto/qnetworkreply/echo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 503118a..de6dbe9 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp index a803e16..730709b 100644 --- a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp +++ b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qnumeric/tst_qnumeric.cpp b/tests/auto/qnumeric/tst_qnumeric.cpp index 7688d01..ac93718 100644 --- a/tests/auto/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/qnumeric/tst_qnumeric.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/qobject/signalbug.cpp index dd4e070..29a83a7 100644 --- a/tests/auto/qobject/signalbug.cpp +++ b/tests/auto/qobject/signalbug.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qobject/signalbug.h b/tests/auto/qobject/signalbug.h index 9ac25ed..6908856 100644 --- a/tests/auto/qobject/signalbug.h +++ b/tests/auto/qobject/signalbug.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 096f1c5..c5551c1 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/qobjectperformance/tst_qobjectperformance.cpp index a1664fc..4355af5 100644 --- a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp +++ b/tests/auto/qobjectperformance/tst_qobjectperformance.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp index 0c88f29..5a9a4e3 100644 --- a/tests/auto/qobjectrace/tst_qobjectrace.cpp +++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpaintengine/tst_qpaintengine.cpp b/tests/auto/qpaintengine/tst_qpaintengine.cpp index 4eb546e..9c935f7 100644 --- a/tests/auto/qpaintengine/tst_qpaintengine.cpp +++ b/tests/auto/qpaintengine/tst_qpaintengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index fb8df2e..f8ce351 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpainter/utils/createImages/main.cpp b/tests/auto/qpainter/utils/createImages/main.cpp index d38b48b..ad4734f 100644 --- a/tests/auto/qpainter/utils/createImages/main.cpp +++ b/tests/auto/qpainter/utils/createImages/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp index cff84e9..361020b 100644 --- a/tests/auto/qpainterpath/tst_qpainterpath.cpp +++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp index 09ae5ec..a724670 100644 --- a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp +++ b/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpalette/tst_qpalette.cpp b/tests/auto/qpalette/tst_qpalette.cpp index a700673..c524e1f 100644 --- a/tests/auto/qpalette/tst_qpalette.cpp +++ b/tests/auto/qpalette/tst_qpalette.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpathclipper/paths.cpp b/tests/auto/qpathclipper/paths.cpp index b92b72d..1e43fb4 100644 --- a/tests/auto/qpathclipper/paths.cpp +++ b/tests/auto/qpathclipper/paths.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpathclipper/paths.h b/tests/auto/qpathclipper/paths.h index 6f6c888..979a4f0 100644 --- a/tests/auto/qpathclipper/paths.h +++ b/tests/auto/qpathclipper/paths.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp index e25c6f1..fcfd292 100644 --- a/tests/auto/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/qpen/tst_qpen.cpp index 0327629..31b8e06 100644 --- a/tests/auto/qpen/tst_qpen.cpp +++ b/tests/auto/qpen/tst_qpen.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/qpicture/tst_qpicture.cpp index 43559e5..145b265 100644 --- a/tests/auto/qpicture/tst_qpicture.cpp +++ b/tests/auto/qpicture/tst_qpicture.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index ba117d8..0c2e684 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp index c163b52..ffceef0 100644 --- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp index 627e121..8ae36cc 100644 --- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp +++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp index a0250fa..628b50f 100644 --- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qplugin/debugplugin/main.cpp b/tests/auto/qplugin/debugplugin/main.cpp index 62d9ffe..8246aca 100644 --- a/tests/auto/qplugin/debugplugin/main.cpp +++ b/tests/auto/qplugin/debugplugin/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qplugin/releaseplugin/main.cpp b/tests/auto/qplugin/releaseplugin/main.cpp index 3ab73f6..1a60931 100644 --- a/tests/auto/qplugin/releaseplugin/main.cpp +++ b/tests/auto/qplugin/releaseplugin/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qplugin/tst_qplugin.cpp b/tests/auto/qplugin/tst_qplugin.cpp index 1c5b48a..e51dc24 100644 --- a/tests/auto/qplugin/tst_qplugin.cpp +++ b/tests/auto/qplugin/tst_qplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp index e0cc5da..e465ad4 100644 --- a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp +++ b/tests/auto/qpluginloader/almostplugin/almostplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.h b/tests/auto/qpluginloader/almostplugin/almostplugin.h index f77acb1..20483a6 100644 --- a/tests/auto/qpluginloader/almostplugin/almostplugin.h +++ b/tests/auto/qpluginloader/almostplugin/almostplugin.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/qpluginloader/theplugin/plugininterface.h index da0d986..c9ec4b6 100644 --- a/tests/auto/qpluginloader/theplugin/plugininterface.h +++ b/tests/auto/qpluginloader/theplugin/plugininterface.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/theplugin/theplugin.cpp b/tests/auto/qpluginloader/theplugin/theplugin.cpp index 6b9f856..d8560e5 100644 --- a/tests/auto/qpluginloader/theplugin/theplugin.cpp +++ b/tests/auto/qpluginloader/theplugin/theplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/theplugin/theplugin.h b/tests/auto/qpluginloader/theplugin/theplugin.h index f6efd6b..dd83b76 100644 --- a/tests/auto/qpluginloader/theplugin/theplugin.h +++ b/tests/auto/qpluginloader/theplugin/theplugin.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index a003f5c..16046cf 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpoint/tst_qpoint.cpp b/tests/auto/qpoint/tst_qpoint.cpp index 67fefa8..094b26c 100644 --- a/tests/auto/qpoint/tst_qpoint.cpp +++ b/tests/auto/qpoint/tst_qpoint.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpointarray/tst_qpointarray.cpp b/tests/auto/qpointarray/tst_qpointarray.cpp index 0d07a24f..1df6c9a 100644 --- a/tests/auto/qpointarray/tst_qpointarray.cpp +++ b/tests/auto/qpointarray/tst_qpointarray.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpointer/tst_qpointer.cpp b/tests/auto/qpointer/tst_qpointer.cpp index 3f87ad7..b3b825c 100644 --- a/tests/auto/qpointer/tst_qpointer.cpp +++ b/tests/auto/qpointer/tst_qpointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 0febb87..32cc274 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp index 27b65b9..ae4c151 100644 --- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/fileWriterProcess/main.cpp b/tests/auto/qprocess/fileWriterProcess/main.cpp index 34c9cff..9745e32 100644 --- a/tests/auto/qprocess/fileWriterProcess/main.cpp +++ b/tests/auto/qprocess/fileWriterProcess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testDetached/main.cpp b/tests/auto/qprocess/testDetached/main.cpp index 035929b..ff82630 100644 --- a/tests/auto/qprocess/testDetached/main.cpp +++ b/tests/auto/qprocess/testDetached/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testExitCodes/main.cpp b/tests/auto/qprocess/testExitCodes/main.cpp index 477791f..0621bec 100644 --- a/tests/auto/qprocess/testExitCodes/main.cpp +++ b/tests/auto/qprocess/testExitCodes/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp index 63e6aa1..2c22375 100644 --- a/tests/auto/qprocess/testGuiProcess/main.cpp +++ b/tests/auto/qprocess/testGuiProcess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessCrash/main.cpp b/tests/auto/qprocess/testProcessCrash/main.cpp index b3e8272..75cba90 100644 --- a/tests/auto/qprocess/testProcessCrash/main.cpp +++ b/tests/auto/qprocess/testProcessCrash/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp b/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp index f314dde..66320f2 100644 --- a/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp +++ b/tests/auto/qprocess/testProcessDeadWhileReading/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessEOF/main.cpp b/tests/auto/qprocess/testProcessEOF/main.cpp index 30a0319..9be7be8 100644 --- a/tests/auto/qprocess/testProcessEOF/main.cpp +++ b/tests/auto/qprocess/testProcessEOF/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessEcho/main.cpp b/tests/auto/qprocess/testProcessEcho/main.cpp index ed5e1ea..0f96822 100644 --- a/tests/auto/qprocess/testProcessEcho/main.cpp +++ b/tests/auto/qprocess/testProcessEcho/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessEcho2/main.cpp b/tests/auto/qprocess/testProcessEcho2/main.cpp index 2f2134d..0dc1dd9 100644 --- a/tests/auto/qprocess/testProcessEcho2/main.cpp +++ b/tests/auto/qprocess/testProcessEcho2/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessEcho3/main.cpp b/tests/auto/qprocess/testProcessEcho3/main.cpp index 932939e..e585fbd 100644 --- a/tests/auto/qprocess/testProcessEcho3/main.cpp +++ b/tests/auto/qprocess/testProcessEcho3/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessEchoGui/main_win.cpp b/tests/auto/qprocess/testProcessEchoGui/main_win.cpp index 0fab773..5ab62a9 100644 --- a/tests/auto/qprocess/testProcessEchoGui/main_win.cpp +++ b/tests/auto/qprocess/testProcessEchoGui/main_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessLoopback/main.cpp b/tests/auto/qprocess/testProcessLoopback/main.cpp index af09f95..411e23c 100644 --- a/tests/auto/qprocess/testProcessLoopback/main.cpp +++ b/tests/auto/qprocess/testProcessLoopback/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessNormal/main.cpp b/tests/auto/qprocess/testProcessNormal/main.cpp index cbe1981..57d15cd 100644 --- a/tests/auto/qprocess/testProcessNormal/main.cpp +++ b/tests/auto/qprocess/testProcessNormal/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessOutput/main.cpp b/tests/auto/qprocess/testProcessOutput/main.cpp index a2aa67f..c5abe15 100644 --- a/tests/auto/qprocess/testProcessOutput/main.cpp +++ b/tests/auto/qprocess/testProcessOutput/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp index fea074a..ffb3707 100644 --- a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp +++ b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testSetWorkingDirectory/main.cpp b/tests/auto/qprocess/testSetWorkingDirectory/main.cpp index d4ff683..12f4c0f 100644 --- a/tests/auto/qprocess/testSetWorkingDirectory/main.cpp +++ b/tests/auto/qprocess/testSetWorkingDirectory/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testSoftExit/main_unix.cpp b/tests/auto/qprocess/testSoftExit/main_unix.cpp index d358ffd..6b15c1a 100644 --- a/tests/auto/qprocess/testSoftExit/main_unix.cpp +++ b/tests/auto/qprocess/testSoftExit/main_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testSoftExit/main_win.cpp b/tests/auto/qprocess/testSoftExit/main_win.cpp index 93b31e4..859da26 100644 --- a/tests/auto/qprocess/testSoftExit/main_win.cpp +++ b/tests/auto/qprocess/testSoftExit/main_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/testSpaceInName/main.cpp b/tests/auto/qprocess/testSpaceInName/main.cpp index 622bcdf..a3bd72e 100644 --- a/tests/auto/qprocess/testSpaceInName/main.cpp +++ b/tests/auto/qprocess/testSpaceInName/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index cb2b1bf..92a3f61 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp index d6379d3..78489d9 100644 --- a/tests/auto/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/qprogressdialog/tst_qprogressdialog.cpp index 3859958..6b0ea94 100644 --- a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp +++ b/tests/auto/qprogressdialog/tst_qprogressdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp index 34dd313..946eced 100644 --- a/tests/auto/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qqueue/tst_qqueue.cpp b/tests/auto/qqueue/tst_qqueue.cpp index 0155ffd..fc3bbdd 100755 --- a/tests/auto/qqueue/tst_qqueue.cpp +++ b/tests/auto/qqueue/tst_qqueue.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qradiobutton/tst_qradiobutton.cpp b/tests/auto/qradiobutton/tst_qradiobutton.cpp index fab938f..e2251cf 100644 --- a/tests/auto/qradiobutton/tst_qradiobutton.cpp +++ b/tests/auto/qradiobutton/tst_qradiobutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qrand/tst_qrand.cpp b/tests/auto/qrand/tst_qrand.cpp index 43a6201..0fc81bb 100644 --- a/tests/auto/qrand/tst_qrand.cpp +++ b/tests/auto/qrand/tst_qrand.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/qreadlocker/tst_qreadlocker.cpp index c650ff5..43af5dd 100644 --- a/tests/auto/qreadlocker/tst_qreadlocker.cpp +++ b/tests/auto/qreadlocker/tst_qreadlocker.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp index 5b2a9a9..aca1ece 100644 --- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qrect/tst_qrect.cpp b/tests/auto/qrect/tst_qrect.cpp index ed605a3..090c1df 100644 --- a/tests/auto/qrect/tst_qrect.cpp +++ b/tests/auto/qrect/tst_qrect.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp index 2968a8e..c5a50f3 100644 --- a/tests/auto/qregexp/tst_qregexp.cpp +++ b/tests/auto/qregexp/tst_qregexp.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp index 1151ea9..daddf1c 100644 --- a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp +++ b/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp index 8ec4c28..4d30ec4 100644 --- a/tests/auto/qregion/tst_qregion.cpp +++ b/tests/auto/qregion/tst_qregion.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qresourceengine/tst_resourceengine.cpp b/tests/auto/qresourceengine/tst_resourceengine.cpp index 408b810..db17d14 100644 --- a/tests/auto/qresourceengine/tst_resourceengine.cpp +++ b/tests/auto/qresourceengine/tst_resourceengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp index 5eabbee..518a416 100644 --- a/tests/auto/qscriptable/tst_qscriptable.cpp +++ b/tests/auto/qscriptable/tst_qscriptable.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp index dcea632..0fa62be 100644 --- a/tests/auto/qscriptclass/tst_qscriptclass.cpp +++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp index bfcd6ee..7ebe725 100644 --- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp +++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp index df1e14f..5d0c11e 100644 --- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp +++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index 5339fb4..82465e3 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp index 6506009..39388ab 100644 --- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp +++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index aa5da04..a0488c8 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index fbb0ba5..2964e8d 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp index 9b9dd16..76907ef 100644 --- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp +++ b/tests/auto/qscriptqobject/tst_qscriptqobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptstring/tst_qscriptstring.cpp b/tests/auto/qscriptstring/tst_qscriptstring.cpp index f856574..8b09e85 100644 --- a/tests/auto/qscriptstring/tst_qscriptstring.cpp +++ b/tests/auto/qscriptstring/tst_qscriptstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 435af41..e288f93 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index bf91001..5bc7460 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp index 1413b0d..9e9a10f 100644 --- a/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp +++ b/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscrollarea/tst_qscrollarea.cpp b/tests/auto/qscrollarea/tst_qscrollarea.cpp index 764b09c..2f57d82 100644 --- a/tests/auto/qscrollarea/tst_qscrollarea.cpp +++ b/tests/auto/qscrollarea/tst_qscrollarea.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qscrollbar/tst_qscrollbar.cpp b/tests/auto/qscrollbar/tst_qscrollbar.cpp index b22e724..ff6f6dc 100644 --- a/tests/auto/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/qscrollbar/tst_qscrollbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsemaphore/tst_qsemaphore.cpp b/tests/auto/qsemaphore/tst_qsemaphore.cpp index adab8a7..4c69a79 100644 --- a/tests/auto/qsemaphore/tst_qsemaphore.cpp +++ b/tests/auto/qsemaphore/tst_qsemaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qset/tst_qset.cpp b/tests/auto/qset/tst_qset.cpp index 7afcd84..c880f9b 100644 --- a/tests/auto/qset/tst_qset.cpp +++ b/tests/auto/qset/tst_qset.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 9524eb3..f9bb291 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/lackey/main.cpp b/tests/auto/qsharedmemory/lackey/main.cpp index 5b3cffc..5556216 100644 --- a/tests/auto/qsharedmemory/lackey/main.cpp +++ b/tests/auto/qsharedmemory/lackey/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp index c72b586..4b4f330 100644 --- a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp +++ b/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/src/qsystemlock.cpp b/tests/auto/qsharedmemory/src/qsystemlock.cpp index 5546ebe..843797c 100644 --- a/tests/auto/qsharedmemory/src/qsystemlock.cpp +++ b/tests/auto/qsharedmemory/src/qsystemlock.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/src/qsystemlock.h b/tests/auto/qsharedmemory/src/qsystemlock.h index 99c2682..437fd5e 100644 --- a/tests/auto/qsharedmemory/src/qsystemlock.h +++ b/tests/auto/qsharedmemory/src/qsystemlock.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/src/qsystemlock_p.h b/tests/auto/qsharedmemory/src/qsystemlock_p.h index 674c7b2..b4660ec 100644 --- a/tests/auto/qsharedmemory/src/qsystemlock_p.h +++ b/tests/auto/qsharedmemory/src/qsystemlock_p.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp index 5c46ce5..ad2ff68 100644 --- a/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp +++ b/tests/auto/qsharedmemory/src/qsystemlock_unix.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qsharedmemory/src/qsystemlock_win.cpp index 62f1b1b..226b73c 100644 --- a/tests/auto/qsharedmemory/src/qsystemlock_win.cpp +++ b/tests/auto/qsharedmemory/src/qsystemlock_win.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp index f39b376..5839be6 100644 --- a/tests/auto/qsharedmemory/tst_qsharedmemory.cpp +++ b/tests/auto/qsharedmemory/tst_qsharedmemory.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index 50a5313..3e0a8f9 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h index e92ae77..5c67602 100644 --- a/tests/auto/qsharedpointer/externaltests.h +++ b/tests/auto/qsharedpointer/externaltests.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index 64439fb..9de134c 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp index 69ebf74..54d5155 100644 --- a/tests/auto/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/qshortcut/tst_qshortcut.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp index 7a262e6..8569fce 100644 --- a/tests/auto/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/qsidebar/tst_qsidebar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp index 493cbc7..ac9ce5a 100644 --- a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp +++ b/tests/auto/qsignalmapper/tst_qsignalmapper.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsignalspy/tst_qsignalspy.cpp b/tests/auto/qsignalspy/tst_qsignalspy.cpp index 4abfb9a..6ab3218 100644 --- a/tests/auto/qsignalspy/tst_qsignalspy.cpp +++ b/tests/auto/qsignalspy/tst_qsignalspy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h b/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h index 2b9817b..f9d69de 100644 --- a/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h +++ b/tests/auto/qsimplexmlnodemodel/TestSimpleNodeModel.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp index 5551f49..f11b941 100644 --- a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp +++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsize/tst_qsize.cpp b/tests/auto/qsize/tst_qsize.cpp index c9629fd..78f90de 100644 --- a/tests/auto/qsize/tst_qsize.cpp +++ b/tests/auto/qsize/tst_qsize.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsizef/tst_qsizef.cpp b/tests/auto/qsizef/tst_qsizef.cpp index 7668491..5498304 100644 --- a/tests/auto/qsizef/tst_qsizef.cpp +++ b/tests/auto/qsizef/tst_qsizef.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsizegrip/tst_qsizegrip.cpp b/tests/auto/qsizegrip/tst_qsizegrip.cpp index 5b050e8..65fbb62 100644 --- a/tests/auto/qsizegrip/tst_qsizegrip.cpp +++ b/tests/auto/qsizegrip/tst_qsizegrip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qslider/tst_qslider.cpp b/tests/auto/qslider/tst_qslider.cpp index 694428d..3d168f4 100644 --- a/tests/auto/qslider/tst_qslider.cpp +++ b/tests/auto/qslider/tst_qslider.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp index 241e5dd..8baa444 100644 --- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp index 86333e0..f83eb05 100644 --- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 0a48066..cf9b4aa 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/qsound/tst_qsound.cpp index 55b5192..ee16f3a 100644 --- a/tests/auto/qsound/tst_qsound.cpp +++ b/tests/auto/qsound/tst_qsound.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp index 9952d0f..5ae937a 100644 --- a/tests/auto/qsourcelocation/tst_qsourcelocation.cpp +++ b/tests/auto/qsourcelocation/tst_qsourcelocation.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp index 1867356..9a56205 100644 --- a/tests/auto/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/qspinbox/tst_qspinbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index b463f7f..1a3708c 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp index d664680..3c68d43 100644 --- a/tests/auto/qsql/tst_qsql.cpp +++ b/tests/auto/qsql/tst_qsql.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h index 9c19048..18a2c74 100644 --- a/tests/auto/qsqldatabase/tst_databases.h +++ b/tests/auto/qsqldatabase/tst_databases.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index 1a66769..b127371 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlerror/tst_qsqlerror.cpp b/tests/auto/qsqlerror/tst_qsqlerror.cpp index 102cb02..83f82a3 100644 --- a/tests/auto/qsqlerror/tst_qsqlerror.cpp +++ b/tests/auto/qsqlerror/tst_qsqlerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlfield/tst_qsqlfield.cpp b/tests/auto/qsqlfield/tst_qsqlfield.cpp index 0c14ef0..4db6bb3 100644 --- a/tests/auto/qsqlfield/tst_qsqlfield.cpp +++ b/tests/auto/qsqlfield/tst_qsqlfield.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index 8d77589..d57e1fb 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp index 88b5770..b8d4e4f 100644 --- a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp index 7e79b4e..0dd88d7 100644 --- a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp +++ b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 76785c3..4d0f9bf 100644 --- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp index d4affe4..6f03190 100644 --- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/qsqlthread/tst_qsqlthread.cpp index 8b8fc65..c2ddae2 100644 --- a/tests/auto/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/qsqlthread/tst_qsqlthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp index 6f50fc4..8695428 100644 --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsslcipher/tst_qsslcipher.cpp b/tests/auto/qsslcipher/tst_qsslcipher.cpp index 93a2c6f..e3f247a 100644 --- a/tests/auto/qsslcipher/tst_qsslcipher.cpp +++ b/tests/auto/qsslcipher/tst_qsslcipher.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsslerror/tst_qsslerror.cpp b/tests/auto/qsslerror/tst_qsslerror.cpp index 63fd163..0687ad8 100644 --- a/tests/auto/qsslerror/tst_qsslerror.cpp +++ b/tests/auto/qsslerror/tst_qsslerror.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/qsslkey/tst_qsslkey.cpp index 06f9013..1b9a814 100644 --- a/tests/auto/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/qsslkey/tst_qsslkey.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 4f98624..2877e5a 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/qstackedlayout/tst_qstackedlayout.cpp index 2d5e787..f5294db 100644 --- a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/qstackedlayout/tst_qstackedlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/qstackedwidget/tst_qstackedwidget.cpp index ddb4ab7..a202d64 100644 --- a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp +++ b/tests/auto/qstackedwidget/tst_qstackedwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstandarditem/tst_qstandarditem.cpp b/tests/auto/qstandarditem/tst_qstandarditem.cpp index ab90d00..141d07c 100644 --- a/tests/auto/qstandarditem/tst_qstandarditem.cpp +++ b/tests/auto/qstandarditem/tst_qstandarditem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp index a3322ab..e444422 100644 --- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/qstatusbar/tst_qstatusbar.cpp index 83da625..0a07385 100644 --- a/tests/auto/qstatusbar/tst_qstatusbar.cpp +++ b/tests/auto/qstatusbar/tst_qstatusbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstl/tst_qstl.cpp b/tests/auto/qstl/tst_qstl.cpp index 2536aa2..c8da297 100644 --- a/tests/auto/qstl/tst_qstl.cpp +++ b/tests/auto/qstl/tst_qstl.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstring/double_data.h b/tests/auto/qstring/double_data.h index f9bee04..abe1172 100644 --- a/tests/auto/qstring/double_data.h +++ b/tests/auto/qstring/double_data.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index f786965..5c3c456 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstringlist/tst_qstringlist.cpp b/tests/auto/qstringlist/tst_qstringlist.cpp index 35a13d2..6e3cc9b 100644 --- a/tests/auto/qstringlist/tst_qstringlist.cpp +++ b/tests/auto/qstringlist/tst_qstringlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstringlistmodel/qmodellistener.h b/tests/auto/qstringlistmodel/qmodellistener.h index 7c25c45..3501013 100644 --- a/tests/auto/qstringlistmodel/qmodellistener.h +++ b/tests/auto/qstringlistmodel/qmodellistener.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp index 27d961e..d9b5172 100644 --- a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp +++ b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/qstringmatcher/tst_qstringmatcher.cpp index aa0ee85..22a97bc 100644 --- a/tests/auto/qstringmatcher/tst_qstringmatcher.cpp +++ b/tests/auto/qstringmatcher/tst_qstringmatcher.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index e31e0db..294fd24 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/qstyleoption/tst_qstyleoption.cpp index 9f4db79..5e635c9 100644 --- a/tests/auto/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/qstyleoption/tst_qstyleoption.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index aa63753..f768dbc 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp index 713b3fa..51b2e1d 100644 --- a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp +++ b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp index a1aad59..ac8a4f8 100644 --- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp +++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index 4a17031..495d18e 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp index 4a26df6..8b3837b 100644 --- a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp +++ b/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsysinfo/tst_qsysinfo.cpp b/tests/auto/qsysinfo/tst_qsysinfo.cpp index 206d4d2..35ff637 100644 --- a/tests/auto/qsysinfo/tst_qsysinfo.cpp +++ b/tests/auto/qsysinfo/tst_qsysinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp index 43ef509..7ae4cfd 100644 --- a/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp +++ b/tests/auto/qsystemsemaphore/tst_qsystemsemaphore.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp index 7ce30aa..78616b6 100644 --- a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp +++ b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp index 433eb86..d866adf 100644 --- a/tests/auto/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/qtabbar/tst_qtabbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index a9b41d8..68d5b61 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtablewidget/tst_qtablewidget.cpp b/tests/auto/qtablewidget/tst_qtablewidget.cpp index 22ded6f..a0266ca 100644 --- a/tests/auto/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/qtablewidget/tst_qtablewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index cb04a5d..8bb0878 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 4320318..4fa9d29 100644 --- a/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp index 50da773..25bd521 100644 --- a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp +++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentmap/functions.h b/tests/auto/qtconcurrentmap/functions.h index b2db4f3..3a66df4 100644 --- a/tests/auto/qtconcurrentmap/functions.h +++ b/tests/auto/qtconcurrentmap/functions.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp index 139eb6e..328203a 100644 --- a/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp index fdec9b1..6aaa40e 100644 --- a/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp index 82b70f6..bcb3507 100644 --- a/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp +++ b/tests/auto/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpserver/crashingServer/main.cpp b/tests/auto/qtcpserver/crashingServer/main.cpp index 7b9a0d5..e468f07 100644 --- a/tests/auto/qtcpserver/crashingServer/main.cpp +++ b/tests/auto/qtcpserver/crashingServer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp index 50b293d..0cfdeaa 100644 --- a/tests/auto/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/qtcpsocket/stressTest/Test.cpp index 305cf72..fab1d42 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.cpp +++ b/tests/auto/qtcpsocket/stressTest/Test.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/qtcpsocket/stressTest/Test.h index eb44cca..5fc502f 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.h +++ b/tests/auto/qtcpsocket/stressTest/Test.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/qtcpsocket/stressTest/main.cpp index 73e04e2..8456dc3 100644 --- a/tests/auto/qtcpsocket/stressTest/main.cpp +++ b/tests/auto/qtcpsocket/stressTest/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index 1e7cc48..4b2885a 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp index 9364af4..c623ed1 100644 --- a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/XrenderFake.h b/tests/auto/qtessellator/XrenderFake.h index b29331b..a0a575c 100644 --- a/tests/auto/qtessellator/XrenderFake.h +++ b/tests/auto/qtessellator/XrenderFake.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/arc.cpp b/tests/auto/qtessellator/arc.cpp index 7627937..f48b5e5 100644 --- a/tests/auto/qtessellator/arc.cpp +++ b/tests/auto/qtessellator/arc.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/arc.h b/tests/auto/qtessellator/arc.h index 0ad7279..0342669 100644 --- a/tests/auto/qtessellator/arc.h +++ b/tests/auto/qtessellator/arc.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp index c767cfa..1928dd2 100644 --- a/tests/auto/qtessellator/dataparser.cpp +++ b/tests/auto/qtessellator/dataparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/dataparser.h b/tests/auto/qtessellator/dataparser.h index 8f8571b..14e812a 100644 --- a/tests/auto/qtessellator/dataparser.h +++ b/tests/auto/qtessellator/dataparser.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/oldtessellator.cpp b/tests/auto/qtessellator/oldtessellator.cpp index edfc1aa..1d6b154 100644 --- a/tests/auto/qtessellator/oldtessellator.cpp +++ b/tests/auto/qtessellator/oldtessellator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/oldtessellator.h b/tests/auto/qtessellator/oldtessellator.h index c01e215..0f50fac 100644 --- a/tests/auto/qtessellator/oldtessellator.h +++ b/tests/auto/qtessellator/oldtessellator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/qnum.h b/tests/auto/qtessellator/qnum.h index 03158c5..0506b1b 100644 --- a/tests/auto/qtessellator/qnum.h +++ b/tests/auto/qtessellator/qnum.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/sample_data.h b/tests/auto/qtessellator/sample_data.h index 540ef30..78a76d4 100644 --- a/tests/auto/qtessellator/sample_data.h +++ b/tests/auto/qtessellator/sample_data.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/simple.cpp b/tests/auto/qtessellator/simple.cpp index 34e0f6c..2faf05b 100644 --- a/tests/auto/qtessellator/simple.cpp +++ b/tests/auto/qtessellator/simple.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/simple.h b/tests/auto/qtessellator/simple.h index aef0638..a837d4c 100644 --- a/tests/auto/qtessellator/simple.h +++ b/tests/auto/qtessellator/simple.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/testtessellator.cpp b/tests/auto/qtessellator/testtessellator.cpp index bd2795c..1b333e6 100644 --- a/tests/auto/qtessellator/testtessellator.cpp +++ b/tests/auto/qtessellator/testtessellator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/testtessellator.h b/tests/auto/qtessellator/testtessellator.h index 089f094..89f46b5 100644 --- a/tests/auto/qtessellator/testtessellator.h +++ b/tests/auto/qtessellator/testtessellator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/tst_tessellator.cpp b/tests/auto/qtessellator/tst_tessellator.cpp index 8958ac3..6366443 100644 --- a/tests/auto/qtessellator/tst_tessellator.cpp +++ b/tests/auto/qtessellator/tst_tessellator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/utils.cpp b/tests/auto/qtessellator/utils.cpp index 8a9dc1e..42442f3 100644 --- a/tests/auto/qtessellator/utils.cpp +++ b/tests/auto/qtessellator/utils.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtessellator/utils.h b/tests/auto/qtessellator/utils.h index bc27853..828615f 100644 --- a/tests/auto/qtessellator/utils.h +++ b/tests/auto/qtessellator/utils.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/qtextblock/tst_qtextblock.cpp index c9206ce..43183bd 100644 --- a/tests/auto/qtextblock/tst_qtextblock.cpp +++ b/tests/auto/qtextblock/tst_qtextblock.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp index 0886dbd..bb632f1 100644 --- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp +++ b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp index f0b8f2c..d932687 100644 --- a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/qtextbrowser/tst_qtextbrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextcodec/echo/main.cpp b/tests/auto/qtextcodec/echo/main.cpp index 0c05a11..ff46f1b 100644 --- a/tests/auto/qtextcodec/echo/main.cpp +++ b/tests/auto/qtextcodec/echo/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index b1bfb86..c3e1a19 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp index 48212a4..7492692 100644 --- a/tests/auto/qtextcursor/tst_qtextcursor.cpp +++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextdocument/common.h b/tests/auto/qtextdocument/common.h index 06932fc..982d95fe 100644 --- a/tests/auto/qtextdocument/common.h +++ b/tests/auto/qtextdocument/common.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp index 58cc019..1658cf31 100644 --- a/tests/auto/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index bace7b4..eb31255 100644 --- a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index 36de574..e7e6af8 100644 --- a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index e61ff7b..3b7c5cd 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/qtextformat/tst_qtextformat.cpp index f41b9fb..b716363 100644 --- a/tests/auto/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/qtextformat/tst_qtextformat.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index 534c7b0..697f539 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextlist/tst_qtextlist.cpp b/tests/auto/qtextlist/tst_qtextlist.cpp index dd41d27..5066a81 100644 --- a/tests/auto/qtextlist/tst_qtextlist.cpp +++ b/tests/auto/qtextlist/tst_qtextlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextobject/tst_qtextobject.cpp b/tests/auto/qtextobject/tst_qtextobject.cpp index 4d1d4b2..659c8a4 100644 --- a/tests/auto/qtextobject/tst_qtextobject.cpp +++ b/tests/auto/qtextobject/tst_qtextobject.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp index f92e30f..08ac6a9 100644 --- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp index 5748b44..380cf11 100644 --- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp +++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/qtextscriptengine/generate/main.cpp index d3ef67b..dbf481b 100644 --- a/tests/auto/qtextscriptengine/generate/main.cpp +++ b/tests/auto/qtextscriptengine/generate/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp index f70082d..9e44c37 100644 --- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextstream/readAllStdinProcess/main.cpp b/tests/auto/qtextstream/readAllStdinProcess/main.cpp index ec9e95f..37bdabf 100644 --- a/tests/auto/qtextstream/readAllStdinProcess/main.cpp +++ b/tests/auto/qtextstream/readAllStdinProcess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextstream/readLineStdinProcess/main.cpp b/tests/auto/qtextstream/readLineStdinProcess/main.cpp index 47fed88..1fe3419 100644 --- a/tests/auto/qtextstream/readLineStdinProcess/main.cpp +++ b/tests/auto/qtextstream/readLineStdinProcess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextstream/stdinProcess/main.cpp b/tests/auto/qtextstream/stdinProcess/main.cpp index 4e1da8d..49566e3 100644 --- a/tests/auto/qtextstream/stdinProcess/main.cpp +++ b/tests/auto/qtextstream/stdinProcess/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 5a6cce8..47aaaa6 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/qtexttable/tst_qtexttable.cpp index 15bf421..bbf9966 100644 --- a/tests/auto/qtexttable/tst_qtexttable.cpp +++ b/tests/auto/qtexttable/tst_qtexttable.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp index 6b6197a..bbf5340 100644 --- a/tests/auto/qthread/tst_qthread.cpp +++ b/tests/auto/qthread/tst_qthread.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthreadonce/qthreadonce.cpp b/tests/auto/qthreadonce/qthreadonce.cpp index 1c7dc7e..fda04db 100644 --- a/tests/auto/qthreadonce/qthreadonce.cpp +++ b/tests/auto/qthreadonce/qthreadonce.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthreadonce/qthreadonce.h b/tests/auto/qthreadonce/qthreadonce.h index d5f9cc9..21cac21 100644 --- a/tests/auto/qthreadonce/qthreadonce.h +++ b/tests/auto/qthreadonce/qthreadonce.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthreadonce/tst_qthreadonce.cpp b/tests/auto/qthreadonce/tst_qthreadonce.cpp index 7e67dc3..81fee5f 100644 --- a/tests/auto/qthreadonce/tst_qthreadonce.cpp +++ b/tests/auto/qthreadonce/tst_qthreadonce.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthreadpool/tst_qthreadpool.cpp b/tests/auto/qthreadpool/tst_qthreadpool.cpp index 9bb39d0..3742b84 100644 --- a/tests/auto/qthreadpool/tst_qthreadpool.cpp +++ b/tests/auto/qthreadpool/tst_qthreadpool.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp index 442f96a..11017b5 100644 --- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtime/tst_qtime.cpp b/tests/auto/qtime/tst_qtime.cpp index ea4700d..f5bc880 100644 --- a/tests/auto/qtime/tst_qtime.cpp +++ b/tests/auto/qtime/tst_qtime.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtimeline/tst_qtimeline.cpp b/tests/auto/qtimeline/tst_qtimeline.cpp index e35f406..75d2771 100644 --- a/tests/auto/qtimeline/tst_qtimeline.cpp +++ b/tests/auto/qtimeline/tst_qtimeline.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index 527628c..282eab9 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtmd5/tst_qtmd5.cpp b/tests/auto/qtmd5/tst_qtmd5.cpp index be5e4aa..af59c10 100644 --- a/tests/auto/qtmd5/tst_qtmd5.cpp +++ b/tests/auto/qtmd5/tst_qtmd5.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp b/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp index ed513b3..24c75e4 100644 --- a/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.h b/tests/auto/qtokenautomaton/tokenizers/basic/basic.h index a2eea59..fc8d986 100644 --- a/tests/auto/qtokenautomaton/tokenizers/basic/basic.h +++ b/tests/auto/qtokenautomaton/tokenizers/basic/basic.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp index 8fcde38..b513dec 100644 --- a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h index de67f0f..ae3d123 100644 --- a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h +++ b/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp index 58ddf9d..f56c518 100644 --- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h index 6d3fde6..fd808cd 100644 --- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h +++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml index 34d57cd..e042635 100644 --- a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml +++ b/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml @@ -29,11 +29,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp index b01f04e..4aeaebd 100644 --- a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h index 1930dd5..cba068e 100644 --- a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h +++ b/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp index 44e16ba..4d969fb 100644 --- a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h index 04be573..660832d 100644 --- a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h +++ b/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp index 541a06d..6d6d456 100644 --- a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp +++ b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h index bda90a0..e038b52 100644 --- a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h +++ b/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp b/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp index e48752d..3fae11a 100644 --- a/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp +++ b/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/qtoolbar/tst_qtoolbar.cpp index 15cee18..c04cecd 100644 --- a/tests/auto/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/qtoolbar/tst_qtoolbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtoolbox/tst_qtoolbox.cpp b/tests/auto/qtoolbox/tst_qtoolbox.cpp index c246843..98034f3 100644 --- a/tests/auto/qtoolbox/tst_qtoolbox.cpp +++ b/tests/auto/qtoolbox/tst_qtoolbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp index 2c0a0cb..e5ed0f1 100644 --- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtooltip/tst_qtooltip.cpp b/tests/auto/qtooltip/tst_qtooltip.cpp index cb17320..6dbced0 100644 --- a/tests/auto/qtooltip/tst_qtooltip.cpp +++ b/tests/auto/qtooltip/tst_qtooltip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/qtransform/tst_qtransform.cpp index 8516ddb..66ef3c1 100644 --- a/tests/auto/qtransform/tst_qtransform.cpp +++ b/tests/auto/qtransform/tst_qtransform.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp index 45f1a7d..e59f03e 100644 --- a/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp +++ b/tests/auto/qtransformedscreen/tst_qtransformedscreen.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtranslator/tst_qtranslator.cpp b/tests/auto/qtranslator/tst_qtranslator.cpp index fb0e930..f772a50 100644 --- a/tests/auto/qtranslator/tst_qtranslator.cpp +++ b/tests/auto/qtranslator/tst_qtranslator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index e1d405d..9c39bd6 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index b21b240..e2a084d 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp index 49abc6d..3695d88 100644 --- a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp +++ b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtwidgets/mainwindow.cpp b/tests/auto/qtwidgets/mainwindow.cpp index e3a4f3a..2640aee 100644 --- a/tests/auto/qtwidgets/mainwindow.cpp +++ b/tests/auto/qtwidgets/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtwidgets/mainwindow.h b/tests/auto/qtwidgets/mainwindow.h index 9a5cc33..e77df36 100644 --- a/tests/auto/qtwidgets/mainwindow.h +++ b/tests/auto/qtwidgets/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qtwidgets/tst_qtwidgets.cpp b/tests/auto/qtwidgets/tst_qtwidgets.cpp index a6a3be1..ac939d5 100644 --- a/tests/auto/qtwidgets/tst_qtwidgets.cpp +++ b/tests/auto/qtwidgets/tst_qtwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qudpsocket/clientserver/main.cpp b/tests/auto/qudpsocket/clientserver/main.cpp index 7bdf337..2d9c145 100644 --- a/tests/auto/qudpsocket/clientserver/main.cpp +++ b/tests/auto/qudpsocket/clientserver/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp index 57e779c..2bab057 100644 --- a/tests/auto/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qudpsocket/udpServer/main.cpp b/tests/auto/qudpsocket/udpServer/main.cpp index 68bfe85..c0b048b 100644 --- a/tests/auto/qudpsocket/udpServer/main.cpp +++ b/tests/auto/qudpsocket/udpServer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qundogroup/tst_qundogroup.cpp b/tests/auto/qundogroup/tst_qundogroup.cpp index aec745a..3081590 100644 --- a/tests/auto/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/qundogroup/tst_qundogroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qundostack/tst_qundostack.cpp b/tests/auto/qundostack/tst_qundostack.cpp index 3b6e303..323a1eb 100644 --- a/tests/auto/qundostack/tst_qundostack.cpp +++ b/tests/auto/qundostack/tst_qundostack.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 3b938f2..e83ea0a 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/quuid/tst_quuid.cpp b/tests/auto/quuid/tst_quuid.cpp index 5535a40..1c36a01 100644 --- a/tests/auto/quuid/tst_quuid.cpp +++ b/tests/auto/quuid/tst_quuid.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 78d597e..fca4c7a 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp index ef52dcb..02f86a5 100644 --- a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp +++ b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qvector/tst_qvector.cpp b/tests/auto/qvector/tst_qvector.cpp index db2fd09..f6dc1f3 100644 --- a/tests/auto/qvector/tst_qvector.cpp +++ b/tests/auto/qvector/tst_qvector.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp index b2305cb..c92c5e8 100644 --- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwebframe/dummy.cpp b/tests/auto/qwebframe/dummy.cpp index 2a34bb9..0c45c0a 100644 --- a/tests/auto/qwebframe/dummy.cpp +++ b/tests/auto/qwebframe/dummy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwebpage/dummy.cpp b/tests/auto/qwebpage/dummy.cpp index 2a34bb9..0c45c0a 100644 --- a/tests/auto/qwebpage/dummy.cpp +++ b/tests/auto/qwebpage/dummy.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 4b41bdb..db034aa 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.h b/tests/auto/qwidget/tst_qwidget_mac_helpers.h index a6abe5c..cf51caf 100644 --- a/tests/auto/qwidget/tst_qwidget_mac_helpers.h +++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/qwidget_window/tst_qwidget_window.cpp index 78a56cc..8a484b5 100644 --- a/tests/auto/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/qwidget_window/tst_qwidget_window.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp index 24d8d9c..afc5de0 100644 --- a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp +++ b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index f23db05..96523d9 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp index 294a26e..7e2fe6c 100644 --- a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp +++ b/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp index 9b9c209..85a9678 100644 --- a/tests/auto/qwizard/tst_qwizard.cpp +++ b/tests/auto/qwizard/tst_qwizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwmatrix/tst_qwmatrix.cpp b/tests/auto/qwmatrix/tst_qwmatrix.cpp index 47fd41f..7887a26 100644 --- a/tests/auto/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/qwmatrix/tst_qwmatrix.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp index 7299374..e9b2f78 100644 --- a/tests/auto/qworkspace/tst_qworkspace.cpp +++ b/tests/auto/qworkspace/tst_qworkspace.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwritelocker/tst_qwritelocker.cpp b/tests/auto/qwritelocker/tst_qwritelocker.cpp index 21bfa8a..c5d3c22 100644 --- a/tests/auto/qwritelocker/tst_qwritelocker.cpp +++ b/tests/auto/qwritelocker/tst_qwritelocker.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp index 22aa8bf..16bb6a5 100644 --- a/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp +++ b/tests/auto/qwsembedwidget/tst_qwsembedwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp index d6620e2..7264bcc 100644 --- a/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp +++ b/tests/auto/qwsinputmethod/tst_qwsinputmethod.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp index da6d300..bab7f83 100644 --- a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp +++ b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index d2a60f6..c6b1373 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxml/tst_qxml.cpp b/tests/auto/qxml/tst_qxml.cpp index 18c54a3..fc7d840 100644 --- a/tests/auto/qxml/tst_qxml.cpp +++ b/tests/auto/qxml/tst_qxml.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp index db730ad..3fd5259 100644 --- a/tests/auto/qxmlformatter/tst_qxmlformatter.cpp +++ b/tests/auto/qxmlformatter/tst_qxmlformatter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp index 18d3d28..c9def61 100644 --- a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlitem/tst_qxmlitem.cpp b/tests/auto/qxmlitem/tst_qxmlitem.cpp index 8f09ea3..5fbf12e 100644 --- a/tests/auto/qxmlitem/tst_qxmlitem.cpp +++ b/tests/auto/qxmlitem/tst_qxmlitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlname/tst_qxmlname.cpp b/tests/auto/qxmlname/tst_qxmlname.cpp index 415f04c..938a3ea 100644 --- a/tests/auto/qxmlname/tst_qxmlname.cpp +++ b/tests/auto/qxmlname/tst_qxmlname.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp index b9f7a2a..6094614 100644 --- a/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp +++ b/tests/auto/qxmlnamepool/tst_qxmlnamepool.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp index d234515..452c38a 100644 --- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp +++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/MessageSilencer.h b/tests/auto/qxmlquery/MessageSilencer.h index 07964df..a7898b2 100644 --- a/tests/auto/qxmlquery/MessageSilencer.h +++ b/tests/auto/qxmlquery/MessageSilencer.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/MessageValidator.cpp b/tests/auto/qxmlquery/MessageValidator.cpp index b4908f0..088088e 100644 --- a/tests/auto/qxmlquery/MessageValidator.cpp +++ b/tests/auto/qxmlquery/MessageValidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/MessageValidator.h b/tests/auto/qxmlquery/MessageValidator.h index 6b7bb2f..1d22695 100644 --- a/tests/auto/qxmlquery/MessageValidator.h +++ b/tests/auto/qxmlquery/MessageValidator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/NetworkOverrider.h b/tests/auto/qxmlquery/NetworkOverrider.h index 85f14c3..a438632 100644 --- a/tests/auto/qxmlquery/NetworkOverrider.h +++ b/tests/auto/qxmlquery/NetworkOverrider.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/PushBaseliner.h b/tests/auto/qxmlquery/PushBaseliner.h index 0b79f19..2e0fd84 100644 --- a/tests/auto/qxmlquery/PushBaseliner.h +++ b/tests/auto/qxmlquery/PushBaseliner.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/TestFundament.cpp b/tests/auto/qxmlquery/TestFundament.cpp index 90e94f9..fd2d3a4 100644 --- a/tests/auto/qxmlquery/TestFundament.cpp +++ b/tests/auto/qxmlquery/TestFundament.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/TestFundament.h b/tests/auto/qxmlquery/TestFundament.h index ddac64f..a184417 100644 --- a/tests/auto/qxmlquery/TestFundament.h +++ b/tests/auto/qxmlquery/TestFundament.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index d457581..91202c3 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp index f3c9748..4a7147e 100644 --- a/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp +++ b/tests/auto/qxmlresultitems/tst_qxmlresultitems.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp index 95e3dba..f155569 100644 --- a/tests/auto/qxmlserializer/tst_qxmlserializer.cpp +++ b/tests/auto/qxmlserializer/tst_qxmlserializer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlsimplereader/parser/main.cpp b/tests/auto/qxmlsimplereader/parser/main.cpp index 264aad9..f378553 100644 --- a/tests/auto/qxmlsimplereader/parser/main.cpp +++ b/tests/auto/qxmlsimplereader/parser/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlsimplereader/parser/parser.cpp b/tests/auto/qxmlsimplereader/parser/parser.cpp index 6b8486f..ec25248 100644 --- a/tests/auto/qxmlsimplereader/parser/parser.cpp +++ b/tests/auto/qxmlsimplereader/parser/parser.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlsimplereader/parser/parser.h b/tests/auto/qxmlsimplereader/parser/parser.h index 7e78fdb..c8ac50f 100644 --- a/tests/auto/qxmlsimplereader/parser/parser.h +++ b/tests/auto/qxmlsimplereader/parser/parser.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp index d919a42..0724705 100644 --- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h index 5c358e3..e52775b 100644 --- a/tests/auto/qxmlstream/qc14n.h +++ b/tests/auto/qxmlstream/qc14n.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp index ad2f233..127cdd7 100644 --- a/tests/auto/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/qzip/tst_qzip.cpp index c2ae663..d57d17f 100644 --- a/tests/auto/qzip/tst_qzip.cpp +++ b/tests/auto/qzip/tst_qzip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/rcc/tst_rcc.cpp index 3297b2b..b151479 100644 --- a/tests/auto/rcc/tst_rcc.cpp +++ b/tests/auto/rcc/tst_rcc.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/selftests/alive/qtestalive.cpp index e2167be..3df40e1 100644 --- a/tests/auto/selftests/alive/qtestalive.cpp +++ b/tests/auto/selftests/alive/qtestalive.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/alive/tst_alive.cpp b/tests/auto/selftests/alive/tst_alive.cpp index 47bfb28..4e033a9 100644 --- a/tests/auto/selftests/alive/tst_alive.cpp +++ b/tests/auto/selftests/alive/tst_alive.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/assert/tst_assert.cpp b/tests/auto/selftests/assert/tst_assert.cpp index f3dc965..c1fe32c 100644 --- a/tests/auto/selftests/assert/tst_assert.cpp +++ b/tests/auto/selftests/assert/tst_assert.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp index 1c01e8d..9c8b4d0 100644 --- a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp +++ b/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index e9d3f6e..da54605 100644 --- a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp +++ b/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp index e006c38..fe50d94 100644 --- a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp +++ b/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp index 6b88cb6..3cd64e6 100644 --- a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp +++ b/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp index 6ab9637..93cd19d 100644 --- a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp +++ b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/selftests/cmptest/tst_cmptest.cpp index db4d2c0..9a4868d 100644 --- a/tests/auto/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/selftests/cmptest/tst_cmptest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp index e1a8f90..ecfe088 100644 --- a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp +++ b/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/crashes/tst_crashes.cpp b/tests/auto/selftests/crashes/tst_crashes.cpp index e08e0e8..7132896 100644 --- a/tests/auto/selftests/crashes/tst_crashes.cpp +++ b/tests/auto/selftests/crashes/tst_crashes.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/datatable/tst_datatable.cpp b/tests/auto/selftests/datatable/tst_datatable.cpp index 33ab829..b008636 100644 --- a/tests/auto/selftests/datatable/tst_datatable.cpp +++ b/tests/auto/selftests/datatable/tst_datatable.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/datetime/tst_datetime.cpp b/tests/auto/selftests/datetime/tst_datetime.cpp index 0358e5b..f08e436 100644 --- a/tests/auto/selftests/datetime/tst_datetime.cpp +++ b/tests/auto/selftests/datetime/tst_datetime.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/differentexec/tst_differentexec.cpp b/tests/auto/selftests/differentexec/tst_differentexec.cpp index c50046a..43a8e84 100644 --- a/tests/auto/selftests/differentexec/tst_differentexec.cpp +++ b/tests/auto/selftests/differentexec/tst_differentexec.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/exception/tst_exception.cpp b/tests/auto/selftests/exception/tst_exception.cpp index 7639935..0ca11f2 100644 --- a/tests/auto/selftests/exception/tst_exception.cpp +++ b/tests/auto/selftests/exception/tst_exception.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/expectfail/tst_expectfail.cpp b/tests/auto/selftests/expectfail/tst_expectfail.cpp index 925c992..c8f01ad 100644 --- a/tests/auto/selftests/expectfail/tst_expectfail.cpp +++ b/tests/auto/selftests/expectfail/tst_expectfail.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/failinit/tst_failinit.cpp b/tests/auto/selftests/failinit/tst_failinit.cpp index fcff2fd..dff33be 100644 --- a/tests/auto/selftests/failinit/tst_failinit.cpp +++ b/tests/auto/selftests/failinit/tst_failinit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp b/tests/auto/selftests/failinitdata/tst_failinitdata.cpp index 52d3c80..ef8a55c 100644 --- a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp +++ b/tests/auto/selftests/failinitdata/tst_failinitdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp b/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp index 085cf73..610f9c6 100644 --- a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp +++ b/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/globaldata/tst_globaldata.cpp b/tests/auto/selftests/globaldata/tst_globaldata.cpp index 15acf82..67d2fea 100644 --- a/tests/auto/selftests/globaldata/tst_globaldata.cpp +++ b/tests/auto/selftests/globaldata/tst_globaldata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.cpp b/tests/auto/selftests/maxwarnings/maxwarnings.cpp index 37340cf..8b5d297 100644 --- a/tests/auto/selftests/maxwarnings/maxwarnings.cpp +++ b/tests/auto/selftests/maxwarnings/maxwarnings.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/multiexec/tst_multiexec.cpp b/tests/auto/selftests/multiexec/tst_multiexec.cpp index 5ae32aa..ce459d0 100644 --- a/tests/auto/selftests/multiexec/tst_multiexec.cpp +++ b/tests/auto/selftests/multiexec/tst_multiexec.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp b/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp index 2c0175c..cad9b8d 100644 --- a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp +++ b/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/singleskip/tst_singleskip.cpp b/tests/auto/selftests/singleskip/tst_singleskip.cpp index 569934a..5ddbb00 100644 --- a/tests/auto/selftests/singleskip/tst_singleskip.cpp +++ b/tests/auto/selftests/singleskip/tst_singleskip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/skip/tst_skip.cpp b/tests/auto/selftests/skip/tst_skip.cpp index b1a3936..8b4ea0d 100644 --- a/tests/auto/selftests/skip/tst_skip.cpp +++ b/tests/auto/selftests/skip/tst_skip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp b/tests/auto/selftests/skipglobal/tst_skipglobal.cpp index fef35d1..57d888c 100644 --- a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp +++ b/tests/auto/selftests/skipglobal/tst_skipglobal.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/skipinit/tst_skipinit.cpp b/tests/auto/selftests/skipinit/tst_skipinit.cpp index 8ecaf3a..d234351 100644 --- a/tests/auto/selftests/skipinit/tst_skipinit.cpp +++ b/tests/auto/selftests/skipinit/tst_skipinit.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp b/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp index ff005a2..2f5ff71 100644 --- a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp +++ b/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/sleep/tst_sleep.cpp b/tests/auto/selftests/sleep/tst_sleep.cpp index f9e1cf7..abaf0cf 100644 --- a/tests/auto/selftests/sleep/tst_sleep.cpp +++ b/tests/auto/selftests/sleep/tst_sleep.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/strcmp/tst_strcmp.cpp b/tests/auto/selftests/strcmp/tst_strcmp.cpp index b4d61ac..5e3f741 100644 --- a/tests/auto/selftests/strcmp/tst_strcmp.cpp +++ b/tests/auto/selftests/strcmp/tst_strcmp.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/subtest/tst_subtest.cpp b/tests/auto/selftests/subtest/tst_subtest.cpp index cf7ad88..f8e040f 100644 --- a/tests/auto/selftests/subtest/tst_subtest.cpp +++ b/tests/auto/selftests/subtest/tst_subtest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index 103fd79..22de3ac 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp b/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp index e43277f..9a55e62 100644 --- a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp +++ b/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/selftests/warnings/tst_warnings.cpp b/tests/auto/selftests/warnings/tst_warnings.cpp index 8d5f276..86d11f0 100644 --- a/tests/auto/selftests/warnings/tst_warnings.cpp +++ b/tests/auto/selftests/warnings/tst_warnings.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index fb148a9..8b16ee4 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/uic/tst_uic.cpp index 6aebbb6..4149dd6 100644 --- a/tests/auto/uic/tst_uic.cpp +++ b/tests/auto/uic/tst_uic.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp index 2cbea3f..5c2ebd6 100644 --- a/tests/auto/uic3/tst_uic3.cpp +++ b/tests/auto/uic3/tst_uic3.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uiloader/tst_screenshot/main.cpp b/tests/auto/uiloader/tst_screenshot/main.cpp index 98d75c5..b85fcd6 100644 --- a/tests/auto/uiloader/tst_screenshot/main.cpp +++ b/tests/auto/uiloader/tst_screenshot/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uiloader/uiloader/tst_uiloader.cpp b/tests/auto/uiloader/uiloader/tst_uiloader.cpp index 398f7f9..c28830c 100644 --- a/tests/auto/uiloader/uiloader/tst_uiloader.cpp +++ b/tests/auto/uiloader/uiloader/tst_uiloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uiloader/uiloader/uiloader.cpp b/tests/auto/uiloader/uiloader/uiloader.cpp index 2bc59b4..73e206a 100644 --- a/tests/auto/uiloader/uiloader/uiloader.cpp +++ b/tests/auto/uiloader/uiloader/uiloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/uiloader/uiloader/uiloader.h b/tests/auto/uiloader/uiloader/uiloader.h index 082d941..d91914d 100644 --- a/tests/auto/uiloader/uiloader/uiloader.h +++ b/tests/auto/uiloader/uiloader/uiloader.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 1a74ccc..c85c0a3 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp index 60037f9..3788f15 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp +++ b/tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp b/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp index 5da739d..ffacb69 100644 --- a/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp +++ b/tests/auto/xmlpatternsview/test/tst_xmlpatternsview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp index c4df9f7..685459f 100644 --- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp +++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h index 94d5b94..b6a50da 100644 --- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h +++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/MainWindow.cpp b/tests/auto/xmlpatternsview/view/MainWindow.cpp index 57aaca0..be1be99 100644 --- a/tests/auto/xmlpatternsview/view/MainWindow.cpp +++ b/tests/auto/xmlpatternsview/view/MainWindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/MainWindow.h b/tests/auto/xmlpatternsview/view/MainWindow.h index 1d14f41..df5f5c2 100644 --- a/tests/auto/xmlpatternsview/view/MainWindow.h +++ b/tests/auto/xmlpatternsview/view/MainWindow.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.cpp b/tests/auto/xmlpatternsview/view/TestCaseView.cpp index c187ef8..4e1b34f 100644 --- a/tests/auto/xmlpatternsview/view/TestCaseView.cpp +++ b/tests/auto/xmlpatternsview/view/TestCaseView.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.h b/tests/auto/xmlpatternsview/view/TestCaseView.h index 9e02a6f..f8463f9 100644 --- a/tests/auto/xmlpatternsview/view/TestCaseView.h +++ b/tests/auto/xmlpatternsview/view/TestCaseView.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TestResultView.cpp b/tests/auto/xmlpatternsview/view/TestResultView.cpp index d944b76..f913bbb 100644 --- a/tests/auto/xmlpatternsview/view/TestResultView.cpp +++ b/tests/auto/xmlpatternsview/view/TestResultView.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TestResultView.h b/tests/auto/xmlpatternsview/view/TestResultView.h index a934fcb..1f4eeb7 100644 --- a/tests/auto/xmlpatternsview/view/TestResultView.h +++ b/tests/auto/xmlpatternsview/view/TestResultView.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp b/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp index d7de3c2..3ef7de8 100644 --- a/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp +++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.h b/tests/auto/xmlpatternsview/view/TreeSortFilter.h index 80e5fc5..41cde8e 100644 --- a/tests/auto/xmlpatternsview/view/TreeSortFilter.h +++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.cpp b/tests/auto/xmlpatternsview/view/UserTestCase.cpp index 7f2e6d0..11c05fd 100644 --- a/tests/auto/xmlpatternsview/view/UserTestCase.cpp +++ b/tests/auto/xmlpatternsview/view/UserTestCase.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.h b/tests/auto/xmlpatternsview/view/UserTestCase.h index a00765e..adede74 100644 --- a/tests/auto/xmlpatternsview/view/UserTestCase.h +++ b/tests/auto/xmlpatternsview/view/UserTestCase.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.cpp b/tests/auto/xmlpatternsview/view/XDTItemItem.cpp index d8a9b4d..bb52ed5 100644 --- a/tests/auto/xmlpatternsview/view/XDTItemItem.cpp +++ b/tests/auto/xmlpatternsview/view/XDTItemItem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.h b/tests/auto/xmlpatternsview/view/XDTItemItem.h index 19b1fdc..b4b593b 100644 --- a/tests/auto/xmlpatternsview/view/XDTItemItem.h +++ b/tests/auto/xmlpatternsview/view/XDTItemItem.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsview/view/main.cpp b/tests/auto/xmlpatternsview/view/main.cpp index fdb895c..0828187 100644 --- a/tests/auto/xmlpatternsview/view/main.cpp +++ b/tests/auto/xmlpatternsview/view/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp b/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp index a9aeb39..41cad74 100644 --- a/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ASTItem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ASTItem.h b/tests/auto/xmlpatternsxqts/lib/ASTItem.h index 7d72db7..b32a2ed 100644 --- a/tests/auto/xmlpatternsxqts/lib/ASTItem.h +++ b/tests/auto/xmlpatternsxqts/lib/ASTItem.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp index 888c14f..b6e5b0a 100644 --- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp +++ b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h index 235e936..196fa54 100644 --- a/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h +++ b/tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp index 35d7b74..3497b86 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h index 150a522..097eb39 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h +++ b/tests/auto/xmlpatternsxqts/lib/ErrorHandler.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp b/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp index 955e261..1e9ba57 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h b/tests/auto/xmlpatternsxqts/lib/ErrorItem.h index fe0602d..4b5c377 100644 --- a/tests/auto/xmlpatternsxqts/lib/ErrorItem.h +++ b/tests/auto/xmlpatternsxqts/lib/ErrorItem.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExitCode.h b/tests/auto/xmlpatternsxqts/lib/ExitCode.h index a419796..f9660c4 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExitCode.h +++ b/tests/auto/xmlpatternsxqts/lib/ExitCode.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp index a9137ba..803fbfd 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h index a48cfbe..c2f4a84 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h +++ b/tests/auto/xmlpatternsxqts/lib/ExpressionInfo.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp index 0286366..5731d4b 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h index 1fb44d3..a472539 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h +++ b/tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp index 5d62889..196c482 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h index 802f5b4..72b024e 100644 --- a/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h +++ b/tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/Global.cpp b/tests/auto/xmlpatternsxqts/lib/Global.cpp index b5aa189..d74cd62 100644 --- a/tests/auto/xmlpatternsxqts/lib/Global.cpp +++ b/tests/auto/xmlpatternsxqts/lib/Global.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/Global.h b/tests/auto/xmlpatternsxqts/lib/Global.h index 640ca32..04850ea 100644 --- a/tests/auto/xmlpatternsxqts/lib/Global.h +++ b/tests/auto/xmlpatternsxqts/lib/Global.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp b/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp index 44dc8a2..a6d2fe3 100644 --- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp +++ b/tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h b/tests/auto/xmlpatternsxqts/lib/ResultThreader.h index 8c511a8..9184e21 100644 --- a/tests/auto/xmlpatternsxqts/lib/ResultThreader.h +++ b/tests/auto/xmlpatternsxqts/lib/ResultThreader.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp index b699ead..a9fd74d 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h index 577c4b1..05b60cf 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h +++ b/tests/auto/xmlpatternsxqts/lib/TestBaseLine.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp b/tests/auto/xmlpatternsxqts/lib/TestCase.cpp index 0dc23dd..5b16182 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestCase.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestCase.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestCase.h b/tests/auto/xmlpatternsxqts/lib/TestCase.h index 14d4a48..a77d07e 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestCase.h +++ b/tests/auto/xmlpatternsxqts/lib/TestCase.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp b/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp index b0a7c36..6e2a8fd 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestContainer.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestContainer.h b/tests/auto/xmlpatternsxqts/lib/TestContainer.h index 5cea0ba..21b8b98 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestContainer.h +++ b/tests/auto/xmlpatternsxqts/lib/TestContainer.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp b/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp index 060f993..0347fe9 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestGroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestGroup.h b/tests/auto/xmlpatternsxqts/lib/TestGroup.h index bfa9468..6a72ac9 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestGroup.h +++ b/tests/auto/xmlpatternsxqts/lib/TestGroup.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestItem.h b/tests/auto/xmlpatternsxqts/lib/TestItem.h index ec373ab..716539b 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestItem.h +++ b/tests/auto/xmlpatternsxqts/lib/TestItem.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp b/tests/auto/xmlpatternsxqts/lib/TestResult.cpp index ae4fd07..fbfcc95 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResult.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestResult.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestResult.h b/tests/auto/xmlpatternsxqts/lib/TestResult.h index 078f495..5de0621 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResult.h +++ b/tests/auto/xmlpatternsxqts/lib/TestResult.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp index 1816dd8..91e2f9f 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h index d738c4c..07741a7 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h +++ b/tests/auto/xmlpatternsxqts/lib/TestResultHandler.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp index 3bca281..fa79109 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestSuite.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuite.h b/tests/auto/xmlpatternsxqts/lib/TestSuite.h index cdd511f..946d636 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuite.h +++ b/tests/auto/xmlpatternsxqts/lib/TestSuite.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp index a87eeaa..a07017b 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h index dff56e5..05c19a4 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h +++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp index c88af5c..7de91b8 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h index f859bfd..e9338b3 100644 --- a/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h +++ b/tests/auto/xmlpatternsxqts/lib/TestSuiteResult.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp b/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp index 2c5c82f..27e1920 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TreeItem.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TreeItem.h b/tests/auto/xmlpatternsxqts/lib/TreeItem.h index 318c123..c7d238c 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeItem.h +++ b/tests/auto/xmlpatternsxqts/lib/TreeItem.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp b/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp index d9ba200..497affe 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp +++ b/tests/auto/xmlpatternsxqts/lib/TreeModel.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/TreeModel.h b/tests/auto/xmlpatternsxqts/lib/TreeModel.h index a85b06b..bfd60f6 100644 --- a/tests/auto/xmlpatternsxqts/lib/TreeModel.h +++ b/tests/auto/xmlpatternsxqts/lib/TreeModel.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.cpp b/tests/auto/xmlpatternsxqts/lib/Worker.cpp index 9fd7b1d..eb86ffb 100644 --- a/tests/auto/xmlpatternsxqts/lib/Worker.cpp +++ b/tests/auto/xmlpatternsxqts/lib/Worker.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/Worker.h b/tests/auto/xmlpatternsxqts/lib/Worker.h index df59892..08986ba 100644 --- a/tests/auto/xmlpatternsxqts/lib/Worker.h +++ b/tests/auto/xmlpatternsxqts/lib/Worker.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp b/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp index 9911d40..9ab060e 100644 --- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp +++ b/tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h b/tests/auto/xmlpatternsxqts/lib/XMLWriter.h index e8f100e..d77c752 100644 --- a/tests/auto/xmlpatternsxqts/lib/XMLWriter.h +++ b/tests/auto/xmlpatternsxqts/lib/XMLWriter.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp index ecd8dd6..0c8c7c6 100644 --- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp +++ b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h index 80ab20d..55a905f 100644 --- a/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h +++ b/tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp index ef5833e4..c76d651 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h index fce64e2..2a64659 100644 --- a/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h +++ b/tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp b/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp index 935143a..9c04b92 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp +++ b/tests/auto/xmlpatternsxqts/lib/docs/XMLIndenterExample.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp b/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp index 935143a..9c04b92 100644 --- a/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp +++ b/tests/auto/xmlpatternsxqts/lib/docs/XMLWriterExample.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp index 738fae1..f86906e 100644 --- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp +++ b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h index bba6557..3dc539f 100644 --- a/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h +++ b/tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -46,11 +46,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp index 1f9e396..b914303 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp +++ b/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h b/tests/auto/xmlpatternsxqts/test/tst_suitetest.h index 922f645..128d4ac 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h +++ b/tests/auto/xmlpatternsxqts/test/tst_suitetest.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp index 6d9502d..3eaaa80 100644 --- a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp +++ b/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp index 6f1d217..2c70e3f 100644 --- a/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp +++ b/tests/auto/xmlpatternsxslts/tst_xmlpatternsxslts.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/blendbench/main.cpp b/tests/benchmarks/blendbench/main.cpp index b0da39d..73d812d 100644 --- a/tests/benchmarks/blendbench/main.cpp +++ b/tests/benchmarks/blendbench/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/containers-associative/main.cpp b/tests/benchmarks/containers-associative/main.cpp index e597e52..ca789da 100644 --- a/tests/benchmarks/containers-associative/main.cpp +++ b/tests/benchmarks/containers-associative/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/containers-sequential/main.cpp b/tests/benchmarks/containers-sequential/main.cpp index d9ca2fc..17d8a39 100644 --- a/tests/benchmarks/containers-sequential/main.cpp +++ b/tests/benchmarks/containers-sequential/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/events/main.cpp b/tests/benchmarks/events/main.cpp index 8bd5c35..9ce9338 100644 --- a/tests/benchmarks/events/main.cpp +++ b/tests/benchmarks/events/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/opengl/main.cpp b/tests/benchmarks/opengl/main.cpp index d63c9b2..9f7c302 100644 --- a/tests/benchmarks/opengl/main.cpp +++ b/tests/benchmarks/opengl/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qapplication/main.cpp b/tests/benchmarks/qapplication/main.cpp index 101d082..8f3578e 100644 --- a/tests/benchmarks/qapplication/main.cpp +++ b/tests/benchmarks/qapplication/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qbytearray/main.cpp b/tests/benchmarks/qbytearray/main.cpp index 8185f08..a053425 100755 --- a/tests/benchmarks/qbytearray/main.cpp +++ b/tests/benchmarks/qbytearray/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qdiriterator/main.cpp b/tests/benchmarks/qdiriterator/main.cpp index 6d1c203..cda1837 100755 --- a/tests/benchmarks/qdiriterator/main.cpp +++ b/tests/benchmarks/qdiriterator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/qdiriterator/qfilesystemiterator.cpp index 144794f..334b737 100644 --- a/tests/benchmarks/qdiriterator/qfilesystemiterator.cpp +++ b/tests/benchmarks/qdiriterator/qfilesystemiterator.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qdiriterator/qfilesystemiterator.h b/tests/benchmarks/qdiriterator/qfilesystemiterator.h index b5f42b7..6e407c5 100644 --- a/tests/benchmarks/qdiriterator/qfilesystemiterator.h +++ b/tests/benchmarks/qdiriterator/qfilesystemiterator.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qfile/main.cpp b/tests/benchmarks/qfile/main.cpp index e9f8d2d..9e1a3d8 100644 --- a/tests/benchmarks/qfile/main.cpp +++ b/tests/benchmarks/qfile/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/benchmarks/qgraphicsscene/tst_qgraphicsscene.cpp index 106a5e5..f780e0f 100644 --- a/tests/benchmarks/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/benchmarks/qgraphicsscene/tst_qgraphicsscene.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.cpp b/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.cpp index 6851696..c1cc7e7 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.h b/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.h index 6fded63..af20034 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.h +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/chip.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/main.cpp b/tests/benchmarks/qgraphicsview/benchapps/chipTest/main.cpp index 6762305..0c95599 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/main.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.cpp b/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.cpp index bf4a2bb..adb4c64 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.h index 4551f4f..84c71ef 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.h +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.cpp b/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.cpp index 306045b..2289d09 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.h index af0e02b..db61083 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.h +++ b/tests/benchmarks/qgraphicsview/benchapps/chipTest/view.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/moveItems/main.cpp b/tests/benchmarks/qgraphicsview/benchapps/moveItems/main.cpp index dde8b6a..a73cb9d 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/moveItems/main.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/moveItems/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp index 669d2cf..8da4073 100644 --- a/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp +++ b/tests/benchmarks/qgraphicsview/benchapps/scrolltest/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/qgraphicsview/chiptester/chip.cpp index e563059..37b10ed 100644 --- a/tests/benchmarks/qgraphicsview/chiptester/chip.cpp +++ b/tests/benchmarks/qgraphicsview/chiptester/chip.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/chiptester/chip.h b/tests/benchmarks/qgraphicsview/chiptester/chip.h index 6fded63..af20034 100644 --- a/tests/benchmarks/qgraphicsview/chiptester/chip.h +++ b/tests/benchmarks/qgraphicsview/chiptester/chip.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/qgraphicsview/chiptester/chiptester.cpp index 0418fcd..363e2a3 100644 --- a/tests/benchmarks/qgraphicsview/chiptester/chiptester.cpp +++ b/tests/benchmarks/qgraphicsview/chiptester/chiptester.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/qgraphicsview/chiptester/chiptester.h index 357d761..eb01db9 100644 --- a/tests/benchmarks/qgraphicsview/chiptester/chiptester.h +++ b/tests/benchmarks/qgraphicsview/chiptester/chiptester.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp index d2213f4..eae3ac6 100644 --- a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/qimagereader/tst_qimagereader.cpp index ae7ecb2..e3731ef 100644 --- a/tests/benchmarks/qimagereader/tst_qimagereader.cpp +++ b/tests/benchmarks/qimagereader/tst_qimagereader.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qiodevice/main.cpp b/tests/benchmarks/qiodevice/main.cpp index fa41f1c..bc914b6 100755 --- a/tests/benchmarks/qiodevice/main.cpp +++ b/tests/benchmarks/qiodevice/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qmetaobject/main.cpp b/tests/benchmarks/qmetaobject/main.cpp index 272093c..353d6b8 100644 --- a/tests/benchmarks/qmetaobject/main.cpp +++ b/tests/benchmarks/qmetaobject/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qobject/main.cpp b/tests/benchmarks/qobject/main.cpp index cd8b142..10624cd 100644 --- a/tests/benchmarks/qobject/main.cpp +++ b/tests/benchmarks/qobject/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qobject/object.cpp b/tests/benchmarks/qobject/object.cpp index d788f94..888df13 100644 --- a/tests/benchmarks/qobject/object.cpp +++ b/tests/benchmarks/qobject/object.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qobject/object.h b/tests/benchmarks/qobject/object.h index b8498c1..276ee97 100644 --- a/tests/benchmarks/qobject/object.h +++ b/tests/benchmarks/qobject/object.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qpainter/tst_qpainter.cpp b/tests/benchmarks/qpainter/tst_qpainter.cpp index af2c412..5a627c3 100644 --- a/tests/benchmarks/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/qpainter/tst_qpainter.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qpixmap/tst_qpixmap.cpp b/tests/benchmarks/qpixmap/tst_qpixmap.cpp index d7515f7..f9db467 100644 --- a/tests/benchmarks/qpixmap/tst_qpixmap.cpp +++ b/tests/benchmarks/qpixmap/tst_qpixmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qrect/main.cpp b/tests/benchmarks/qrect/main.cpp index 54fa733..4cb94a3 100644 --- a/tests/benchmarks/qrect/main.cpp +++ b/tests/benchmarks/qrect/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qregexp/main.cpp b/tests/benchmarks/qregexp/main.cpp index 1c15af4..3e91a97 100644 --- a/tests/benchmarks/qregexp/main.cpp +++ b/tests/benchmarks/qregexp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qregion/main.cpp b/tests/benchmarks/qregion/main.cpp index 6b6d059..4a07093 100644 --- a/tests/benchmarks/qregion/main.cpp +++ b/tests/benchmarks/qregion/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qstringlist/main.cpp b/tests/benchmarks/qstringlist/main.cpp index ce03caa..ffe533a 100644 --- a/tests/benchmarks/qstringlist/main.cpp +++ b/tests/benchmarks/qstringlist/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qstylesheetstyle/main.cpp b/tests/benchmarks/qstylesheetstyle/main.cpp index 96813bd..1bdb21c 100644 --- a/tests/benchmarks/qstylesheetstyle/main.cpp +++ b/tests/benchmarks/qstylesheetstyle/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtemporaryfile/main.cpp b/tests/benchmarks/qtemporaryfile/main.cpp index 69a6bd5..94cb7b2 100644 --- a/tests/benchmarks/qtemporaryfile/main.cpp +++ b/tests/benchmarks/qtemporaryfile/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtestlib-simple/main.cpp b/tests/benchmarks/qtestlib-simple/main.cpp index 8e03793..bce379f 100644 --- a/tests/benchmarks/qtestlib-simple/main.cpp +++ b/tests/benchmarks/qtestlib-simple/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtransform/tst_qtransform.cpp b/tests/benchmarks/qtransform/tst_qtransform.cpp index 70b69a3..a935c25 100644 --- a/tests/benchmarks/qtransform/tst_qtransform.cpp +++ b/tests/benchmarks/qtransform/tst_qtransform.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtwidgets/mainwindow.cpp b/tests/benchmarks/qtwidgets/mainwindow.cpp index 4c4b2cb..27409d1 100644 --- a/tests/benchmarks/qtwidgets/mainwindow.cpp +++ b/tests/benchmarks/qtwidgets/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtwidgets/mainwindow.h b/tests/benchmarks/qtwidgets/mainwindow.h index 9a5cc33..e77df36 100644 --- a/tests/benchmarks/qtwidgets/mainwindow.h +++ b/tests/benchmarks/qtwidgets/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qtwidgets/tst_qtwidgets.cpp b/tests/benchmarks/qtwidgets/tst_qtwidgets.cpp index 46a550f..acd9e32 100644 --- a/tests/benchmarks/qtwidgets/tst_qtwidgets.cpp +++ b/tests/benchmarks/qtwidgets/tst_qtwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qvariant/tst_qvariant.cpp b/tests/benchmarks/qvariant/tst_qvariant.cpp index 4a7ad02..1dd74c8 100644 --- a/tests/benchmarks/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/qvariant/tst_qvariant.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/benchmarks/qwidget/tst_qwidget.cpp b/tests/benchmarks/qwidget/tst_qwidget.cpp index fd8dfea..799956f 100644 --- a/tests/benchmarks/qwidget/tst_qwidget.cpp +++ b/tests/benchmarks/qwidget/tst_qwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tests/shared/util.h b/tests/shared/util.h index d8bbc6c..fc85381 100644 --- a/tests/shared/util.h +++ b/tests/shared/util.h @@ -6,11 +6,11 @@ ** This file is part of the test suite 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/dumpcpp/main.cpp b/tools/activeqt/dumpcpp/main.cpp index 05f1f19..4546210 100644 --- a/tools/activeqt/dumpcpp/main.cpp +++ b/tools/activeqt/dumpcpp/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/dumpdoc/main.cpp b/tools/activeqt/dumpdoc/main.cpp index 87b9540..af99d54 100644 --- a/tools/activeqt/dumpdoc/main.cpp +++ b/tools/activeqt/dumpdoc/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/ambientproperties.cpp b/tools/activeqt/testcon/ambientproperties.cpp index 8e284d8..6c06104 100644 --- a/tools/activeqt/testcon/ambientproperties.cpp +++ b/tools/activeqt/testcon/ambientproperties.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/ambientproperties.h b/tools/activeqt/testcon/ambientproperties.h index fa15158..e0b9d5a 100644 --- a/tools/activeqt/testcon/ambientproperties.h +++ b/tools/activeqt/testcon/ambientproperties.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/ambientproperties.ui b/tools/activeqt/testcon/ambientproperties.ui index 5c68825..9753d8c 100644 --- a/tools/activeqt/testcon/ambientproperties.ui +++ b/tools/activeqt/testcon/ambientproperties.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/changeproperties.cpp b/tools/activeqt/testcon/changeproperties.cpp index 64387cc..f1dd381 100644 --- a/tools/activeqt/testcon/changeproperties.cpp +++ b/tools/activeqt/testcon/changeproperties.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/changeproperties.h b/tools/activeqt/testcon/changeproperties.h index 5bb053a..7e42ead 100644 --- a/tools/activeqt/testcon/changeproperties.h +++ b/tools/activeqt/testcon/changeproperties.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/changeproperties.ui b/tools/activeqt/testcon/changeproperties.ui index 2714b99..200d9ae 100644 --- a/tools/activeqt/testcon/changeproperties.ui +++ b/tools/activeqt/testcon/changeproperties.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/controlinfo.cpp b/tools/activeqt/testcon/controlinfo.cpp index 8c76448..988588b 100644 --- a/tools/activeqt/testcon/controlinfo.cpp +++ b/tools/activeqt/testcon/controlinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/controlinfo.h b/tools/activeqt/testcon/controlinfo.h index 11235bb..0b81fd7 100644 --- a/tools/activeqt/testcon/controlinfo.h +++ b/tools/activeqt/testcon/controlinfo.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/controlinfo.ui b/tools/activeqt/testcon/controlinfo.ui index 3aeaf58..9a69740 100644 --- a/tools/activeqt/testcon/controlinfo.ui +++ b/tools/activeqt/testcon/controlinfo.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/docuwindow.cpp b/tools/activeqt/testcon/docuwindow.cpp index b0b2d81..b0184e9 100644 --- a/tools/activeqt/testcon/docuwindow.cpp +++ b/tools/activeqt/testcon/docuwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/docuwindow.h b/tools/activeqt/testcon/docuwindow.h index 99d0286..ce00ec0 100644 --- a/tools/activeqt/testcon/docuwindow.h +++ b/tools/activeqt/testcon/docuwindow.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/invokemethod.cpp b/tools/activeqt/testcon/invokemethod.cpp index 7319adc..f92f75a 100644 --- a/tools/activeqt/testcon/invokemethod.cpp +++ b/tools/activeqt/testcon/invokemethod.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/invokemethod.h b/tools/activeqt/testcon/invokemethod.h index c374bad..0cc63e2 100644 --- a/tools/activeqt/testcon/invokemethod.h +++ b/tools/activeqt/testcon/invokemethod.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/invokemethod.ui b/tools/activeqt/testcon/invokemethod.ui index c92ab0c..ae997fd 100644 --- a/tools/activeqt/testcon/invokemethod.ui +++ b/tools/activeqt/testcon/invokemethod.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/main.cpp b/tools/activeqt/testcon/main.cpp index 1800fcb..8bf8ce7 100644 --- a/tools/activeqt/testcon/main.cpp +++ b/tools/activeqt/testcon/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/mainwindow.cpp b/tools/activeqt/testcon/mainwindow.cpp index 15f9d4c..fb93a31 100644 --- a/tools/activeqt/testcon/mainwindow.cpp +++ b/tools/activeqt/testcon/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/mainwindow.h b/tools/activeqt/testcon/mainwindow.h index abab47e..ec12d48 100644 --- a/tools/activeqt/testcon/mainwindow.h +++ b/tools/activeqt/testcon/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/activeqt/testcon/mainwindow.ui b/tools/activeqt/testcon/mainwindow.ui index 96fe7bd..045eb69 100644 --- a/tools/activeqt/testcon/mainwindow.ui +++ b/tools/activeqt/testcon/mainwindow.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/config.cpp b/tools/assistant/compat/config.cpp index b2eba11..97bc768 100644 --- a/tools/assistant/compat/config.cpp +++ b/tools/assistant/compat/config.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/config.h b/tools/assistant/compat/config.h index 0858ad8..31fd7d1 100644 --- a/tools/assistant/compat/config.h +++ b/tools/assistant/compat/config.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/docuparser.cpp b/tools/assistant/compat/docuparser.cpp index 31e1040..770b18f 100644 --- a/tools/assistant/compat/docuparser.cpp +++ b/tools/assistant/compat/docuparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/docuparser.h b/tools/assistant/compat/docuparser.h index 181a8f1..d1a7272 100644 --- a/tools/assistant/compat/docuparser.h +++ b/tools/assistant/compat/docuparser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/fontsettingsdialog.cpp b/tools/assistant/compat/fontsettingsdialog.cpp index cd0cc06..3777358 100644 --- a/tools/assistant/compat/fontsettingsdialog.cpp +++ b/tools/assistant/compat/fontsettingsdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/fontsettingsdialog.h b/tools/assistant/compat/fontsettingsdialog.h index e4607aa..8eba2d0 100644 --- a/tools/assistant/compat/fontsettingsdialog.h +++ b/tools/assistant/compat/fontsettingsdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/helpdialog.cpp b/tools/assistant/compat/helpdialog.cpp index 4ea97d0..6093958 100644 --- a/tools/assistant/compat/helpdialog.cpp +++ b/tools/assistant/compat/helpdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/helpdialog.h b/tools/assistant/compat/helpdialog.h index 29d77d9..1290dcc 100644 --- a/tools/assistant/compat/helpdialog.h +++ b/tools/assistant/compat/helpdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/helpdialog.ui b/tools/assistant/compat/helpdialog.ui index acd1372..7d63290 100644 --- a/tools/assistant/compat/helpdialog.ui +++ b/tools/assistant/compat/helpdialog.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/helpwindow.cpp b/tools/assistant/compat/helpwindow.cpp index d3ddc29..bff2825 100644 --- a/tools/assistant/compat/helpwindow.cpp +++ b/tools/assistant/compat/helpwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/helpwindow.h b/tools/assistant/compat/helpwindow.h index f1327b5..5187374 100644 --- a/tools/assistant/compat/helpwindow.h +++ b/tools/assistant/compat/helpwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/index.cpp b/tools/assistant/compat/index.cpp index e98b00b..e27f4bf 100644 --- a/tools/assistant/compat/index.cpp +++ b/tools/assistant/compat/index.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/index.h b/tools/assistant/compat/index.h index 9fc30af..1beecf7 100644 --- a/tools/assistant/compat/index.h +++ b/tools/assistant/compat/index.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/lib/qassistantclient.cpp b/tools/assistant/compat/lib/qassistantclient.cpp index 25fbd6c..6db24d2 100644 --- a/tools/assistant/compat/lib/qassistantclient.cpp +++ b/tools/assistant/compat/lib/qassistantclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/lib/qassistantclient.h b/tools/assistant/compat/lib/qassistantclient.h index d76246f..58a4628 100644 --- a/tools/assistant/compat/lib/qassistantclient.h +++ b/tools/assistant/compat/lib/qassistantclient.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/lib/qassistantclient_global.h b/tools/assistant/compat/lib/qassistantclient_global.h index 3ae8bb2..917bb58 100644 --- a/tools/assistant/compat/lib/qassistantclient_global.h +++ b/tools/assistant/compat/lib/qassistantclient_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/main.cpp b/tools/assistant/compat/main.cpp index 6609572..c5d69dc 100644 --- a/tools/assistant/compat/main.cpp +++ b/tools/assistant/compat/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp index 65759ad..effc8a8 100644 --- a/tools/assistant/compat/mainwindow.cpp +++ b/tools/assistant/compat/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/mainwindow.h b/tools/assistant/compat/mainwindow.h index 2073f0d..f9ae90a 100644 --- a/tools/assistant/compat/mainwindow.h +++ b/tools/assistant/compat/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/mainwindow.ui b/tools/assistant/compat/mainwindow.ui index 803a4dc..2045b7c 100644 --- a/tools/assistant/compat/mainwindow.ui +++ b/tools/assistant/compat/mainwindow.ui @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/profile.cpp b/tools/assistant/compat/profile.cpp index 10b1737..2098c95 100644 --- a/tools/assistant/compat/profile.cpp +++ b/tools/assistant/compat/profile.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/profile.h b/tools/assistant/compat/profile.h index 24aef3e..c650567 100644 --- a/tools/assistant/compat/profile.h +++ b/tools/assistant/compat/profile.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/tabbedbrowser.cpp b/tools/assistant/compat/tabbedbrowser.cpp index 198be4a..2489e62 100644 --- a/tools/assistant/compat/tabbedbrowser.cpp +++ b/tools/assistant/compat/tabbedbrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/tabbedbrowser.h b/tools/assistant/compat/tabbedbrowser.h index 0e26bed..b0a6b46 100644 --- a/tools/assistant/compat/tabbedbrowser.h +++ b/tools/assistant/compat/tabbedbrowser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/tabbedbrowser.ui b/tools/assistant/compat/tabbedbrowser.ui index acb38f3..9667dc2 100644 --- a/tools/assistant/compat/tabbedbrowser.ui +++ b/tools/assistant/compat/tabbedbrowser.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/topicchooser.cpp b/tools/assistant/compat/topicchooser.cpp index 7333cb3..6e286a3 100644 --- a/tools/assistant/compat/topicchooser.cpp +++ b/tools/assistant/compat/topicchooser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/topicchooser.h b/tools/assistant/compat/topicchooser.h index 122a233..561f0e1 100644 --- a/tools/assistant/compat/topicchooser.h +++ b/tools/assistant/compat/topicchooser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/compat/topicchooser.ui b/tools/assistant/compat/topicchooser.ui index a26eeb8..475533e 100644 --- a/tools/assistant/compat/topicchooser.ui +++ b/tools/assistant/compat/topicchooser.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelp_global.h b/tools/assistant/lib/qhelp_global.h index 5f09a08..585e945 100644 --- a/tools/assistant/lib/qhelp_global.h +++ b/tools/assistant/lib/qhelp_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpcollectionhandler.cpp b/tools/assistant/lib/qhelpcollectionhandler.cpp index 2356591..33f0e76 100644 --- a/tools/assistant/lib/qhelpcollectionhandler.cpp +++ b/tools/assistant/lib/qhelpcollectionhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpcollectionhandler_p.h b/tools/assistant/lib/qhelpcollectionhandler_p.h index 2520694..43759d2 100644 --- a/tools/assistant/lib/qhelpcollectionhandler_p.h +++ b/tools/assistant/lib/qhelpcollectionhandler_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpcontentwidget.cpp b/tools/assistant/lib/qhelpcontentwidget.cpp index c70aef3..c4e313e 100644 --- a/tools/assistant/lib/qhelpcontentwidget.cpp +++ b/tools/assistant/lib/qhelpcontentwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpcontentwidget.h b/tools/assistant/lib/qhelpcontentwidget.h index ceab7fe..705db24 100644 --- a/tools/assistant/lib/qhelpcontentwidget.h +++ b/tools/assistant/lib/qhelpcontentwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpdatainterface.cpp b/tools/assistant/lib/qhelpdatainterface.cpp index 001c059..a5d9688 100644 --- a/tools/assistant/lib/qhelpdatainterface.cpp +++ b/tools/assistant/lib/qhelpdatainterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpdatainterface_p.h b/tools/assistant/lib/qhelpdatainterface_p.h index 2d05cc6..69787ab 100644 --- a/tools/assistant/lib/qhelpdatainterface_p.h +++ b/tools/assistant/lib/qhelpdatainterface_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpdbreader.cpp b/tools/assistant/lib/qhelpdbreader.cpp index 76994a7..c7c6a17 100644 --- a/tools/assistant/lib/qhelpdbreader.cpp +++ b/tools/assistant/lib/qhelpdbreader.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpdbreader_p.h b/tools/assistant/lib/qhelpdbreader_p.h index 08fc382..2ac13f7 100644 --- a/tools/assistant/lib/qhelpdbreader_p.h +++ b/tools/assistant/lib/qhelpdbreader_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpengine.cpp b/tools/assistant/lib/qhelpengine.cpp index 6a603b7..2681f1c 100644 --- a/tools/assistant/lib/qhelpengine.cpp +++ b/tools/assistant/lib/qhelpengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpengine.h b/tools/assistant/lib/qhelpengine.h index 9c80ff3..717be5d 100644 --- a/tools/assistant/lib/qhelpengine.h +++ b/tools/assistant/lib/qhelpengine.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpengine_p.h b/tools/assistant/lib/qhelpengine_p.h index 287329a..389c150 100644 --- a/tools/assistant/lib/qhelpengine_p.h +++ b/tools/assistant/lib/qhelpengine_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpenginecore.cpp b/tools/assistant/lib/qhelpenginecore.cpp index 85bd9fd..d264ddf 100644 --- a/tools/assistant/lib/qhelpenginecore.cpp +++ b/tools/assistant/lib/qhelpenginecore.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpenginecore.h b/tools/assistant/lib/qhelpenginecore.h index 92ba2fd..8bb397a 100644 --- a/tools/assistant/lib/qhelpenginecore.h +++ b/tools/assistant/lib/qhelpenginecore.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp index 03df3cc..b75f1e3 100644 --- a/tools/assistant/lib/qhelpgenerator.cpp +++ b/tools/assistant/lib/qhelpgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpgenerator_p.h b/tools/assistant/lib/qhelpgenerator_p.h index ddf2aed..b1cd121 100644 --- a/tools/assistant/lib/qhelpgenerator_p.h +++ b/tools/assistant/lib/qhelpgenerator_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpindexwidget.cpp b/tools/assistant/lib/qhelpindexwidget.cpp index 7db9867..88d5ae8 100644 --- a/tools/assistant/lib/qhelpindexwidget.cpp +++ b/tools/assistant/lib/qhelpindexwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpindexwidget.h b/tools/assistant/lib/qhelpindexwidget.h index 46b9e4c..3b219b6 100644 --- a/tools/assistant/lib/qhelpindexwidget.h +++ b/tools/assistant/lib/qhelpindexwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp index fcb8cf6..792460a 100644 --- a/tools/assistant/lib/qhelpprojectdata.cpp +++ b/tools/assistant/lib/qhelpprojectdata.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpprojectdata_p.h b/tools/assistant/lib/qhelpprojectdata_p.h index 52eb723..a3c3070 100644 --- a/tools/assistant/lib/qhelpprojectdata_p.h +++ b/tools/assistant/lib/qhelpprojectdata_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp index 9025f4f..7a32334 100644 --- a/tools/assistant/lib/qhelpsearchengine.cpp +++ b/tools/assistant/lib/qhelpsearchengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h index bd14d3e..226857f 100644 --- a/tools/assistant/lib/qhelpsearchengine.h +++ b/tools/assistant/lib/qhelpsearchengine.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindex_default.cpp b/tools/assistant/lib/qhelpsearchindex_default.cpp index defba91..00f7bd3 100644 --- a/tools/assistant/lib/qhelpsearchindex_default.cpp +++ b/tools/assistant/lib/qhelpsearchindex_default.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindex_default_p.h b/tools/assistant/lib/qhelpsearchindex_default_p.h index b9ada2d..ddc619c 100644 --- a/tools/assistant/lib/qhelpsearchindex_default_p.h +++ b/tools/assistant/lib/qhelpsearchindex_default_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp index a1ba001..4d3ce2b 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h index f7536e9..68f90a6 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h +++ b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexreader_default.cpp b/tools/assistant/lib/qhelpsearchindexreader_default.cpp index 617d0d2..4203d66 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexreader_default.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexreader_default_p.h b/tools/assistant/lib/qhelpsearchindexreader_default_p.h index 22480f7..0ce178c 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_default_p.h +++ b/tools/assistant/lib/qhelpsearchindexreader_default_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp index 195c490..7812cbf 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h b/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h index 55c852b..437a3a2 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp index d55b984..68c6570 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default_p.h b/tools/assistant/lib/qhelpsearchindexwriter_default_p.h index 015eb5a..51141ed 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_default_p.h +++ b/tools/assistant/lib/qhelpsearchindexwriter_default_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp index c018ffc..d9f344a 100644 --- a/tools/assistant/lib/qhelpsearchquerywidget.cpp +++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchquerywidget.h b/tools/assistant/lib/qhelpsearchquerywidget.h index f4bcf3e..5d2c648 100644 --- a/tools/assistant/lib/qhelpsearchquerywidget.h +++ b/tools/assistant/lib/qhelpsearchquerywidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp index e72cf97..459bd28 100644 --- a/tools/assistant/lib/qhelpsearchresultwidget.cpp +++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/lib/qhelpsearchresultwidget.h b/tools/assistant/lib/qhelpsearchresultwidget.h index 26bc1d97..59fa266 100644 --- a/tools/assistant/lib/qhelpsearchresultwidget.h +++ b/tools/assistant/lib/qhelpsearchresultwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/aboutdialog.cpp b/tools/assistant/tools/assistant/aboutdialog.cpp index 629f249..7745aa5 100644 --- a/tools/assistant/tools/assistant/aboutdialog.cpp +++ b/tools/assistant/tools/assistant/aboutdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/aboutdialog.h b/tools/assistant/tools/assistant/aboutdialog.h index d62a220..09923a4 100644 --- a/tools/assistant/tools/assistant/aboutdialog.h +++ b/tools/assistant/tools/assistant/aboutdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp index 6f5732f..a1848e2 100644 --- a/tools/assistant/tools/assistant/bookmarkmanager.cpp +++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/bookmarkmanager.h b/tools/assistant/tools/assistant/bookmarkmanager.h index ab905d1..c2da58a 100644 --- a/tools/assistant/tools/assistant/bookmarkmanager.h +++ b/tools/assistant/tools/assistant/bookmarkmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index 1b0e671..c9ddd46 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h index 75bd8be..479968c 100644 --- a/tools/assistant/tools/assistant/centralwidget.h +++ b/tools/assistant/tools/assistant/centralwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/cmdlineparser.cpp b/tools/assistant/tools/assistant/cmdlineparser.cpp index 0dae785..464d3f2 100644 --- a/tools/assistant/tools/assistant/cmdlineparser.cpp +++ b/tools/assistant/tools/assistant/cmdlineparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/cmdlineparser.h b/tools/assistant/tools/assistant/cmdlineparser.h index 332d464..c73fe0c 100644 --- a/tools/assistant/tools/assistant/cmdlineparser.h +++ b/tools/assistant/tools/assistant/cmdlineparser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp index 89060bd..850d7fa 100644 --- a/tools/assistant/tools/assistant/contentwindow.cpp +++ b/tools/assistant/tools/assistant/contentwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/contentwindow.h b/tools/assistant/tools/assistant/contentwindow.h index ddc3e7c..b120014 100644 --- a/tools/assistant/tools/assistant/contentwindow.h +++ b/tools/assistant/tools/assistant/contentwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/filternamedialog.cpp b/tools/assistant/tools/assistant/filternamedialog.cpp index fc137ed..50ab142 100644 --- a/tools/assistant/tools/assistant/filternamedialog.cpp +++ b/tools/assistant/tools/assistant/filternamedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/filternamedialog.h b/tools/assistant/tools/assistant/filternamedialog.h index 32e849c..99595e8 100644 --- a/tools/assistant/tools/assistant/filternamedialog.h +++ b/tools/assistant/tools/assistant/filternamedialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index f7225fa..d07e587 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h index eea7340..4c1fbe5 100644 --- a/tools/assistant/tools/assistant/helpviewer.h +++ b/tools/assistant/tools/assistant/helpviewer.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp index 0beb5ee..7f31643 100644 --- a/tools/assistant/tools/assistant/indexwindow.cpp +++ b/tools/assistant/tools/assistant/indexwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/indexwindow.h b/tools/assistant/tools/assistant/indexwindow.h index 14ed83c..d0674cd 100644 --- a/tools/assistant/tools/assistant/indexwindow.h +++ b/tools/assistant/tools/assistant/indexwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp index 1f02ac1..7169177 100644 --- a/tools/assistant/tools/assistant/installdialog.cpp +++ b/tools/assistant/tools/assistant/installdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/installdialog.h b/tools/assistant/tools/assistant/installdialog.h index 88c882c..84031ee 100644 --- a/tools/assistant/tools/assistant/installdialog.h +++ b/tools/assistant/tools/assistant/installdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp index 794be02..adc6526 100644 --- a/tools/assistant/tools/assistant/main.cpp +++ b/tools/assistant/tools/assistant/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index df39650..d70f7b9 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h index c716b1c..99ca702 100644 --- a/tools/assistant/tools/assistant/mainwindow.h +++ b/tools/assistant/tools/assistant/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/preferencesdialog.cpp b/tools/assistant/tools/assistant/preferencesdialog.cpp index 094bd9c..9534245 100644 --- a/tools/assistant/tools/assistant/preferencesdialog.cpp +++ b/tools/assistant/tools/assistant/preferencesdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/preferencesdialog.h b/tools/assistant/tools/assistant/preferencesdialog.h index a890500..81aad9d 100644 --- a/tools/assistant/tools/assistant/preferencesdialog.h +++ b/tools/assistant/tools/assistant/preferencesdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/qtdocinstaller.cpp b/tools/assistant/tools/assistant/qtdocinstaller.cpp index 9063847..2380d97 100644 --- a/tools/assistant/tools/assistant/qtdocinstaller.cpp +++ b/tools/assistant/tools/assistant/qtdocinstaller.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/qtdocinstaller.h b/tools/assistant/tools/assistant/qtdocinstaller.h index a8a98fa..29bee92 100644 --- a/tools/assistant/tools/assistant/qtdocinstaller.h +++ b/tools/assistant/tools/assistant/qtdocinstaller.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/remotecontrol.cpp b/tools/assistant/tools/assistant/remotecontrol.cpp index f374538..ca7e642 100644 --- a/tools/assistant/tools/assistant/remotecontrol.cpp +++ b/tools/assistant/tools/assistant/remotecontrol.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/remotecontrol.h b/tools/assistant/tools/assistant/remotecontrol.h index 3c7c6c5..bbe4a7d 100644 --- a/tools/assistant/tools/assistant/remotecontrol.h +++ b/tools/assistant/tools/assistant/remotecontrol.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/remotecontrol_win.h b/tools/assistant/tools/assistant/remotecontrol_win.h index 081eb25..0b8f1d6 100644 --- a/tools/assistant/tools/assistant/remotecontrol_win.h +++ b/tools/assistant/tools/assistant/remotecontrol_win.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp index 000c73d..26c655c 100644 --- a/tools/assistant/tools/assistant/searchwidget.cpp +++ b/tools/assistant/tools/assistant/searchwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/searchwidget.h b/tools/assistant/tools/assistant/searchwidget.h index 22fe80d..140b8cd 100644 --- a/tools/assistant/tools/assistant/searchwidget.h +++ b/tools/assistant/tools/assistant/searchwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/topicchooser.cpp b/tools/assistant/tools/assistant/topicchooser.cpp index 3f30417..ea1ca1b 100644 --- a/tools/assistant/tools/assistant/topicchooser.cpp +++ b/tools/assistant/tools/assistant/topicchooser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/assistant/topicchooser.h b/tools/assistant/tools/assistant/topicchooser.h index 58b3796..85692aa 100644 --- a/tools/assistant/tools/assistant/topicchooser.h +++ b/tools/assistant/tools/assistant/topicchooser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp index 68db53f..07d22a3 100644 --- a/tools/assistant/tools/qcollectiongenerator/main.cpp +++ b/tools/assistant/tools/qcollectiongenerator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/adpreader.cpp b/tools/assistant/tools/qhelpconverter/adpreader.cpp index 930417a..5752950 100644 --- a/tools/assistant/tools/qhelpconverter/adpreader.cpp +++ b/tools/assistant/tools/qhelpconverter/adpreader.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/adpreader.h b/tools/assistant/tools/qhelpconverter/adpreader.h index a7fa606..fab6003 100644 --- a/tools/assistant/tools/qhelpconverter/adpreader.h +++ b/tools/assistant/tools/qhelpconverter/adpreader.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/conversionwizard.cpp b/tools/assistant/tools/qhelpconverter/conversionwizard.cpp index c3fe94a0..ff1f524 100644 --- a/tools/assistant/tools/qhelpconverter/conversionwizard.cpp +++ b/tools/assistant/tools/qhelpconverter/conversionwizard.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/conversionwizard.h b/tools/assistant/tools/qhelpconverter/conversionwizard.h index 4c8fb02..6edf389 100644 --- a/tools/assistant/tools/qhelpconverter/conversionwizard.h +++ b/tools/assistant/tools/qhelpconverter/conversionwizard.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/filespage.cpp b/tools/assistant/tools/qhelpconverter/filespage.cpp index 2963155..7a3ab53 100644 --- a/tools/assistant/tools/qhelpconverter/filespage.cpp +++ b/tools/assistant/tools/qhelpconverter/filespage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/filespage.h b/tools/assistant/tools/qhelpconverter/filespage.h index 584af87..73a9def 100644 --- a/tools/assistant/tools/qhelpconverter/filespage.h +++ b/tools/assistant/tools/qhelpconverter/filespage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/filterpage.cpp b/tools/assistant/tools/qhelpconverter/filterpage.cpp index 9f7e303..a163f99 100644 --- a/tools/assistant/tools/qhelpconverter/filterpage.cpp +++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/filterpage.h b/tools/assistant/tools/qhelpconverter/filterpage.h index 5f0e1b1..e1f7f89 100644 --- a/tools/assistant/tools/qhelpconverter/filterpage.h +++ b/tools/assistant/tools/qhelpconverter/filterpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/finishpage.cpp b/tools/assistant/tools/qhelpconverter/finishpage.cpp index 0b3c33f..7460e94 100644 --- a/tools/assistant/tools/qhelpconverter/finishpage.cpp +++ b/tools/assistant/tools/qhelpconverter/finishpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/finishpage.h b/tools/assistant/tools/qhelpconverter/finishpage.h index 7a4689d..2094055 100644 --- a/tools/assistant/tools/qhelpconverter/finishpage.h +++ b/tools/assistant/tools/qhelpconverter/finishpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/generalpage.cpp b/tools/assistant/tools/qhelpconverter/generalpage.cpp index f59be49..c7125f3 100644 --- a/tools/assistant/tools/qhelpconverter/generalpage.cpp +++ b/tools/assistant/tools/qhelpconverter/generalpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/generalpage.h b/tools/assistant/tools/qhelpconverter/generalpage.h index c9d2b4d..7f8d4b9 100644 --- a/tools/assistant/tools/qhelpconverter/generalpage.h +++ b/tools/assistant/tools/qhelpconverter/generalpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/helpwindow.cpp b/tools/assistant/tools/qhelpconverter/helpwindow.cpp index b41a410..a48e6ac 100644 --- a/tools/assistant/tools/qhelpconverter/helpwindow.cpp +++ b/tools/assistant/tools/qhelpconverter/helpwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/helpwindow.h b/tools/assistant/tools/qhelpconverter/helpwindow.h index 9c0866a..400e43b 100644 --- a/tools/assistant/tools/qhelpconverter/helpwindow.h +++ b/tools/assistant/tools/qhelpconverter/helpwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/identifierpage.cpp b/tools/assistant/tools/qhelpconverter/identifierpage.cpp index 64a23a6..cb38d85 100644 --- a/tools/assistant/tools/qhelpconverter/identifierpage.cpp +++ b/tools/assistant/tools/qhelpconverter/identifierpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/identifierpage.h b/tools/assistant/tools/qhelpconverter/identifierpage.h index fcebb49..fb4a97f 100644 --- a/tools/assistant/tools/qhelpconverter/identifierpage.h +++ b/tools/assistant/tools/qhelpconverter/identifierpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/inputpage.cpp b/tools/assistant/tools/qhelpconverter/inputpage.cpp index 5872523..83039ec 100644 --- a/tools/assistant/tools/qhelpconverter/inputpage.cpp +++ b/tools/assistant/tools/qhelpconverter/inputpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/inputpage.h b/tools/assistant/tools/qhelpconverter/inputpage.h index dddf80d..6cc4b14 100644 --- a/tools/assistant/tools/qhelpconverter/inputpage.h +++ b/tools/assistant/tools/qhelpconverter/inputpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/main.cpp b/tools/assistant/tools/qhelpconverter/main.cpp index 2b0f602..d39b98f 100644 --- a/tools/assistant/tools/qhelpconverter/main.cpp +++ b/tools/assistant/tools/qhelpconverter/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/outputpage.cpp b/tools/assistant/tools/qhelpconverter/outputpage.cpp index 77cbf4c..4be6b79 100644 --- a/tools/assistant/tools/qhelpconverter/outputpage.cpp +++ b/tools/assistant/tools/qhelpconverter/outputpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/outputpage.h b/tools/assistant/tools/qhelpconverter/outputpage.h index 3907ae5..b3794fd 100644 --- a/tools/assistant/tools/qhelpconverter/outputpage.h +++ b/tools/assistant/tools/qhelpconverter/outputpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/pathpage.cpp b/tools/assistant/tools/qhelpconverter/pathpage.cpp index 83019d6..c7504e3 100644 --- a/tools/assistant/tools/qhelpconverter/pathpage.cpp +++ b/tools/assistant/tools/qhelpconverter/pathpage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/pathpage.h b/tools/assistant/tools/qhelpconverter/pathpage.h index e081b73..b55f01d 100644 --- a/tools/assistant/tools/qhelpconverter/pathpage.h +++ b/tools/assistant/tools/qhelpconverter/pathpage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp b/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp index 55a1b12..59739c7 100644 --- a/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp +++ b/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/qhcpwriter.h b/tools/assistant/tools/qhelpconverter/qhcpwriter.h index ba448a5..bb2ab3b 100644 --- a/tools/assistant/tools/qhelpconverter/qhcpwriter.h +++ b/tools/assistant/tools/qhelpconverter/qhcpwriter.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/qhpwriter.cpp b/tools/assistant/tools/qhelpconverter/qhpwriter.cpp index cd54537..04803f2 100644 --- a/tools/assistant/tools/qhelpconverter/qhpwriter.cpp +++ b/tools/assistant/tools/qhelpconverter/qhpwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpconverter/qhpwriter.h b/tools/assistant/tools/qhelpconverter/qhpwriter.h index bba3fcb..2faa8a2 100644 --- a/tools/assistant/tools/qhelpconverter/qhpwriter.h +++ b/tools/assistant/tools/qhelpconverter/qhpwriter.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/qhelpgenerator/main.cpp b/tools/assistant/tools/qhelpgenerator/main.cpp index 42a1595..023a16e 100644 --- a/tools/assistant/tools/qhelpgenerator/main.cpp +++ b/tools/assistant/tools/qhelpgenerator/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/shared/helpgenerator.cpp b/tools/assistant/tools/shared/helpgenerator.cpp index a40cc4d..0506fac 100644 --- a/tools/assistant/tools/shared/helpgenerator.cpp +++ b/tools/assistant/tools/shared/helpgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/assistant/tools/shared/helpgenerator.h b/tools/assistant/tools/shared/helpgenerator.h index ba8a479..2b47c19 100644 --- a/tools/assistant/tools/shared/helpgenerator.h +++ b/tools/assistant/tools/shared/helpgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Assistant 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/checksdk/cesdkhandler.cpp b/tools/checksdk/cesdkhandler.cpp index c1dd6ab..e4cda7b 100644 --- a/tools/checksdk/cesdkhandler.cpp +++ b/tools/checksdk/cesdkhandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/checksdk/cesdkhandler.h b/tools/checksdk/cesdkhandler.h index 22a3e0e..95ac270 100644 --- a/tools/checksdk/cesdkhandler.h +++ b/tools/checksdk/cesdkhandler.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/checksdk/main.cpp b/tools/checksdk/main.cpp index 1d4b616..a5a59e1 100644 --- a/tools/checksdk/main.cpp +++ b/tools/checksdk/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/configure_pch.h b/tools/configure/configure_pch.h index 24eac4f..d188a6a 100644 --- a/tools/configure/configure_pch.h +++ b/tools/configure/configure_pch.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8c0dc39..0c4dbb3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index e09ac56..6143087 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 589b954..1fbcafd 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 08cff4c..a68b9d7 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index d91e124..2987463 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 760c101..3b0bcbd 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/configure/tools.h b/tools/configure/tools.h index 68a439a..873afc1 100644 --- a/tools/configure/tools.h +++ b/tools/configure/tools.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/data/generate_header.xsl b/tools/designer/data/generate_header.xsl index e3dae9e..ce52b41 100644 --- a/tools/designer/data/generate_header.xsl +++ b/tools/designer/data/generate_header.xsl @@ -342,11 +342,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/data/generate_impl.xsl b/tools/designer/data/generate_impl.xsl index 2dfbb15..e7cccf4 100644 --- a/tools/designer/data/generate_impl.xsl +++ b/tools/designer/data/generate_impl.xsl @@ -1098,11 +1098,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.cpp b/tools/designer/src/components/buddyeditor/buddyeditor.cpp index f5c93fa..9eca9d6 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor.cpp +++ b/tools/designer/src/components/buddyeditor/buddyeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.h b/tools/designer/src/components/buddyeditor/buddyeditor.h index 4f8f8d4..46284aa 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor.h +++ b/tools/designer/src/components/buddyeditor/buddyeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_global.h b/tools/designer/src/components/buddyeditor/buddyeditor_global.h index 490f591..5d7ea4a 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_global.h +++ b/tools/designer/src/components/buddyeditor/buddyeditor_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp index bcfa415..eb254e1 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp +++ b/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp index 98fff8c..cdea857 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp +++ b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h index 79f3f49..f0f7fe6 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h +++ b/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp index 68a6030..cbf7176 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp +++ b/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/buddyeditor/buddyeditor_tool.h b/tools/designer/src/components/buddyeditor/buddyeditor_tool.h index dee43a0..60970a1 100644 --- a/tools/designer/src/components/buddyeditor/buddyeditor_tool.h +++ b/tools/designer/src/components/buddyeditor/buddyeditor_tool.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp index b1c056e..cf5adc4 100644 --- a/tools/designer/src/components/formeditor/brushmanagerproxy.cpp +++ b/tools/designer/src/components/formeditor/brushmanagerproxy.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h index cbe50ae..71fcfba 100644 --- a/tools/designer/src/components/formeditor/brushmanagerproxy.h +++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_actionprovider.cpp b/tools/designer/src/components/formeditor/default_actionprovider.cpp index 49bf095..07adceb 100644 --- a/tools/designer/src/components/formeditor/default_actionprovider.cpp +++ b/tools/designer/src/components/formeditor/default_actionprovider.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_actionprovider.h b/tools/designer/src/components/formeditor/default_actionprovider.h index 6c81ec6..d70bfc2 100644 --- a/tools/designer/src/components/formeditor/default_actionprovider.h +++ b/tools/designer/src/components/formeditor/default_actionprovider.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_container.cpp b/tools/designer/src/components/formeditor/default_container.cpp index eb3cd4f..5aa389a 100644 --- a/tools/designer/src/components/formeditor/default_container.cpp +++ b/tools/designer/src/components/formeditor/default_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_container.h b/tools/designer/src/components/formeditor/default_container.h index e8547638..3c5a007 100644 --- a/tools/designer/src/components/formeditor/default_container.h +++ b/tools/designer/src/components/formeditor/default_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_layoutdecoration.cpp b/tools/designer/src/components/formeditor/default_layoutdecoration.cpp index 5558068..071a614 100644 --- a/tools/designer/src/components/formeditor/default_layoutdecoration.cpp +++ b/tools/designer/src/components/formeditor/default_layoutdecoration.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/default_layoutdecoration.h b/tools/designer/src/components/formeditor/default_layoutdecoration.h index 770372f..a059305 100644 --- a/tools/designer/src/components/formeditor/default_layoutdecoration.h +++ b/tools/designer/src/components/formeditor/default_layoutdecoration.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.cpp b/tools/designer/src/components/formeditor/deviceprofiledialog.cpp index 995bc3f..06d285f 100644 --- a/tools/designer/src/components/formeditor/deviceprofiledialog.cpp +++ b/tools/designer/src/components/formeditor/deviceprofiledialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/deviceprofiledialog.h b/tools/designer/src/components/formeditor/deviceprofiledialog.h index dafcd77..e64fbfa 100644 --- a/tools/designer/src/components/formeditor/deviceprofiledialog.h +++ b/tools/designer/src/components/formeditor/deviceprofiledialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/dpi_chooser.cpp b/tools/designer/src/components/formeditor/dpi_chooser.cpp index d766e31..18f0acd 100644 --- a/tools/designer/src/components/formeditor/dpi_chooser.cpp +++ b/tools/designer/src/components/formeditor/dpi_chooser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/dpi_chooser.h b/tools/designer/src/components/formeditor/dpi_chooser.h index f8ca810..4987cbc 100644 --- a/tools/designer/src/components/formeditor/dpi_chooser.h +++ b/tools/designer/src/components/formeditor/dpi_chooser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp index bf3f3f1..3214c42 100644 --- a/tools/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/tools/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/embeddedoptionspage.h b/tools/designer/src/components/formeditor/embeddedoptionspage.h index 6b76d38..4411910 100644 --- a/tools/designer/src/components/formeditor/embeddedoptionspage.h +++ b/tools/designer/src/components/formeditor/embeddedoptionspage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formeditor.cpp b/tools/designer/src/components/formeditor/formeditor.cpp index b09ffab..180417b 100644 --- a/tools/designer/src/components/formeditor/formeditor.cpp +++ b/tools/designer/src/components/formeditor/formeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formeditor.h b/tools/designer/src/components/formeditor/formeditor.h index 2e0b819..ad3e091 100644 --- a/tools/designer/src/components/formeditor/formeditor.h +++ b/tools/designer/src/components/formeditor/formeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formeditor_global.h b/tools/designer/src/components/formeditor/formeditor_global.h index 0195f1b..82ab95c 100644 --- a/tools/designer/src/components/formeditor/formeditor_global.h +++ b/tools/designer/src/components/formeditor/formeditor_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp index 0b20531..5866013 100644 --- a/tools/designer/src/components/formeditor/formeditor_optionspage.cpp +++ b/tools/designer/src/components/formeditor/formeditor_optionspage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formeditor_optionspage.h b/tools/designer/src/components/formeditor/formeditor_optionspage.h index 4aeda6a..2763285 100644 --- a/tools/designer/src/components/formeditor/formeditor_optionspage.h +++ b/tools/designer/src/components/formeditor/formeditor_optionspage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp index 48efcde..7a636e9 100644 --- a/tools/designer/src/components/formeditor/formwindow.cpp +++ b/tools/designer/src/components/formeditor/formwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow.h b/tools/designer/src/components/formeditor/formwindow.h index 7e50ca2..98ed910 100644 --- a/tools/designer/src/components/formeditor/formwindow.h +++ b/tools/designer/src/components/formeditor/formwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow_dnditem.cpp b/tools/designer/src/components/formeditor/formwindow_dnditem.cpp index 3af5343..2070e87 100644 --- a/tools/designer/src/components/formeditor/formwindow_dnditem.cpp +++ b/tools/designer/src/components/formeditor/formwindow_dnditem.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow_dnditem.h b/tools/designer/src/components/formeditor/formwindow_dnditem.h index c6e7479..6505b21 100644 --- a/tools/designer/src/components/formeditor/formwindow_dnditem.h +++ b/tools/designer/src/components/formeditor/formwindow_dnditem.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp index 7270628..6ef48b8 100644 --- a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.h b/tools/designer/src/components/formeditor/formwindow_widgetstack.h index 92323c5..2eab9e1 100644 --- a/tools/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowcursor.cpp b/tools/designer/src/components/formeditor/formwindowcursor.cpp index 5b4aee1..3f56ffc 100644 --- a/tools/designer/src/components/formeditor/formwindowcursor.cpp +++ b/tools/designer/src/components/formeditor/formwindowcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowcursor.h b/tools/designer/src/components/formeditor/formwindowcursor.h index 7167432..1b51131 100644 --- a/tools/designer/src/components/formeditor/formwindowcursor.h +++ b/tools/designer/src/components/formeditor/formwindowcursor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowmanager.cpp b/tools/designer/src/components/formeditor/formwindowmanager.cpp index 69fb4a3..c851078 100644 --- a/tools/designer/src/components/formeditor/formwindowmanager.cpp +++ b/tools/designer/src/components/formeditor/formwindowmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowmanager.h b/tools/designer/src/components/formeditor/formwindowmanager.h index d81ec2d..549e294 100644 --- a/tools/designer/src/components/formeditor/formwindowmanager.h +++ b/tools/designer/src/components/formeditor/formwindowmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowsettings.cpp b/tools/designer/src/components/formeditor/formwindowsettings.cpp index 1f6d5dd..5f00e51 100644 --- a/tools/designer/src/components/formeditor/formwindowsettings.cpp +++ b/tools/designer/src/components/formeditor/formwindowsettings.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowsettings.h b/tools/designer/src/components/formeditor/formwindowsettings.h index 4289f42..e74861c 100644 --- a/tools/designer/src/components/formeditor/formwindowsettings.h +++ b/tools/designer/src/components/formeditor/formwindowsettings.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/formwindowsettings.ui b/tools/designer/src/components/formeditor/formwindowsettings.ui index 4e56365..d39a911 100644 --- a/tools/designer/src/components/formeditor/formwindowsettings.ui +++ b/tools/designer/src/components/formeditor/formwindowsettings.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/iconcache.cpp b/tools/designer/src/components/formeditor/iconcache.cpp index a256bf8..ca700d0 100644 --- a/tools/designer/src/components/formeditor/iconcache.cpp +++ b/tools/designer/src/components/formeditor/iconcache.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/iconcache.h b/tools/designer/src/components/formeditor/iconcache.h index 24d36e2..de0e6a2 100644 --- a/tools/designer/src/components/formeditor/iconcache.h +++ b/tools/designer/src/components/formeditor/iconcache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp index 609ce84..4fd0b5a 100644 --- a/tools/designer/src/components/formeditor/itemview_propertysheet.cpp +++ b/tools/designer/src/components/formeditor/itemview_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/itemview_propertysheet.h b/tools/designer/src/components/formeditor/itemview_propertysheet.h index e4c80dd..d21715f 100644 --- a/tools/designer/src/components/formeditor/itemview_propertysheet.h +++ b/tools/designer/src/components/formeditor/itemview_propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/layout_propertysheet.cpp b/tools/designer/src/components/formeditor/layout_propertysheet.cpp index a304c6a..b200996 100644 --- a/tools/designer/src/components/formeditor/layout_propertysheet.cpp +++ b/tools/designer/src/components/formeditor/layout_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/layout_propertysheet.h b/tools/designer/src/components/formeditor/layout_propertysheet.h index bb2b785..28bb138 100644 --- a/tools/designer/src/components/formeditor/layout_propertysheet.h +++ b/tools/designer/src/components/formeditor/layout_propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/line_propertysheet.cpp b/tools/designer/src/components/formeditor/line_propertysheet.cpp index d13779e..023fc0d 100644 --- a/tools/designer/src/components/formeditor/line_propertysheet.cpp +++ b/tools/designer/src/components/formeditor/line_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/line_propertysheet.h b/tools/designer/src/components/formeditor/line_propertysheet.h index 5149cac..4b70f13 100644 --- a/tools/designer/src/components/formeditor/line_propertysheet.h +++ b/tools/designer/src/components/formeditor/line_propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/previewactiongroup.cpp b/tools/designer/src/components/formeditor/previewactiongroup.cpp index aa52872..be98070 100644 --- a/tools/designer/src/components/formeditor/previewactiongroup.cpp +++ b/tools/designer/src/components/formeditor/previewactiongroup.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/previewactiongroup.h b/tools/designer/src/components/formeditor/previewactiongroup.h index 851f554..3777a56 100644 --- a/tools/designer/src/components/formeditor/previewactiongroup.h +++ b/tools/designer/src/components/formeditor/previewactiongroup.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp index 75a53b7..2a1381a 100644 --- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.h b/tools/designer/src/components/formeditor/qdesigner_resource.h index 3d6a842..e03f414 100644 --- a/tools/designer/src/components/formeditor/qdesigner_resource.h +++ b/tools/designer/src/components/formeditor/qdesigner_resource.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp index e3e4a97..649249d 100644 --- a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp +++ b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h index e96adaf..0f7c9e1 100644 --- a/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h +++ b/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qmainwindow_container.cpp b/tools/designer/src/components/formeditor/qmainwindow_container.cpp index 7fd21d1..77e0b4c 100644 --- a/tools/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/tools/designer/src/components/formeditor/qmainwindow_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qmainwindow_container.h b/tools/designer/src/components/formeditor/qmainwindow_container.h index aaf942f..2ee897f 100644 --- a/tools/designer/src/components/formeditor/qmainwindow_container.h +++ b/tools/designer/src/components/formeditor/qmainwindow_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qmdiarea_container.cpp b/tools/designer/src/components/formeditor/qmdiarea_container.cpp index fdeef03..45acbaf 100644 --- a/tools/designer/src/components/formeditor/qmdiarea_container.cpp +++ b/tools/designer/src/components/formeditor/qmdiarea_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qmdiarea_container.h b/tools/designer/src/components/formeditor/qmdiarea_container.h index 462c11f..0cfa8f2 100644 --- a/tools/designer/src/components/formeditor/qmdiarea_container.h +++ b/tools/designer/src/components/formeditor/qmdiarea_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.cpp b/tools/designer/src/components/formeditor/qtbrushmanager.cpp index c28c6b9..0e2d099 100644 --- a/tools/designer/src/components/formeditor/qtbrushmanager.cpp +++ b/tools/designer/src/components/formeditor/qtbrushmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h index f8f1b8a..6bee186 100644 --- a/tools/designer/src/components/formeditor/qtbrushmanager.h +++ b/tools/designer/src/components/formeditor/qtbrushmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qwizard_container.cpp b/tools/designer/src/components/formeditor/qwizard_container.cpp index 669f71a..51820c8 100644 --- a/tools/designer/src/components/formeditor/qwizard_container.cpp +++ b/tools/designer/src/components/formeditor/qwizard_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qwizard_container.h b/tools/designer/src/components/formeditor/qwizard_container.h index 6667a1d..e6c0df3 100644 --- a/tools/designer/src/components/formeditor/qwizard_container.h +++ b/tools/designer/src/components/formeditor/qwizard_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qworkspace_container.cpp b/tools/designer/src/components/formeditor/qworkspace_container.cpp index 03cb382..68caeb4 100644 --- a/tools/designer/src/components/formeditor/qworkspace_container.cpp +++ b/tools/designer/src/components/formeditor/qworkspace_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/qworkspace_container.h b/tools/designer/src/components/formeditor/qworkspace_container.h index fa1e66c..d1fb8f1 100644 --- a/tools/designer/src/components/formeditor/qworkspace_container.h +++ b/tools/designer/src/components/formeditor/qworkspace_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/spacer_propertysheet.cpp b/tools/designer/src/components/formeditor/spacer_propertysheet.cpp index 16dd69d..49112ea 100644 --- a/tools/designer/src/components/formeditor/spacer_propertysheet.cpp +++ b/tools/designer/src/components/formeditor/spacer_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/spacer_propertysheet.h b/tools/designer/src/components/formeditor/spacer_propertysheet.h index a83e3d1..8e5ec30 100644 --- a/tools/designer/src/components/formeditor/spacer_propertysheet.h +++ b/tools/designer/src/components/formeditor/spacer_propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/templateoptionspage.cpp b/tools/designer/src/components/formeditor/templateoptionspage.cpp index dacd0d3..b30707c 100644 --- a/tools/designer/src/components/formeditor/templateoptionspage.cpp +++ b/tools/designer/src/components/formeditor/templateoptionspage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/templateoptionspage.h b/tools/designer/src/components/formeditor/templateoptionspage.h index 2f17141..ee08a08 100644 --- a/tools/designer/src/components/formeditor/templateoptionspage.h +++ b/tools/designer/src/components/formeditor/templateoptionspage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp index 3a59543..7064f34 100644 --- a/tools/designer/src/components/formeditor/tool_widgeteditor.cpp +++ b/tools/designer/src/components/formeditor/tool_widgeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/tool_widgeteditor.h b/tools/designer/src/components/formeditor/tool_widgeteditor.h index 58df974..b3b0015 100644 --- a/tools/designer/src/components/formeditor/tool_widgeteditor.h +++ b/tools/designer/src/components/formeditor/tool_widgeteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/widgetselection.cpp b/tools/designer/src/components/formeditor/widgetselection.cpp index ce103ec..7a72e3c 100644 --- a/tools/designer/src/components/formeditor/widgetselection.cpp +++ b/tools/designer/src/components/formeditor/widgetselection.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/formeditor/widgetselection.h b/tools/designer/src/components/formeditor/widgetselection.h index 9099e89..5690b45 100644 --- a/tools/designer/src/components/formeditor/widgetselection.h +++ b/tools/designer/src/components/formeditor/widgetselection.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/lib/lib_pch.h b/tools/designer/src/components/lib/lib_pch.h index 9f47b25..5282e74 100644 --- a/tools/designer/src/components/lib/lib_pch.h +++ b/tools/designer/src/components/lib/lib_pch.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/lib/qdesigner_components.cpp b/tools/designer/src/components/lib/qdesigner_components.cpp index 42752d9..311bdc3 100644 --- a/tools/designer/src/components/lib/qdesigner_components.cpp +++ b/tools/designer/src/components/lib/qdesigner_components.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/objectinspector/objectinspector.cpp b/tools/designer/src/components/objectinspector/objectinspector.cpp index 4e515be..54c2c88 100644 --- a/tools/designer/src/components/objectinspector/objectinspector.cpp +++ b/tools/designer/src/components/objectinspector/objectinspector.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/objectinspector/objectinspector.h b/tools/designer/src/components/objectinspector/objectinspector.h index 6b3b3d0..aa081ed 100644 --- a/tools/designer/src/components/objectinspector/objectinspector.h +++ b/tools/designer/src/components/objectinspector/objectinspector.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/objectinspector/objectinspector_global.h b/tools/designer/src/components/objectinspector/objectinspector_global.h index b1aedc0..5be7ad8 100644 --- a/tools/designer/src/components/objectinspector/objectinspector_global.h +++ b/tools/designer/src/components/objectinspector/objectinspector_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp index bc1ac0c..09f1170 100644 --- a/tools/designer/src/components/objectinspector/objectinspectormodel.cpp +++ b/tools/designer/src/components/objectinspector/objectinspectormodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/objectinspector/objectinspectormodel_p.h b/tools/designer/src/components/objectinspector/objectinspectormodel_p.h index 63bc025..8320242 100644 --- a/tools/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/tools/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp b/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp index 2a63ba6..c8e4f7a 100644 --- a/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp +++ b/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/brushpropertymanager.h b/tools/designer/src/components/propertyeditor/brushpropertymanager.h index 2bb4933..993176f 100644 --- a/tools/designer/src/components/propertyeditor/brushpropertymanager.h +++ b/tools/designer/src/components/propertyeditor/brushpropertymanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/defs.cpp b/tools/designer/src/components/propertyeditor/defs.cpp index ebee40a..87b3826 100644 --- a/tools/designer/src/components/propertyeditor/defs.cpp +++ b/tools/designer/src/components/propertyeditor/defs.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/defs.h b/tools/designer/src/components/propertyeditor/defs.h index e7a48d6..0db5d8e 100644 --- a/tools/designer/src/components/propertyeditor/defs.h +++ b/tools/designer/src/components/propertyeditor/defs.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp index 1b267aa..2b4404b 100644 --- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.h b/tools/designer/src/components/propertyeditor/designerpropertymanager.h index 78ab8e6..d4d6608 100644 --- a/tools/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/fontmapping.xml b/tools/designer/src/components/propertyeditor/fontmapping.xml index c19f7a3..b9707fb 100644 --- a/tools/designer/src/components/propertyeditor/fontmapping.xml +++ b/tools/designer/src/components/propertyeditor/fontmapping.xml @@ -8,11 +8,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp b/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp index ab980aa..ee44651 100644 --- a/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp +++ b/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/fontpropertymanager.h b/tools/designer/src/components/propertyeditor/fontpropertymanager.h index 915dcd9..22baabd 100644 --- a/tools/designer/src/components/propertyeditor/fontpropertymanager.h +++ b/tools/designer/src/components/propertyeditor/fontpropertymanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp index b9f0227..0f0397b 100644 --- a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp +++ b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h index 025f4fd..8342224 100644 --- a/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h +++ b/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.cpp b/tools/designer/src/components/propertyeditor/paletteeditor.cpp index b0dc82b..eca1f16 100644 --- a/tools/designer/src/components/propertyeditor/paletteeditor.cpp +++ b/tools/designer/src/components/propertyeditor/paletteeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.h b/tools/designer/src/components/propertyeditor/paletteeditor.h index f501968..a423ba8 100644 --- a/tools/designer/src/components/propertyeditor/paletteeditor.h +++ b/tools/designer/src/components/propertyeditor/paletteeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/paletteeditor.ui b/tools/designer/src/components/propertyeditor/paletteeditor.ui index 55ef5ac..f40c8e3 100644 --- a/tools/designer/src/components/propertyeditor/paletteeditor.ui +++ b/tools/designer/src/components/propertyeditor/paletteeditor.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp index d7a76b9..dc3f3a6 100644 --- a/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp +++ b/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/paletteeditorbutton.h b/tools/designer/src/components/propertyeditor/paletteeditorbutton.h index dea9221..cd489d6 100644 --- a/tools/designer/src/components/propertyeditor/paletteeditorbutton.h +++ b/tools/designer/src/components/propertyeditor/paletteeditorbutton.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/previewframe.cpp b/tools/designer/src/components/propertyeditor/previewframe.cpp index 95d533d..9f1978b 100644 --- a/tools/designer/src/components/propertyeditor/previewframe.cpp +++ b/tools/designer/src/components/propertyeditor/previewframe.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/previewframe.h b/tools/designer/src/components/propertyeditor/previewframe.h index 678a7ab..0b968e2 100644 --- a/tools/designer/src/components/propertyeditor/previewframe.h +++ b/tools/designer/src/components/propertyeditor/previewframe.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/previewwidget.cpp b/tools/designer/src/components/propertyeditor/previewwidget.cpp index fa458e7..fb886f7 100644 --- a/tools/designer/src/components/propertyeditor/previewwidget.cpp +++ b/tools/designer/src/components/propertyeditor/previewwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/previewwidget.h b/tools/designer/src/components/propertyeditor/previewwidget.h index 38690d5..751c9b6 100644 --- a/tools/designer/src/components/propertyeditor/previewwidget.h +++ b/tools/designer/src/components/propertyeditor/previewwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/previewwidget.ui b/tools/designer/src/components/propertyeditor/previewwidget.ui index c61f0d6..55e2fa3 100644 --- a/tools/designer/src/components/propertyeditor/previewwidget.ui +++ b/tools/designer/src/components/propertyeditor/previewwidget.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp index 63b57d8..43765be 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.h b/tools/designer/src/components/propertyeditor/propertyeditor.h index 21e81dd..b270d75 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.h +++ b/tools/designer/src/components/propertyeditor/propertyeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/propertyeditor_global.h b/tools/designer/src/components/propertyeditor/propertyeditor_global.h index c7c4780..136534a 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor_global.h +++ b/tools/designer/src/components/propertyeditor/propertyeditor_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp b/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp index a6663cf..56d3b65 100644 --- a/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp +++ b/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/qlonglongvalidator.h b/tools/designer/src/components/propertyeditor/qlonglongvalidator.h index 2b3174b..7bbf18f 100644 --- a/tools/designer/src/components/propertyeditor/qlonglongvalidator.h +++ b/tools/designer/src/components/propertyeditor/qlonglongvalidator.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.cpp b/tools/designer/src/components/propertyeditor/stringlisteditor.cpp index 861e699..9e43b56 100644 --- a/tools/designer/src/components/propertyeditor/stringlisteditor.cpp +++ b/tools/designer/src/components/propertyeditor/stringlisteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.h b/tools/designer/src/components/propertyeditor/stringlisteditor.h index 86b48ff..c0cb89b 100644 --- a/tools/designer/src/components/propertyeditor/stringlisteditor.h +++ b/tools/designer/src/components/propertyeditor/stringlisteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/stringlisteditor.ui b/tools/designer/src/components/propertyeditor/stringlisteditor.ui index fdcdabc..58cac40 100644 --- a/tools/designer/src/components/propertyeditor/stringlisteditor.ui +++ b/tools/designer/src/components/propertyeditor/stringlisteditor.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp index 440015c..5873ab7 100644 --- a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp +++ b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h index c843980..0b665f9 100644 --- a/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h +++ b/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/connectdialog.cpp b/tools/designer/src/components/signalsloteditor/connectdialog.cpp index d9b8ed5..cd82e08 100644 --- a/tools/designer/src/components/signalsloteditor/connectdialog.cpp +++ b/tools/designer/src/components/signalsloteditor/connectdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/connectdialog_p.h b/tools/designer/src/components/signalsloteditor/connectdialog_p.h index 8fdc019..2bce60c 100644 --- a/tools/designer/src/components/signalsloteditor/connectdialog_p.h +++ b/tools/designer/src/components/signalsloteditor/connectdialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp index f4c7693..229ecc6 100644 --- a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp +++ b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h b/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h index 9b051e4..8c09e93 100644 --- a/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h +++ b/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp index 511b91f..07ae77f 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor.h b/tools/designer/src/components/signalsloteditor/signalsloteditor.h index f330ca0..85c4532 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h index 399778a..a098459 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp index c7a799a..c0e7a1e 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h index 8cec010..3aa74c7 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp index 311c843..fdd815e 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h index 546110d..ee59328 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp index 973105c..63c0974 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h index 97ea831..4c4dc1f 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index dc6b3c3..7bed7e4 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h index 417e44b..23a600c 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h +++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor.cpp b/tools/designer/src/components/tabordereditor/tabordereditor.cpp index 92f5ed1..1341c7a 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor.cpp +++ b/tools/designer/src/components/tabordereditor/tabordereditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor.h b/tools/designer/src/components/tabordereditor/tabordereditor.h index ec7a81d..bf198b4 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor.h +++ b/tools/designer/src/components/tabordereditor/tabordereditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_global.h b/tools/designer/src/components/tabordereditor/tabordereditor_global.h index af40dbd..1f52b83 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_global.h +++ b/tools/designer/src/components/tabordereditor/tabordereditor_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp index fe006ce..fd6b1fb 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp +++ b/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp index 46bf378..2228208 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp +++ b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h index e5ef762..5da60c3 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h +++ b/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp index 4f291a1..b4d8023 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp +++ b/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/tabordereditor/tabordereditor_tool.h b/tools/designer/src/components/tabordereditor/tabordereditor_tool.h index ea74da2..addf40b 100644 --- a/tools/designer/src/components/tabordereditor/tabordereditor_tool.h +++ b/tools/designer/src/components/tabordereditor/tabordereditor_tool.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.cpp b/tools/designer/src/components/taskmenu/button_taskmenu.cpp index ced32ce..b2403ac 100644 --- a/tools/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/button_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.h b/tools/designer/src/components/taskmenu/button_taskmenu.h index 1681f34..57afc70 100644 --- a/tools/designer/src/components/taskmenu/button_taskmenu.h +++ b/tools/designer/src/components/taskmenu/button_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp index e3364cc..b400f98 100644 --- a/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/combobox_taskmenu.h b/tools/designer/src/components/taskmenu/combobox_taskmenu.h index 9f80e40..7c18147 100644 --- a/tools/designer/src/components/taskmenu/combobox_taskmenu.h +++ b/tools/designer/src/components/taskmenu/combobox_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp index b182ddf..e1403d0 100644 --- a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h index 25e24ed..8332337 100644 --- a/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h +++ b/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp index bb97342..4a92a20 100644 --- a/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/groupbox_taskmenu.h b/tools/designer/src/components/taskmenu/groupbox_taskmenu.h index 8e2d36f..fef6ec9 100644 --- a/tools/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/tools/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/inplace_editor.cpp b/tools/designer/src/components/taskmenu/inplace_editor.cpp index 322d1ed..6f13bae 100644 --- a/tools/designer/src/components/taskmenu/inplace_editor.cpp +++ b/tools/designer/src/components/taskmenu/inplace_editor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/inplace_editor.h b/tools/designer/src/components/taskmenu/inplace_editor.h index 8c59aeb..99a5f25 100644 --- a/tools/designer/src/components/taskmenu/inplace_editor.h +++ b/tools/designer/src/components/taskmenu/inplace_editor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp b/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp index 5cf3df1..5475899 100644 --- a/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp +++ b/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/inplace_widget_helper.h b/tools/designer/src/components/taskmenu/inplace_widget_helper.h index 2b74d57..df85be8 100644 --- a/tools/designer/src/components/taskmenu/inplace_widget_helper.h +++ b/tools/designer/src/components/taskmenu/inplace_widget_helper.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.cpp b/tools/designer/src/components/taskmenu/itemlisteditor.cpp index 4e6940e..a0eef5f 100644 --- a/tools/designer/src/components/taskmenu/itemlisteditor.cpp +++ b/tools/designer/src/components/taskmenu/itemlisteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.h b/tools/designer/src/components/taskmenu/itemlisteditor.h index 347dcbb..920fcd6 100644 --- a/tools/designer/src/components/taskmenu/itemlisteditor.h +++ b/tools/designer/src/components/taskmenu/itemlisteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/itemlisteditor.ui b/tools/designer/src/components/taskmenu/itemlisteditor.ui index 62e5b27..f95580e 100644 --- a/tools/designer/src/components/taskmenu/itemlisteditor.ui +++ b/tools/designer/src/components/taskmenu/itemlisteditor.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/label_taskmenu.cpp b/tools/designer/src/components/taskmenu/label_taskmenu.cpp index 77e5ed9..51eee7c 100644 --- a/tools/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/label_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/label_taskmenu.h b/tools/designer/src/components/taskmenu/label_taskmenu.h index 0d7722b..123dc88 100644 --- a/tools/designer/src/components/taskmenu/label_taskmenu.h +++ b/tools/designer/src/components/taskmenu/label_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp index 4a3aeec..d234be1 100644 --- a/tools/designer/src/components/taskmenu/layouttaskmenu.cpp +++ b/tools/designer/src/components/taskmenu/layouttaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/layouttaskmenu.h b/tools/designer/src/components/taskmenu/layouttaskmenu.h index 97fde9c..dcdea34 100644 --- a/tools/designer/src/components/taskmenu/layouttaskmenu.h +++ b/tools/designer/src/components/taskmenu/layouttaskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp index baf4785..d0ea549 100644 --- a/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/lineedit_taskmenu.h b/tools/designer/src/components/taskmenu/lineedit_taskmenu.h index f37fad8..61be3f5 100644 --- a/tools/designer/src/components/taskmenu/lineedit_taskmenu.h +++ b/tools/designer/src/components/taskmenu/lineedit_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp index 1a9ba36..2351d9b 100644 --- a/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/listwidget_taskmenu.h b/tools/designer/src/components/taskmenu/listwidget_taskmenu.h index 6f730a2..44eae9a 100644 --- a/tools/designer/src/components/taskmenu/listwidget_taskmenu.h +++ b/tools/designer/src/components/taskmenu/listwidget_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp index 2a8de52..aac987d 100644 --- a/tools/designer/src/components/taskmenu/listwidgeteditor.cpp +++ b/tools/designer/src/components/taskmenu/listwidgeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/listwidgeteditor.h b/tools/designer/src/components/taskmenu/listwidgeteditor.h index c7fcdea..1bd5e71 100644 --- a/tools/designer/src/components/taskmenu/listwidgeteditor.h +++ b/tools/designer/src/components/taskmenu/listwidgeteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/menutaskmenu.cpp b/tools/designer/src/components/taskmenu/menutaskmenu.cpp index 52320ac..a77a808 100644 --- a/tools/designer/src/components/taskmenu/menutaskmenu.cpp +++ b/tools/designer/src/components/taskmenu/menutaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/menutaskmenu.h b/tools/designer/src/components/taskmenu/menutaskmenu.h index 98ae3e1..9843d9c 100644 --- a/tools/designer/src/components/taskmenu/menutaskmenu.h +++ b/tools/designer/src/components/taskmenu/menutaskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp index 5ef1f9c..89ce4f2 100644 --- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h index 6ee9c26..1785456 100644 --- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h +++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp index 0863847..36e52a0 100644 --- a/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp +++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.h b/tools/designer/src/components/taskmenu/tablewidgeteditor.h index a4f0b52..d460b11 100644 --- a/tools/designer/src/components/taskmenu/tablewidgeteditor.h +++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/tablewidgeteditor.ui b/tools/designer/src/components/taskmenu/tablewidgeteditor.ui index be59fd2..5291afe 100644 --- a/tools/designer/src/components/taskmenu/tablewidgeteditor.ui +++ b/tools/designer/src/components/taskmenu/tablewidgeteditor.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/taskmenu_component.cpp b/tools/designer/src/components/taskmenu/taskmenu_component.cpp index 629fc8a..f4f19a7 100644 --- a/tools/designer/src/components/taskmenu/taskmenu_component.cpp +++ b/tools/designer/src/components/taskmenu/taskmenu_component.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/taskmenu_component.h b/tools/designer/src/components/taskmenu/taskmenu_component.h index 56f3eaf..37c5c8e 100644 --- a/tools/designer/src/components/taskmenu/taskmenu_component.h +++ b/tools/designer/src/components/taskmenu/taskmenu_component.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/taskmenu_global.h b/tools/designer/src/components/taskmenu/taskmenu_global.h index 418c849..2ae3eb4 100644 --- a/tools/designer/src/components/taskmenu/taskmenu_global.h +++ b/tools/designer/src/components/taskmenu/taskmenu_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp index feaec2c..5cbded2 100644 --- a/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/textedit_taskmenu.h b/tools/designer/src/components/taskmenu/textedit_taskmenu.h index 939e3ec..0d9ce51 100644 --- a/tools/designer/src/components/taskmenu/textedit_taskmenu.h +++ b/tools/designer/src/components/taskmenu/textedit_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp index a15cd8a..8f5e483 100644 --- a/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/toolbar_taskmenu.h b/tools/designer/src/components/taskmenu/toolbar_taskmenu.h index 4ae1994..0795276 100644 --- a/tools/designer/src/components/taskmenu/toolbar_taskmenu.h +++ b/tools/designer/src/components/taskmenu/toolbar_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp index b1c8c28..dc2c6bc 100644 --- a/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/treewidget_taskmenu.h b/tools/designer/src/components/taskmenu/treewidget_taskmenu.h index dac4c20..c1654ca 100644 --- a/tools/designer/src/components/taskmenu/treewidget_taskmenu.h +++ b/tools/designer/src/components/taskmenu/treewidget_taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp index faf00f2..92085f0 100644 --- a/tools/designer/src/components/taskmenu/treewidgeteditor.cpp +++ b/tools/designer/src/components/taskmenu/treewidgeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.h b/tools/designer/src/components/taskmenu/treewidgeteditor.h index f4abc78..4d9c0c8 100644 --- a/tools/designer/src/components/taskmenu/treewidgeteditor.h +++ b/tools/designer/src/components/taskmenu/treewidgeteditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/taskmenu/treewidgeteditor.ui b/tools/designer/src/components/taskmenu/treewidgeteditor.ui index d72b152..75637f8 100644 --- a/tools/designer/src/components/taskmenu/treewidgeteditor.ui +++ b/tools/designer/src/components/taskmenu/treewidgeteditor.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox.cpp b/tools/designer/src/components/widgetbox/widgetbox.cpp index d8c6aa3..dcb0d57 100644 --- a/tools/designer/src/components/widgetbox/widgetbox.cpp +++ b/tools/designer/src/components/widgetbox/widgetbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox.h b/tools/designer/src/components/widgetbox/widgetbox.h index e77c0ed..f92aa88 100644 --- a/tools/designer/src/components/widgetbox/widgetbox.h +++ b/tools/designer/src/components/widgetbox/widgetbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox.xml b/tools/designer/src/components/widgetbox/widgetbox.xml index 462ac7d..6224fde 100644 --- a/tools/designer/src/components/widgetbox/widgetbox.xml +++ b/tools/designer/src/components/widgetbox/widgetbox.xml @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp index 1dc63a5..9772327 100644 --- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp +++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.h b/tools/designer/src/components/widgetbox/widgetbox_dnditem.h index 0641f69..41a1b0c 100644 --- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.h +++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetbox_global.h b/tools/designer/src/components/widgetbox/widgetbox_global.h index 3e95063..1a0c017 100644 --- a/tools/designer/src/components/widgetbox/widgetbox_global.h +++ b/tools/designer/src/components/widgetbox/widgetbox_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index fad13f2..9345184 100644 --- a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h index c8c5d3a..d526fba 100644 --- a/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h +++ b/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 799f96f..f6dd061 100644 --- a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/components/widgetbox/widgetboxtreewidget.h b/tools/designer/src/components/widgetbox/widgetboxtreewidget.h index 9282a0f..c7288a3 100644 --- a/tools/designer/src/components/widgetbox/widgetboxtreewidget.h +++ b/tools/designer/src/components/widgetbox/widgetboxtreewidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/appfontdialog.cpp b/tools/designer/src/designer/appfontdialog.cpp index d10cef8..780effb 100644 --- a/tools/designer/src/designer/appfontdialog.cpp +++ b/tools/designer/src/designer/appfontdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/appfontdialog.h b/tools/designer/src/designer/appfontdialog.h index c6142f2..16b61df 100644 --- a/tools/designer/src/designer/appfontdialog.h +++ b/tools/designer/src/designer/appfontdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/assistantclient.cpp b/tools/designer/src/designer/assistantclient.cpp index d3a388d..f33eb4a 100644 --- a/tools/designer/src/designer/assistantclient.cpp +++ b/tools/designer/src/designer/assistantclient.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/assistantclient.h b/tools/designer/src/designer/assistantclient.h index ac3c980..1f0a39c 100644 --- a/tools/designer/src/designer/assistantclient.h +++ b/tools/designer/src/designer/assistantclient.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/designer_enums.h b/tools/designer/src/designer/designer_enums.h index 25c3078..fe219b5 100644 --- a/tools/designer/src/designer/designer_enums.h +++ b/tools/designer/src/designer/designer_enums.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/main.cpp b/tools/designer/src/designer/main.cpp index 2a56efe..25b7b06 100644 --- a/tools/designer/src/designer/main.cpp +++ b/tools/designer/src/designer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/mainwindow.cpp b/tools/designer/src/designer/mainwindow.cpp index 6384fa7..79b5b25 100644 --- a/tools/designer/src/designer/mainwindow.cpp +++ b/tools/designer/src/designer/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/mainwindow.h b/tools/designer/src/designer/mainwindow.h index 40ce863..4f8ae58 100644 --- a/tools/designer/src/designer/mainwindow.h +++ b/tools/designer/src/designer/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/newform.cpp b/tools/designer/src/designer/newform.cpp index 70133c5..613e482 100644 --- a/tools/designer/src/designer/newform.cpp +++ b/tools/designer/src/designer/newform.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/newform.h b/tools/designer/src/designer/newform.h index edcb1b4..5f81f6f 100644 --- a/tools/designer/src/designer/newform.h +++ b/tools/designer/src/designer/newform.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/preferencesdialog.cpp b/tools/designer/src/designer/preferencesdialog.cpp index 5a90534..eb72eb6 100644 --- a/tools/designer/src/designer/preferencesdialog.cpp +++ b/tools/designer/src/designer/preferencesdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/preferencesdialog.h b/tools/designer/src/designer/preferencesdialog.h index ef9d620..5638920 100644 --- a/tools/designer/src/designer/preferencesdialog.h +++ b/tools/designer/src/designer/preferencesdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner.cpp b/tools/designer/src/designer/qdesigner.cpp index 6eb5198..eaad6e6 100644 --- a/tools/designer/src/designer/qdesigner.cpp +++ b/tools/designer/src/designer/qdesigner.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner.h b/tools/designer/src/designer/qdesigner.h index 887037c..3fae509 100644 --- a/tools/designer/src/designer/qdesigner.h +++ b/tools/designer/src/designer/qdesigner.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_actions.cpp b/tools/designer/src/designer/qdesigner_actions.cpp index 65e5937..2914955 100644 --- a/tools/designer/src/designer/qdesigner_actions.cpp +++ b/tools/designer/src/designer/qdesigner_actions.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_actions.h b/tools/designer/src/designer/qdesigner_actions.h index 1e203b2..62c3245 100644 --- a/tools/designer/src/designer/qdesigner_actions.h +++ b/tools/designer/src/designer/qdesigner_actions.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_appearanceoptions.cpp b/tools/designer/src/designer/qdesigner_appearanceoptions.cpp index a729d38..ca4c236 100644 --- a/tools/designer/src/designer/qdesigner_appearanceoptions.cpp +++ b/tools/designer/src/designer/qdesigner_appearanceoptions.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_appearanceoptions.h b/tools/designer/src/designer/qdesigner_appearanceoptions.h index 40f8c8b..96e9eb5 100644 --- a/tools/designer/src/designer/qdesigner_appearanceoptions.h +++ b/tools/designer/src/designer/qdesigner_appearanceoptions.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_formwindow.cpp b/tools/designer/src/designer/qdesigner_formwindow.cpp index 557db69..417f9ef 100644 --- a/tools/designer/src/designer/qdesigner_formwindow.cpp +++ b/tools/designer/src/designer/qdesigner_formwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_formwindow.h b/tools/designer/src/designer/qdesigner_formwindow.h index d9967a2..e3b29c2 100644 --- a/tools/designer/src/designer/qdesigner_formwindow.h +++ b/tools/designer/src/designer/qdesigner_formwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_pch.h b/tools/designer/src/designer/qdesigner_pch.h index 46f541c..31f95a2 100644 --- a/tools/designer/src/designer/qdesigner_pch.h +++ b/tools/designer/src/designer/qdesigner_pch.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_server.cpp b/tools/designer/src/designer/qdesigner_server.cpp index 98007ec..170e451 100644 --- a/tools/designer/src/designer/qdesigner_server.cpp +++ b/tools/designer/src/designer/qdesigner_server.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_server.h b/tools/designer/src/designer/qdesigner_server.h index 4820966..22c2956 100644 --- a/tools/designer/src/designer/qdesigner_server.h +++ b/tools/designer/src/designer/qdesigner_server.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_settings.cpp b/tools/designer/src/designer/qdesigner_settings.cpp index d9060b1..2f5a4d4 100644 --- a/tools/designer/src/designer/qdesigner_settings.cpp +++ b/tools/designer/src/designer/qdesigner_settings.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_settings.h b/tools/designer/src/designer/qdesigner_settings.h index 33c5ca3..f269be3 100644 --- a/tools/designer/src/designer/qdesigner_settings.h +++ b/tools/designer/src/designer/qdesigner_settings.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_toolwindow.cpp b/tools/designer/src/designer/qdesigner_toolwindow.cpp index c850ed6..c78c8a6 100644 --- a/tools/designer/src/designer/qdesigner_toolwindow.cpp +++ b/tools/designer/src/designer/qdesigner_toolwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_toolwindow.h b/tools/designer/src/designer/qdesigner_toolwindow.h index cf3942d..e48d18d 100644 --- a/tools/designer/src/designer/qdesigner_toolwindow.h +++ b/tools/designer/src/designer/qdesigner_toolwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp index 7ab3e94..b4cb363 100644 --- a/tools/designer/src/designer/qdesigner_workbench.cpp +++ b/tools/designer/src/designer/qdesigner_workbench.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/qdesigner_workbench.h b/tools/designer/src/designer/qdesigner_workbench.h index 0ac18af..6062729 100644 --- a/tools/designer/src/designer/qdesigner_workbench.h +++ b/tools/designer/src/designer/qdesigner_workbench.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/saveformastemplate.cpp b/tools/designer/src/designer/saveformastemplate.cpp index ef89731..5e94536 100644 --- a/tools/designer/src/designer/saveformastemplate.cpp +++ b/tools/designer/src/designer/saveformastemplate.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/saveformastemplate.h b/tools/designer/src/designer/saveformastemplate.h index 3f62d15..c3e48c6 100644 --- a/tools/designer/src/designer/saveformastemplate.h +++ b/tools/designer/src/designer/saveformastemplate.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/saveformastemplate.ui b/tools/designer/src/designer/saveformastemplate.ui index c721c5b..bf02fe3 100644 --- a/tools/designer/src/designer/saveformastemplate.ui +++ b/tools/designer/src/designer/saveformastemplate.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp index a129a4d..47e86d1 100644 --- a/tools/designer/src/designer/versiondialog.cpp +++ b/tools/designer/src/designer/versiondialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/designer/versiondialog.h b/tools/designer/src/designer/versiondialog.h index 2a380ec..5f811c6 100644 --- a/tools/designer/src/designer/versiondialog.h +++ b/tools/designer/src/designer/versiondialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/components/qdesigner_components.h b/tools/designer/src/lib/components/qdesigner_components.h index e4cdef2..84809c9 100644 --- a/tools/designer/src/lib/components/qdesigner_components.h +++ b/tools/designer/src/lib/components/qdesigner_components.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/components/qdesigner_components_global.h b/tools/designer/src/lib/components/qdesigner_components_global.h index 0ae57b2..ca2af59 100644 --- a/tools/designer/src/lib/components/qdesigner_components_global.h +++ b/tools/designer/src/lib/components/qdesigner_components_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/default_extensionfactory.cpp b/tools/designer/src/lib/extension/default_extensionfactory.cpp index a96783a..2c44166 100644 --- a/tools/designer/src/lib/extension/default_extensionfactory.cpp +++ b/tools/designer/src/lib/extension/default_extensionfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/default_extensionfactory.h b/tools/designer/src/lib/extension/default_extensionfactory.h index 1966c91..50206fd 100644 --- a/tools/designer/src/lib/extension/default_extensionfactory.h +++ b/tools/designer/src/lib/extension/default_extensionfactory.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/extension.cpp b/tools/designer/src/lib/extension/extension.cpp index 7ff13d0..b7fa931 100644 --- a/tools/designer/src/lib/extension/extension.cpp +++ b/tools/designer/src/lib/extension/extension.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/extension.h b/tools/designer/src/lib/extension/extension.h index 1ccd4ef..9c0359b 100644 --- a/tools/designer/src/lib/extension/extension.h +++ b/tools/designer/src/lib/extension/extension.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/extension_global.h b/tools/designer/src/lib/extension/extension_global.h index abd18d8..e0de2a7 100644 --- a/tools/designer/src/lib/extension/extension_global.h +++ b/tools/designer/src/lib/extension/extension_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/qextensionmanager.cpp b/tools/designer/src/lib/extension/qextensionmanager.cpp index 686c091..49c3e9c 100644 --- a/tools/designer/src/lib/extension/qextensionmanager.cpp +++ b/tools/designer/src/lib/extension/qextensionmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/extension/qextensionmanager.h b/tools/designer/src/lib/extension/qextensionmanager.h index a5b727f..192b547 100644 --- a/tools/designer/src/lib/extension/qextensionmanager.h +++ b/tools/designer/src/lib/extension/qextensionmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/lib_pch.h b/tools/designer/src/lib/lib_pch.h index 27c5905..ea9c8c9 100644 --- a/tools/designer/src/lib/lib_pch.h +++ b/tools/designer/src/lib/lib_pch.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractactioneditor.cpp b/tools/designer/src/lib/sdk/abstractactioneditor.cpp index e3b870a..c23ac25 100644 --- a/tools/designer/src/lib/sdk/abstractactioneditor.cpp +++ b/tools/designer/src/lib/sdk/abstractactioneditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractactioneditor.h b/tools/designer/src/lib/sdk/abstractactioneditor.h index 7408a52..6069902 100644 --- a/tools/designer/src/lib/sdk/abstractactioneditor.h +++ b/tools/designer/src/lib/sdk/abstractactioneditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractbrushmanager.h b/tools/designer/src/lib/sdk/abstractbrushmanager.h index 493ca25..19263a1 100644 --- a/tools/designer/src/lib/sdk/abstractbrushmanager.h +++ b/tools/designer/src/lib/sdk/abstractbrushmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractdialoggui.cpp b/tools/designer/src/lib/sdk/abstractdialoggui.cpp index 690fb51..a942ded 100644 --- a/tools/designer/src/lib/sdk/abstractdialoggui.cpp +++ b/tools/designer/src/lib/sdk/abstractdialoggui.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractdialoggui_p.h b/tools/designer/src/lib/sdk/abstractdialoggui_p.h index faaa7e5..56ac80e 100644 --- a/tools/designer/src/lib/sdk/abstractdialoggui_p.h +++ b/tools/designer/src/lib/sdk/abstractdialoggui_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractdnditem.h b/tools/designer/src/lib/sdk/abstractdnditem.h index fca1295..95e5482 100644 --- a/tools/designer/src/lib/sdk/abstractdnditem.h +++ b/tools/designer/src/lib/sdk/abstractdnditem.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformeditor.cpp b/tools/designer/src/lib/sdk/abstractformeditor.cpp index 17e93e7..fc733c1 100644 --- a/tools/designer/src/lib/sdk/abstractformeditor.cpp +++ b/tools/designer/src/lib/sdk/abstractformeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformeditor.h b/tools/designer/src/lib/sdk/abstractformeditor.h index 0625ce6..23d05e8 100644 --- a/tools/designer/src/lib/sdk/abstractformeditor.h +++ b/tools/designer/src/lib/sdk/abstractformeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp b/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp index f4ee895..655ad84 100644 --- a/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp +++ b/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformeditorplugin.h b/tools/designer/src/lib/sdk/abstractformeditorplugin.h index 6288602..27454f4 100644 --- a/tools/designer/src/lib/sdk/abstractformeditorplugin.h +++ b/tools/designer/src/lib/sdk/abstractformeditorplugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindow.cpp b/tools/designer/src/lib/sdk/abstractformwindow.cpp index 3c05ff7..7bce544 100644 --- a/tools/designer/src/lib/sdk/abstractformwindow.cpp +++ b/tools/designer/src/lib/sdk/abstractformwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindow.h b/tools/designer/src/lib/sdk/abstractformwindow.h index 1fc3702..1658b68 100644 --- a/tools/designer/src/lib/sdk/abstractformwindow.h +++ b/tools/designer/src/lib/sdk/abstractformwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp b/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp index 2d27133..890cfdc 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp +++ b/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowcursor.h b/tools/designer/src/lib/sdk/abstractformwindowcursor.h index 117bcac..a6f26f2 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowcursor.h +++ b/tools/designer/src/lib/sdk/abstractformwindowcursor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp b/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp index 5265552..4af99ff 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp +++ b/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowmanager.h b/tools/designer/src/lib/sdk/abstractformwindowmanager.h index e3ac3dc..26f0f57 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/tools/designer/src/lib/sdk/abstractformwindowmanager.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowtool.cpp b/tools/designer/src/lib/sdk/abstractformwindowtool.cpp index 9ef2e86..9bcdf35 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowtool.cpp +++ b/tools/designer/src/lib/sdk/abstractformwindowtool.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractformwindowtool.h b/tools/designer/src/lib/sdk/abstractformwindowtool.h index a797311..776fbe4 100644 --- a/tools/designer/src/lib/sdk/abstractformwindowtool.h +++ b/tools/designer/src/lib/sdk/abstractformwindowtool.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstracticoncache.h b/tools/designer/src/lib/sdk/abstracticoncache.h index b0c827f..93002f2 100644 --- a/tools/designer/src/lib/sdk/abstracticoncache.h +++ b/tools/designer/src/lib/sdk/abstracticoncache.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractintegration.cpp b/tools/designer/src/lib/sdk/abstractintegration.cpp index 3ef1810..1433696 100644 --- a/tools/designer/src/lib/sdk/abstractintegration.cpp +++ b/tools/designer/src/lib/sdk/abstractintegration.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractintegration.h b/tools/designer/src/lib/sdk/abstractintegration.h index 8af5bfb..860a7d3 100644 --- a/tools/designer/src/lib/sdk/abstractintegration.h +++ b/tools/designer/src/lib/sdk/abstractintegration.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractintrospection.cpp b/tools/designer/src/lib/sdk/abstractintrospection.cpp index 70ff723..9bfa6bf 100644 --- a/tools/designer/src/lib/sdk/abstractintrospection.cpp +++ b/tools/designer/src/lib/sdk/abstractintrospection.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractintrospection_p.h b/tools/designer/src/lib/sdk/abstractintrospection_p.h index 52f6807..76c7cf2 100644 --- a/tools/designer/src/lib/sdk/abstractintrospection_p.h +++ b/tools/designer/src/lib/sdk/abstractintrospection_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractlanguage.h b/tools/designer/src/lib/sdk/abstractlanguage.h index b997530..a4a9723 100644 --- a/tools/designer/src/lib/sdk/abstractlanguage.h +++ b/tools/designer/src/lib/sdk/abstractlanguage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractmetadatabase.cpp b/tools/designer/src/lib/sdk/abstractmetadatabase.cpp index 16bab34..67a5e0e 100644 --- a/tools/designer/src/lib/sdk/abstractmetadatabase.cpp +++ b/tools/designer/src/lib/sdk/abstractmetadatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractmetadatabase.h b/tools/designer/src/lib/sdk/abstractmetadatabase.h index 0c5dcc5..2d1a2ab 100644 --- a/tools/designer/src/lib/sdk/abstractmetadatabase.h +++ b/tools/designer/src/lib/sdk/abstractmetadatabase.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractnewformwidget.cpp b/tools/designer/src/lib/sdk/abstractnewformwidget.cpp index ca1adde..ec92a75 100644 --- a/tools/designer/src/lib/sdk/abstractnewformwidget.cpp +++ b/tools/designer/src/lib/sdk/abstractnewformwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractnewformwidget_p.h b/tools/designer/src/lib/sdk/abstractnewformwidget_p.h index df8020a..8759667 100644 --- a/tools/designer/src/lib/sdk/abstractnewformwidget_p.h +++ b/tools/designer/src/lib/sdk/abstractnewformwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractobjectinspector.cpp b/tools/designer/src/lib/sdk/abstractobjectinspector.cpp index 61af96a..b202231 100644 --- a/tools/designer/src/lib/sdk/abstractobjectinspector.cpp +++ b/tools/designer/src/lib/sdk/abstractobjectinspector.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractobjectinspector.h b/tools/designer/src/lib/sdk/abstractobjectinspector.h index 39f1361..0da1d50 100644 --- a/tools/designer/src/lib/sdk/abstractobjectinspector.h +++ b/tools/designer/src/lib/sdk/abstractobjectinspector.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractoptionspage_p.h b/tools/designer/src/lib/sdk/abstractoptionspage_p.h index 415cc83..9d0d783 100644 --- a/tools/designer/src/lib/sdk/abstractoptionspage_p.h +++ b/tools/designer/src/lib/sdk/abstractoptionspage_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp b/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp index 79fba01..acbd0f5 100644 --- a/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractpromotioninterface.h b/tools/designer/src/lib/sdk/abstractpromotioninterface.h index 2acae74..1f9e0de 100644 --- a/tools/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/tools/designer/src/lib/sdk/abstractpromotioninterface.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp b/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp index f244a52..699baad 100644 --- a/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp +++ b/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractpropertyeditor.h b/tools/designer/src/lib/sdk/abstractpropertyeditor.h index acdcd4f..301286f 100644 --- a/tools/designer/src/lib/sdk/abstractpropertyeditor.h +++ b/tools/designer/src/lib/sdk/abstractpropertyeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp b/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp index 1aed6da..4394371 100644 --- a/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp +++ b/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractresourcebrowser.h b/tools/designer/src/lib/sdk/abstractresourcebrowser.h index 9f6b523..651f8cb0 100644 --- a/tools/designer/src/lib/sdk/abstractresourcebrowser.h +++ b/tools/designer/src/lib/sdk/abstractresourcebrowser.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractsettings_p.h b/tools/designer/src/lib/sdk/abstractsettings_p.h index 2117b49..5d837a3 100644 --- a/tools/designer/src/lib/sdk/abstractsettings_p.h +++ b/tools/designer/src/lib/sdk/abstractsettings_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetbox.cpp b/tools/designer/src/lib/sdk/abstractwidgetbox.cpp index a09f50e..92b21d6 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetbox.cpp +++ b/tools/designer/src/lib/sdk/abstractwidgetbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetbox.h b/tools/designer/src/lib/sdk/abstractwidgetbox.h index b5ccde1..1d03edc 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetbox.h +++ b/tools/designer/src/lib/sdk/abstractwidgetbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp index 39b64fc..0c17168 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp +++ b/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetdatabase.h b/tools/designer/src/lib/sdk/abstractwidgetdatabase.h index 7c66710..b3947bf 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/tools/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp b/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp index 88d310e..3e4c8ea 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp +++ b/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/abstractwidgetfactory.h b/tools/designer/src/lib/sdk/abstractwidgetfactory.h index e2d4cde..b4d8ab2 100644 --- a/tools/designer/src/lib/sdk/abstractwidgetfactory.h +++ b/tools/designer/src/lib/sdk/abstractwidgetfactory.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/dynamicpropertysheet.h b/tools/designer/src/lib/sdk/dynamicpropertysheet.h index fa5eb4b..4d5a5ed 100644 --- a/tools/designer/src/lib/sdk/dynamicpropertysheet.h +++ b/tools/designer/src/lib/sdk/dynamicpropertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/extrainfo.cpp b/tools/designer/src/lib/sdk/extrainfo.cpp index ab57685..c62b589 100644 --- a/tools/designer/src/lib/sdk/extrainfo.cpp +++ b/tools/designer/src/lib/sdk/extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/extrainfo.h b/tools/designer/src/lib/sdk/extrainfo.h index 910dedb..78a2587 100644 --- a/tools/designer/src/lib/sdk/extrainfo.h +++ b/tools/designer/src/lib/sdk/extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/layoutdecoration.h b/tools/designer/src/lib/sdk/layoutdecoration.h index c99cae4..c65cb3f 100644 --- a/tools/designer/src/lib/sdk/layoutdecoration.h +++ b/tools/designer/src/lib/sdk/layoutdecoration.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/membersheet.h b/tools/designer/src/lib/sdk/membersheet.h index 14c4aba..59a391b 100644 --- a/tools/designer/src/lib/sdk/membersheet.h +++ b/tools/designer/src/lib/sdk/membersheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/propertysheet.h b/tools/designer/src/lib/sdk/propertysheet.h index 1104f9e..c9e16fb 100644 --- a/tools/designer/src/lib/sdk/propertysheet.h +++ b/tools/designer/src/lib/sdk/propertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/script.cpp b/tools/designer/src/lib/sdk/script.cpp index cd34f2a..695aeca 100644 --- a/tools/designer/src/lib/sdk/script.cpp +++ b/tools/designer/src/lib/sdk/script.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/script_p.h b/tools/designer/src/lib/sdk/script_p.h index a93fbfa..c9dadaa 100644 --- a/tools/designer/src/lib/sdk/script_p.h +++ b/tools/designer/src/lib/sdk/script_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/sdk_global.h b/tools/designer/src/lib/sdk/sdk_global.h index 679870a..c7eae2a 100644 --- a/tools/designer/src/lib/sdk/sdk_global.h +++ b/tools/designer/src/lib/sdk/sdk_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/sdk/taskmenu.h b/tools/designer/src/lib/sdk/taskmenu.h index 930fef6..bd03236 100644 --- a/tools/designer/src/lib/sdk/taskmenu.h +++ b/tools/designer/src/lib/sdk/taskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/actioneditor.cpp b/tools/designer/src/lib/shared/actioneditor.cpp index 6a66442..32cc884 100644 --- a/tools/designer/src/lib/shared/actioneditor.cpp +++ b/tools/designer/src/lib/shared/actioneditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/actioneditor_p.h b/tools/designer/src/lib/shared/actioneditor_p.h index 36baf50..3de08c0 100644 --- a/tools/designer/src/lib/shared/actioneditor_p.h +++ b/tools/designer/src/lib/shared/actioneditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/actionprovider_p.h b/tools/designer/src/lib/shared/actionprovider_p.h index e358f61..a4559c3 100644 --- a/tools/designer/src/lib/shared/actionprovider_p.h +++ b/tools/designer/src/lib/shared/actionprovider_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/actionrepository.cpp b/tools/designer/src/lib/shared/actionrepository.cpp index 941a9ba..272991d 100644 --- a/tools/designer/src/lib/shared/actionrepository.cpp +++ b/tools/designer/src/lib/shared/actionrepository.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/actionrepository_p.h b/tools/designer/src/lib/shared/actionrepository_p.h index 9d1af5a..1b2ff7d 100644 --- a/tools/designer/src/lib/shared/actionrepository_p.h +++ b/tools/designer/src/lib/shared/actionrepository_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/codedialog.cpp b/tools/designer/src/lib/shared/codedialog.cpp index 5a2db33..59cf693 100644 --- a/tools/designer/src/lib/shared/codedialog.cpp +++ b/tools/designer/src/lib/shared/codedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/codedialog_p.h b/tools/designer/src/lib/shared/codedialog_p.h index 89f5fa9..1849f96 100644 --- a/tools/designer/src/lib/shared/codedialog_p.h +++ b/tools/designer/src/lib/shared/codedialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/connectionedit.cpp b/tools/designer/src/lib/shared/connectionedit.cpp index 579a59e..59ca982 100644 --- a/tools/designer/src/lib/shared/connectionedit.cpp +++ b/tools/designer/src/lib/shared/connectionedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/connectionedit_p.h b/tools/designer/src/lib/shared/connectionedit_p.h index c4f735a..d6ac5d1 100644 --- a/tools/designer/src/lib/shared/connectionedit_p.h +++ b/tools/designer/src/lib/shared/connectionedit_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/csshighlighter.cpp b/tools/designer/src/lib/shared/csshighlighter.cpp index d5e045b..a1380b1 100644 --- a/tools/designer/src/lib/shared/csshighlighter.cpp +++ b/tools/designer/src/lib/shared/csshighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/csshighlighter_p.h b/tools/designer/src/lib/shared/csshighlighter_p.h index fa671ea..9e5ee5e 100644 --- a/tools/designer/src/lib/shared/csshighlighter_p.h +++ b/tools/designer/src/lib/shared/csshighlighter_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/deviceprofile.cpp b/tools/designer/src/lib/shared/deviceprofile.cpp index c512ff5..b74a96d 100644 --- a/tools/designer/src/lib/shared/deviceprofile.cpp +++ b/tools/designer/src/lib/shared/deviceprofile.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/deviceprofile_p.h b/tools/designer/src/lib/shared/deviceprofile_p.h index a1a36e3..ab465d5 100644 --- a/tools/designer/src/lib/shared/deviceprofile_p.h +++ b/tools/designer/src/lib/shared/deviceprofile_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/dialoggui.cpp b/tools/designer/src/lib/shared/dialoggui.cpp index ef9dbae..cad463f 100644 --- a/tools/designer/src/lib/shared/dialoggui.cpp +++ b/tools/designer/src/lib/shared/dialoggui.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/dialoggui_p.h b/tools/designer/src/lib/shared/dialoggui_p.h index 753e130..617b09a 100644 --- a/tools/designer/src/lib/shared/dialoggui_p.h +++ b/tools/designer/src/lib/shared/dialoggui_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/extensionfactory_p.h b/tools/designer/src/lib/shared/extensionfactory_p.h index 10649c4..f473041 100644 --- a/tools/designer/src/lib/shared/extensionfactory_p.h +++ b/tools/designer/src/lib/shared/extensionfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp index f0a77c3..756a989 100644 --- a/tools/designer/src/lib/shared/filterwidget.cpp +++ b/tools/designer/src/lib/shared/filterwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/filterwidget_p.h b/tools/designer/src/lib/shared/filterwidget_p.h index 3d1f64e..ff5ea8f 100644 --- a/tools/designer/src/lib/shared/filterwidget_p.h +++ b/tools/designer/src/lib/shared/filterwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/formlayoutmenu.cpp b/tools/designer/src/lib/shared/formlayoutmenu.cpp index c2966a1..45c0845 100644 --- a/tools/designer/src/lib/shared/formlayoutmenu.cpp +++ b/tools/designer/src/lib/shared/formlayoutmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/formlayoutmenu_p.h b/tools/designer/src/lib/shared/formlayoutmenu_p.h index a575468..b6ee529 100644 --- a/tools/designer/src/lib/shared/formlayoutmenu_p.h +++ b/tools/designer/src/lib/shared/formlayoutmenu_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/formwindowbase.cpp b/tools/designer/src/lib/shared/formwindowbase.cpp index 3e7e17b..4edd744 100644 --- a/tools/designer/src/lib/shared/formwindowbase.cpp +++ b/tools/designer/src/lib/shared/formwindowbase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/formwindowbase_p.h b/tools/designer/src/lib/shared/formwindowbase_p.h index 68e977e..b33e1bb 100644 --- a/tools/designer/src/lib/shared/formwindowbase_p.h +++ b/tools/designer/src/lib/shared/formwindowbase_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/grid.cpp b/tools/designer/src/lib/shared/grid.cpp index 99dbcee..e23c5b6 100644 --- a/tools/designer/src/lib/shared/grid.cpp +++ b/tools/designer/src/lib/shared/grid.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/grid_p.h b/tools/designer/src/lib/shared/grid_p.h index b07217f..b2ca964 100644 --- a/tools/designer/src/lib/shared/grid_p.h +++ b/tools/designer/src/lib/shared/grid_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/gridpanel.cpp b/tools/designer/src/lib/shared/gridpanel.cpp index f7658ba..bc5ad6c 100644 --- a/tools/designer/src/lib/shared/gridpanel.cpp +++ b/tools/designer/src/lib/shared/gridpanel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/gridpanel_p.h b/tools/designer/src/lib/shared/gridpanel_p.h index c51b08c..91222bf 100644 --- a/tools/designer/src/lib/shared/gridpanel_p.h +++ b/tools/designer/src/lib/shared/gridpanel_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/htmlhighlighter.cpp b/tools/designer/src/lib/shared/htmlhighlighter.cpp index ba07673..e74972b 100644 --- a/tools/designer/src/lib/shared/htmlhighlighter.cpp +++ b/tools/designer/src/lib/shared/htmlhighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/htmlhighlighter_p.h b/tools/designer/src/lib/shared/htmlhighlighter_p.h index e841ec7..e51004d 100644 --- a/tools/designer/src/lib/shared/htmlhighlighter_p.h +++ b/tools/designer/src/lib/shared/htmlhighlighter_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/iconloader.cpp b/tools/designer/src/lib/shared/iconloader.cpp index b2df262..7d6ec57 100644 --- a/tools/designer/src/lib/shared/iconloader.cpp +++ b/tools/designer/src/lib/shared/iconloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/iconloader_p.h b/tools/designer/src/lib/shared/iconloader_p.h index 572aab9..44fb9fc 100644 --- a/tools/designer/src/lib/shared/iconloader_p.h +++ b/tools/designer/src/lib/shared/iconloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/iconselector.cpp b/tools/designer/src/lib/shared/iconselector.cpp index 02a3dee..2866c4c 100644 --- a/tools/designer/src/lib/shared/iconselector.cpp +++ b/tools/designer/src/lib/shared/iconselector.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h index 6b70cd2..917c976 100644 --- a/tools/designer/src/lib/shared/iconselector_p.h +++ b/tools/designer/src/lib/shared/iconselector_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/invisible_widget.cpp b/tools/designer/src/lib/shared/invisible_widget.cpp index f88022c..cab12e2 100644 --- a/tools/designer/src/lib/shared/invisible_widget.cpp +++ b/tools/designer/src/lib/shared/invisible_widget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/invisible_widget_p.h b/tools/designer/src/lib/shared/invisible_widget_p.h index 11c8f81..570c59f 100644 --- a/tools/designer/src/lib/shared/invisible_widget_p.h +++ b/tools/designer/src/lib/shared/invisible_widget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/layout.cpp b/tools/designer/src/lib/shared/layout.cpp index b1fe02a..6acf122 100644 --- a/tools/designer/src/lib/shared/layout.cpp +++ b/tools/designer/src/lib/shared/layout.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/layout_p.h b/tools/designer/src/lib/shared/layout_p.h index 8396876..b4abd33 100644 --- a/tools/designer/src/lib/shared/layout_p.h +++ b/tools/designer/src/lib/shared/layout_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/layoutinfo.cpp b/tools/designer/src/lib/shared/layoutinfo.cpp index 01eb43a..16ab2d0 100644 --- a/tools/designer/src/lib/shared/layoutinfo.cpp +++ b/tools/designer/src/lib/shared/layoutinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/layoutinfo_p.h b/tools/designer/src/lib/shared/layoutinfo_p.h index 64f3f04..a8954de 100644 --- a/tools/designer/src/lib/shared/layoutinfo_p.h +++ b/tools/designer/src/lib/shared/layoutinfo_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/metadatabase.cpp b/tools/designer/src/lib/shared/metadatabase.cpp index 1403440..9bb7ee2 100644 --- a/tools/designer/src/lib/shared/metadatabase.cpp +++ b/tools/designer/src/lib/shared/metadatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/metadatabase_p.h b/tools/designer/src/lib/shared/metadatabase_p.h index 874b540..2979b36 100644 --- a/tools/designer/src/lib/shared/metadatabase_p.h +++ b/tools/designer/src/lib/shared/metadatabase_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/morphmenu.cpp b/tools/designer/src/lib/shared/morphmenu.cpp index 0d41af0..4ed96b7 100644 --- a/tools/designer/src/lib/shared/morphmenu.cpp +++ b/tools/designer/src/lib/shared/morphmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/morphmenu_p.h b/tools/designer/src/lib/shared/morphmenu_p.h index 92389a0..7d44289 100644 --- a/tools/designer/src/lib/shared/morphmenu_p.h +++ b/tools/designer/src/lib/shared/morphmenu_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newactiondialog.cpp b/tools/designer/src/lib/shared/newactiondialog.cpp index 53aec4b..e26b1d0 100644 --- a/tools/designer/src/lib/shared/newactiondialog.cpp +++ b/tools/designer/src/lib/shared/newactiondialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newactiondialog.ui b/tools/designer/src/lib/shared/newactiondialog.ui index 77eda28..fb8fbb7 100644 --- a/tools/designer/src/lib/shared/newactiondialog.ui +++ b/tools/designer/src/lib/shared/newactiondialog.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newactiondialog_p.h b/tools/designer/src/lib/shared/newactiondialog_p.h index c8bd34c..919210a 100644 --- a/tools/designer/src/lib/shared/newactiondialog_p.h +++ b/tools/designer/src/lib/shared/newactiondialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newformwidget.cpp b/tools/designer/src/lib/shared/newformwidget.cpp index d79d77a..c18609b 100644 --- a/tools/designer/src/lib/shared/newformwidget.cpp +++ b/tools/designer/src/lib/shared/newformwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newformwidget.ui b/tools/designer/src/lib/shared/newformwidget.ui index c062602..a310b1b 100644 --- a/tools/designer/src/lib/shared/newformwidget.ui +++ b/tools/designer/src/lib/shared/newformwidget.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/newformwidget_p.h b/tools/designer/src/lib/shared/newformwidget_p.h index f94f952..0ef4722 100644 --- a/tools/designer/src/lib/shared/newformwidget_p.h +++ b/tools/designer/src/lib/shared/newformwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/orderdialog.cpp b/tools/designer/src/lib/shared/orderdialog.cpp index 3f14ca6..06666b3 100644 --- a/tools/designer/src/lib/shared/orderdialog.cpp +++ b/tools/designer/src/lib/shared/orderdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/orderdialog.ui b/tools/designer/src/lib/shared/orderdialog.ui index dcecb31..8f139a2 100644 --- a/tools/designer/src/lib/shared/orderdialog.ui +++ b/tools/designer/src/lib/shared/orderdialog.ui @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/orderdialog_p.h b/tools/designer/src/lib/shared/orderdialog_p.h index e8897e6..075b5dc 100644 --- a/tools/designer/src/lib/shared/orderdialog_p.h +++ b/tools/designer/src/lib/shared/orderdialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/plaintexteditor.cpp b/tools/designer/src/lib/shared/plaintexteditor.cpp index ce5cd5b..912a16a 100644 --- a/tools/designer/src/lib/shared/plaintexteditor.cpp +++ b/tools/designer/src/lib/shared/plaintexteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/plaintexteditor_p.h b/tools/designer/src/lib/shared/plaintexteditor_p.h index d227db8..d02f6e7 100644 --- a/tools/designer/src/lib/shared/plaintexteditor_p.h +++ b/tools/designer/src/lib/shared/plaintexteditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/plugindialog.cpp b/tools/designer/src/lib/shared/plugindialog.cpp index 447f1e2..c504625 100644 --- a/tools/designer/src/lib/shared/plugindialog.cpp +++ b/tools/designer/src/lib/shared/plugindialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/plugindialog.ui b/tools/designer/src/lib/shared/plugindialog.ui index b12a42d..3f40a43 100644 --- a/tools/designer/src/lib/shared/plugindialog.ui +++ b/tools/designer/src/lib/shared/plugindialog.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/plugindialog_p.h b/tools/designer/src/lib/shared/plugindialog_p.h index a2601d4..d8fcc66 100644 --- a/tools/designer/src/lib/shared/plugindialog_p.h +++ b/tools/designer/src/lib/shared/plugindialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/pluginmanager.cpp b/tools/designer/src/lib/shared/pluginmanager.cpp index 9dc8c7b..c6346a4 100644 --- a/tools/designer/src/lib/shared/pluginmanager.cpp +++ b/tools/designer/src/lib/shared/pluginmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/pluginmanager_p.h b/tools/designer/src/lib/shared/pluginmanager_p.h index e374f42..fb6f883 100644 --- a/tools/designer/src/lib/shared/pluginmanager_p.h +++ b/tools/designer/src/lib/shared/pluginmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp index 2cf362f..16d349f 100644 --- a/tools/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/tools/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/previewconfigurationwidget_p.h b/tools/designer/src/lib/shared/previewconfigurationwidget_p.h index 897ec4e..fbffd2b 100644 --- a/tools/designer/src/lib/shared/previewconfigurationwidget_p.h +++ b/tools/designer/src/lib/shared/previewconfigurationwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/previewmanager.cpp b/tools/designer/src/lib/shared/previewmanager.cpp index 8ed1772..ab2ed90 100644 --- a/tools/designer/src/lib/shared/previewmanager.cpp +++ b/tools/designer/src/lib/shared/previewmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/previewmanager_p.h b/tools/designer/src/lib/shared/previewmanager_p.h index 1060f3c..35f66e5 100644 --- a/tools/designer/src/lib/shared/previewmanager_p.h +++ b/tools/designer/src/lib/shared/previewmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/promotionmodel.cpp b/tools/designer/src/lib/shared/promotionmodel.cpp index 77d0bbb..af3aeb9 100644 --- a/tools/designer/src/lib/shared/promotionmodel.cpp +++ b/tools/designer/src/lib/shared/promotionmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/promotionmodel_p.h b/tools/designer/src/lib/shared/promotionmodel_p.h index d5843fc..bf88818 100644 --- a/tools/designer/src/lib/shared/promotionmodel_p.h +++ b/tools/designer/src/lib/shared/promotionmodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/promotiontaskmenu.cpp b/tools/designer/src/lib/shared/promotiontaskmenu.cpp index e458aab..4e05f14 100644 --- a/tools/designer/src/lib/shared/promotiontaskmenu.cpp +++ b/tools/designer/src/lib/shared/promotiontaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/promotiontaskmenu_p.h b/tools/designer/src/lib/shared/promotiontaskmenu_p.h index 223ce48..5eaff71 100644 --- a/tools/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/tools/designer/src/lib/shared/promotiontaskmenu_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/propertylineedit.cpp b/tools/designer/src/lib/shared/propertylineedit.cpp index a3b1efa..d101dbd 100644 --- a/tools/designer/src/lib/shared/propertylineedit.cpp +++ b/tools/designer/src/lib/shared/propertylineedit.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/propertylineedit_p.h b/tools/designer/src/lib/shared/propertylineedit_p.h index 42f0b3c..12ec643 100644 --- a/tools/designer/src/lib/shared/propertylineedit_p.h +++ b/tools/designer/src/lib/shared/propertylineedit_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_command.cpp b/tools/designer/src/lib/shared/qdesigner_command.cpp index 81d5917..f63e308 100644 --- a/tools/designer/src/lib/shared/qdesigner_command.cpp +++ b/tools/designer/src/lib/shared/qdesigner_command.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_command2.cpp b/tools/designer/src/lib/shared/qdesigner_command2.cpp index db534c0..3194cb2 100644 --- a/tools/designer/src/lib/shared/qdesigner_command2.cpp +++ b/tools/designer/src/lib/shared/qdesigner_command2.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_command2_p.h b/tools/designer/src/lib/shared/qdesigner_command2_p.h index e61222b..17de3de 100644 --- a/tools/designer/src/lib/shared/qdesigner_command2_p.h +++ b/tools/designer/src/lib/shared/qdesigner_command2_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_command_p.h b/tools/designer/src/lib/shared/qdesigner_command_p.h index 3a4ce2d..8b96189 100644 --- a/tools/designer/src/lib/shared/qdesigner_command_p.h +++ b/tools/designer/src/lib/shared/qdesigner_command_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_dnditem.cpp b/tools/designer/src/lib/shared/qdesigner_dnditem.cpp index 5dfbb65..3324cd6 100644 --- a/tools/designer/src/lib/shared/qdesigner_dnditem.cpp +++ b/tools/designer/src/lib/shared/qdesigner_dnditem.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_dnditem_p.h b/tools/designer/src/lib/shared/qdesigner_dnditem_p.h index cf36b39..09367c2 100644 --- a/tools/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/tools/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp b/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp index b678982..443e700 100644 --- a/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp +++ b/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h b/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h index f055908..eb45554 100644 --- a/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h +++ b/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp b/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp index 6394847..a9ad3a3 100644 --- a/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h b/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h index b982e1c..5b459b9 100644 --- a/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp b/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp index 5e5e661..ed8bc47 100644 --- a/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp +++ b/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h b/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h index b0fdd77..6868e7f 100644 --- a/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h +++ b/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp b/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp index 9d6d57e..d9747c3 100644 --- a/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp +++ b/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h b/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h index f640e66..de85a05 100644 --- a/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h +++ b/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp index 87213b4..b7ef7d1 100644 --- a/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp +++ b/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h b/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h index 61aee72..eb4f51d 100644 --- a/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h +++ b/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_integration.cpp b/tools/designer/src/lib/shared/qdesigner_integration.cpp index 02e0246..6adc145 100644 --- a/tools/designer/src/lib/shared/qdesigner_integration.cpp +++ b/tools/designer/src/lib/shared/qdesigner_integration.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_integration_p.h b/tools/designer/src/lib/shared/qdesigner_integration_p.h index 6938bfb..214600b 100644 --- a/tools/designer/src/lib/shared/qdesigner_integration_p.h +++ b/tools/designer/src/lib/shared/qdesigner_integration_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_introspection.cpp b/tools/designer/src/lib/shared/qdesigner_introspection.cpp index c512a97..e64be42 100644 --- a/tools/designer/src/lib/shared/qdesigner_introspection.cpp +++ b/tools/designer/src/lib/shared/qdesigner_introspection.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_introspection_p.h b/tools/designer/src/lib/shared/qdesigner_introspection_p.h index 89f4c53..327cead 100644 --- a/tools/designer/src/lib/shared/qdesigner_introspection_p.h +++ b/tools/designer/src/lib/shared/qdesigner_introspection_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_membersheet.cpp b/tools/designer/src/lib/shared/qdesigner_membersheet.cpp index e51d2fe..4d997c8 100644 --- a/tools/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/tools/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_membersheet_p.h b/tools/designer/src/lib/shared/qdesigner_membersheet_p.h index 695b808..ee426d4 100644 --- a/tools/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/tools/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_menu.cpp b/tools/designer/src/lib/shared/qdesigner_menu.cpp index 7aea52d..3359762 100644 --- a/tools/designer/src/lib/shared/qdesigner_menu.cpp +++ b/tools/designer/src/lib/shared/qdesigner_menu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_menu_p.h b/tools/designer/src/lib/shared/qdesigner_menu_p.h index ac3ec03..238b3cd 100644 --- a/tools/designer/src/lib/shared/qdesigner_menu_p.h +++ b/tools/designer/src/lib/shared/qdesigner_menu_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_menubar.cpp b/tools/designer/src/lib/shared/qdesigner_menubar.cpp index 97f1734..276e62a 100644 --- a/tools/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/tools/designer/src/lib/shared/qdesigner_menubar.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_menubar_p.h b/tools/designer/src/lib/shared/qdesigner_menubar_p.h index 7c8be4c..4bd5ec8 100644 --- a/tools/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/tools/designer/src/lib/shared/qdesigner_menubar_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp b/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp index 9cef55b..2a01ec5 100644 --- a/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp +++ b/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h b/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h index 5a4a163..f5ec917 100644 --- a/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h +++ b/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_promotion.cpp b/tools/designer/src/lib/shared/qdesigner_promotion.cpp index 526b521..889c5c9 100644 --- a/tools/designer/src/lib/shared/qdesigner_promotion.cpp +++ b/tools/designer/src/lib/shared/qdesigner_promotion.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_promotion_p.h b/tools/designer/src/lib/shared/qdesigner_promotion_p.h index 6806b4c..710900f 100644 --- a/tools/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/tools/designer/src/lib/shared/qdesigner_promotion_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 8453c16..d52f78d 100644 --- a/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h b/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h index d371df8..35e1e78 100644 --- a/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h +++ b/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp index ff3b50b..6bb98e1 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h b/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h index 6b9722f..b664f4f 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h +++ b/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp index 7c7d9d7..c088dd6 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h b/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h index a979fde..254f3b5 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h +++ b/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp index 7abbde7..5fcf6fd 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h index 8a25baf..8c5ec46 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h +++ b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_qsettings.cpp b/tools/designer/src/lib/shared/qdesigner_qsettings.cpp index efea643..b5116ad 100644 --- a/tools/designer/src/lib/shared/qdesigner_qsettings.cpp +++ b/tools/designer/src/lib/shared/qdesigner_qsettings.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_qsettings_p.h b/tools/designer/src/lib/shared/qdesigner_qsettings_p.h index 2ca749b..6b296c1 100644 --- a/tools/designer/src/lib/shared/qdesigner_qsettings_p.h +++ b/tools/designer/src/lib/shared/qdesigner_qsettings_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp b/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp index c36ab9a..f09b6ae 100644 --- a/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp +++ b/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h b/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h index a48dd94..4070cfd 100644 --- a/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h +++ b/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp b/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp index 903b066..0ac8371 100644 --- a/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp +++ b/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h b/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h index b5af372..75d100e 100644 --- a/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h +++ b/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp b/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp index cce0528..c20e519 100644 --- a/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h b/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h index db5807b..6beba1b 100644 --- a/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp index cb77801..29211f5 100644 --- a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_toolbar_p.h b/tools/designer/src/lib/shared/qdesigner_toolbar_p.h index fd14eb4..992ce79 100644 --- a/tools/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/tools/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_toolbox.cpp b/tools/designer/src/lib/shared/qdesigner_toolbox.cpp index 46c8ffe..8409bde 100644 --- a/tools/designer/src/lib/shared/qdesigner_toolbox.cpp +++ b/tools/designer/src/lib/shared/qdesigner_toolbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_toolbox_p.h b/tools/designer/src/lib/shared/qdesigner_toolbox_p.h index fdd738a..89a96fc 100644 --- a/tools/designer/src/lib/shared/qdesigner_toolbox_p.h +++ b/tools/designer/src/lib/shared/qdesigner_toolbox_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp index d2f092e..fcb7f27 100644 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_utils_p.h b/tools/designer/src/lib/shared/qdesigner_utils_p.h index 85b3090..b822b4d 100644 --- a/tools/designer/src/lib/shared/qdesigner_utils_p.h +++ b/tools/designer/src/lib/shared/qdesigner_utils_p.h @@ -7,11 +7,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widget.cpp b/tools/designer/src/lib/shared/qdesigner_widget.cpp index 6d2be17..1d2e001 100644 --- a/tools/designer/src/lib/shared/qdesigner_widget.cpp +++ b/tools/designer/src/lib/shared/qdesigner_widget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widget_p.h b/tools/designer/src/lib/shared/qdesigner_widget_p.h index 77d3934..c9d1b0a 100644 --- a/tools/designer/src/lib/shared/qdesigner_widget_p.h +++ b/tools/designer/src/lib/shared/qdesigner_widget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp b/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp index 5ba8ad7..d0d7ca6 100644 --- a/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp +++ b/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h b/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h index bec0081..aaf1050 100644 --- a/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h +++ b/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp b/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp index 029ee89..490397f 100644 --- a/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp +++ b/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h b/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h index 1d8ff3e..109f30e 100644 --- a/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h +++ b/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qlayout_widget.cpp b/tools/designer/src/lib/shared/qlayout_widget.cpp index c0986ce..0d97c8d 100644 --- a/tools/designer/src/lib/shared/qlayout_widget.cpp +++ b/tools/designer/src/lib/shared/qlayout_widget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qlayout_widget_p.h b/tools/designer/src/lib/shared/qlayout_widget_p.h index 7856088..e0e87f6 100644 --- a/tools/designer/src/lib/shared/qlayout_widget_p.h +++ b/tools/designer/src/lib/shared/qlayout_widget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qscripthighlighter.cpp b/tools/designer/src/lib/shared/qscripthighlighter.cpp index 3f1d638..102e0ec 100644 --- a/tools/designer/src/lib/shared/qscripthighlighter.cpp +++ b/tools/designer/src/lib/shared/qscripthighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qscripthighlighter_p.h b/tools/designer/src/lib/shared/qscripthighlighter_p.h index 9530ba2..2b01c3f 100644 --- a/tools/designer/src/lib/shared/qscripthighlighter_p.h +++ b/tools/designer/src/lib/shared/qscripthighlighter_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qsimpleresource.cpp b/tools/designer/src/lib/shared/qsimpleresource.cpp index 8d29002..65c613b 100644 --- a/tools/designer/src/lib/shared/qsimpleresource.cpp +++ b/tools/designer/src/lib/shared/qsimpleresource.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qsimpleresource_p.h b/tools/designer/src/lib/shared/qsimpleresource_p.h index 8d45c3c..5e24dc5 100644 --- a/tools/designer/src/lib/shared/qsimpleresource_p.h +++ b/tools/designer/src/lib/shared/qsimpleresource_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp index adddf72..2038bed 100644 --- a/tools/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/tools/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h index f2531d9..9a1d3eb 100644 --- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h +++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp index e6152be..1335e15 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel.cpp +++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h index 726db29..2ff36d8 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel_p.h +++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourceview.cpp b/tools/designer/src/lib/shared/qtresourceview.cpp index d956491..4779419 100644 --- a/tools/designer/src/lib/shared/qtresourceview.cpp +++ b/tools/designer/src/lib/shared/qtresourceview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h index 33162c5..f996ba8 100644 --- a/tools/designer/src/lib/shared/qtresourceview_p.h +++ b/tools/designer/src/lib/shared/qtresourceview_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/richtexteditor.cpp b/tools/designer/src/lib/shared/richtexteditor.cpp index 8aa036b..54fc2c9 100644 --- a/tools/designer/src/lib/shared/richtexteditor.cpp +++ b/tools/designer/src/lib/shared/richtexteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/richtexteditor_p.h b/tools/designer/src/lib/shared/richtexteditor_p.h index 5341fbb..c94df93 100644 --- a/tools/designer/src/lib/shared/richtexteditor_p.h +++ b/tools/designer/src/lib/shared/richtexteditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scriptcommand.cpp b/tools/designer/src/lib/shared/scriptcommand.cpp index 5261562..7bd6ada 100644 --- a/tools/designer/src/lib/shared/scriptcommand.cpp +++ b/tools/designer/src/lib/shared/scriptcommand.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scriptcommand_p.h b/tools/designer/src/lib/shared/scriptcommand_p.h index 45cc588..09ba3b5 100644 --- a/tools/designer/src/lib/shared/scriptcommand_p.h +++ b/tools/designer/src/lib/shared/scriptcommand_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scriptdialog.cpp b/tools/designer/src/lib/shared/scriptdialog.cpp index 616f0c9..e2d7a94 100644 --- a/tools/designer/src/lib/shared/scriptdialog.cpp +++ b/tools/designer/src/lib/shared/scriptdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scriptdialog_p.h b/tools/designer/src/lib/shared/scriptdialog_p.h index 418cc1e..2ad8bc0 100644 --- a/tools/designer/src/lib/shared/scriptdialog_p.h +++ b/tools/designer/src/lib/shared/scriptdialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scripterrordialog.cpp b/tools/designer/src/lib/shared/scripterrordialog.cpp index c4a7e07..056d169 100644 --- a/tools/designer/src/lib/shared/scripterrordialog.cpp +++ b/tools/designer/src/lib/shared/scripterrordialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/scripterrordialog_p.h b/tools/designer/src/lib/shared/scripterrordialog_p.h index 2a8b89a..2fe9808 100644 --- a/tools/designer/src/lib/shared/scripterrordialog_p.h +++ b/tools/designer/src/lib/shared/scripterrordialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/shared_enums_p.h b/tools/designer/src/lib/shared/shared_enums_p.h index 838b9d0..7223a9e 100644 --- a/tools/designer/src/lib/shared/shared_enums_p.h +++ b/tools/designer/src/lib/shared/shared_enums_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/shared_global_p.h b/tools/designer/src/lib/shared/shared_global_p.h index 277472c..be09019 100644 --- a/tools/designer/src/lib/shared/shared_global_p.h +++ b/tools/designer/src/lib/shared/shared_global_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/shared_settings.cpp b/tools/designer/src/lib/shared/shared_settings.cpp index c97dd3b..1fc5f4e 100644 --- a/tools/designer/src/lib/shared/shared_settings.cpp +++ b/tools/designer/src/lib/shared/shared_settings.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/shared_settings_p.h b/tools/designer/src/lib/shared/shared_settings_p.h index c021b00..c1f2ba0 100644 --- a/tools/designer/src/lib/shared/shared_settings_p.h +++ b/tools/designer/src/lib/shared/shared_settings_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/sheet_delegate.cpp b/tools/designer/src/lib/shared/sheet_delegate.cpp index c0722bb..bec7cc3 100644 --- a/tools/designer/src/lib/shared/sheet_delegate.cpp +++ b/tools/designer/src/lib/shared/sheet_delegate.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/sheet_delegate_p.h b/tools/designer/src/lib/shared/sheet_delegate_p.h index a3d70df..cb8b4f1 100644 --- a/tools/designer/src/lib/shared/sheet_delegate_p.h +++ b/tools/designer/src/lib/shared/sheet_delegate_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/signalslotdialog.cpp b/tools/designer/src/lib/shared/signalslotdialog.cpp index a23d228..67d2db3 100644 --- a/tools/designer/src/lib/shared/signalslotdialog.cpp +++ b/tools/designer/src/lib/shared/signalslotdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/signalslotdialog_p.h b/tools/designer/src/lib/shared/signalslotdialog_p.h index 434b73f..471fcf1 100644 --- a/tools/designer/src/lib/shared/signalslotdialog_p.h +++ b/tools/designer/src/lib/shared/signalslotdialog_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/spacer_widget.cpp b/tools/designer/src/lib/shared/spacer_widget.cpp index 8256bf7..a85d4f4 100644 --- a/tools/designer/src/lib/shared/spacer_widget.cpp +++ b/tools/designer/src/lib/shared/spacer_widget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/spacer_widget_p.h b/tools/designer/src/lib/shared/spacer_widget_p.h index 2b90813..ea1a53e 100644 --- a/tools/designer/src/lib/shared/spacer_widget_p.h +++ b/tools/designer/src/lib/shared/spacer_widget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/stylesheeteditor.cpp b/tools/designer/src/lib/shared/stylesheeteditor.cpp index 2056fcf..446dd32 100644 --- a/tools/designer/src/lib/shared/stylesheeteditor.cpp +++ b/tools/designer/src/lib/shared/stylesheeteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/stylesheeteditor_p.h b/tools/designer/src/lib/shared/stylesheeteditor_p.h index c9fd682..787495a 100644 --- a/tools/designer/src/lib/shared/stylesheeteditor_p.h +++ b/tools/designer/src/lib/shared/stylesheeteditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/textpropertyeditor.cpp b/tools/designer/src/lib/shared/textpropertyeditor.cpp index 95a9f85..d7f7f87 100644 --- a/tools/designer/src/lib/shared/textpropertyeditor.cpp +++ b/tools/designer/src/lib/shared/textpropertyeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/textpropertyeditor_p.h b/tools/designer/src/lib/shared/textpropertyeditor_p.h index d921135..0067c57 100644 --- a/tools/designer/src/lib/shared/textpropertyeditor_p.h +++ b/tools/designer/src/lib/shared/textpropertyeditor_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/widgetdatabase.cpp b/tools/designer/src/lib/shared/widgetdatabase.cpp index e452eab..f0dbeeb 100644 --- a/tools/designer/src/lib/shared/widgetdatabase.cpp +++ b/tools/designer/src/lib/shared/widgetdatabase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/widgetdatabase_p.h b/tools/designer/src/lib/shared/widgetdatabase_p.h index 4414bbe..61be31d 100644 --- a/tools/designer/src/lib/shared/widgetdatabase_p.h +++ b/tools/designer/src/lib/shared/widgetdatabase_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp index 3822fec..6e68212 100644 --- a/tools/designer/src/lib/shared/widgetfactory.cpp +++ b/tools/designer/src/lib/shared/widgetfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/widgetfactory_p.h b/tools/designer/src/lib/shared/widgetfactory_p.h index 1a053ed..eda73c2 100644 --- a/tools/designer/src/lib/shared/widgetfactory_p.h +++ b/tools/designer/src/lib/shared/widgetfactory_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/zoomwidget.cpp b/tools/designer/src/lib/shared/zoomwidget.cpp index f4ab48e..b95a5ac 100644 --- a/tools/designer/src/lib/shared/zoomwidget.cpp +++ b/tools/designer/src/lib/shared/zoomwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/shared/zoomwidget_p.h b/tools/designer/src/lib/shared/zoomwidget_p.h index fe850f7..9371ac6 100644 --- a/tools/designer/src/lib/shared/zoomwidget_p.h +++ b/tools/designer/src/lib/shared/zoomwidget_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp index 4dae28e..f53d4da 100644 --- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.h b/tools/designer/src/lib/uilib/abstractformbuilder.h index 94429f8..1b5fe00 100644 --- a/tools/designer/src/lib/uilib/abstractformbuilder.h +++ b/tools/designer/src/lib/uilib/abstractformbuilder.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/container.h b/tools/designer/src/lib/uilib/container.h index e107ad7..48467d2 100644 --- a/tools/designer/src/lib/uilib/container.h +++ b/tools/designer/src/lib/uilib/container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/customwidget.h b/tools/designer/src/lib/uilib/customwidget.h index 0da4c05..793feac 100644 --- a/tools/designer/src/lib/uilib/customwidget.h +++ b/tools/designer/src/lib/uilib/customwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp index 414eb14..b1bc7aa 100644 --- a/tools/designer/src/lib/uilib/formbuilder.cpp +++ b/tools/designer/src/lib/uilib/formbuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formbuilder.h b/tools/designer/src/lib/uilib/formbuilder.h index a9fe900..f82d8cd 100644 --- a/tools/designer/src/lib/uilib/formbuilder.h +++ b/tools/designer/src/lib/uilib/formbuilder.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formbuilderextra.cpp b/tools/designer/src/lib/uilib/formbuilderextra.cpp index cb82967..43a281a 100644 --- a/tools/designer/src/lib/uilib/formbuilderextra.cpp +++ b/tools/designer/src/lib/uilib/formbuilderextra.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formbuilderextra_p.h b/tools/designer/src/lib/uilib/formbuilderextra_p.h index f357239..8c2d638 100644 --- a/tools/designer/src/lib/uilib/formbuilderextra_p.h +++ b/tools/designer/src/lib/uilib/formbuilderextra_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formscriptrunner.cpp b/tools/designer/src/lib/uilib/formscriptrunner.cpp index d07673a..1f959ea 100644 --- a/tools/designer/src/lib/uilib/formscriptrunner.cpp +++ b/tools/designer/src/lib/uilib/formscriptrunner.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/formscriptrunner_p.h b/tools/designer/src/lib/uilib/formscriptrunner_p.h index f53120c..c50bd2d 100644 --- a/tools/designer/src/lib/uilib/formscriptrunner_p.h +++ b/tools/designer/src/lib/uilib/formscriptrunner_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/properties.cpp b/tools/designer/src/lib/uilib/properties.cpp index 2cf9bf9..d08b50a 100644 --- a/tools/designer/src/lib/uilib/properties.cpp +++ b/tools/designer/src/lib/uilib/properties.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/properties_p.h b/tools/designer/src/lib/uilib/properties_p.h index bc02ad5..005125b 100644 --- a/tools/designer/src/lib/uilib/properties_p.h +++ b/tools/designer/src/lib/uilib/properties_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/qdesignerexportwidget.h b/tools/designer/src/lib/uilib/qdesignerexportwidget.h index c50f34c..1762bfd 100644 --- a/tools/designer/src/lib/uilib/qdesignerexportwidget.h +++ b/tools/designer/src/lib/uilib/qdesignerexportwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/resourcebuilder.cpp b/tools/designer/src/lib/uilib/resourcebuilder.cpp index 3679f92..be4a81e 100644 --- a/tools/designer/src/lib/uilib/resourcebuilder.cpp +++ b/tools/designer/src/lib/uilib/resourcebuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/resourcebuilder_p.h b/tools/designer/src/lib/uilib/resourcebuilder_p.h index 5274b2d..32570ce 100644 --- a/tools/designer/src/lib/uilib/resourcebuilder_p.h +++ b/tools/designer/src/lib/uilib/resourcebuilder_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/textbuilder.cpp b/tools/designer/src/lib/uilib/textbuilder.cpp index 4219d14..aceb274 100644 --- a/tools/designer/src/lib/uilib/textbuilder.cpp +++ b/tools/designer/src/lib/uilib/textbuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/textbuilder_p.h b/tools/designer/src/lib/uilib/textbuilder_p.h index fb0b981..eb43e1c 100644 --- a/tools/designer/src/lib/uilib/textbuilder_p.h +++ b/tools/designer/src/lib/uilib/textbuilder_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/ui4.cpp b/tools/designer/src/lib/uilib/ui4.cpp index 2047739..778c584 100644 --- a/tools/designer/src/lib/uilib/ui4.cpp +++ b/tools/designer/src/lib/uilib/ui4.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/ui4_p.h b/tools/designer/src/lib/uilib/ui4_p.h index df02a39..73859c0 100644 --- a/tools/designer/src/lib/uilib/ui4_p.h +++ b/tools/designer/src/lib/uilib/ui4_p.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/lib/uilib/uilib_global.h b/tools/designer/src/lib/uilib/uilib_global.h index 796fa79..b9dfcdb 100644 --- a/tools/designer/src/lib/uilib/uilib_global.h +++ b/tools/designer/src/lib/uilib/uilib_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp index 369cd7f..495a683 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h index 343bb76..c8c864d 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h +++ b/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp index f80df14..814b0f2 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h index 662c490..0143a26 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h +++ b/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp index f94da88..ecf44d4 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h index 64caf3c..5ccd565 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h +++ b/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index 96b209f..de1948e 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h index 9520673..541929f 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h +++ b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp index 48245f1..84e7503 100644 --- a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp +++ b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h index 290ce8f..a759eb0 100644 --- a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h +++ b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/phononcollection.cpp b/tools/designer/src/plugins/phononwidgets/phononcollection.cpp index 3d32fd4..f02f66c 100644 --- a/tools/designer/src/plugins/phononwidgets/phononcollection.cpp +++ b/tools/designer/src/plugins/phononwidgets/phononcollection.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp index 9bb1317..301b25e 100644 --- a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp +++ b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h index 6facefe..bc171ae 100644 --- a/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h +++ b/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp index a111b1a..f46db33 100644 --- a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp +++ b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h index 1f88dc6..d02129d 100644 --- a/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h +++ b/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp index 9c1f2f7..a5a5855 100644 --- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp +++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h index d58d62d..b8936bf 100644 --- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h +++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp index 61625cc..d007242 100644 --- a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp +++ b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h index 02c5fe1..be1d3c6 100644 --- a/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h +++ b/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp b/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp index 9b0932a..280a8a0 100644 --- a/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp +++ b/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/qwebview/qwebview_plugin.h b/tools/designer/src/plugins/qwebview/qwebview_plugin.h index 345daa7..bd6f5f8 100644 --- a/tools/designer/src/plugins/qwebview/qwebview_plugin.h +++ b/tools/designer/src/plugins/qwebview/qwebview_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d.cpp b/tools/designer/src/plugins/tools/view3d/view3d.cpp index 97d9097..66176f8 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d.cpp +++ b/tools/designer/src/plugins/tools/view3d/view3d.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d.h b/tools/designer/src/plugins/tools/view3d/view3d.h index bc6b583..fd1777e 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d.h +++ b/tools/designer/src/plugins/tools/view3d/view3d.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d_global.h b/tools/designer/src/plugins/tools/view3d/view3d_global.h index 90c8ce2..1a8a08b 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d_global.h +++ b/tools/designer/src/plugins/tools/view3d/view3d_global.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp b/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp index a599e7e..04669e5 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp +++ b/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d_plugin.h b/tools/designer/src/plugins/tools/view3d/view3d_plugin.h index a9db8a6..c211b08 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d_plugin.h +++ b/tools/designer/src/plugins/tools/view3d/view3d_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp b/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp index 05015c3..2aa7938 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp +++ b/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/tools/view3d/view3d_tool.h b/tools/designer/src/plugins/tools/view3d/view3d_tool.h index d099019..e21921e 100644 --- a/tools/designer/src/plugins/tools/view3d/view3d_tool.h +++ b/tools/designer/src/plugins/tools/view3d/view3d_tool.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp index 3f0b0b5..b033d81 100644 --- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h index bd07bf6..dc6bf97 100644 --- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp index 6d85326..1c740bb 100644 --- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h index 982bbf3..e3ee9dc 100644 --- a/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h +++ b/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp index 36a6fc1..4bfd2b6 100644 --- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h index ddfa83f..d10f189 100644 --- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp index ab383f5..29252ab 100644 --- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h index e48f898..fbab5fb 100644 --- a/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h +++ b/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp index 8ba507d..294c277 100644 --- a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h index 15fb0dc..fdbe39c 100644 --- a/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp index 16e4179..81ec08c 100644 --- a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h index 85e35c6..e50637f 100644 --- a/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h +++ b/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp index f0bebd5..8372125 100644 --- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp +++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h index ad44265..73c8b68 100644 --- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h +++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp index dd21833..4dc9f6b 100644 --- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h index 524506f..6948d7f 100644 --- a/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h +++ b/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp index 8353466..8ffd070 100644 --- a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h index 6dc7a30..504c2ac 100644 --- a/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp index 142a15b..d42abd6 100644 --- a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h index 0a23e97..0705c5c 100644 --- a/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h +++ b/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp index f60c395..44ff845 100644 --- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h index 3ccc211..e5167b5 100644 --- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp index 804c4cd..059bcc7 100644 --- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h index 7ab94c7..2e8d471 100644 --- a/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h +++ b/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp index 0ad538c..4d12884 100644 --- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp +++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h index c2e3c54..a73c39e 100644 --- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h +++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp index 1f5debe..e8b1a53 100644 --- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h index 7cb85bb..b72d494 100644 --- a/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h +++ b/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp index faf3da6..db6fd78 100644 --- a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp +++ b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h index 76a14c5..8268efd 100644 --- a/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h +++ b/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp index 9482d4b..0db8795 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp +++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h index 3d6045d..58df92d 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h +++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp index 61907a6..cbf0f21 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h index bbe85ff..d618041 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h +++ b/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp index adb3d56..640d161 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp +++ b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h index 5c35514..745080b 100644 --- a/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h +++ b/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp index 57252b9..672d237 100644 --- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp +++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h index 1e28176..cf8374b 100644 --- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h +++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp index bdd6ddc..796f551 100644 --- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp +++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h index f21dfd3..5a569e0 100644 --- a/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h +++ b/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp b/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp index eafcf7a..b2bab30 100644 --- a/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp +++ b/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp index d3d1d54..db72183 100644 --- a/tools/designer/src/uitools/quiloader.cpp +++ b/tools/designer/src/uitools/quiloader.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h index 6543ba8..379bdb5 100644 --- a/tools/designer/src/uitools/quiloader.h +++ b/tools/designer/src/uitools/quiloader.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/designer/src/uitools/quiloader_p.h b/tools/designer/src/uitools/quiloader_p.h index 6441106..f4811c9 100644 --- a/tools/designer/src/uitools/quiloader_p.h +++ b/tools/designer/src/uitools/quiloader_p.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Designer 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/build.bat b/tools/installer/batch/build.bat index ee90f92..dff1f29 100755 --- a/tools/installer/batch/build.bat +++ b/tools/installer/batch/build.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/copy.bat b/tools/installer/batch/copy.bat index 0fcb5a6..5003c13 100755 --- a/tools/installer/batch/copy.bat +++ b/tools/installer/batch/copy.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/delete.bat b/tools/installer/batch/delete.bat index 1174cde..e4800b8 100755 --- a/tools/installer/batch/delete.bat +++ b/tools/installer/batch/delete.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/env.bat b/tools/installer/batch/env.bat index cbea4f5..8ad7918 100755 --- a/tools/installer/batch/env.bat +++ b/tools/installer/batch/env.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/extract.bat b/tools/installer/batch/extract.bat index 59554bc..89228dc 100755 --- a/tools/installer/batch/extract.bat +++ b/tools/installer/batch/extract.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/installer.bat b/tools/installer/batch/installer.bat index c5c51de..d5b2b8c 100755 --- a/tools/installer/batch/installer.bat +++ b/tools/installer/batch/installer.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/log.bat b/tools/installer/batch/log.bat index 094df8f..6abe49d 100755 --- a/tools/installer/batch/log.bat +++ b/tools/installer/batch/log.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/batch/toupper.bat b/tools/installer/batch/toupper.bat index 5e19f0f..f7e1747 100755 --- a/tools/installer/batch/toupper.bat +++ b/tools/installer/batch/toupper.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/config/config.default.sample b/tools/installer/config/config.default.sample index c6e79e4..c823ae0 100644 --- a/tools/installer/config/config.default.sample +++ b/tools/installer/config/config.default.sample @@ -6,11 +6,11 @@ ## This file is part of the tools applications 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 either Technology Preview License Agreement or the -## Beta Release License Agreement. +## Commercial Usage +## Licensees holding valid Qt Commercial licenses may use this file in +## accordance with the Qt Commercial License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Nokia. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/config/mingw-opensource.conf b/tools/installer/config/mingw-opensource.conf index b01c2a1..21b822c 100644 --- a/tools/installer/config/mingw-opensource.conf +++ b/tools/installer/config/mingw-opensource.conf @@ -6,11 +6,11 @@ ## This file is part of the tools applications 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 either Technology Preview License Agreement or the -## Beta Release License Agreement. +## Commercial Usage +## Licensees holding valid Qt Commercial licenses may use this file in +## accordance with the Qt Commercial License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Nokia. ## ## GNU Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/iwmake.bat b/tools/installer/iwmake.bat index ee1158d..ea72246 100755 --- a/tools/installer/iwmake.bat +++ b/tools/installer/iwmake.bat @@ -6,11 +6,11 @@ :: This file is part of the tools applications 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 either Technology Preview License Agreement or the -:: Beta Release License Agreement. +:: Commercial Usage +:: Licensees holding valid Qt Commercial licenses may use this file in +:: accordance with the Qt Commercial License Agreement provided with the +:: Software or, alternatively, in accordance with the terms contained in +:: a written agreement between you and Nokia. :: :: GNU Lesser General Public License Usage :: Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini index 8790e83..adc8d61 100644 --- a/tools/installer/nsis/confirmpage.ini +++ b/tools/installer/nsis/confirmpage.ini @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini index 05c5952..62c69a6 100644 --- a/tools/installer/nsis/gwdownload.ini +++ b/tools/installer/nsis/gwdownload.ini @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini index 9525164..ae480fd 100644 --- a/tools/installer/nsis/gwmirror.ini +++ b/tools/installer/nsis/gwmirror.ini @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh index c124018..1df2e77 100644 --- a/tools/installer/nsis/includes/global.nsh +++ b/tools/installer/nsis/includes/global.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh index 859b004..a88deb9 100644 --- a/tools/installer/nsis/includes/instdir.nsh +++ b/tools/installer/nsis/includes/instdir.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh index c553f67..fd8dc08 100644 --- a/tools/installer/nsis/includes/list.nsh +++ b/tools/installer/nsis/includes/list.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh index 72a5211..df21099 100644 --- a/tools/installer/nsis/includes/qtcommon.nsh +++ b/tools/installer/nsis/includes/qtcommon.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh index 9232093..404d02e 100644 --- a/tools/installer/nsis/includes/qtenv.nsh +++ b/tools/installer/nsis/includes/qtenv.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh index f7cbec4..86b4f74 100644 --- a/tools/installer/nsis/includes/system.nsh +++ b/tools/installer/nsis/includes/system.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi index c077850..361982e 100644 --- a/tools/installer/nsis/installer.nsi +++ b/tools/installer/nsis/installer.nsi @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh index 0f6013b..a77c329 100644 --- a/tools/installer/nsis/modules/environment.nsh +++ b/tools/installer/nsis/modules/environment.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh index 8485178..de82990 100644 --- a/tools/installer/nsis/modules/mingw.nsh +++ b/tools/installer/nsis/modules/mingw.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh index 3657ba8..852bb94 100644 --- a/tools/installer/nsis/modules/opensource.nsh +++ b/tools/installer/nsis/modules/opensource.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh index a335097..b5ff4f3 100644 --- a/tools/installer/nsis/modules/registeruiext.nsh +++ b/tools/installer/nsis/modules/registeruiext.nsh @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini index 334dc5d..6af3b51 100644 --- a/tools/installer/nsis/opensource.ini +++ b/tools/installer/nsis/opensource.ini @@ -6,11 +6,11 @@ ;; This file is part of the tools applications 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 either Technology Preview License Agreement or the -;; Beta Release License Agreement. +;; Commercial Usage +;; Licensees holding valid Qt Commercial licenses may use this file in +;; accordance with the Qt Commercial License Agreement provided with the +;; Software or, alternatively, in accordance with the terms contained in +;; a written agreement between you and Nokia. ;; ;; GNU Lesser General Public License Usage ;; Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index 9ccc60e..f8cea15 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/batchtranslation.ui b/tools/linguist/linguist/batchtranslation.ui index 4824dfb..df15f7b 100644 --- a/tools/linguist/linguist/batchtranslation.ui +++ b/tools/linguist/linguist/batchtranslation.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/batchtranslationdialog.cpp b/tools/linguist/linguist/batchtranslationdialog.cpp index 101ad97..6bd9fe5 100644 --- a/tools/linguist/linguist/batchtranslationdialog.cpp +++ b/tools/linguist/linguist/batchtranslationdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/batchtranslationdialog.h b/tools/linguist/linguist/batchtranslationdialog.h index 1ceeb6e..19feb45 100644 --- a/tools/linguist/linguist/batchtranslationdialog.h +++ b/tools/linguist/linguist/batchtranslationdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/errorsview.cpp b/tools/linguist/linguist/errorsview.cpp index 9ffebaa..ab00c58 100644 --- a/tools/linguist/linguist/errorsview.cpp +++ b/tools/linguist/linguist/errorsview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/errorsview.h b/tools/linguist/linguist/errorsview.h index bc6097b..225a1c3 100644 --- a/tools/linguist/linguist/errorsview.h +++ b/tools/linguist/linguist/errorsview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp index ae243ea..46607b6 100644 --- a/tools/linguist/linguist/finddialog.cpp +++ b/tools/linguist/linguist/finddialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h index a9fc146..7c14363 100644 --- a/tools/linguist/linguist/finddialog.h +++ b/tools/linguist/linguist/finddialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/finddialog.ui b/tools/linguist/linguist/finddialog.ui index fd1c4a1..536c83d 100644 --- a/tools/linguist/linguist/finddialog.ui +++ b/tools/linguist/linguist/finddialog.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/formpreviewview.cpp b/tools/linguist/linguist/formpreviewview.cpp index 184f01b..ae64781 100644 --- a/tools/linguist/linguist/formpreviewview.cpp +++ b/tools/linguist/linguist/formpreviewview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/formpreviewview.h b/tools/linguist/linguist/formpreviewview.h index 5923f24..b32e3f3 100644 --- a/tools/linguist/linguist/formpreviewview.h +++ b/tools/linguist/linguist/formpreviewview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp index 018fbc5..57baab9 100644 --- a/tools/linguist/linguist/main.cpp +++ b/tools/linguist/linguist/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp index 84200d4..d4d0068 100644 --- a/tools/linguist/linguist/mainwindow.cpp +++ b/tools/linguist/linguist/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/mainwindow.h b/tools/linguist/linguist/mainwindow.h index 9f6b4d9..d03981f 100644 --- a/tools/linguist/linguist/mainwindow.h +++ b/tools/linguist/linguist/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/mainwindow.ui b/tools/linguist/linguist/mainwindow.ui index 6cc74ac..812fe7d 100644 --- a/tools/linguist/linguist/mainwindow.ui +++ b/tools/linguist/linguist/mainwindow.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp index dc8b8e4..43c8435 100644 --- a/tools/linguist/linguist/messageeditor.cpp +++ b/tools/linguist/linguist/messageeditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messageeditor.h b/tools/linguist/linguist/messageeditor.h index de563ec..f53c485 100644 --- a/tools/linguist/linguist/messageeditor.h +++ b/tools/linguist/linguist/messageeditor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messageeditorwidgets.cpp b/tools/linguist/linguist/messageeditorwidgets.cpp index 7412571..f0504b3 100644 --- a/tools/linguist/linguist/messageeditorwidgets.cpp +++ b/tools/linguist/linguist/messageeditorwidgets.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messageeditorwidgets.h b/tools/linguist/linguist/messageeditorwidgets.h index b1609e5..d1a9809 100644 --- a/tools/linguist/linguist/messageeditorwidgets.h +++ b/tools/linguist/linguist/messageeditorwidgets.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messagehighlighter.cpp b/tools/linguist/linguist/messagehighlighter.cpp index 4965582..aa43de0 100644 --- a/tools/linguist/linguist/messagehighlighter.cpp +++ b/tools/linguist/linguist/messagehighlighter.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messagehighlighter.h b/tools/linguist/linguist/messagehighlighter.h index 0fd061b..9c580cc 100644 --- a/tools/linguist/linguist/messagehighlighter.h +++ b/tools/linguist/linguist/messagehighlighter.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp index 7a8063b..ddb7b49 100644 --- a/tools/linguist/linguist/messagemodel.cpp +++ b/tools/linguist/linguist/messagemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/messagemodel.h b/tools/linguist/linguist/messagemodel.h index 3b75f7a..4969292 100644 --- a/tools/linguist/linguist/messagemodel.h +++ b/tools/linguist/linguist/messagemodel.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp index 300f6e8..6c16a47 100644 --- a/tools/linguist/linguist/phrase.cpp +++ b/tools/linguist/linguist/phrase.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrase.h b/tools/linguist/linguist/phrase.h index 6747c80..3d026a8 100644 --- a/tools/linguist/linguist/phrase.h +++ b/tools/linguist/linguist/phrase.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp index 50749d7..e2306a4 100644 --- a/tools/linguist/linguist/phrasebookbox.cpp +++ b/tools/linguist/linguist/phrasebookbox.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h index b34cae5..7b73df1 100644 --- a/tools/linguist/linguist/phrasebookbox.h +++ b/tools/linguist/linguist/phrasebookbox.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrasebookbox.ui b/tools/linguist/linguist/phrasebookbox.ui index 32c51f6..884a1e8 100644 --- a/tools/linguist/linguist/phrasebookbox.ui +++ b/tools/linguist/linguist/phrasebookbox.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrasemodel.cpp b/tools/linguist/linguist/phrasemodel.cpp index 5368978..c39520e 100644 --- a/tools/linguist/linguist/phrasemodel.cpp +++ b/tools/linguist/linguist/phrasemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phrasemodel.h b/tools/linguist/linguist/phrasemodel.h index 4013a0b..3790642 100644 --- a/tools/linguist/linguist/phrasemodel.h +++ b/tools/linguist/linguist/phrasemodel.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phraseview.cpp b/tools/linguist/linguist/phraseview.cpp index 72c27dc..c5a963f 100644 --- a/tools/linguist/linguist/phraseview.cpp +++ b/tools/linguist/linguist/phraseview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/phraseview.h b/tools/linguist/linguist/phraseview.h index 39a5355..c81f9c3 100644 --- a/tools/linguist/linguist/phraseview.h +++ b/tools/linguist/linguist/phraseview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp index 924180c..6026343 100644 --- a/tools/linguist/linguist/printout.cpp +++ b/tools/linguist/linguist/printout.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/printout.h b/tools/linguist/linguist/printout.h index 11ffa63..cc407e3 100644 --- a/tools/linguist/linguist/printout.h +++ b/tools/linguist/linguist/printout.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/recentfiles.cpp b/tools/linguist/linguist/recentfiles.cpp index 6fc72f7..570bc84 100644 --- a/tools/linguist/linguist/recentfiles.cpp +++ b/tools/linguist/linguist/recentfiles.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/recentfiles.h b/tools/linguist/linguist/recentfiles.h index d0d25eb..a9e387d 100644 --- a/tools/linguist/linguist/recentfiles.h +++ b/tools/linguist/linguist/recentfiles.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/sourcecodeview.cpp b/tools/linguist/linguist/sourcecodeview.cpp index c948d77..93d0c87 100644 --- a/tools/linguist/linguist/sourcecodeview.cpp +++ b/tools/linguist/linguist/sourcecodeview.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/sourcecodeview.h b/tools/linguist/linguist/sourcecodeview.h index 99a28c5..30e85b3 100644 --- a/tools/linguist/linguist/sourcecodeview.h +++ b/tools/linguist/linguist/sourcecodeview.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/statistics.cpp b/tools/linguist/linguist/statistics.cpp index 2cd197f..079f010 100644 --- a/tools/linguist/linguist/statistics.cpp +++ b/tools/linguist/linguist/statistics.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/statistics.h b/tools/linguist/linguist/statistics.h index 175f2e1..23e486d 100644 --- a/tools/linguist/linguist/statistics.h +++ b/tools/linguist/linguist/statistics.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/statistics.ui b/tools/linguist/linguist/statistics.ui index b7b2e04..da786bf 100644 --- a/tools/linguist/linguist/statistics.ui +++ b/tools/linguist/linguist/statistics.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/translatedialog.cpp b/tools/linguist/linguist/translatedialog.cpp index 537c364..67334a6 100644 --- a/tools/linguist/linguist/translatedialog.cpp +++ b/tools/linguist/linguist/translatedialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/translatedialog.h b/tools/linguist/linguist/translatedialog.h index fbed2df..a25c25f 100644 --- a/tools/linguist/linguist/translatedialog.h +++ b/tools/linguist/linguist/translatedialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/translatedialog.ui b/tools/linguist/linguist/translatedialog.ui index 89f2138..d8fbeca 100644 --- a/tools/linguist/linguist/translatedialog.ui +++ b/tools/linguist/linguist/translatedialog.ui @@ -8,11 +8,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/translationsettingsdialog.cpp b/tools/linguist/linguist/translationsettingsdialog.cpp index 32f5c58..8a9e886 100644 --- a/tools/linguist/linguist/translationsettingsdialog.cpp +++ b/tools/linguist/linguist/translationsettingsdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/linguist/translationsettingsdialog.h b/tools/linguist/linguist/translationsettingsdialog.h index a7ed1b4..ac29db4 100644 --- a/tools/linguist/linguist/translationsettingsdialog.h +++ b/tools/linguist/linguist/translationsettingsdialog.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 3bcc998..0a613cc 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index b537b6e..8df7017 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/abstractproitemvisitor.h b/tools/linguist/shared/abstractproitemvisitor.h index b108e7e..f3ffa90 100644 --- a/tools/linguist/shared/abstractproitemvisitor.h +++ b/tools/linguist/shared/abstractproitemvisitor.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/cpp.cpp b/tools/linguist/shared/cpp.cpp index 2e137cf..5fd8265 100644 --- a/tools/linguist/shared/cpp.cpp +++ b/tools/linguist/shared/cpp.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/java.cpp b/tools/linguist/shared/java.cpp index 912a8d7..10417ed 100644 --- a/tools/linguist/shared/java.cpp +++ b/tools/linguist/shared/java.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/numerus.cpp b/tools/linguist/shared/numerus.cpp index f3a29cc..d731839 100644 --- a/tools/linguist/shared/numerus.cpp +++ b/tools/linguist/shared/numerus.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index 5842771..a99c972 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index ce53c27..f249ae8 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index beb16ea..63ba855 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp index 1895852..b518ff9 100644 --- a/tools/linguist/shared/proitems.cpp +++ b/tools/linguist/shared/proitems.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/proitems.h b/tools/linguist/shared/proitems.h index befaa88..1fbd0fd 100644 --- a/tools/linguist/shared/proitems.h +++ b/tools/linguist/shared/proitems.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/proparserutils.h b/tools/linguist/shared/proparserutils.h index 8914a8e..370f12f 100644 --- a/tools/linguist/shared/proparserutils.h +++ b/tools/linguist/shared/proparserutils.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp index 5563ac5..c61a455 100644 --- a/tools/linguist/shared/qm.cpp +++ b/tools/linguist/shared/qm.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/qph.cpp b/tools/linguist/shared/qph.cpp index 799bf7d..12765bc 100644 --- a/tools/linguist/shared/qph.cpp +++ b/tools/linguist/shared/qph.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/qscript.cpp b/tools/linguist/shared/qscript.cpp index 7377cba..f409242 100644 --- a/tools/linguist/shared/qscript.cpp +++ b/tools/linguist/shared/qscript.cpp @@ -7,11 +7,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/qscript.g b/tools/linguist/shared/qscript.g index 8d33277..1339634 100644 --- a/tools/linguist/shared/qscript.g +++ b/tools/linguist/shared/qscript.g @@ -6,11 +6,11 @@ -- This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the --- Beta Release License Agreement. +-- Commercial Usage +-- Licensees holding valid Qt Commercial licenses may use this file in +-- accordance with the Qt Commercial License Agreement provided with the +-- Software or, alternatively, in accordance with the terms contained in +-- a written agreement between you and Nokia. -- -- GNU Lesser General Public License Usage -- Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/simtexth.cpp b/tools/linguist/shared/simtexth.cpp index 0556ed6..d9b2339 100644 --- a/tools/linguist/shared/simtexth.cpp +++ b/tools/linguist/shared/simtexth.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/simtexth.h b/tools/linguist/shared/simtexth.h index e3cad91..54b8346 100644 --- a/tools/linguist/shared/simtexth.h +++ b/tools/linguist/shared/simtexth.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp index 312bb71..0af7ba6 100644 --- a/tools/linguist/shared/translator.cpp +++ b/tools/linguist/shared/translator.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 6b88b23..eac6399 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translatormessage.cpp b/tools/linguist/shared/translatormessage.cpp index afe66fe..119a4ac 100644 --- a/tools/linguist/shared/translatormessage.cpp +++ b/tools/linguist/shared/translatormessage.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translatormessage.h b/tools/linguist/shared/translatormessage.h index 7d31925..e5cab60 100644 --- a/tools/linguist/shared/translatormessage.h +++ b/tools/linguist/shared/translatormessage.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translatortools.cpp b/tools/linguist/shared/translatortools.cpp index 96301d5..79b7400 100644 --- a/tools/linguist/shared/translatortools.cpp +++ b/tools/linguist/shared/translatortools.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/translatortools.h b/tools/linguist/shared/translatortools.h index 9eaf024..3b7bacb 100644 --- a/tools/linguist/shared/translatortools.h +++ b/tools/linguist/shared/translatortools.h @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/ts.cpp b/tools/linguist/shared/ts.cpp index 22f2a1b..8173d32 100644 --- a/tools/linguist/shared/ts.cpp +++ b/tools/linguist/shared/ts.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/ui.cpp b/tools/linguist/shared/ui.cpp index 23a73e7..02a3539 100644 --- a/tools/linguist/shared/ui.cpp +++ b/tools/linguist/shared/ui.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/linguist/shared/xliff.cpp b/tools/linguist/shared/xliff.cpp index 6acf67a..6cd1a0d 100644 --- a/tools/linguist/shared/xliff.cpp +++ b/tools/linguist/shared/xliff.cpp @@ -6,11 +6,11 @@ ** This file is part of the Qt Linguist 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/macdeployqt/macchangeqt/main.cpp b/tools/macdeployqt/macchangeqt/main.cpp index e94e8a3..af017d1 100644 --- a/tools/macdeployqt/macchangeqt/main.cpp +++ b/tools/macdeployqt/macchangeqt/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/macdeployqt/macdeployqt/main.cpp b/tools/macdeployqt/macdeployqt/main.cpp index d6f7e5f..77a1690 100644 --- a/tools/macdeployqt/macdeployqt/main.cpp +++ b/tools/macdeployqt/macdeployqt/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp index db76ef2..5fb8dd3 100644 --- a/tools/macdeployqt/shared/shared.cpp +++ b/tools/macdeployqt/shared/shared.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/macdeployqt/shared/shared.h b/tools/macdeployqt/shared/shared.h index 5f30dad..29b8229 100644 --- a/tools/macdeployqt/shared/shared.h +++ b/tools/macdeployqt/shared/shared.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/macdeployqt/tests/tst_deployment_mac.cpp b/tools/macdeployqt/tests/tst_deployment_mac.cpp index 5f9c990..9de938b 100644 --- a/tools/macdeployqt/tests/tst_deployment_mac.cpp +++ b/tools/macdeployqt/tests/tst_deployment_mac.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp index 919841c..21be982 100644 --- a/tools/makeqpf/main.cpp +++ b/tools/makeqpf/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/makeqpf/mainwindow.cpp b/tools/makeqpf/mainwindow.cpp index 8a4da8c..1378c36 100644 --- a/tools/makeqpf/mainwindow.cpp +++ b/tools/makeqpf/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/makeqpf/mainwindow.h b/tools/makeqpf/mainwindow.h index dad684b..23f57d0 100644 --- a/tools/makeqpf/mainwindow.h +++ b/tools/makeqpf/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp index b97b9d4..915de89 100644 --- a/tools/makeqpf/qpf2.cpp +++ b/tools/makeqpf/qpf2.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/makeqpf/qpf2.h b/tools/makeqpf/qpf2.h index 211ac4d..48d1c9a 100644 --- a/tools/makeqpf/qpf2.h +++ b/tools/makeqpf/qpf2.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/pixeltool/main.cpp b/tools/pixeltool/main.cpp index aa0c95c..1c179bb 100644 --- a/tools/pixeltool/main.cpp +++ b/tools/pixeltool/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/pixeltool/qpixeltool.cpp b/tools/pixeltool/qpixeltool.cpp index 6de7741..e69f3b8 100644 --- a/tools/pixeltool/qpixeltool.cpp +++ b/tools/pixeltool/qpixeltool.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/pixeltool/qpixeltool.h b/tools/pixeltool/qpixeltool.h index 0c8520a..189391c 100644 --- a/tools/pixeltool/qpixeltool.h +++ b/tools/pixeltool/qpixeltool.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/ast.cpp b/tools/porting/src/ast.cpp index 9e8ce94..ff17e75 100644 --- a/tools/porting/src/ast.cpp +++ b/tools/porting/src/ast.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/ast.h b/tools/porting/src/ast.h index 7daa680..f587aac 100644 --- a/tools/porting/src/ast.h +++ b/tools/porting/src/ast.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodel.cpp b/tools/porting/src/codemodel.cpp index 4622833..e88c5a8 100644 --- a/tools/porting/src/codemodel.cpp +++ b/tools/porting/src/codemodel.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h index 017191e..d2fc6c3 100644 --- a/tools/porting/src/codemodel.h +++ b/tools/porting/src/codemodel.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodelattributes.cpp b/tools/porting/src/codemodelattributes.cpp index eccd11d..7b518a0 100644 --- a/tools/porting/src/codemodelattributes.cpp +++ b/tools/porting/src/codemodelattributes.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodelattributes.h b/tools/porting/src/codemodelattributes.h index e02f383..2962174 100644 --- a/tools/porting/src/codemodelattributes.h +++ b/tools/porting/src/codemodelattributes.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodelwalker.cpp b/tools/porting/src/codemodelwalker.cpp index 641bc02..75ab4ec 100644 --- a/tools/porting/src/codemodelwalker.cpp +++ b/tools/porting/src/codemodelwalker.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/codemodelwalker.h b/tools/porting/src/codemodelwalker.h index 446ea93..67ef39a 100644 --- a/tools/porting/src/codemodelwalker.h +++ b/tools/porting/src/codemodelwalker.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/cpplexer.cpp b/tools/porting/src/cpplexer.cpp index ef63538..67989c2 100644 --- a/tools/porting/src/cpplexer.cpp +++ b/tools/porting/src/cpplexer.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/cpplexer.h b/tools/porting/src/cpplexer.h index ae84f1d..5322547 100644 --- a/tools/porting/src/cpplexer.h +++ b/tools/porting/src/cpplexer.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/errors.cpp b/tools/porting/src/errors.cpp index 76292c9..462c6ed 100644 --- a/tools/porting/src/errors.cpp +++ b/tools/porting/src/errors.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/errors.h b/tools/porting/src/errors.h index 11c2376..d19bdf9 100644 --- a/tools/porting/src/errors.h +++ b/tools/porting/src/errors.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/fileporter.cpp b/tools/porting/src/fileporter.cpp index 9a5a458..9d7f61c 100644 --- a/tools/porting/src/fileporter.cpp +++ b/tools/porting/src/fileporter.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/fileporter.h b/tools/porting/src/fileporter.h index 000e2fd..f031737 100644 --- a/tools/porting/src/fileporter.h +++ b/tools/porting/src/fileporter.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/filewriter.cpp b/tools/porting/src/filewriter.cpp index e1ba0aa..3b0affd 100644 --- a/tools/porting/src/filewriter.cpp +++ b/tools/porting/src/filewriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/filewriter.h b/tools/porting/src/filewriter.h index a58e8e0..f5b808c 100644 --- a/tools/porting/src/filewriter.h +++ b/tools/porting/src/filewriter.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/list.h b/tools/porting/src/list.h index 0021f25..269382d 100644 --- a/tools/porting/src/list.h +++ b/tools/porting/src/list.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/logger.cpp b/tools/porting/src/logger.cpp index fb44de7..27aeecf 100644 --- a/tools/porting/src/logger.cpp +++ b/tools/porting/src/logger.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/logger.h b/tools/porting/src/logger.h index 20e7dd5..39f0459 100644 --- a/tools/porting/src/logger.h +++ b/tools/porting/src/logger.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/parser.cpp b/tools/porting/src/parser.cpp index a903ece..13080bd 100644 --- a/tools/porting/src/parser.cpp +++ b/tools/porting/src/parser.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/parser.h b/tools/porting/src/parser.h index 45278d4..e7b2214 100644 --- a/tools/porting/src/parser.h +++ b/tools/porting/src/parser.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/port.cpp b/tools/porting/src/port.cpp index eeb1f2e..190fc3b 100644 --- a/tools/porting/src/port.cpp +++ b/tools/porting/src/port.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/portingrules.cpp b/tools/porting/src/portingrules.cpp index 4931064..3b83a9a 100644 --- a/tools/porting/src/portingrules.cpp +++ b/tools/porting/src/portingrules.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/portingrules.h b/tools/porting/src/portingrules.h index ac9064b..66cc9d5 100644 --- a/tools/porting/src/portingrules.h +++ b/tools/porting/src/portingrules.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/preprocessorcontrol.cpp b/tools/porting/src/preprocessorcontrol.cpp index 4bfe197..d0eafb7 100644 --- a/tools/porting/src/preprocessorcontrol.cpp +++ b/tools/porting/src/preprocessorcontrol.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/preprocessorcontrol.h b/tools/porting/src/preprocessorcontrol.h index 0c1c2f9..f93f97f 100644 --- a/tools/porting/src/preprocessorcontrol.h +++ b/tools/porting/src/preprocessorcontrol.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/projectporter.cpp b/tools/porting/src/projectporter.cpp index 404c6726..eb1014f 100644 --- a/tools/porting/src/projectporter.cpp +++ b/tools/porting/src/projectporter.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/projectporter.h b/tools/porting/src/projectporter.h index e86c29a..7ebb026 100644 --- a/tools/porting/src/projectporter.h +++ b/tools/porting/src/projectporter.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/proparser.cpp b/tools/porting/src/proparser.cpp index db3876d..2193deb 100644 --- a/tools/porting/src/proparser.cpp +++ b/tools/porting/src/proparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/proparser.h b/tools/porting/src/proparser.h index 8fdf46b..1948470 100644 --- a/tools/porting/src/proparser.h +++ b/tools/porting/src/proparser.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/q3porting.xml b/tools/porting/src/q3porting.xml index 42a9ae6..2877b41 100644 --- a/tools/porting/src/q3porting.xml +++ b/tools/porting/src/q3porting.xml @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/qtsimplexml.cpp b/tools/porting/src/qtsimplexml.cpp index 7803d7d..e616fb2 100644 --- a/tools/porting/src/qtsimplexml.cpp +++ b/tools/porting/src/qtsimplexml.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/qtsimplexml.h b/tools/porting/src/qtsimplexml.h index b3d6732..14a97a7 100644 --- a/tools/porting/src/qtsimplexml.h +++ b/tools/porting/src/qtsimplexml.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/replacetoken.cpp b/tools/porting/src/replacetoken.cpp index 52757a1..b2bd04e 100644 --- a/tools/porting/src/replacetoken.cpp +++ b/tools/porting/src/replacetoken.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/replacetoken.h b/tools/porting/src/replacetoken.h index 5df0575..8d346fb 100644 --- a/tools/porting/src/replacetoken.h +++ b/tools/porting/src/replacetoken.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpp.cpp b/tools/porting/src/rpp.cpp index e95138b..bb3cbbf 100644 --- a/tools/porting/src/rpp.cpp +++ b/tools/porting/src/rpp.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpp.h b/tools/porting/src/rpp.h index ae19e27..f0dac3e 100644 --- a/tools/porting/src/rpp.h +++ b/tools/porting/src/rpp.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rppexpressionbuilder.cpp b/tools/porting/src/rppexpressionbuilder.cpp index 6695924..3552853 100644 --- a/tools/porting/src/rppexpressionbuilder.cpp +++ b/tools/porting/src/rppexpressionbuilder.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rppexpressionbuilder.h b/tools/porting/src/rppexpressionbuilder.h index bca90b1..52ecb66 100644 --- a/tools/porting/src/rppexpressionbuilder.h +++ b/tools/porting/src/rppexpressionbuilder.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpplexer.cpp b/tools/porting/src/rpplexer.cpp index 7a606bf..f108ead 100644 --- a/tools/porting/src/rpplexer.cpp +++ b/tools/porting/src/rpplexer.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpplexer.h b/tools/porting/src/rpplexer.h index 2d725f4..55bfae6 100644 --- a/tools/porting/src/rpplexer.h +++ b/tools/porting/src/rpplexer.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpptreeevaluator.cpp b/tools/porting/src/rpptreeevaluator.cpp index 4fbd581..f98e32a 100644 --- a/tools/porting/src/rpptreeevaluator.cpp +++ b/tools/porting/src/rpptreeevaluator.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpptreeevaluator.h b/tools/porting/src/rpptreeevaluator.h index 4492d64..ee806b9 100644 --- a/tools/porting/src/rpptreeevaluator.h +++ b/tools/porting/src/rpptreeevaluator.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpptreewalker.cpp b/tools/porting/src/rpptreewalker.cpp index be2feda..94c2194 100644 --- a/tools/porting/src/rpptreewalker.cpp +++ b/tools/porting/src/rpptreewalker.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/rpptreewalker.h b/tools/porting/src/rpptreewalker.h index a0af418..f50b0dd 100644 --- a/tools/porting/src/rpptreewalker.h +++ b/tools/porting/src/rpptreewalker.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/semantic.cpp b/tools/porting/src/semantic.cpp index 0f9a2d7..2d37793 100644 --- a/tools/porting/src/semantic.cpp +++ b/tools/porting/src/semantic.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/semantic.h b/tools/porting/src/semantic.h index 18d41b3..8f88de7 100644 --- a/tools/porting/src/semantic.h +++ b/tools/porting/src/semantic.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/smallobject.cpp b/tools/porting/src/smallobject.cpp index 704e802..fb77adf 100644 --- a/tools/porting/src/smallobject.cpp +++ b/tools/porting/src/smallobject.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/smallobject.h b/tools/porting/src/smallobject.h index f086b70..39cdaaa 100644 --- a/tools/porting/src/smallobject.h +++ b/tools/porting/src/smallobject.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/textreplacement.cpp b/tools/porting/src/textreplacement.cpp index 1123e4f..b94cb86 100644 --- a/tools/porting/src/textreplacement.cpp +++ b/tools/porting/src/textreplacement.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h index e8bfaf1..0540afc 100644 --- a/tools/porting/src/textreplacement.h +++ b/tools/porting/src/textreplacement.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenengine.cpp b/tools/porting/src/tokenengine.cpp index 151d18e..e3d9eee 100644 --- a/tools/porting/src/tokenengine.cpp +++ b/tools/porting/src/tokenengine.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenengine.h b/tools/porting/src/tokenengine.h index 7fcfaec..1a1f04e 100644 --- a/tools/porting/src/tokenengine.h +++ b/tools/porting/src/tokenengine.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenizer.cpp b/tools/porting/src/tokenizer.cpp index 4dcaa46..0cde88d 100644 --- a/tools/porting/src/tokenizer.cpp +++ b/tools/porting/src/tokenizer.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenizer.h b/tools/porting/src/tokenizer.h index b41aaf2..7843bd3 100644 --- a/tools/porting/src/tokenizer.h +++ b/tools/porting/src/tokenizer.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenreplacements.cpp b/tools/porting/src/tokenreplacements.cpp index acf9ab9..0ff9ff9 100644 --- a/tools/porting/src/tokenreplacements.cpp +++ b/tools/porting/src/tokenreplacements.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenreplacements.h b/tools/porting/src/tokenreplacements.h index e92a68c..2277e82 100644 --- a/tools/porting/src/tokenreplacements.h +++ b/tools/porting/src/tokenreplacements.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokens.h b/tools/porting/src/tokens.h index 09154fd..6c23386 100644 --- a/tools/porting/src/tokens.h +++ b/tools/porting/src/tokens.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/tokenstreamadapter.h b/tools/porting/src/tokenstreamadapter.h index 8983053..8a09e12 100644 --- a/tools/porting/src/tokenstreamadapter.h +++ b/tools/porting/src/tokenstreamadapter.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/translationunit.cpp b/tools/porting/src/translationunit.cpp index b49225b..599b9ac 100644 --- a/tools/porting/src/translationunit.cpp +++ b/tools/porting/src/translationunit.cpp @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/translationunit.h b/tools/porting/src/translationunit.h index 0a378ae..2f0359f 100644 --- a/tools/porting/src/translationunit.h +++ b/tools/porting/src/translationunit.h @@ -6,11 +6,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/treewalker.cpp b/tools/porting/src/treewalker.cpp index 98ab60c..9d0262a 100644 --- a/tools/porting/src/treewalker.cpp +++ b/tools/porting/src/treewalker.cpp @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/porting/src/treewalker.h b/tools/porting/src/treewalker.h index 77ca951..c905d21 100644 --- a/tools/porting/src/treewalker.h +++ b/tools/porting/src/treewalker.h @@ -7,11 +7,11 @@ ** This file is part of the qt3to4 porting application 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/feature.cpp b/tools/qconfig/feature.cpp index 829573a..835b882 100644 --- a/tools/qconfig/feature.cpp +++ b/tools/qconfig/feature.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/feature.h b/tools/qconfig/feature.h index 8e502ee..e204596 100644 --- a/tools/qconfig/feature.h +++ b/tools/qconfig/feature.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/featuretreemodel.cpp b/tools/qconfig/featuretreemodel.cpp index 2bd5f00..c5131b0 100644 --- a/tools/qconfig/featuretreemodel.cpp +++ b/tools/qconfig/featuretreemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/featuretreemodel.h b/tools/qconfig/featuretreemodel.h index 965d363..bc84c8d 100644 --- a/tools/qconfig/featuretreemodel.h +++ b/tools/qconfig/featuretreemodel.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/graphics.h b/tools/qconfig/graphics.h index a67aced..adb1cd2 100644 --- a/tools/qconfig/graphics.h +++ b/tools/qconfig/graphics.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index dd53e09..8974249 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbus/qdbus.cpp b/tools/qdbus/qdbus/qdbus.cpp index d290eab..ba024b1 100644 --- a/tools/qdbus/qdbus/qdbus.cpp +++ b/tools/qdbus/qdbus/qdbus.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp index 9e789b0..0895bc3 100644 --- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/main.cpp b/tools/qdbus/qdbusviewer/main.cpp index b670337..d62488e 100644 --- a/tools/qdbus/qdbusviewer/main.cpp +++ b/tools/qdbus/qdbusviewer/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/propertydialog.cpp b/tools/qdbus/qdbusviewer/propertydialog.cpp index 6359cd7..c60afba 100644 --- a/tools/qdbus/qdbusviewer/propertydialog.cpp +++ b/tools/qdbus/qdbusviewer/propertydialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/propertydialog.h b/tools/qdbus/qdbusviewer/propertydialog.h index 2ba30e17..171d2b9 100644 --- a/tools/qdbus/qdbusviewer/propertydialog.h +++ b/tools/qdbus/qdbusviewer/propertydialog.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/qdbusmodel.cpp b/tools/qdbus/qdbusviewer/qdbusmodel.cpp index 88e3524..a4ad9f6 100644 --- a/tools/qdbus/qdbusviewer/qdbusmodel.cpp +++ b/tools/qdbus/qdbusviewer/qdbusmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/qdbusmodel.h b/tools/qdbus/qdbusviewer/qdbusmodel.h index 50f928e..07d4f24 100644 --- a/tools/qdbus/qdbusviewer/qdbusmodel.h +++ b/tools/qdbus/qdbusviewer/qdbusmodel.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp index e8ac3a6..a81e9ce 100644 --- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.h b/tools/qdbus/qdbusviewer/qdbusviewer.h index 75511b7..ed7dd78 100644 --- a/tools/qdbus/qdbusviewer/qdbusviewer.h +++ b/tools/qdbus/qdbusviewer/qdbusviewer.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp index a871fe4..daaf6c4 100644 --- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/apigenerator.cpp b/tools/qdoc3/apigenerator.cpp index d998839..4b69ff9 100644 --- a/tools/qdoc3/apigenerator.cpp +++ b/tools/qdoc3/apigenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/apigenerator.h b/tools/qdoc3/apigenerator.h index 9545fae..10e7080 100644 --- a/tools/qdoc3/apigenerator.h +++ b/tools/qdoc3/apigenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/archiveextractor.cpp b/tools/qdoc3/archiveextractor.cpp index b72d27a..b75ed4b 100644 --- a/tools/qdoc3/archiveextractor.cpp +++ b/tools/qdoc3/archiveextractor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/archiveextractor.h b/tools/qdoc3/archiveextractor.h index cfa45bd..3a7c14d 100644 --- a/tools/qdoc3/archiveextractor.h +++ b/tools/qdoc3/archiveextractor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp index f341862..6503f53 100644 --- a/tools/qdoc3/atom.cpp +++ b/tools/qdoc3/atom.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h index 178d9ed..bed6125 100644 --- a/tools/qdoc3/atom.h +++ b/tools/qdoc3/atom.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/bookgenerator.cpp b/tools/qdoc3/bookgenerator.cpp index 4e49491..420ab61 100644 --- a/tools/qdoc3/bookgenerator.cpp +++ b/tools/qdoc3/bookgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/bookgenerator.h b/tools/qdoc3/bookgenerator.h index 15b830e..50733f7 100644 --- a/tools/qdoc3/bookgenerator.h +++ b/tools/qdoc3/bookgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/ccodeparser.cpp b/tools/qdoc3/ccodeparser.cpp index d6318f5..187f6b3 100644 --- a/tools/qdoc3/ccodeparser.cpp +++ b/tools/qdoc3/ccodeparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/ccodeparser.h b/tools/qdoc3/ccodeparser.h index 4e1877a..d6e8cff 100644 --- a/tools/qdoc3/ccodeparser.h +++ b/tools/qdoc3/ccodeparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codechunk.cpp b/tools/qdoc3/codechunk.cpp index 77c2a3e..9906d44 100644 --- a/tools/qdoc3/codechunk.cpp +++ b/tools/qdoc3/codechunk.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codechunk.h b/tools/qdoc3/codechunk.h index f7ac863..1093fbd 100644 --- a/tools/qdoc3/codechunk.h +++ b/tools/qdoc3/codechunk.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp index a803281..45206e7 100644 --- a/tools/qdoc3/codemarker.cpp +++ b/tools/qdoc3/codemarker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h index 2bb1f2b..3dc38b7 100644 --- a/tools/qdoc3/codemarker.h +++ b/tools/qdoc3/codemarker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp index 9a58bc6..dd6e37c 100644 --- a/tools/qdoc3/codeparser.cpp +++ b/tools/qdoc3/codeparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/codeparser.h b/tools/qdoc3/codeparser.h index 019e806..19ae608 100644 --- a/tools/qdoc3/codeparser.h +++ b/tools/qdoc3/codeparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/command.cpp b/tools/qdoc3/command.cpp index a82494d..21bcf72 100644 --- a/tools/qdoc3/command.cpp +++ b/tools/qdoc3/command.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/command.h b/tools/qdoc3/command.h index 4b86c38..76c596a 100644 --- a/tools/qdoc3/command.h +++ b/tools/qdoc3/command.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp index c8488f3..d15c45d 100644 --- a/tools/qdoc3/config.cpp +++ b/tools/qdoc3/config.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h index 9443f0d..17281f0 100644 --- a/tools/qdoc3/config.h +++ b/tools/qdoc3/config.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index 59b967b..061fb96 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h index 8b68bc0..4a0d970 100644 --- a/tools/qdoc3/cppcodemarker.h +++ b/tools/qdoc3/cppcodemarker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 1ad5843..fc94778 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h index e672654..712894a 100644 --- a/tools/qdoc3/cppcodeparser.h +++ b/tools/qdoc3/cppcodeparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cpptoqsconverter.cpp b/tools/qdoc3/cpptoqsconverter.cpp index dfc81bc..3650376 100644 --- a/tools/qdoc3/cpptoqsconverter.cpp +++ b/tools/qdoc3/cpptoqsconverter.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/cpptoqsconverter.h b/tools/qdoc3/cpptoqsconverter.h index baf801c..3322347 100644 --- a/tools/qdoc3/cpptoqsconverter.h +++ b/tools/qdoc3/cpptoqsconverter.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/dcfsection.cpp b/tools/qdoc3/dcfsection.cpp index 5bff070..3f0d9f1 100644 --- a/tools/qdoc3/dcfsection.cpp +++ b/tools/qdoc3/dcfsection.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/dcfsection.h b/tools/qdoc3/dcfsection.h index 91d31ed..d885614 100644 --- a/tools/qdoc3/dcfsection.h +++ b/tools/qdoc3/dcfsection.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 61d0ed6..b71118f 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h index 6cb6f0a..d5c95b9 100644 --- a/tools/qdoc3/doc.h +++ b/tools/qdoc3/doc.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/editdistance.cpp b/tools/qdoc3/editdistance.cpp index 11cc18f..dc4dac9 100644 --- a/tools/qdoc3/editdistance.cpp +++ b/tools/qdoc3/editdistance.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/editdistance.h b/tools/qdoc3/editdistance.h index d69f6b9..4feb67c 100644 --- a/tools/qdoc3/editdistance.h +++ b/tools/qdoc3/editdistance.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp index d89d6af..d98b52b 100644 --- a/tools/qdoc3/generator.cpp +++ b/tools/qdoc3/generator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h index 3db2d8d..d3473d6 100644 --- a/tools/qdoc3/generator.h +++ b/tools/qdoc3/generator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp index d0fa7c0..7487120 100644 --- a/tools/qdoc3/helpprojectwriter.cpp +++ b/tools/qdoc3/helpprojectwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/helpprojectwriter.h b/tools/qdoc3/helpprojectwriter.h index f90b2a4..19c7ddc 100644 --- a/tools/qdoc3/helpprojectwriter.h +++ b/tools/qdoc3/helpprojectwriter.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 13d52bf..01cefd7 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index de64190..ada8e1e 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/jambiapiparser.cpp b/tools/qdoc3/jambiapiparser.cpp index 73d10a6..e44ec2f 100644 --- a/tools/qdoc3/jambiapiparser.cpp +++ b/tools/qdoc3/jambiapiparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/jambiapiparser.h b/tools/qdoc3/jambiapiparser.h index e0dfe3d..6449868 100644 --- a/tools/qdoc3/jambiapiparser.h +++ b/tools/qdoc3/jambiapiparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/javacodemarker.cpp b/tools/qdoc3/javacodemarker.cpp index 813f505..85ef520 100644 --- a/tools/qdoc3/javacodemarker.cpp +++ b/tools/qdoc3/javacodemarker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/javacodemarker.h b/tools/qdoc3/javacodemarker.h index 3381fc3..c19e329 100644 --- a/tools/qdoc3/javacodemarker.h +++ b/tools/qdoc3/javacodemarker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/javadocgenerator.cpp b/tools/qdoc3/javadocgenerator.cpp index 872699d..af55de9 100644 --- a/tools/qdoc3/javadocgenerator.cpp +++ b/tools/qdoc3/javadocgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/javadocgenerator.h b/tools/qdoc3/javadocgenerator.h index aac938e..79e834b 100644 --- a/tools/qdoc3/javadocgenerator.h +++ b/tools/qdoc3/javadocgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/linguistgenerator.cpp b/tools/qdoc3/linguistgenerator.cpp index 1350654..40de572 100644 --- a/tools/qdoc3/linguistgenerator.cpp +++ b/tools/qdoc3/linguistgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/linguistgenerator.h b/tools/qdoc3/linguistgenerator.h index cae7e33..3fcb091 100644 --- a/tools/qdoc3/linguistgenerator.h +++ b/tools/qdoc3/linguistgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/location.cpp b/tools/qdoc3/location.cpp index 62a18f0..72c86b4 100644 --- a/tools/qdoc3/location.cpp +++ b/tools/qdoc3/location.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/location.h b/tools/qdoc3/location.h index d8f3106..a1bd563 100644 --- a/tools/qdoc3/location.h +++ b/tools/qdoc3/location.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/loutgenerator.cpp b/tools/qdoc3/loutgenerator.cpp index 0d1f646..3492da6 100644 --- a/tools/qdoc3/loutgenerator.cpp +++ b/tools/qdoc3/loutgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/loutgenerator.h b/tools/qdoc3/loutgenerator.h index 0d6f5f1..45b862e 100644 --- a/tools/qdoc3/loutgenerator.h +++ b/tools/qdoc3/loutgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp index 3e6f832..dd53551 100644 --- a/tools/qdoc3/main.cpp +++ b/tools/qdoc3/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/mangenerator.cpp b/tools/qdoc3/mangenerator.cpp index 619a680..7d1763a 100644 --- a/tools/qdoc3/mangenerator.cpp +++ b/tools/qdoc3/mangenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/mangenerator.h b/tools/qdoc3/mangenerator.h index 0136c5d..f670677 100644 --- a/tools/qdoc3/mangenerator.h +++ b/tools/qdoc3/mangenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 231149e..524c028 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index c34b82b..1af539c 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/openedlist.cpp b/tools/qdoc3/openedlist.cpp index 04d9871..3ca3975 100644 --- a/tools/qdoc3/openedlist.cpp +++ b/tools/qdoc3/openedlist.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/openedlist.h b/tools/qdoc3/openedlist.h index 0506e79..b12d81e 100644 --- a/tools/qdoc3/openedlist.h +++ b/tools/qdoc3/openedlist.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 2d50279..9d27487 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h index 002d390..d1f6285 100644 --- a/tools/qdoc3/pagegenerator.h +++ b/tools/qdoc3/pagegenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/plaincodemarker.cpp b/tools/qdoc3/plaincodemarker.cpp index 5ed4bbe..624d2f2 100644 --- a/tools/qdoc3/plaincodemarker.cpp +++ b/tools/qdoc3/plaincodemarker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/plaincodemarker.h b/tools/qdoc3/plaincodemarker.h index 24a1dfe..a9a5f68 100644 --- a/tools/qdoc3/plaincodemarker.h +++ b/tools/qdoc3/plaincodemarker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/polyarchiveextractor.cpp b/tools/qdoc3/polyarchiveextractor.cpp index b7fdfef..fd0c252 100644 --- a/tools/qdoc3/polyarchiveextractor.cpp +++ b/tools/qdoc3/polyarchiveextractor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/polyarchiveextractor.h b/tools/qdoc3/polyarchiveextractor.h index 9c637da..d2dfcce 100644 --- a/tools/qdoc3/polyarchiveextractor.h +++ b/tools/qdoc3/polyarchiveextractor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/polyuncompressor.cpp b/tools/qdoc3/polyuncompressor.cpp index c08ede6..4b37553 100644 --- a/tools/qdoc3/polyuncompressor.cpp +++ b/tools/qdoc3/polyuncompressor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/polyuncompressor.h b/tools/qdoc3/polyuncompressor.h index 162f672..b787651 100644 --- a/tools/qdoc3/polyuncompressor.h +++ b/tools/qdoc3/polyuncompressor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qsakernelparser.cpp b/tools/qdoc3/qsakernelparser.cpp index b856957..498c5a2 100644 --- a/tools/qdoc3/qsakernelparser.cpp +++ b/tools/qdoc3/qsakernelparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qsakernelparser.h b/tools/qdoc3/qsakernelparser.h index 59273cd..74d47a4 100644 --- a/tools/qdoc3/qsakernelparser.h +++ b/tools/qdoc3/qsakernelparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qscodemarker.cpp b/tools/qdoc3/qscodemarker.cpp index ed89b60..445758b 100644 --- a/tools/qdoc3/qscodemarker.cpp +++ b/tools/qdoc3/qscodemarker.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qscodemarker.h b/tools/qdoc3/qscodemarker.h index a283e88..99c97c2 100644 --- a/tools/qdoc3/qscodemarker.h +++ b/tools/qdoc3/qscodemarker.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qscodeparser.cpp b/tools/qdoc3/qscodeparser.cpp index 1a8902e..f300918 100644 --- a/tools/qdoc3/qscodeparser.cpp +++ b/tools/qdoc3/qscodeparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/qscodeparser.h b/tools/qdoc3/qscodeparser.h index bd599a8..1799b4f 100644 --- a/tools/qdoc3/qscodeparser.h +++ b/tools/qdoc3/qscodeparser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/quoter.cpp b/tools/qdoc3/quoter.cpp index 40ca15a..8ae435c 100644 --- a/tools/qdoc3/quoter.cpp +++ b/tools/qdoc3/quoter.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/quoter.h b/tools/qdoc3/quoter.h index 7906754..90af4f9 100644 --- a/tools/qdoc3/quoter.h +++ b/tools/qdoc3/quoter.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/separator.cpp b/tools/qdoc3/separator.cpp index 0d730e1..a7bad36 100644 --- a/tools/qdoc3/separator.cpp +++ b/tools/qdoc3/separator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/separator.h b/tools/qdoc3/separator.h index f29868c..8b50364 100644 --- a/tools/qdoc3/separator.h +++ b/tools/qdoc3/separator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/sgmlgenerator.cpp b/tools/qdoc3/sgmlgenerator.cpp index 575bb53..378df4d 100644 --- a/tools/qdoc3/sgmlgenerator.cpp +++ b/tools/qdoc3/sgmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/sgmlgenerator.h b/tools/qdoc3/sgmlgenerator.h index e4ffa80..0c17393 100644 --- a/tools/qdoc3/sgmlgenerator.h +++ b/tools/qdoc3/sgmlgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/text.cpp b/tools/qdoc3/text.cpp index 0b0a8d7..df71bee 100644 --- a/tools/qdoc3/text.cpp +++ b/tools/qdoc3/text.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/text.h b/tools/qdoc3/text.h index 82506df..1118647 100644 --- a/tools/qdoc3/text.h +++ b/tools/qdoc3/text.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/tokenizer.cpp b/tools/qdoc3/tokenizer.cpp index 24b1b5a..15c0881 100644 --- a/tools/qdoc3/tokenizer.cpp +++ b/tools/qdoc3/tokenizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h index 745c427..7013ec2 100644 --- a/tools/qdoc3/tokenizer.h +++ b/tools/qdoc3/tokenizer.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/tr.h b/tools/qdoc3/tr.h index 0966e45..bf9e802 100644 --- a/tools/qdoc3/tr.h +++ b/tools/qdoc3/tr.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp index 0fbd438..bdab17e 100644 --- a/tools/qdoc3/tree.cpp +++ b/tools/qdoc3/tree.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/tree.h b/tools/qdoc3/tree.h index 8aebcaa..3fd7157 100644 --- a/tools/qdoc3/tree.h +++ b/tools/qdoc3/tree.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/uncompressor.cpp b/tools/qdoc3/uncompressor.cpp index 8f3897d..2e8e91b 100644 --- a/tools/qdoc3/uncompressor.cpp +++ b/tools/qdoc3/uncompressor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/uncompressor.h b/tools/qdoc3/uncompressor.h index 4d5c9af..5854328 100644 --- a/tools/qdoc3/uncompressor.h +++ b/tools/qdoc3/uncompressor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/webxmlgenerator.cpp b/tools/qdoc3/webxmlgenerator.cpp index 0438adf..1fd9a9f 100644 --- a/tools/qdoc3/webxmlgenerator.cpp +++ b/tools/qdoc3/webxmlgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/webxmlgenerator.h b/tools/qdoc3/webxmlgenerator.h index f7b4445..fcbbf05 100644 --- a/tools/qdoc3/webxmlgenerator.h +++ b/tools/qdoc3/webxmlgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qdoc3/yyindent.cpp b/tools/qdoc3/yyindent.cpp index bbca39b..0b67288 100644 --- a/tools/qdoc3/yyindent.cpp +++ b/tools/qdoc3/yyindent.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qev/qev.cpp b/tools/qev/qev.cpp index 577c683..433a55b 100644 --- a/tools/qev/qev.cpp +++ b/tools/qev/qev.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconcurrent/codegenerator/example/main.cpp b/tools/qtconcurrent/codegenerator/example/main.cpp index 0cd4c49..0f01a8b 100644 --- a/tools/qtconcurrent/codegenerator/example/main.cpp +++ b/tools/qtconcurrent/codegenerator/example/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp index 62b66cc..d9ac5a4 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.h b/tools/qtconcurrent/codegenerator/src/codegenerator.h index 260ba8c..076f61a 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.h +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconcurrent/generaterun/main.cpp b/tools/qtconcurrent/generaterun/main.cpp index 5dd18fb..c1072f0 100644 --- a/tools/qtconcurrent/generaterun/main.cpp +++ b/tools/qtconcurrent/generaterun/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp index d700507..4da8d29 100644 --- a/tools/qtconfig/colorbutton.cpp +++ b/tools/qtconfig/colorbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h index 01f6760..6f202a0 100644 --- a/tools/qtconfig/colorbutton.h +++ b/tools/qtconfig/colorbutton.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/main.cpp b/tools/qtconfig/main.cpp index e6b7630..2da8f508 100644 --- a/tools/qtconfig/main.cpp +++ b/tools/qtconfig/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 498a6b6..aff0dd8 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h index ac16232..2b05537 100644 --- a/tools/qtconfig/mainwindow.h +++ b/tools/qtconfig/mainwindow.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/mainwindowbase.cpp b/tools/qtconfig/mainwindowbase.cpp index 9f90479..3ce7468 100644 --- a/tools/qtconfig/mainwindowbase.cpp +++ b/tools/qtconfig/mainwindowbase.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/mainwindowbase.h b/tools/qtconfig/mainwindowbase.h index f54b433..f246017 100644 --- a/tools/qtconfig/mainwindowbase.h +++ b/tools/qtconfig/mainwindowbase.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/mainwindowbase.ui b/tools/qtconfig/mainwindowbase.ui index 747ca28..465e058 100644 --- a/tools/qtconfig/mainwindowbase.ui +++ b/tools/qtconfig/mainwindowbase.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp index d9bafeb..2d21f27 100644 --- a/tools/qtconfig/paletteeditoradvanced.cpp +++ b/tools/qtconfig/paletteeditoradvanced.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h index 7dc80db..b229f52 100644 --- a/tools/qtconfig/paletteeditoradvanced.h +++ b/tools/qtconfig/paletteeditoradvanced.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/paletteeditoradvancedbase.cpp b/tools/qtconfig/paletteeditoradvancedbase.cpp index 4e107a2..7ab8529 100644 --- a/tools/qtconfig/paletteeditoradvancedbase.cpp +++ b/tools/qtconfig/paletteeditoradvancedbase.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/paletteeditoradvancedbase.h b/tools/qtconfig/paletteeditoradvancedbase.h index f7920d8..69a23b6 100644 --- a/tools/qtconfig/paletteeditoradvancedbase.h +++ b/tools/qtconfig/paletteeditoradvancedbase.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/paletteeditoradvancedbase.ui b/tools/qtconfig/paletteeditoradvancedbase.ui index 465569e..8892fbe 100644 --- a/tools/qtconfig/paletteeditoradvancedbase.ui +++ b/tools/qtconfig/paletteeditoradvancedbase.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewframe.cpp b/tools/qtconfig/previewframe.cpp index 5be5b1c..90e4d11 100644 --- a/tools/qtconfig/previewframe.cpp +++ b/tools/qtconfig/previewframe.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h index ce98ffe..3a4e6ea 100644 --- a/tools/qtconfig/previewframe.h +++ b/tools/qtconfig/previewframe.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp index 00b1738..0cd09dd 100644 --- a/tools/qtconfig/previewwidget.cpp +++ b/tools/qtconfig/previewwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h index c29eb20..1f1fd58 100644 --- a/tools/qtconfig/previewwidget.h +++ b/tools/qtconfig/previewwidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewwidgetbase.cpp b/tools/qtconfig/previewwidgetbase.cpp index 56e9294..1b6d8c5 100644 --- a/tools/qtconfig/previewwidgetbase.cpp +++ b/tools/qtconfig/previewwidgetbase.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewwidgetbase.h b/tools/qtconfig/previewwidgetbase.h index aa510cd..8deb40f 100644 --- a/tools/qtconfig/previewwidgetbase.h +++ b/tools/qtconfig/previewwidgetbase.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtconfig/previewwidgetbase.ui b/tools/qtconfig/previewwidgetbase.ui index 2c4e05d..548b749 100644 --- a/tools/qtconfig/previewwidgetbase.ui +++ b/tools/qtconfig/previewwidgetbase.ui @@ -8,11 +8,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/updater/main.cpp b/tools/qtestlib/updater/main.cpp index 38628cf..728cabc 100644 --- a/tools/qtestlib/updater/main.cpp +++ b/tools/qtestlib/updater/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp index fc0e7b4..45fc26d 100644 --- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp +++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.h b/tools/qtestlib/wince/cetest/activesyncconnection.h index 44ff356..f89ad7d 100644 --- a/tools/qtestlib/wince/cetest/activesyncconnection.h +++ b/tools/qtestlib/wince/cetest/activesyncconnection.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/deployment.cpp b/tools/qtestlib/wince/cetest/deployment.cpp index 99ea532..942d1eb 100644 --- a/tools/qtestlib/wince/cetest/deployment.cpp +++ b/tools/qtestlib/wince/cetest/deployment.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/deployment.h b/tools/qtestlib/wince/cetest/deployment.h index aa994ef..b4b2917 100644 --- a/tools/qtestlib/wince/cetest/deployment.h +++ b/tools/qtestlib/wince/cetest/deployment.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp index 17f6810..8723d53 100644 --- a/tools/qtestlib/wince/cetest/main.cpp +++ b/tools/qtestlib/wince/cetest/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/remoteconnection.cpp b/tools/qtestlib/wince/cetest/remoteconnection.cpp index 7033ed6..ba7955c 100644 --- a/tools/qtestlib/wince/cetest/remoteconnection.cpp +++ b/tools/qtestlib/wince/cetest/remoteconnection.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/cetest/remoteconnection.h b/tools/qtestlib/wince/cetest/remoteconnection.h index 8e8b3fd..85969e6 100644 --- a/tools/qtestlib/wince/cetest/remoteconnection.h +++ b/tools/qtestlib/wince/cetest/remoteconnection.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/remotelib/commands.cpp b/tools/qtestlib/wince/remotelib/commands.cpp index f611317..bdedce4 100644 --- a/tools/qtestlib/wince/remotelib/commands.cpp +++ b/tools/qtestlib/wince/remotelib/commands.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qtestlib/wince/remotelib/commands.h b/tools/qtestlib/wince/remotelib/commands.h index 80a6f13..6406bbf 100644 --- a/tools/qtestlib/wince/remotelib/commands.h +++ b/tools/qtestlib/wince/remotelib/commands.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui index 7a45bfe..78b1d6c 100644 --- a/tools/qvfb/config.ui +++ b/tools/qvfb/config.ui @@ -7,11 +7,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h index 53717a6..f11156d 100644 --- a/tools/qvfb/gammaview.h +++ b/tools/qvfb/gammaview.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp index b0eb4e7..695ec53 100644 --- a/tools/qvfb/main.cpp +++ b/tools/qvfb/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index caa7e95..6ceb8eb 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qanimationwriter.h b/tools/qvfb/qanimationwriter.h index 8440a89..b83f279 100644 --- a/tools/qvfb/qanimationwriter.h +++ b/tools/qvfb/qanimationwriter.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qtopiakeysym.h b/tools/qvfb/qtopiakeysym.h index 2641e91..5e224c1 100644 --- a/tools/qvfb/qtopiakeysym.h +++ b/tools/qvfb/qtopiakeysym.h @@ -5,11 +5,11 @@ ** This file is part of the Phone Edition 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index b6a715c..244068b 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h index 90f2a33..cc4f061 100644 --- a/tools/qvfb/qvfb.h +++ b/tools/qvfb/qvfb.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbmmap.cpp b/tools/qvfb/qvfbmmap.cpp index d8230f7..b9548c1 100644 --- a/tools/qvfb/qvfbmmap.cpp +++ b/tools/qvfb/qvfbmmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbmmap.h b/tools/qvfb/qvfbmmap.h index 5b580ac..4e59a87 100644 --- a/tools/qvfb/qvfbmmap.h +++ b/tools/qvfb/qvfbmmap.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbprotocol.cpp b/tools/qvfb/qvfbprotocol.cpp index 08d2973..cc1ae3e 100644 --- a/tools/qvfb/qvfbprotocol.cpp +++ b/tools/qvfb/qvfbprotocol.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbprotocol.h b/tools/qvfb/qvfbprotocol.h index e7b6f63..40a30a1 100644 --- a/tools/qvfb/qvfbprotocol.h +++ b/tools/qvfb/qvfbprotocol.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp index 594e3f1..46b5bc9 100644 --- a/tools/qvfb/qvfbratedlg.cpp +++ b/tools/qvfb/qvfbratedlg.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h index 1611c76..21ea5bc 100644 --- a/tools/qvfb/qvfbratedlg.h +++ b/tools/qvfb/qvfbratedlg.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp index d07cd0f..8397651 100644 --- a/tools/qvfb/qvfbshmem.cpp +++ b/tools/qvfb/qvfbshmem.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbshmem.h b/tools/qvfb/qvfbshmem.h index 166ff07..b33b452 100644 --- a/tools/qvfb/qvfbshmem.h +++ b/tools/qvfb/qvfbshmem.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 53a5360..a417ed7 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h index d533613..aafb4f3 100644 --- a/tools/qvfb/qvfbview.h +++ b/tools/qvfb/qvfbview.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbx11view.cpp b/tools/qvfb/qvfbx11view.cpp index cad0b2c..01d8a8e 100644 --- a/tools/qvfb/qvfbx11view.cpp +++ b/tools/qvfb/qvfbx11view.cpp @@ -5,11 +5,11 @@ ** This file is part of the Phone Edition 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/qvfbx11view.h b/tools/qvfb/qvfbx11view.h index a96fa6d..512d093 100644 --- a/tools/qvfb/qvfbx11view.h +++ b/tools/qvfb/qvfbx11view.h @@ -5,11 +5,11 @@ ** This file is part of the Phone Edition 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/x11keyfaker.cpp b/tools/qvfb/x11keyfaker.cpp index 76d6e6a..8a3bdba 100644 --- a/tools/qvfb/x11keyfaker.cpp +++ b/tools/qvfb/x11keyfaker.cpp @@ -5,11 +5,11 @@ ** This file is part of the Phone Edition 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/qvfb/x11keyfaker.h b/tools/qvfb/x11keyfaker.h index 32417df..a2ab19e 100644 --- a/tools/qvfb/x11keyfaker.h +++ b/tools/qvfb/x11keyfaker.h @@ -5,11 +5,11 @@ ** This file is part of the Phone Edition 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/deviceskin/deviceskin.cpp b/tools/shared/deviceskin/deviceskin.cpp index 3301d24..dfade5a 100644 --- a/tools/shared/deviceskin/deviceskin.cpp +++ b/tools/shared/deviceskin/deviceskin.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/deviceskin/deviceskin.h b/tools/shared/deviceskin/deviceskin.h index 8f3fefd..b6aedb6 100644 --- a/tools/shared/deviceskin/deviceskin.h +++ b/tools/shared/deviceskin/deviceskin.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/abstractfindwidget.cpp b/tools/shared/findwidget/abstractfindwidget.cpp index e52722c..5d5c7d3 100644 --- a/tools/shared/findwidget/abstractfindwidget.cpp +++ b/tools/shared/findwidget/abstractfindwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/abstractfindwidget.h b/tools/shared/findwidget/abstractfindwidget.h index fe0c932..e25cc96 100644 --- a/tools/shared/findwidget/abstractfindwidget.h +++ b/tools/shared/findwidget/abstractfindwidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/itemviewfindwidget.cpp b/tools/shared/findwidget/itemviewfindwidget.cpp index e1f8468..3219abd 100644 --- a/tools/shared/findwidget/itemviewfindwidget.cpp +++ b/tools/shared/findwidget/itemviewfindwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/itemviewfindwidget.h b/tools/shared/findwidget/itemviewfindwidget.h index 71bb8f6..3ef2b93 100644 --- a/tools/shared/findwidget/itemviewfindwidget.h +++ b/tools/shared/findwidget/itemviewfindwidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/texteditfindwidget.cpp b/tools/shared/findwidget/texteditfindwidget.cpp index 73100f5..8fe69dc 100644 --- a/tools/shared/findwidget/texteditfindwidget.cpp +++ b/tools/shared/findwidget/texteditfindwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/findwidget/texteditfindwidget.h b/tools/shared/findwidget/texteditfindwidget.h index 4074ff0..e4733cc 100644 --- a/tools/shared/findwidget/texteditfindwidget.h +++ b/tools/shared/findwidget/texteditfindwidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/fontpanel/fontpanel.cpp b/tools/shared/fontpanel/fontpanel.cpp index 4545baa..2411629 100644 --- a/tools/shared/fontpanel/fontpanel.cpp +++ b/tools/shared/fontpanel/fontpanel.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/fontpanel/fontpanel.h b/tools/shared/fontpanel/fontpanel.h index 0f542c6..d3b9337 100644 --- a/tools/shared/fontpanel/fontpanel.h +++ b/tools/shared/fontpanel/fontpanel.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.cpp b/tools/shared/qtgradienteditor/qtcolorbutton.cpp index 6926f60..21b9848 100644 --- a/tools/shared/qtgradienteditor/qtcolorbutton.cpp +++ b/tools/shared/qtgradienteditor/qtcolorbutton.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h index fb91452..26bdde0 100644 --- a/tools/shared/qtgradienteditor/qtcolorbutton.h +++ b/tools/shared/qtgradienteditor/qtcolorbutton.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtcolorline.cpp b/tools/shared/qtgradienteditor/qtcolorline.cpp index 337726c..6ddeb5c 100644 --- a/tools/shared/qtgradienteditor/qtcolorline.cpp +++ b/tools/shared/qtgradienteditor/qtcolorline.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h index d5535b1..4c3118c 100644 --- a/tools/shared/qtgradienteditor/qtcolorline.h +++ b/tools/shared/qtgradienteditor/qtcolorline.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.cpp b/tools/shared/qtgradienteditor/qtgradientdialog.cpp index 032cb16..b434aea 100644 --- a/tools/shared/qtgradienteditor/qtgradientdialog.cpp +++ b/tools/shared/qtgradienteditor/qtgradientdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h index d3bafc9..a89f028 100644 --- a/tools/shared/qtgradienteditor/qtgradientdialog.h +++ b/tools/shared/qtgradienteditor/qtgradientdialog.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.ui b/tools/shared/qtgradienteditor/qtgradientdialog.ui index 0b3db0b..7a205c1 100644 --- a/tools/shared/qtgradienteditor/qtgradientdialog.ui +++ b/tools/shared/qtgradienteditor/qtgradientdialog.ui @@ -7,11 +7,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.cpp b/tools/shared/qtgradienteditor/qtgradienteditor.cpp index 9eca9d8..95be5d2 100644 --- a/tools/shared/qtgradienteditor/qtgradienteditor.cpp +++ b/tools/shared/qtgradienteditor/qtgradienteditor.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h index 9974065..838b474 100644 --- a/tools/shared/qtgradienteditor/qtgradienteditor.h +++ b/tools/shared/qtgradienteditor/qtgradienteditor.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.ui b/tools/shared/qtgradienteditor/qtgradienteditor.ui index 4d103e3..69e90a3 100644 --- a/tools/shared/qtgradienteditor/qtgradienteditor.ui +++ b/tools/shared/qtgradienteditor/qtgradienteditor.ui @@ -7,11 +7,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientmanager.cpp b/tools/shared/qtgradienteditor/qtgradientmanager.cpp index 51b5d96..db4bc7c 100644 --- a/tools/shared/qtgradienteditor/qtgradientmanager.cpp +++ b/tools/shared/qtgradienteditor/qtgradientmanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientmanager.h b/tools/shared/qtgradienteditor/qtgradientmanager.h index ff9ebf7..5e3b3ab 100644 --- a/tools/shared/qtgradienteditor/qtgradientmanager.h +++ b/tools/shared/qtgradienteditor/qtgradientmanager.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp index cbc53db..7f87d97 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp +++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h index 9f16fb0..1152234 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h +++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp index a632c0f..44505ee 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp +++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h index d4e6b3c..81ebbb9 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h +++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp index adaf57d..e457383 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp +++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h index aafea8b..9b5f69d 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h +++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientutils.cpp b/tools/shared/qtgradienteditor/qtgradientutils.cpp index 2456233..dd36f87 100644 --- a/tools/shared/qtgradienteditor/qtgradientutils.cpp +++ b/tools/shared/qtgradienteditor/qtgradientutils.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientutils.h b/tools/shared/qtgradienteditor/qtgradientutils.h index 2e35652..02e5274 100644 --- a/tools/shared/qtgradienteditor/qtgradientutils.h +++ b/tools/shared/qtgradienteditor/qtgradientutils.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientview.cpp b/tools/shared/qtgradienteditor/qtgradientview.cpp index ac8ed17..06d109e 100644 --- a/tools/shared/qtgradienteditor/qtgradientview.cpp +++ b/tools/shared/qtgradienteditor/qtgradientview.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientview.h b/tools/shared/qtgradienteditor/qtgradientview.h index b1fafd7..a72c734 100644 --- a/tools/shared/qtgradienteditor/qtgradientview.h +++ b/tools/shared/qtgradienteditor/qtgradientview.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp index c139ec4..38b583b 100644 --- a/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp +++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.h b/tools/shared/qtgradienteditor/qtgradientviewdialog.h index 2ec7cdd..ad901b9 100644 --- a/tools/shared/qtgradienteditor/qtgradientviewdialog.h +++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientviewdialog.ui b/tools/shared/qtgradienteditor/qtgradientviewdialog.ui index ed53209..d211998 100644 --- a/tools/shared/qtgradienteditor/qtgradientviewdialog.ui +++ b/tools/shared/qtgradienteditor/qtgradientviewdialog.ui @@ -7,11 +7,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.cpp b/tools/shared/qtgradienteditor/qtgradientwidget.cpp index 3f6b48d..4da7ecb 100644 --- a/tools/shared/qtgradienteditor/qtgradientwidget.cpp +++ b/tools/shared/qtgradienteditor/qtgradientwidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h index 4dc740b..5abef8c 100644 --- a/tools/shared/qtgradienteditor/qtgradientwidget.h +++ b/tools/shared/qtgradienteditor/qtgradientwidget.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp index ecdaf16..b9607a6 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h index 0833c2d..7c33cbc 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.cpp b/tools/shared/qtpropertybrowser/qteditorfactory.cpp index 3e9336f..ad5d085 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/tools/shared/qtpropertybrowser/qteditorfactory.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h index 044dd5e..8938b98 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.h +++ b/tools/shared/qtpropertybrowser/qteditorfactory.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp index d7c8f0b..a462f2c 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h index 29422bd..ec3887f 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp index 7254245..0cd994b 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h index 649a9e3..c172fb8 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp index d689e60..7e18d72 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h index 2eab3c8..8a66d05 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp index 8b84eb9..4179497 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h index 90fe5c0..4643bc1 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.h +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp index ed262e5..0a7225a 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h index 63bd7f6..e508afd 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp index 7e1975e..5cf0264 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h index 91397d8..a29fa76 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.h +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp index f15c4bc..3ed82c1 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h index 879b437..e08de7e 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.h +++ b/tools/shared/qttoolbardialog/qttoolbardialog.h @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp index ceb5f75..8d58e4c 100644 --- a/tools/xmlpatterns/main.cpp +++ b/tools/xmlpatterns/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the Patternist project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/main.h b/tools/xmlpatterns/main.h index eaef3bb..42c74a1 100644 --- a/tools/xmlpatterns/main.h +++ b/tools/xmlpatterns/main.h @@ -4,11 +4,11 @@ * ** * ** This file is part of the Patternist project on Trolltech Labs. * ** * ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qapplicationargument.cpp b/tools/xmlpatterns/qapplicationargument.cpp index e88d5f8..3b6a508 100644 --- a/tools/xmlpatterns/qapplicationargument.cpp +++ b/tools/xmlpatterns/qapplicationargument.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h index 3232bbc..74e43e1 100644 --- a/tools/xmlpatterns/qapplicationargument_p.h +++ b/tools/xmlpatterns/qapplicationargument_p.h @@ -5,11 +5,11 @@ ** ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 7a9b902..ecca529 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -6,11 +6,11 @@ ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h index 16bcfe0..cf5156f 100644 --- a/tools/xmlpatterns/qapplicationargumentparser_p.h +++ b/tools/xmlpatterns/qapplicationargumentparser_p.h @@ -5,11 +5,11 @@ ** ** This file is part of the tools applications 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qcoloringmessagehandler.cpp b/tools/xmlpatterns/qcoloringmessagehandler.cpp index dd7e97f..e2848ee 100644 --- a/tools/xmlpatterns/qcoloringmessagehandler.cpp +++ b/tools/xmlpatterns/qcoloringmessagehandler.cpp @@ -6,11 +6,11 @@ ** This file is part of the QtCore 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qcoloringmessagehandler_p.h b/tools/xmlpatterns/qcoloringmessagehandler_p.h index 69ca5b0..be512cb 100644 --- a/tools/xmlpatterns/qcoloringmessagehandler_p.h +++ b/tools/xmlpatterns/qcoloringmessagehandler_p.h @@ -4,11 +4,11 @@ * ** * ** This file is part of the Patternist project on Trolltech Labs. * ** * ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qcoloroutput.cpp b/tools/xmlpatterns/qcoloroutput.cpp index e401c5d..ff28d80 100644 --- a/tools/xmlpatterns/qcoloroutput.cpp +++ b/tools/xmlpatterns/qcoloroutput.cpp @@ -5,11 +5,11 @@ * ** This file is part of the Patternist project on Trolltech Labs. * ** * ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/tools/xmlpatterns/qcoloroutput_p.h b/tools/xmlpatterns/qcoloroutput_p.h index d9daa14..4a2c161 100644 --- a/tools/xmlpatterns/qcoloroutput_p.h +++ b/tools/xmlpatterns/qcoloroutput_p.h @@ -4,11 +4,11 @@ * ** * ** This file is part of the Patternist project on Trolltech Labs. * ** * ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp index a089959..80ed602 100644 --- a/util/fixnonlatin1/main.cpp +++ b/util/fixnonlatin1/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/gencmap/gencmap.cpp b/util/gencmap/gencmap.cpp index 9d0d997..33fec91 100644 --- a/util/gencmap/gencmap.cpp +++ b/util/gencmap/gencmap.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/archive/qarchive.cpp b/util/install/archive/qarchive.cpp index dd51c65..b343b7f 100644 --- a/util/install/archive/qarchive.cpp +++ b/util/install/archive/qarchive.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/archive/qarchive.h b/util/install/archive/qarchive.h index 351a48b..a499e88 100644 --- a/util/install/archive/qarchive.h +++ b/util/install/archive/qarchive.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/keygen/keyinfo.cpp b/util/install/keygen/keyinfo.cpp index 9ad5404..ba91309 100644 --- a/util/install/keygen/keyinfo.cpp +++ b/util/install/keygen/keyinfo.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/keygen/keyinfo.h b/util/install/keygen/keyinfo.h index 9b3687a..dbc13aa 100644 --- a/util/install/keygen/keyinfo.h +++ b/util/install/keygen/keyinfo.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/keygen/main.cpp b/util/install/keygen/main.cpp index b6eee41..d5016e8 100644 --- a/util/install/keygen/main.cpp +++ b/util/install/keygen/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/mac/licensedlgimpl.cpp b/util/install/mac/licensedlgimpl.cpp index ed2998a..add9205 100644 --- a/util/install/mac/licensedlgimpl.cpp +++ b/util/install/mac/licensedlgimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/mac/licensedlgimpl.h b/util/install/mac/licensedlgimpl.h index 90f8809..7a48857 100644 --- a/util/install/mac/licensedlgimpl.h +++ b/util/install/mac/licensedlgimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/mac/main.cpp b/util/install/mac/main.cpp index ede85a6..2d88c57 100644 --- a/util/install/mac/main.cpp +++ b/util/install/mac/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/mac/unpackdlgimpl.cpp b/util/install/mac/unpackdlgimpl.cpp index 5538f4d..e7f73eb 100644 --- a/util/install/mac/unpackdlgimpl.cpp +++ b/util/install/mac/unpackdlgimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/mac/unpackdlgimpl.h b/util/install/mac/unpackdlgimpl.h index 11585d7..b07ded7 100644 --- a/util/install/mac/unpackdlgimpl.h +++ b/util/install/mac/unpackdlgimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/package/main.cpp b/util/install/package/main.cpp index 39c71db..5f74c08 100644 --- a/util/install/package/main.cpp +++ b/util/install/package/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/archive.cpp b/util/install/win/archive.cpp index 81f8e53..9a8ba79 100644 --- a/util/install/win/archive.cpp +++ b/util/install/win/archive.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/archive.h b/util/install/win/archive.h index d470a27..6764efe 100644 --- a/util/install/win/archive.h +++ b/util/install/win/archive.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/dialogs/folderdlgimpl.cpp b/util/install/win/dialogs/folderdlgimpl.cpp index 8c3c27f..edbbe62 100644 --- a/util/install/win/dialogs/folderdlgimpl.cpp +++ b/util/install/win/dialogs/folderdlgimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/dialogs/folderdlgimpl.h b/util/install/win/dialogs/folderdlgimpl.h index 25e13b5..b3e4d40 100644 --- a/util/install/win/dialogs/folderdlgimpl.h +++ b/util/install/win/dialogs/folderdlgimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/environment.cpp b/util/install/win/environment.cpp index bbf5719..00ab46b 100644 --- a/util/install/win/environment.cpp +++ b/util/install/win/environment.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/environment.h b/util/install/win/environment.h index d0f45e4..b21f961 100644 --- a/util/install/win/environment.h +++ b/util/install/win/environment.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/globalinformation.cpp b/util/install/win/globalinformation.cpp index a05db1e..c231a5e 100644 --- a/util/install/win/globalinformation.cpp +++ b/util/install/win/globalinformation.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/globalinformation.h b/util/install/win/globalinformation.h index 843dac6..c03cedd 100644 --- a/util/install/win/globalinformation.h +++ b/util/install/win/globalinformation.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/main.cpp b/util/install/win/main.cpp index 0c21523..fcb9d70 100644 --- a/util/install/win/main.cpp +++ b/util/install/win/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/pages/pages.cpp b/util/install/win/pages/pages.cpp index 3ee4093..7fd79b2 100644 --- a/util/install/win/pages/pages.cpp +++ b/util/install/win/pages/pages.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/pages/pages.h b/util/install/win/pages/pages.h index 8108f42..2c8a266 100644 --- a/util/install/win/pages/pages.h +++ b/util/install/win/pages/pages.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/pages/sidedecorationimpl.cpp b/util/install/win/pages/sidedecorationimpl.cpp index aa25825..8fab952 100644 --- a/util/install/win/pages/sidedecorationimpl.cpp +++ b/util/install/win/pages/sidedecorationimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/pages/sidedecorationimpl.h b/util/install/win/pages/sidedecorationimpl.h index f39e204..40556ac 100644 --- a/util/install/win/pages/sidedecorationimpl.h +++ b/util/install/win/pages/sidedecorationimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/resource.cpp b/util/install/win/resource.cpp index 4ea0ad8..baf416e 100644 --- a/util/install/win/resource.cpp +++ b/util/install/win/resource.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/resource.h b/util/install/win/resource.h index 791edfe..33714cb 100644 --- a/util/install/win/resource.h +++ b/util/install/win/resource.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/setupwizardimpl.cpp b/util/install/win/setupwizardimpl.cpp index 909d986..c32ad48 100644 --- a/util/install/win/setupwizardimpl.cpp +++ b/util/install/win/setupwizardimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/setupwizardimpl.h b/util/install/win/setupwizardimpl.h index 1c86f74..5a6c011 100644 --- a/util/install/win/setupwizardimpl.h +++ b/util/install/win/setupwizardimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/setupwizardimpl_config.cpp b/util/install/win/setupwizardimpl_config.cpp index a5959fb..f34710f 100644 --- a/util/install/win/setupwizardimpl_config.cpp +++ b/util/install/win/setupwizardimpl_config.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/shell.cpp b/util/install/win/shell.cpp index b1303a7..71dff8f 100644 --- a/util/install/win/shell.cpp +++ b/util/install/win/shell.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/shell.h b/util/install/win/shell.h index 4d5f9af..3dd9968 100644 --- a/util/install/win/shell.h +++ b/util/install/win/shell.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/uninstaller/uninstaller.cpp b/util/install/win/uninstaller/uninstaller.cpp index 9a7c529..1f5a2a0 100644 --- a/util/install/win/uninstaller/uninstaller.cpp +++ b/util/install/win/uninstaller/uninstaller.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/uninstaller/uninstallimpl.cpp b/util/install/win/uninstaller/uninstallimpl.cpp index d30358b..11371b0 100644 --- a/util/install/win/uninstaller/uninstallimpl.cpp +++ b/util/install/win/uninstaller/uninstallimpl.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/install/win/uninstaller/uninstallimpl.h b/util/install/win/uninstaller/uninstallimpl.h index b3bff36..fe9d714 100644 --- a/util/install/win/uninstaller/uninstallimpl.h +++ b/util/install/win/uninstaller/uninstallimpl.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/configfile.cpp b/util/lexgen/configfile.cpp index 8d77689..9a9077b 100644 --- a/util/lexgen/configfile.cpp +++ b/util/lexgen/configfile.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/configfile.h b/util/lexgen/configfile.h index 7bf3389..fb665eb 100644 --- a/util/lexgen/configfile.h +++ b/util/lexgen/configfile.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp index a3c63f2..15b4473 100644 --- a/util/lexgen/generator.cpp +++ b/util/lexgen/generator.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h index 047378b..f360852 100644 --- a/util/lexgen/generator.h +++ b/util/lexgen/generator.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/global.h b/util/lexgen/global.h index 01f915d..1e79b67 100644 --- a/util/lexgen/global.h +++ b/util/lexgen/global.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp index b7b529a..fd3eb90 100644 --- a/util/lexgen/main.cpp +++ b/util/lexgen/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp index 701a5e0..147ce28 100644 --- a/util/lexgen/nfa.cpp +++ b/util/lexgen/nfa.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/nfa.h b/util/lexgen/nfa.h index 1f25071..73460dd 100644 --- a/util/lexgen/nfa.h +++ b/util/lexgen/nfa.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/re2nfa.cpp b/util/lexgen/re2nfa.cpp index ed58d50..ef06c95 100644 --- a/util/lexgen/re2nfa.cpp +++ b/util/lexgen/re2nfa.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/re2nfa.h b/util/lexgen/re2nfa.h index fc10bea..1e2d4be 100644 --- a/util/lexgen/re2nfa.h +++ b/util/lexgen/re2nfa.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/tests/tst_lexgen.cpp b/util/lexgen/tests/tst_lexgen.cpp index 6e50b15..0a6e768 100644 --- a/util/lexgen/tests/tst_lexgen.cpp +++ b/util/lexgen/tests/tst_lexgen.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/lexgen/tokenizer.cpp b/util/lexgen/tokenizer.cpp index 401fa92..9fc4d84 100644 --- a/util/lexgen/tokenizer.cpp +++ b/util/lexgen/tokenizer.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/local_database/testlocales/localemodel.cpp b/util/local_database/testlocales/localemodel.cpp index 8772207..c191354 100644 --- a/util/local_database/testlocales/localemodel.cpp +++ b/util/local_database/testlocales/localemodel.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/local_database/testlocales/localemodel.h b/util/local_database/testlocales/localemodel.h index 16512de..c100986 100644 --- a/util/local_database/testlocales/localemodel.h +++ b/util/local_database/testlocales/localemodel.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/local_database/testlocales/localewidget.cpp b/util/local_database/testlocales/localewidget.cpp index d6b23a9..21bf78c 100644 --- a/util/local_database/testlocales/localewidget.cpp +++ b/util/local_database/testlocales/localewidget.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/local_database/testlocales/localewidget.h b/util/local_database/testlocales/localewidget.h index 834e10c..f8c6de7 100644 --- a/util/local_database/testlocales/localewidget.h +++ b/util/local_database/testlocales/localewidget.h @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/local_database/testlocales/main.cpp b/util/local_database/testlocales/main.cpp index ba4e678..09bb27a 100644 --- a/util/local_database/testlocales/main.cpp +++ b/util/local_database/testlocales/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp index 905c1ec..bd1f590 100644 --- a/util/normalize/main.cpp +++ b/util/normalize/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/plugintest/main.cpp b/util/plugintest/main.cpp index eabcbb0..c379aeb 100644 --- a/util/plugintest/main.cpp +++ b/util/plugintest/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp index f1daac8..4f0d8b9 100644 --- a/util/qlalr/compress.cpp +++ b/util/qlalr/compress.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h index 8b7ac60..034bc72 100644 --- a/util/qlalr/compress.h +++ b/util/qlalr/compress.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index 9bfc1a9..54e7a14 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h index dd32413..8c73efe 100644 --- a/util/qlalr/cppgenerator.h +++ b/util/qlalr/cppgenerator.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp index 641ed01..f1510e0 100644 --- a/util/qlalr/dotgraph.cpp +++ b/util/qlalr/dotgraph.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h index e308b74..8c5b4b4 100644 --- a/util/qlalr/dotgraph.h +++ b/util/qlalr/dotgraph.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp index 9e5dabf..f7c02fa 100644 --- a/util/qlalr/grammar.cpp +++ b/util/qlalr/grammar.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h index a9a4172..fa863d4 100644 --- a/util/qlalr/grammar_p.h +++ b/util/qlalr/grammar_p.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp index 51c2674..bc06343 100644 --- a/util/qlalr/lalr.cpp +++ b/util/qlalr/lalr.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g index ed2ef86..8a5dfd0 100644 --- a/util/qlalr/lalr.g +++ b/util/qlalr/lalr.g @@ -6,11 +6,11 @@ -- This file is part of the QLALR project on Trolltech Labs. -- -- $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 either Technology Preview License Agreement or the --- Beta Release License Agreement. +-- Commercial Usage +-- Licensees holding valid Qt Commercial licenses may use this file in +-- accordance with the Qt Commercial License Agreement provided with the +-- Software or, alternatively, in accordance with the terms contained in +-- a written agreement between you and Nokia. -- -- GNU Lesser General Public License Usage -- Alternatively, this file may be used under the terms of the GNU Lesser @@ -86,11 +86,11 @@ ** This file is part of the project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -200,11 +200,11 @@ protected: ** This file is part of the project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h index 29bb522..73ea4cc 100644 --- a/util/qlalr/lalr.h +++ b/util/qlalr/lalr.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp index 91c72bb..d85c70c 100644 --- a/util/qlalr/main.cpp +++ b/util/qlalr/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp index c117071..6208feb 100644 --- a/util/qlalr/parsetable.cpp +++ b/util/qlalr/parsetable.cpp @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h index 36f6926..6c3caa1 100644 --- a/util/qlalr/parsetable.h +++ b/util/qlalr/parsetable.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp index 5a7ad3b..2011774 100644 --- a/util/qlalr/recognizer.cpp +++ b/util/qlalr/recognizer.cpp @@ -7,11 +7,11 @@ ** This file is part of the project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h index c9be98f..8df583b 100644 --- a/util/qlalr/recognizer.h +++ b/util/qlalr/recognizer.h @@ -6,11 +6,11 @@ ** This file is part of the QLALR project on Trolltech Labs. ** ** $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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/unicode/codecs/big5/main.cpp b/util/unicode/codecs/big5/main.cpp index edd70e5..793cfd6 100644 --- a/util/unicode/codecs/big5/main.cpp +++ b/util/unicode/codecs/big5/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index fa6ca8b..955cbfd 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/util/xkbdatagen/main.cpp b/util/xkbdatagen/main.cpp index bd9f3ed..e147aa6 100644 --- a/util/xkbdatagen/main.cpp +++ b/util/xkbdatagen/main.cpp @@ -6,11 +6,11 @@ ** This file is part of the utils 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -- cgit v0.12 From 0d29f576e6a64b61f56b3087fd72b2d21ca65f7f Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 8 Apr 2009 08:18:55 +0200 Subject: Don't check license for internal configurations A Nokia build doesn't require a license. Reviewed-by: mauricek BT: yes (cherry picked from commit 7332065a28577444e7c97617fb03d0f14c706b5b) --- tools/configure/configureapp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0c4dbb3..810e47b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3499,7 +3499,8 @@ void Configure::readLicense() } #else } else { - Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); + if (dictionary[ "BUILDNOKIA" ] != "yes") + Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); if (dictionary["DONE"] != "error") { // give the user some feedback, and prompt for license acceptance cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl; -- cgit v0.12 From dcfef78f9a8be49b71512d47e3bbe076c2beb4c8 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 8 Apr 2009 08:25:05 +0200 Subject: New binary for Windows configure Reviewed-by: mauricek BT: yes (cherry picked from commit f0239a4983dd84b0e23c1e6f796c5c44dfde26b2) --- configure.exe | Bin 1134592 -> 851968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 13ca0e5..891e928 100644 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12 From 7c8672bab9cef0eb9b0a8e3c5c1696dc98b78cc0 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 8 Apr 2009 08:57:16 +0200 Subject: BT: Revert "Fixes: Remove warnings in the embeddeddialogs demo." This reverts commit 7d24c0af8e52687b4e5735950495bb25947ca9f0. This change removed the accidental recursion leading to console warnings on Mac OS X by changing the way the scene event filter is registered for popups. But it also broke the behavior of the demo with regards to popup handling, in that the custom proxy no longer can detect popups that close, so dialogs stay zoomed in after the cursor has left. So before, the demo worked but printed warnings to the console on Mac OS X, and after, the warnings were gone but the demo behavior broke on all platforms... The change also accidentally removed the cache mode from the popup; I don't think this was intentional. Reviewed-by: Alexis (cherry picked from commit ccaf16278f4fd422458d01b80579952846e6cf38) --- demos/embeddeddialogs/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp index a41e4d1..5a0204e 100644 --- a/demos/embeddeddialogs/main.cpp +++ b/demos/embeddeddialogs/main.cpp @@ -68,7 +68,6 @@ int main(int argc, char *argv[]) proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache); scene.addItem(proxy); - proxy->installSceneEventFilter(proxy); } } scene.setSceneRect(scene.itemsBoundingRect()); -- cgit v0.12 From abea9cafaf3bfc4e5e286c93e9509fd3416b1f65 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 8 Apr 2009 10:30:50 +0200 Subject: Autotest: Cisco changed their DNS setup; update our test. Reviewed-by: TrustMe (cherry picked from commit df461a4a1bc7492729f701d38c81916b1be386b0) --- tests/auto/qhostinfo/tst_qhostinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index 67e68a7..f369121d 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -305,7 +305,7 @@ void tst_QHostInfo::reverseLookup_data() // ### Use internal DNS instead. Discussed with Andreas. //QTest::newRow("classical.hexago.com") << QString("2001:5c0:0:2::24") << QStringList(QString("classical.hexago.com")) << 0; - QTest::newRow("www.cisco.com") << QString("198.133.219.25") << QStringList(QString("www.cisco.com")) << 0; + QTest::newRow("www.cisco.com") << QString("198.133.219.25") << QStringList(QString("origin-www.cisco.com")) << 0; QTest::newRow("bogusexample.doenstexist.org") << QString("1::2::3::4") << QStringList() << 1; } -- cgit v0.12 From 4208365d7cf83bd953534bfb6b56bcbbeb77ad83 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 8 Apr 2009 10:25:06 +0200 Subject: Revert "Bt: Fix regression in the Embedded dialogs example" This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b. The change to QComboBox introduces a behavior change; whereas before the view container would always get its palette set as a response to QEvent::PaletteChange, it would now miss this event and rely on regular palette propagation to get the right contens. The difference in behavior is that QWidget::setPalette() also resolves the palette mask, and after 35c26d69 this would no longer happen. The bug in the embedded dialogs demo is caused by the embedded dialogs demo. See upcoming commit. Reviewed-by: Alexis Reviewed-by: Jens Bache-Wiig (cherry picked from commit 3f3d09cf1511dde99797671a7bc848cdabc8d7fa) --- demos/embeddeddialogs/customproxy.cpp | 11 ++--------- src/gui/widgets/qcombobox.cpp | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp index 899565f..0eea687 100644 --- a/demos/embeddeddialogs/customproxy.cpp +++ b/demos/embeddeddialogs/customproxy.cpp @@ -111,15 +111,8 @@ bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event) QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &value) { - if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { - QGraphicsItem *item = qVariantValue(value); - if (change == ItemChildAddedChange) { - item->setCacheMode(ItemCoordinateCache); - item->installSceneEventFilter(this); - } else { - item->removeSceneEventFilter(this); - } - } + if (change == ItemChildRemovedChange) + removeSceneEventFilter(this); return QGraphicsProxyWidget::itemChange(change, value); } diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index f864224..f7e68e2 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2572,21 +2572,19 @@ void QComboBox::changeEvent(QEvent *e) hidePopup(); break; case QEvent::PaletteChange: { - if (d->container) { - QStyleOptionComboBox opt; - initStyleOption(&opt); + QStyleOptionComboBox opt; + initStyleOption(&opt); #ifndef QT_NO_MENU - if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, this)) { - QMenu menu; - menu.ensurePolished(); - d->viewContainer()->setPalette(menu.palette()); - d->viewContainer()->setWindowOpacity(menu.windowOpacity()); - } else + if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, this)) { + QMenu menu; + menu.ensurePolished(); + d->viewContainer()->setPalette(menu.palette()); + d->viewContainer()->setWindowOpacity(menu.windowOpacity()); + } else #endif - { - d->viewContainer()->setPalette(palette()); - d->viewContainer()->setWindowOpacity(1.0); - } + { + d->viewContainer()->setPalette(palette()); + d->viewContainer()->setWindowOpacity(1.0); } break; } -- cgit v0.12 From b9400015f13a61d5a16306ceb7b741f810f0cb3d Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 8 Apr 2009 10:27:28 +0200 Subject: BT: Fix the embedded dialogs demo on Mac OS X and Motif style The CustomProxy class installs an event filter on its child to detect whether it is shadowed by a popup or not. The problem is it does this regardless of whether it currently has a scene assigned or not. Styles that assign palettes, or otherwise cause side effects when assigned to a QGraphicsProxyWidget, will cause the demo to print warnings to the console and fail to install the event filter. The reason for the failure to install the filter is that QGraphicsItem only allows scene event filters to be installed between items that are in the same scene. So, depending on the style, you either get an ItemSceneHasChanged or an ItemChildAddedChange first. The demo must account for this, and install its filter only when the items are guaranteed to be in the scene already. Reviewed-by: Alexis (cherry picked from commit 510ce6fa8a3a30063744eaaf004850679610060e) --- demos/embeddeddialogs/customproxy.cpp | 17 ++++++++++++++--- demos/embeddeddialogs/customproxy.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp index 0eea687..acbfbc1 100644 --- a/demos/embeddeddialogs/customproxy.cpp +++ b/demos/embeddeddialogs/customproxy.cpp @@ -44,7 +44,7 @@ #include CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags) - : QGraphicsProxyWidget(parent, wFlags), popupShown(false) + : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(0) { timeLine = new QTimeLine(250, this); connect(timeLine, SIGNAL(valueChanged(qreal)), @@ -111,8 +111,19 @@ bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event) QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &value) { - if (change == ItemChildRemovedChange) - removeSceneEventFilter(this); + if (change == ItemChildAddedChange || change == ItemChildRemovedChange) { + if (change == ItemChildAddedChange) { + currentPopup = qVariantValue(value); + currentPopup->setCacheMode(ItemCoordinateCache); + if (scene()) + currentPopup->installSceneEventFilter(this); + } else if (scene()) { + currentPopup->removeSceneEventFilter(this); + currentPopup = 0; + } + } else if (currentPopup && change == ItemSceneHasChanged) { + currentPopup->installSceneEventFilter(this); + } return QGraphicsProxyWidget::itemChange(change, value); } diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h index 155d739..091bbb0 100644 --- a/demos/embeddeddialogs/customproxy.h +++ b/demos/embeddeddialogs/customproxy.h @@ -70,6 +70,7 @@ private slots: private: QTimeLine *timeLine; bool popupShown; + QGraphicsItem *currentPopup; }; #endif -- cgit v0.12 From 195c01f7209dce880799c542933efbdc5f1495bc Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 8 Apr 2009 10:45:41 +0200 Subject: BT: Fix infinite recursion potential from change acff913a6287ad50b0ac782 It seems there is a potential for recursion because calling keyDown: can bubble up to the window which will start the process all over again. keyDown: will actually call qt_dispatchKeyEvent(), we may as well short it out here. All the previous cases I tried continue to work and we don't crash Creator if you are really impatient hitting keys. (cherry picked from commit c131208e59f5b2dd517b00c4539458760b8fd8aa) --- src/gui/widgets/qcocoamenu_mac.mm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index e1490f6..ac2372f 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -159,10 +159,11 @@ QT_END_NAMESPACE accel_ev.ignore(); qt_sendSpontaneousEvent(widget, &accel_ev); if (accel_ev.isAccepted()) { - *target = nil; - *action = nil; - [qt_mac_nativeview_for(widget) keyDown:event]; - return YES; + if (qt_dispatchKeyEvent(event, widget)) { + *target = nil; + *action = nil; + return YES; + } } } } -- cgit v0.12 From 64424f5e6cf229cecc104ebf6b7f64c85e027b98 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 8 Apr 2009 11:07:33 +0200 Subject: Javascript: When there is javascript running then it will spin the CPU at 100% Zero timers on Windows would continue to fire even after being stopped as long as a new timer was started that reused the pointer address of the zero timer. Fix this by only re-firing zero timers if the zero timer hadn't been stopped (we can check this by looking at the inTimerEvent flag, which is set to false by registerTimer()). Task-number: 247401 Reviewed-by: Denis Dzyubenko Reviewed-by: Prasanth Ullattil (cherry picked from commit 74f092408d1a870e2c1e2a49182c8e09f952055d) --- dist/changes-4.5.1 | 4 ++ src/corelib/kernel/qeventdispatcher_win.cpp | 15 +++++-- tests/auto/qtimer/tst_qtimer.cpp | 65 +++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index de4eef7..eb8ec5f 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -68,6 +68,10 @@ Qt for Linux/X11 Qt for Windows -------------- +- QCoreApplication + * [247401] Fixed a bug that would cause a restarted timer to fire + too early, causing Javascript in QtWebKit to consume 100% CPU on + Windows. Qt for Mac OS X --------------- diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 32d9eec..c07a418 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -1059,11 +1059,20 @@ bool QEventDispatcherWin32::event(QEvent *e) QZeroTimerEvent *zte = static_cast(e); WinTimerInfo *t = d->timerDict.value(zte->timerId()); if (t) { + t->inTimerEvent = true; + QTimerEvent te(zte->timerId()); QCoreApplication::sendEvent(t->obj, &te); - WinTimerInfo *tn = d->timerDict.value(zte->timerId()); - if (tn && t == tn) - QCoreApplication::postEvent(this, new QZeroTimerEvent(zte->timerId())); + + t = d->timerDict.value(zte->timerId()); + if (t) { + if (t->interval == 0 && t->inTimerEvent) { + // post the next zero timer event as long as the timer was not restarted + QCoreApplication::postEvent(this, new QZeroTimerEvent(zte->timerId())); + } + + t->inTimerEvent = false; + } } return true; } else if (e->type() == QEvent::Timer) { diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index 282eab9..d4bafd4 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -83,6 +83,7 @@ private slots: void recurringTimer(); void deleteLaterOnQTimer(); // long name, don't want to shadow QObject::deleteLater() void moveToThread(); + void restartedTimerFiresTooSoon(); }; class TimerHelper : public QObject @@ -416,5 +417,69 @@ void tst_QTimer::moveToThread() QVERIFY((ti3.timerId() & 0xffffff) != (ti1.timerId() & 0xffffff)); } +class RestartedTimerFiresTooSoonObject : public QObject +{ + Q_OBJECT + +public: + QBasicTimer m_timer; + + int m_interval; + QTime m_startedTime; + QEventLoop eventLoop; + + inline RestartedTimerFiresTooSoonObject() + : QObject(), m_interval(0) + { } + + void timerFired() + { + static int interval = 1000; + + m_interval = interval; + m_startedTime.start(); + m_timer.start(interval, this); + + // alternate between single-shot and 1 sec + interval = interval ? 0 : 1000; + } + + void timerEvent(QTimerEvent* ev) + { + if (ev->timerId() != m_timer.timerId()) + return; + + m_timer.stop(); + + QTime now = QTime::currentTime(); + int elapsed = m_startedTime.elapsed(); + + if (elapsed < m_interval / 2) { + // severely too early! + m_timer.stop(); + eventLoop.exit(-1); + return; + } + + timerFired(); + + // don't do this forever + static int count = 0; + if (count++ > 20) { + m_timer.stop(); + eventLoop.quit(); + return; + } + } +}; + +void tst_QTimer::restartedTimerFiresTooSoon() +{ + RestartedTimerFiresTooSoonObject object; + object.timerFired(); + QVERIFY(object.eventLoop.exec() == 0); +} + QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" +\ -- cgit v0.12 From 2500148affcb4a025d756078744241c27207c3c3 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 8 Apr 2009 20:10:30 +1000 Subject: BT: Fix up comments in new Cocoa files. It seems that Vim or Xcode or whatever I was using to paste these in messed up and added an extra space. Now we should be consistent with the .cpp files and I found a file that we missed too. (cherry picked from commit be3b8acbd311b9cbeaa7c87b4f34b2e33b4a7fa3) Conflicts: src/gui/kernel/qcocoaapplication_mac.mm src/gui/kernel/qcocoaapplicationdelegate_mac.mm src/gui/kernel/qcocoamenuloader_mac.mm src/gui/kernel/qcocoawindow_mac.mm src/gui/kernel/qcocoawindowdelegate_mac.mm src/gui/widgets/qcocoamenu_mac.mm src/gui/widgets/qmaccocoaviewcontainer_mac.mm src/gui/widgets/qmacnativewidget_mac.mm --- src/gui/kernel/qcocoaapplication_mac.mm | 22 ++++++------- src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 22 ++++++------- src/gui/kernel/qcocoamenuloader_mac.mm | 22 ++++++------- src/gui/kernel/qcocoawindow_mac.mm | 22 ++++++------- src/gui/kernel/qcocoawindowdelegate_mac.mm | 22 ++++++------- src/gui/widgets/qcocoamenu_mac.mm | 24 +++++++------- src/gui/widgets/qmaccocoaviewcontainer_mac.mm | 22 ++++++------- src/gui/widgets/qmacnativewidget_mac.mm | 22 ++++++------- src/gui/widgets/qmainwindowlayout_mac.mm | 44 +++++++++++++++++++++++++ 9 files changed, 133 insertions(+), 89 deletions(-) diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm index 17a9166..8f9fe06 100644 --- a/src/gui/kernel/qcocoaapplication_mac.mm +++ b/src/gui/kernel/qcocoaapplication_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ /**************************************************************************** ** diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm index 809f96a..44867ae 100644 --- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm +++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ /**************************************************************************** ** diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index 9b627ac..093cb0d 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #include "qmacdefines_mac.h" #ifdef QT_MAC_USE_COCOA diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm index 95659ed..b5ee5a6 100644 --- a/src/gui/kernel/qcocoawindow_mac.mm +++ b/src/gui/kernel/qcocoawindow_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #include "qmacdefines_mac.h" #ifdef QT_MAC_USE_COCOA diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm index ec9881b..6affe11 100644 --- a/src/gui/kernel/qcocoawindowdelegate_mac.mm +++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #import "private/qcocoawindowdelegate_mac_p.h" #ifdef QT_MAC_USE_COCOA diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index ac2372f..8d3239e 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #include "qmacdefines_mac.h" #include "qapplication.h" diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm index 626dd76..e25899f 100644 --- a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #import #include diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm index 5e7b73a..5b90e31 100644 --- a/src/gui/widgets/qmacnativewidget_mac.mm +++ b/src/gui/widgets/qmacnativewidget_mac.mm @@ -1,11 +1,11 @@ /**************************************************************************** - ** - ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) - ** - ** This file is part of the QtGui module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Commercial License Agreement provided with the @@ -36,11 +36,11 @@ ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** $QT_END_LICENSE$ - ** - ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - ** - ****************************************************************************/ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #import #import diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index 950f758..c807afb 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -1,3 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ + #include #include #include -- cgit v0.12 From c3bb01f6713e2625d4cc70e6d689feabf88731b4 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 8 Apr 2009 21:01:00 +1000 Subject: Revert "New binary for Windows configure" This reverts commit dcfef78f9a8be49b71512d47e3bbe076c2beb4c8. --- configure.exe | Bin 851968 -> 1134592 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 891e928..13ca0e5 100644 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12 From 406d8ef682af938172aa5f196774666f83811289 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 8 Apr 2009 21:01:51 +1000 Subject: Revert "Don't check license for internal configurations" This reverts commit 0d29f576e6a64b61f56b3087fd72b2d21ca65f7f. --- tools/configure/configureapp.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 810e47b..0c4dbb3 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3499,8 +3499,7 @@ void Configure::readLicense() } #else } else { - if (dictionary[ "BUILDNOKIA" ] != "yes") - Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); + Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); if (dictionary["DONE"] != "error") { // give the user some feedback, and prompt for license acceptance cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl; -- cgit v0.12 From fbc1b03044e5582299d5b60b28e029dba278c3ac Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 8 Apr 2009 12:56:08 +0200 Subject: Added some changes for 4.5.1 (cherry picked from commit a08d7a675a4e7f61b80a8a92114cda6f8dbacd96) --- dist/changes-4.5.1 | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index eb8ec5f..17e32d4 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -52,6 +52,10 @@ Third party components * [245668] set also protocol, verifyMode and verifyDepth in setSslConfiguration() +- QStyleSheetStyle + * Improved support for setting background and foreground roles in styles + such as the text color in a combo box popup on Mac and Cleanlooks. + **************************************************************************** * Database Drivers * **************************************************************************** @@ -64,6 +68,27 @@ Third party components Qt for Linux/X11 ---------------- +- Phonon/GStreamer + * [244259] Fixed a problem where the backend would fail to indicate an + error when streaming fails. + * [233188] Fixed a problem where the seek slider would reset to 0 while + being dragged. + * [246189] Fixed a problem where the backend would fail to correctly + escape certain file names so that playback would not start + * [246097] Added support for the MediaController interface to allow audio + CD playback. + +- QGtkStyle + * The system palette is no longer strictly forced. Also behavior related + to system theme changes have been improved. + * [249363] QFrame is now styled as a GtkScrolledWindow. + * [247653] Fixed a compilation issue on solaris. + * Fixed palette and styling issues with the background color of + combo box popups. + * [239829] Disabled alt-key navigation for QGtkStyle to follow + GTK+ behavior. + * [238196] Allow middle click to set scrollbar position to follow + GTK+ behavior. Qt for Windows -------------- @@ -72,6 +97,9 @@ Qt for Windows * [247401] Fixed a bug that would cause a restarted timer to fire too early, causing Javascript in QtWebKit to consume 100% CPU on Windows. +- QWindowsXPStyle + * [248036] Fixed an issue where tool buttons would incorrectly + hover when disabled. Qt for Mac OS X --------------- @@ -122,7 +150,6 @@ Qt for Windows CE - moc - - uic * [244998] Fixed include file generation for phonon widgets. * [248070] Fixed code generation for QStringList-type properties to use -- cgit v0.12 From 8f6302718ca4061f0a5241f8a372a058ab3c35b9 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 8 Apr 2009 14:04:26 +0200 Subject: My changes. (cherry picked from commit 27c1edac6769f863549f0940d35cf3f82e778a46) --- dist/changes-4.5.1 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 17e32d4..5584c11 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -45,6 +45,13 @@ Third party components - QHttp * [208445] cancel request upon receiving unknown authentication method +- QMacStyle + * [248769] Fix regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. + * Adjust the opacity value for popups. + +- QMainWindow + * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. + - QSharedPointer * [246843] Fixed a crash caused by using QSharedPointer in global statics @@ -104,6 +111,35 @@ Qt for Windows Qt for Mac OS X --------------- +- Cocoa port + * Fixed a bug where actions in the native menubar weren't properly disabled. + * Make shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard layout. + * Fixed a bug where dialogs would be positioned in the wrong place on the screen. + * [244369] Window flags on Cocoa windows should match have a similar look as the Carbon ones. + * The build-key for Cocoa was changed in the unlikely case that a plugin may make + assumptions on how Qt was built. All Cocoa plugins built against 4.5.0 WILL NOT WORK + with 4.5.1, we don't foresee changing this again. + * Fixed a bug where some windows would not get activation when they normally should. + * Key events sent to popups do not get propagated onwards. + * [249296] Fix a bug where lineedits on a second page of a stack widget wourd not get key events + * QFileOpenEvents are no longer sent for items passed on the command line. + * Various fixes for determining metrics of text and the ability to disable kerning. + * [248918] Fixed color matching for themed text items. + * Modify the colliding mice example to work better with coalesced updates. + +- Fix a crash when showing a widget that is window modal but has no parent. +- [248803] Showing two dialogs at the same time don't get shared activation. +- Added QSysInfo::MV_10_6 as an enum to test against. +- Various compile fixes for Snow Leopard (preliminary support). + + +- The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. + +- Document a bit clearer how qt_mac_set_dock_menu() works. + +- QTestLib + * Activate the test application when launched from the command line. + Qt for Embedded Linux --------------------- @@ -161,6 +197,7 @@ Qt for Windows CE - qmake + * [248806] Ensure that the Xcode generator includes the right path to frameworks. - configure -- cgit v0.12 From f4cf13b1172312b72f14dbab956a13eee79d7bd4 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 8 Apr 2009 14:34:18 +0200 Subject: BT: Fix a painting glitch in gtk combo box This improves the look of combo box with gtk style which is somewhat a regression from 4.5.0 since we did not style this part before. Reviewed-by: nrc (cherry picked from commit f2edb497ac2c3ff6f8c004046e216b8bdf7c4347) --- src/gui/styles/qgtkstyle.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 64b7c85..073c95d 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2507,6 +2507,10 @@ void QGtkStyle::drawControl(ControlElement element, if (selected) { QRect rect = option->rect.adjusted(0, 0, -1, -1); +#ifndef QT_NO_COMBOBOX + if (qobject_cast(widget)) + rect = option->rect; +#endif gtkPainter.paintBox( gtkMenuItem, "menuitem", rect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style); } -- cgit v0.12 From 247e0046985e0322464b4b80b9b3f21e2b405974 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 8 Apr 2009 15:47:42 +0200 Subject: BT: Compilefix for Windows CE and namespaces RevBy: Mauricek Details: functions needs to be declared outside of the namespace (cherry picked from commit b273cd322345c54d5cbd6f178791d1ccfcc08e05) --- src/gui/inputmethod/qwininputcontext_win.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp index 33048f8..0a718db 100644 --- a/src/gui/inputmethod/qwininputcontext_win.cpp +++ b/src/gui/inputmethod/qwininputcontext_win.cpp @@ -57,15 +57,17 @@ #ifdef Q_IME_DEBUG #include "qdebug.h" -#endif - -QT_BEGIN_NAMESPACE +#endif -extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); #if defined(Q_OS_WINCE) extern void qt_wince_show_SIP(bool show); // defined in qguifunctions_wince.cpp #endif +QT_BEGIN_NAMESPACE + +extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); + + DEFINE_GUID(IID_IActiveIMMApp, 0x08c0e040, 0x62d1, 0x11d1, 0x93, 0x26, 0x0, 0x60, 0xb0, 0x67, 0xb8, 0x6e); -- cgit v0.12 From 4aa98617ee50308ae1c7d864d2ba8b09889042d7 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Thu, 9 Apr 2009 13:37:59 -0700 Subject: Add a change description about DirectFB Reviewed-by: TrustMe (cherry picked from commit d4f23b414c337654d65ba54937e40d46b8510c0a) --- dist/changes-4.5.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 5584c11..87f808d 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -144,6 +144,7 @@ Qt for Mac OS X Qt for Embedded Linux --------------------- +- Various improvements to the Qt DirectFB plugin. Qt for Windows CE ----------------- -- cgit v0.12 From 846ea566aeabc35f2cbe35337902d2fe3e9192cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 14 Apr 2009 09:16:55 +0200 Subject: Fix spelling error Reviewed-by: TrustMe (cherry picked from commit 02f4f244f585868dc1cca208f0caa6f02d734d65) --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 7e66a98..6d67dee 100755 --- a/configure +++ b/configure @@ -2698,7 +2698,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then for i in $CFG_MAC_ARCHS do if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then - echo "Unknown architecture: \"$i\". Supported architechtures: x86 ppc x86_64 ppc64"; + echo "Unknown architecture: \"$i\". Supported architectures: x86 ppc x86_64 ppc64"; exit 2; fi done -- cgit v0.12 From 092dd016f33c9bb887e99d9ce7a03a40ee821730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 14 Apr 2009 09:40:47 +0200 Subject: Fix typo. Reviewed-by: nrc (cherry picked from commit 91e4f13001a2969ea6311171fb5e7ec0164a3165) --- tools/macdeployqt/macdeployqt/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/macdeployqt/macdeployqt/main.cpp b/tools/macdeployqt/macdeployqt/main.cpp index 77a1690..6f83beb 100644 --- a/tools/macdeployqt/macdeployqt/main.cpp +++ b/tools/macdeployqt/macdeployqt/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char **argv) qDebug() << "framework. The accessibilty, image formats, and text codec"; qDebug() << "plugins are always copied, unless \"-no-plugins\" is specified."; qDebug() << ""; - qDebug() << "See the \"Deploying an Application on Qt/Mac\" typic in the"; + qDebug() << "See the \"Deploying an Application on Qt/Mac\" topic in the"; qDebug() << "documentation for more information about deployment on Mac OS X."; return 0; -- cgit v0.12 From 5c53406134b6efc2686275757ed9c680f1eb6979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Tue, 14 Apr 2009 09:44:23 +0200 Subject: Remove duplicate defines in the mac accessibility module. This was causing compile warnings. Reviewed-by: nrc (cherry picked from commit 69414e5afeb87df2f7a371962f092c2d277aaf6f) --- src/gui/accessible/qaccessible_mac.mm | 122 ---------------------------------- 1 file changed, 122 deletions(-) diff --git a/src/gui/accessible/qaccessible_mac.mm b/src/gui/accessible/qaccessible_mac.mm index fd1af45..73b6f94 100644 --- a/src/gui/accessible/qaccessible_mac.mm +++ b/src/gui/accessible/qaccessible_mac.mm @@ -72,55 +72,36 @@ typedef NSString * const QAXRoleType; #define QAXApplicationRole NSAccessibilityApplicationRole #define QAXButtonRole NSAccessibilityButtonRole #define QAXCancelAction NSAccessibilityCancelAction -#define QAXCancelAction NSAccessibilityCancelAction #define QAXCheckBoxRole NSAccessibilityCheckBoxRole #define QAXChildrenAttribute NSAccessibilityChildrenAttribute -#define QAXChildrenAttribute NSAccessibilityChildrenAttribute -#define QAXChildrenAttribute NSAccessibilityChildrenAttribute #define QAXCloseButtonAttribute NSAccessibilityCloseButtonAttribute #define QAXCloseButtonAttribute NSAccessibilityCloseButtonAttribute #define QAXColumnRole NSAccessibilityColumnRole #define QAXConfirmAction NSAccessibilityConfirmAction -#define QAXConfirmAction NSAccessibilityConfirmAction #define QAXContentsAttribute NSAccessibilityContentsAttribute -#define QAXContentsAttribute NSAccessibilityContentsAttribute -#define QAXDecrementAction NSAccessibilityDecrementAction #define QAXDecrementAction NSAccessibilityDecrementAction #define QAXDecrementArrowSubrole NSAccessibilityDecrementArrowSubrole #define QAXDecrementPageSubrole NSAccessibilityDecrementPageSubrole #define QAXDescriptionAttribute NSAccessibilityDescriptionAttribute -#define QAXDescriptionAttribute NSAccessibilityDescriptionAttribute -#define QAXDescriptionAttribute NSAccessibilityDescriptionAttribute -#define QAXDescriptionAttribute NSAccessibilityDescriptionAttribute -#define QAXEnabledAttribute NSAccessibilityEnabledAttribute #define QAXEnabledAttribute NSAccessibilityEnabledAttribute #define QAXExpandedAttribute NSAccessibilityExpandedAttribute #define QAXFocusedAttribute NSAccessibilityFocusedAttribute -#define QAXFocusedAttribute NSAccessibilityFocusedAttribute -#define QAXFocusedAttribute NSAccessibilityFocusedAttribute #define QAXFocusedUIElementChangedNotification NSAccessibilityFocusedUIElementChangedNotification #define QAXFocusedWindowChangedNotification NSAccessibilityFocusedWindowChangedNotification #define QAXGroupRole NSAccessibilityGroupRole #define QAXGrowAreaAttribute NSAccessibilityGrowAreaAttribute -#define QAXGrowAreaAttribute NSAccessibilityGrowAreaAttribute #define QAXGrowAreaRole NSAccessibilityGrowAreaRole #define QAXHelpAttribute NSAccessibilityHelpAttribute -#define QAXHelpAttribute NSAccessibilityHelpAttribute -#define QAXHelpAttribute NSAccessibilityHelpAttribute #define QAXHorizontalOrientationValue NSAccessibilityHorizontalOrientationValue #define QAXHorizontalScrollBarAttribute NSAccessibilityHorizontalScrollBarAttribute -#define QAXHorizontalScrollBarAttribute NSAccessibilityHorizontalScrollBarAttribute -#define QAXIncrementAction NSAccessibilityIncrementAction #define QAXIncrementAction NSAccessibilityIncrementAction #define QAXIncrementArrowSubrole NSAccessibilityIncrementArrowSubrole #define QAXIncrementPageSubrole NSAccessibilityIncrementPageSubrole #define QAXIncrementorRole NSAccessibilityIncrementorRole #define QAXLinkedUIElementsAttribute NSAccessibilityLinkedUIElementsAttribute -#define QAXLinkedUIElementsAttribute NSAccessibilityLinkedUIElementsAttribute #define QAXListRole NSAccessibilityListRole #define QAXMainAttribute NSAccessibilityMainAttribute #define QAXMaxValueAttribute NSAccessibilityMaxValueAttribute -#define QAXMaxValueAttribute NSAccessibilityMaxValueAttribute #define QAXMenuBarRole NSAccessibilityMenuBarRole #define QAXMenuButtonRole NSAccessibilityMenuButtonRole #define QAXMenuClosedNotification NSAccessibilityMenuClosedNotification @@ -128,151 +109,90 @@ typedef NSString * const QAXRoleType; #define QAXMenuOpenedNotification NSAccessibilityMenuOpenedNotification #define QAXMenuRole NSAccessibilityMenuRole #define QAXMinValueAttribute NSAccessibilityMinValueAttribute -#define QAXMinValueAttribute NSAccessibilityMinValueAttribute #define QAXMinimizeButtonAttribute NSAccessibilityMinimizeButtonAttribute -#define QAXMinimizeButtonAttribute NSAccessibilityMinimizeButtonAttribute -#define QAXMinimizedAttribute NSAccessibilityMinimizedAttribute #define QAXMinimizedAttribute NSAccessibilityMinimizedAttribute #define QAXNextContentsAttribute NSAccessibilityNextContentsAttribute -#define QAXNextContentsAttribute NSAccessibilityNextContentsAttribute -#define QAXOrientationAttribute NSAccessibilityOrientationAttribute -#define QAXOrientationAttribute NSAccessibilityOrientationAttribute #define QAXOrientationAttribute NSAccessibilityOrientationAttribute #define QAXParentAttribute NSAccessibilityParentAttribute #define QAXPickAction NSAccessibilityPickAction -#define QAXPickAction NSAccessibilityPickAction #define QAXPopUpButtonRole NSAccessibilityPopUpButtonRole #define QAXPositionAttribute NSAccessibilityPositionAttribute -#define QAXPositionAttribute NSAccessibilityPositionAttribute -#define QAXPressAction NSAccessibilityPressAction #define QAXPressAction NSAccessibilityPressAction #define QAXPreviousContentsAttribute NSAccessibilityPreviousContentsAttribute -#define QAXPreviousContentsAttribute NSAccessibilityPreviousContentsAttribute -#define QAXPreviousContentsAttribute NSAccessibilityPreviousContentsAttribute #define QAXProgressIndicatorRole NSAccessibilityProgressIndicatorRole #define QAXRadioButtonRole NSAccessibilityRadioButtonRole #define QAXRoleAttribute NSAccessibilityRoleAttribute -#define QAXRoleAttribute NSAccessibilityRoleAttribute #define QAXRoleDescriptionAttribute NSAccessibilityRoleDescriptionAttribute #define QAXRowRole NSAccessibilityRowRole #define QAXRowsAttribute NSAccessibilityRowsAttribute -#define QAXRowsAttribute NSAccessibilityRowsAttribute -#define QAXScrollAreaRole NSAccessibilityScrollAreaRole -#define QAXScrollAreaRole NSAccessibilityScrollAreaRole #define QAXScrollAreaRole NSAccessibilityScrollAreaRole #define QAXScrollBarRole NSAccessibilityScrollBarRole #define QAXSelectedAttribute NSAccessibilitySelectedAttribute #define QAXSelectedChildrenAttribute NSAccessibilitySelectedChildrenAttribute #define QAXSelectedRowsAttribute NSAccessibilitySelectedRowsAttribute -#define QAXSelectedRowsAttribute NSAccessibilitySelectedRowsAttribute -#define QAXSizeAttribute NSAccessibilitySizeAttribute #define QAXSizeAttribute NSAccessibilitySizeAttribute #define QAXSliderRole NSAccessibilitySliderRole #define QAXSplitGroupRole NSAccessibilitySplitGroupRole #define QAXSplitterRole NSAccessibilitySplitterRole -#define QAXSplitterRole NSAccessibilitySplitterRole -#define QAXSplitterRole NSAccessibilitySplitterRole -#define QAXSplittersAttribute NSAccessibilitySplittersAttribute #define QAXSplittersAttribute NSAccessibilitySplittersAttribute #define QAXStaticTextRole NSAccessibilityStaticTextRole -#define QAXStaticTextRole NSAccessibilityStaticTextRole -#define QAXSubroleAttribute NSAccessibilitySubroleAttribute #define QAXSubroleAttribute NSAccessibilitySubroleAttribute #define QAXSubroleAttribute NSAccessibilitySubroleAttribute #define QAXTabGroupRole NSAccessibilityTabGroupRole -#define QAXTabGroupRole NSAccessibilityTabGroupRole #define QAXTableRole NSAccessibilityTableRole #define QAXTabsAttribute NSAccessibilityTabsAttribute -#define QAXTabsAttribute NSAccessibilityTabsAttribute #define QAXTextFieldRole NSAccessibilityTextFieldRole -#define QAXTextFieldRole NSAccessibilityTextFieldRole -#define QAXTitleAttribute NSAccessibilityTitleAttribute -#define QAXTitleAttribute NSAccessibilityTitleAttribute #define QAXTitleAttribute NSAccessibilityTitleAttribute -#define QAXTitleAttribute NSAccessibilityTitleAttribute -#define QAXTitleUIElementAttribute NSAccessibilityTitleUIElementAttribute #define QAXTitleUIElementAttribute NSAccessibilityTitleUIElementAttribute #define QAXToolbarButtonAttribute NSAccessibilityToolbarButtonAttribute -#define QAXToolbarButtonAttribute NSAccessibilityToolbarButtonAttribute #define QAXToolbarRole NSAccessibilityToolbarRole #define QAXTopLevelUIElementAttribute NSAccessibilityTopLevelUIElementAttribute -#define QAXTopLevelUIElementAttribute NSAccessibilityTopLevelUIElementAttribute -#define QAXTopLevelUIElementAttribute NSAccessibilityTopLevelUIElementAttribute -#define QAXUnknownRole NSAccessibilityUnknownRole #define QAXUnknownRole NSAccessibilityUnknownRole #define QAXValueAttribute NSAccessibilityValueAttribute -#define QAXValueAttribute NSAccessibilityValueAttribute -#define QAXValueAttribute NSAccessibilityValueAttribute -#define QAXValueAttribute NSAccessibilityValueAttribute #define QAXValueChangedNotification NSAccessibilityValueChangedNotification #define QAXValueIndicatorRole NSAccessibilityValueIndicatorRole #define QAXVerticalOrientationValue NSAccessibilityVerticalOrientationValue #define QAXVerticalScrollBarAttribute NSAccessibilityVerticalScrollBarAttribute -#define QAXVerticalScrollBarAttribute NSAccessibilityVerticalScrollBarAttribute #define QAXVisibleRowsAttribute NSAccessibilityVisibleRowsAttribute -#define QAXVisibleRowsAttribute NSAccessibilityVisibleRowsAttribute -#define QAXWindowAttribute NSAccessibilityWindowAttribute -#define QAXWindowAttribute NSAccessibilityWindowAttribute #define QAXWindowAttribute NSAccessibilityWindowAttribute #define QAXWindowCreatedNotification NSAccessibilityWindowCreatedNotification #define QAXWindowMovedNotification NSAccessibilityWindowMovedNotification #define QAXWindowRole NSAccessibilityWindowRole #define QAXZoomButtonAttribute NSAccessibilityZoomButtonAttribute -#define QAXZoomButtonAttribute NSAccessibilityZoomButtonAttribute #else typedef CFStringRef const QAXRoleType; #define QAXApplicationRole kAXApplicationRole #define QAXButtonRole kAXButtonRole #define QAXCancelAction kAXCancelAction -#define QAXCancelAction kAXCancelAction #define QAXCheckBoxRole kAXCheckBoxRole #define QAXChildrenAttribute kAXChildrenAttribute -#define QAXChildrenAttribute kAXChildrenAttribute -#define QAXChildrenAttribute kAXChildrenAttribute -#define QAXCloseButtonAttribute kAXCloseButtonAttribute #define QAXCloseButtonAttribute kAXCloseButtonAttribute #define QAXColumnRole kAXColumnRole #define QAXConfirmAction kAXConfirmAction -#define QAXConfirmAction kAXConfirmAction #define QAXContentsAttribute kAXContentsAttribute -#define QAXContentsAttribute kAXContentsAttribute -#define QAXDecrementAction kAXDecrementAction #define QAXDecrementAction kAXDecrementAction #define QAXDecrementArrowSubrole kAXDecrementArrowSubrole #define QAXDecrementPageSubrole kAXDecrementPageSubrole #define QAXDescriptionAttribute kAXDescriptionAttribute -#define QAXDescriptionAttribute kAXDescriptionAttribute -#define QAXDescriptionAttribute kAXDescriptionAttribute -#define QAXDescriptionAttribute kAXDescriptionAttribute -#define QAXEnabledAttribute kAXEnabledAttribute #define QAXEnabledAttribute kAXEnabledAttribute #define QAXExpandedAttribute kAXExpandedAttribute #define QAXFocusedAttribute kAXFocusedAttribute -#define QAXFocusedAttribute kAXFocusedAttribute -#define QAXFocusedAttribute kAXFocusedAttribute #define QAXFocusedUIElementChangedNotification kAXFocusedUIElementChangedNotification #define QAXFocusedWindowChangedNotification kAXFocusedWindowChangedNotification #define QAXGroupRole kAXGroupRole #define QAXGrowAreaAttribute kAXGrowAreaAttribute -#define QAXGrowAreaAttribute kAXGrowAreaAttribute #define QAXGrowAreaRole kAXGrowAreaRole #define QAXHelpAttribute kAXHelpAttribute -#define QAXHelpAttribute kAXHelpAttribute -#define QAXHelpAttribute kAXHelpAttribute #define QAXHorizontalOrientationValue kAXHorizontalOrientationValue #define QAXHorizontalScrollBarAttribute kAXHorizontalScrollBarAttribute -#define QAXHorizontalScrollBarAttribute kAXHorizontalScrollBarAttribute -#define QAXIncrementAction kAXIncrementAction #define QAXIncrementAction kAXIncrementAction #define QAXIncrementArrowSubrole kAXIncrementArrowSubrole #define QAXIncrementPageSubrole kAXIncrementPageSubrole #define QAXIncrementorRole kAXIncrementorRole #define QAXLinkedUIElementsAttribute kAXLinkedUIElementsAttribute -#define QAXLinkedUIElementsAttribute kAXLinkedUIElementsAttribute #define QAXListRole kAXListRole #define QAXMainAttribute kAXMainAttribute #define QAXMaxValueAttribute kAXMaxValueAttribute -#define QAXMaxValueAttribute kAXMaxValueAttribute #define QAXMenuBarRole kAXMenuBarRole #define QAXMenuButtonRole kAXMenuButtonRole #define QAXMenuClosedNotification kAXMenuClosedNotification @@ -280,97 +200,55 @@ typedef CFStringRef const QAXRoleType; #define QAXMenuOpenedNotification kAXMenuOpenedNotification #define QAXMenuRole kAXMenuRole #define QAXMinValueAttribute kAXMinValueAttribute -#define QAXMinValueAttribute kAXMinValueAttribute #define QAXMinimizeButtonAttribute kAXMinimizeButtonAttribute -#define QAXMinimizeButtonAttribute kAXMinimizeButtonAttribute -#define QAXMinimizedAttribute kAXMinimizedAttribute #define QAXMinimizedAttribute kAXMinimizedAttribute #define QAXNextContentsAttribute kAXNextContentsAttribute -#define QAXNextContentsAttribute kAXNextContentsAttribute -#define QAXOrientationAttribute kAXOrientationAttribute -#define QAXOrientationAttribute kAXOrientationAttribute #define QAXOrientationAttribute kAXOrientationAttribute #define QAXParentAttribute kAXParentAttribute #define QAXPickAction kAXPickAction -#define QAXPickAction kAXPickAction #define QAXPopUpButtonRole kAXPopUpButtonRole #define QAXPositionAttribute kAXPositionAttribute -#define QAXPositionAttribute kAXPositionAttribute -#define QAXPressAction kAXPressAction #define QAXPressAction kAXPressAction #define QAXPreviousContentsAttribute kAXPreviousContentsAttribute -#define QAXPreviousContentsAttribute kAXPreviousContentsAttribute -#define QAXPreviousContentsAttribute kAXPreviousContentsAttribute #define QAXProgressIndicatorRole kAXProgressIndicatorRole #define QAXRadioButtonRole kAXRadioButtonRole #define QAXRoleAttribute kAXRoleAttribute -#define QAXRoleAttribute kAXRoleAttribute #define QAXRoleDescriptionAttribute kAXRoleDescriptionAttribute #define QAXRowRole kAXRowRole #define QAXRowsAttribute kAXRowsAttribute -#define QAXRowsAttribute kAXRowsAttribute -#define QAXScrollAreaRole kAXScrollAreaRole -#define QAXScrollAreaRole kAXScrollAreaRole #define QAXScrollAreaRole kAXScrollAreaRole #define QAXScrollBarRole kAXScrollBarRole #define QAXSelectedAttribute kAXSelectedAttribute #define QAXSelectedChildrenAttribute kAXSelectedChildrenAttribute #define QAXSelectedRowsAttribute kAXSelectedRowsAttribute -#define QAXSelectedRowsAttribute kAXSelectedRowsAttribute -#define QAXSizeAttribute kAXSizeAttribute #define QAXSizeAttribute kAXSizeAttribute #define QAXSliderRole kAXSliderRole #define QAXSplitGroupRole kAXSplitGroupRole #define QAXSplitterRole kAXSplitterRole -#define QAXSplitterRole kAXSplitterRole -#define QAXSplitterRole kAXSplitterRole -#define QAXSplittersAttribute kAXSplittersAttribute #define QAXSplittersAttribute kAXSplittersAttribute #define QAXStaticTextRole kAXStaticTextRole -#define QAXStaticTextRole kAXStaticTextRole -#define QAXSubroleAttribute kAXSubroleAttribute #define QAXSubroleAttribute kAXSubroleAttribute -#define QAXSubroleAttribute kAXSubroleAttribute -#define QAXTabGroupRole kAXTabGroupRole #define QAXTabGroupRole kAXTabGroupRole #define QAXTableRole kAXTableRole #define QAXTabsAttribute kAXTabsAttribute -#define QAXTabsAttribute kAXTabsAttribute -#define QAXTextFieldRole kAXTextFieldRole #define QAXTextFieldRole kAXTextFieldRole #define QAXTitleAttribute kAXTitleAttribute -#define QAXTitleAttribute kAXTitleAttribute -#define QAXTitleAttribute kAXTitleAttribute -#define QAXTitleAttribute kAXTitleAttribute #define QAXTitleUIElementAttribute kAXTitleUIElementAttribute -#define QAXTitleUIElementAttribute kAXTitleUIElementAttribute -#define QAXToolbarButtonAttribute kAXToolbarButtonAttribute #define QAXToolbarButtonAttribute kAXToolbarButtonAttribute #define QAXToolbarRole kAXToolbarRole #define QAXTopLevelUIElementAttribute kAXTopLevelUIElementAttribute -#define QAXTopLevelUIElementAttribute kAXTopLevelUIElementAttribute -#define QAXTopLevelUIElementAttribute kAXTopLevelUIElementAttribute #define QAXUnknownRole kAXUnknownRole -#define QAXUnknownRole kAXUnknownRole -#define QAXValueAttribute kAXValueAttribute -#define QAXValueAttribute kAXValueAttribute -#define QAXValueAttribute kAXValueAttribute #define QAXValueAttribute kAXValueAttribute #define QAXValueChangedNotification kAXValueChangedNotification #define QAXValueIndicatorRole kAXValueIndicatorRole #define QAXVerticalOrientationValue kAXVerticalOrientationValue #define QAXVerticalScrollBarAttribute kAXVerticalScrollBarAttribute -#define QAXVerticalScrollBarAttribute kAXVerticalScrollBarAttribute -#define QAXVisibleRowsAttribute kAXVisibleRowsAttribute #define QAXVisibleRowsAttribute kAXVisibleRowsAttribute #define QAXWindowAttribute kAXWindowAttribute -#define QAXWindowAttribute kAXWindowAttribute -#define QAXWindowAttribute kAXWindowAttribute #define QAXWindowCreatedNotification kAXWindowCreatedNotification #define QAXWindowMovedNotification kAXWindowMovedNotification #define QAXWindowRole kAXWindowRole #define QAXZoomButtonAttribute kAXZoomButtonAttribute -#define QAXZoomButtonAttribute kAXZoomButtonAttribute #endif -- cgit v0.12 From b9fa1480c711cfea3bf442b928f3a47063c7b388 Mon Sep 17 00:00:00 2001 From: jasplin Date: Tue, 14 Apr 2009 10:14:03 +0200 Subject: My changes. (cherry picked from commit d5a99cff5235ff72f68f57ab0772274d332b118b) --- dist/changes-4.5.1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 87f808d..f0ab546 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -39,6 +39,13 @@ Third party components - QAuthenticator * [237979] fix implemenation of md5-sess +- QColorDialog + * [247349] Fixed bug causing the wrong alpha value to be returned. + +- QCompleter + * [250064] Fixed focus policy propagation regression. + * [246056] Fixed assertion failure in setCompletionPrefix(). + - QFileInfo * [205244] return valid file info also for relative UNC paths @@ -63,6 +70,10 @@ Third party components * Improved support for setting background and foreground roles in styles such as the text color in a combo box popup on Mac and Cleanlooks. +- QWizard + * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. + + **************************************************************************** * Database Drivers * **************************************************************************** -- cgit v0.12 From 07cab473de93fbd28fbf1bb038dc739a9977789b Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 8 Apr 2009 10:35:18 +0200 Subject: Fix docs of QPainter::initFrom. (cherry picked from commit 52f87de53328c661049acf09d5fedc1850aa9bfa) --- src/gui/painting/qpainter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 415a8d3..a60ee7c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1465,8 +1465,8 @@ bool QPainter::isActive() const /*! Initializes the painters pen, background and font to the same as - the given \a widget. Call this function after begin() while the - painter is active. + the given \a widget. This function is automatically when the + painter is opened on a QWidget. \sa begin(), {QPainter#Settings}{Settings} */ -- cgit v0.12 From 709fe1eb40eeea68fcf1d6fac1fd36811f6e2185 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Tue, 14 Apr 2009 12:59:26 +0200 Subject: Updated changelog for 4.5.1 (cherry picked from commit afc51dc4cf5254f6cfb552bc09dd443a8fe0762b) --- dist/changes-4.5.1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index f0ab546..38651a9 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -119,6 +119,11 @@ Qt for Windows * [248036] Fixed an issue where tool buttons would incorrectly hover when disabled. +- [249576] Fixed a crash when using a combobox with Qt::NoFocus. +- [244875] System menu will now be shown for a fullscreen window. +- [240891] Corrected the focus behavior of native file dialogs, when application has multiple toplevels. +- [245330] Fixed a bug which causes mouse inputs to be ignored on modal dialogs, when shown from an ActieQt control. + Qt for Mac OS X --------------- @@ -132,11 +137,13 @@ Qt for Mac OS X with 4.5.1, we don't foresee changing this again. * Fixed a bug where some windows would not get activation when they normally should. * Key events sent to popups do not get propagated onwards. - * [249296] Fix a bug where lineedits on a second page of a stack widget wourd not get key events + * [249296] Fix a bug where lineedits on a second page of a stack widget would not get key events * QFileOpenEvents are no longer sent for items passed on the command line. * Various fixes for determining metrics of text and the ability to disable kerning. * [248918] Fixed color matching for themed text items. * Modify the colliding mice example to work better with coalesced updates. + * Fixed a bug where the drag cursor was not updated when modifier keys are used. + * [247947] Fixed a crash in drag and drop. - Fix a crash when showing a widget that is window modal but has no parent. - [248803] Showing two dialogs at the same time don't get shared activation. -- cgit v0.12 From 6eec372d7079c7e62f11eb8e43740649d110cee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 14 Apr 2009 13:13:29 +0200 Subject: Remove scale applied to cosmetic pens when antialiasing is enabled (X11). The pen width should not be scaled for cosmetic pens. Task-number: 247083 Reviewed-by: Trond BT: yes (cherry picked from commit c28cb85841fb5be154c2460efdc82dde012407b9) --- src/gui/painting/qpaintengine_x11.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index fbf2c62..64774e2 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -1760,7 +1760,10 @@ void QX11PaintEngine::drawPath(const QPainterPath &path) QRectF deviceRect(0, 0, d->pdev->width(), d->pdev->height()); // necessary to get aliased alphablended primitives to be drawn correctly if (d->cpen.isCosmetic() || d->has_scaling_xform) { - stroker.setWidth(width == 0 ? 1 : width * d->xform_scale); + if (d->cpen.isCosmetic()) + stroker.setWidth(width == 0 ? 1 : width); + else + stroker.setWidth(width * d->xform_scale); stroker.d_ptr->stroker.setClipRect(deviceRect); stroke = stroker.createStroke(path * d->matrix); if (stroke.isEmpty()) -- cgit v0.12 From 9d40f4726e7efa24fdd580a8d6738bb122606bc9 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 14 Apr 2009 14:05:23 +0200 Subject: Adding note about setting properties to QPrinter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting properties on an invalid printer is not supported. Use isValid() to check if it valid. Rev-by: Trond KjernÃ¥sen Rev-by: Geir Vattekar (cherry picked from commit 4db6f873386e7b21e23efb4a5ca31eb09f3dd94e) --- src/gui/painting/qprinter.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 54538e1..e01a51f 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -284,6 +284,10 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke to send PostScript or PDF output to the printer. As an alternative, the printProgram() function can be used to specify the command or utility to use instead of the system default. + + Note that setting parameters like paper size and resolution on an + invalid printer is undefined. You can use QPrinter::isValid() to + verify this before changing any parameters. QPrinter supports a number of parameters, most of which can be changed by the end user through a \l{QPrintDialog}{print dialog}. In -- cgit v0.12 From 4171e64f6df27fde5213fe17c09cbfe999914f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Tue, 14 Apr 2009 14:02:36 +0200 Subject: Update docs regarding sibling widgets ontop of QGLWidgets when Qt is built with Cocoa support on Mac. The Cocoa API doesn't have a concept of Z-ordering of widgets, and it's implemented by reordering the widget hierarchy for normal widgets. This does unfortunately not work for GL widgets, and it's not supported by Apple. This apparently work with the Carbon AGL API though. Task-number: 244890 Reviewed-by: Gunnar Sletta BT: yes (cherry picked from commit eb87a7003153b190d8b635563868717b58ce2faf) --- src/opengl/qgl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 19f8758..edd5c45 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2615,6 +2615,10 @@ const QGLContext* QGLContext::currentContext() QGLWidget. This will side-step the issue altogether, and is what we recommend for users that need this kind of functionality. + On Mac OS X, when Qt is built with Cocoa support, a QGLWidget + can't have any sibling widgets placed ontop of itself. This is due + to limitations in the Cocoa API and is not supported by Apple. + \section1 Overlays The QGLWidget creates a GL overlay context in addition to the -- cgit v0.12 From 80f0149ace017cefd7b0c7df14931b2bca31cd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 14 Apr 2009 14:13:54 +0200 Subject: My updates to 4.5.1 changelog. (cherry picked from commit e1a9014cc92091e8371f9a888ff94c694f562df0) --- dist/changes-4.5.1 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 38651a9..7bd7aa4 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -59,6 +59,22 @@ Third party components - QMainWindow * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. +- QPainter + * [247492] Fix rendering bug in raster paint engine causing one-pixel + offset when drawing premultiplied ARGB32 images on RGB16 images. + * [249490] Fix one-pixel offset between stroke and fills of ellipses in + X11 paint engine. + * [246573] Fix very slow stroking of paths in X11 paint engine. + * [247083] Fix scale applied to antialiased cosmetic pens in X11 paint + engine. + * [247505] Fix missing fills of rectangles with negative width/height in + raster paint engine. + * [249628] Fix crash in OpenGL paint engine when filling using Qt::NoBrush. + +- QPixmap + * [249175] Fix QPixmap::fromImage() of monochrome images to result in + black/white pixels and not transparent/white pixels. + - QSharedPointer * [246843] Fixed a crash caused by using QSharedPointer in global statics @@ -108,6 +124,17 @@ Qt for Linux/X11 * [238196] Allow middle click to set scrollbar position to follow GTK+ behavior. +- Font rendering + * Improve performance of subpixel antialiased text rendering by using a mask + in the calls to XRender's text compositing function. + * [248387] Better respect the font config LCD filter settings for subpixel + antialiased text rendering when Freetype's native subpixel rendering is + disabled. + * [248498] Fix garbled rendering of subpixel antialiased text when using + Freetype's native subpixel rendering for vertical subpixel layouts. + * [248644] Fall back to Qt's subpixel rendering if Freetype's subpixel + rendering is available at compile-time but not at run-time. + Qt for Windows -------------- -- cgit v0.12 From 522e757b7b5fa9e18338b00eca1b12b79c1ff3e5 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 14 Apr 2009 10:02:42 +0200 Subject: Fix crash in QTreeView Discovered in Kopete trunk BT: yes Reviewed-by: Thierry (cherry picked from commit 91aeceb7132f4afae0996443a162a5783d8f17aa) --- src/gui/itemviews/qtreeview.cpp | 1 + tests/auto/qtreeview/tst_qtreeview.cpp | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index f2dfb0b..ed6ad03 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -2019,6 +2019,7 @@ int QTreeView::verticalOffset() const // If we are scrolling per item and have non-uniform row heights, // finding the vertical offset in pixels is going to be relatively slow. // ### find a faster way to do this + d->executePostedLayout(); int offset = 0; for (int i = 0; i < d->viewItems.count(); ++i) { if (i == verticalScrollBar()->value()) diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index 9c39bd6..87c1c7c 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -209,6 +209,8 @@ private slots: void indexRowSizeHint(); void addRowsWhileSectionsAreHidden(); + void filterProxyModelCrash(); + // task-specific tests: void task174627_moveLeftToRoot(); void task171902_expandWith1stColHidden(); @@ -2829,6 +2831,29 @@ void tst_QTreeView::indexRowSizeHint() QCOMPARE(view.indexRowSizeHint(index), w->sizeHint().height()); } +void tst_QTreeView::filterProxyModelCrash() +{ + QStandardItemModel model; + QList items; + for (int i = 0; i < 100; i++) + items << new QStandardItem(QString::fromLatin1("item %1").arg(i)); + model.appendColumn(items); + + QSortFilterProxyModel proxy; + proxy.setSourceModel(&model); + + QTreeView view; + view.setModel(&proxy); + view.show(); + QTest::qWait(30); + proxy.invalidate(); + view.verticalScrollBar()->setValue(15); + QTest::qWait(20); + + proxy.invalidate(); + view.repaint(); //used to crash +} + class task174627_TreeView : public QTreeView { Q_OBJECT @@ -3254,6 +3279,5 @@ void tst_QTreeView::task246536_scrollbarsNotWorking() QVERIFY(o.count > 0); } - QTEST_MAIN(tst_QTreeView) #include "tst_qtreeview.moc" -- cgit v0.12 From 69bd4d0447e2655f887e0d4dba2d6b68e5cf8f00 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 14 Apr 2009 14:52:49 +0200 Subject: fix deployment rules add additional file to deployment. (cherry picked from commit e2fa120510584327b7e46ff2a4413aa659a5bd65) --- tests/auto/qtranslator/qtranslator.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro index e4ad22a..0d67f70 100644 --- a/tests/auto/qtranslator/qtranslator.pro +++ b/tests/auto/qtranslator/qtranslator.pro @@ -3,7 +3,7 @@ SOURCES += tst_qtranslator.cpp wince*: { - addFiles.sources = hellotr_la.qm + addFiles.sources = hellotr_la.qm msgfmt_from_po.qm addFiles.path = . DEPLOYMENT += addFiles } -- cgit v0.12 From ca7c34f9acb833a635836592fd0511c90690b9e9 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 14 Apr 2009 14:59:30 +0200 Subject: fix potential crash Reviewed-by: Thomas Hartmann need to check for valid menuBar, otherwise dereferencing will horribly fail. (cherry picked from commit f0ceef57b178d4ed71e61a6ce2681f3d401d69fe) --- src/gui/widgets/qmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index e945611..41b8e31 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -481,7 +481,7 @@ void QMainWindow::setMenuBar(QMenuBar *menuBar) oldMenuBar->deleteLater(); } #ifdef Q_OS_WINCE - if (menuBar->size().height() > 0) + if (menuBar && menuBar->size().height() > 0) #endif d->layout->setMenuBar(menuBar); } -- cgit v0.12 From 00928230e104238f4ccfc53a54666bfde68212b8 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 14 Apr 2009 15:16:43 +0200 Subject: increase waiting time slower platforms (like WinCE) need some more time to actually update. (cherry picked from commit 9a41b437be6014c7a671591e2741c5ca7d8c8be8) --- tests/auto/qcolordialog/tst_qcolordialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/qcolordialog/tst_qcolordialog.cpp index 8a92682..329551c 100644 --- a/tests/auto/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/qcolordialog/tst_qcolordialog.cpp @@ -108,7 +108,7 @@ void tst_QColorDialog::native_activeModalWidget() // color dialog when it is executing, even when using a native // dialog: TestNativeDialog d; - QTimer::singleShot(100, &d, SLOT(hide())); + QTimer::singleShot(1000, &d, SLOT(hide())); d.exec(); QVERIFY(&d == d.m_activeModalWidget); } -- cgit v0.12 From 5e253192581593dcb4273adff81428903a4a9bea Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 14 Apr 2009 15:19:41 +0200 Subject: Don't remove the cache file if you have successfully added it. This regression probably happened because of the fix to task 244485 (see 8d500381), which made QFile follow a rename. This means that QTemporaryFile removes its target when it is deleted. This fixes a number of caching autotests that are failing. Reviewed-by: Markus Goetz BT: yes (cherry picked from commit 99ed68cda10355dba5c7a3e2466ee45b59dbb555) --- src/network/access/qnetworkdiskcache.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index 5e194e2..f3b5e9a 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -253,7 +253,8 @@ void QNetworkDiskCachePrivate::storeItem(QCacheItem *cacheItem) // ### use atomic rename rather then remove & rename if (cacheItem->file->rename(fileName)) currentCacheSize += cacheItem->file->size(); - cacheItem->file->setAutoRemove(true); + else + cacheItem->file->setAutoRemove(true); } if (cacheItem->metaData.url() == lastItem.metaData.url()) lastItem.reset(); -- cgit v0.12 From 2db2869bea16b6c98681aa55eda58fb2418db9b3 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 14 Apr 2009 16:10:51 +0200 Subject: Changelog: add my changes for 4.5.1 BT: yes (cherry picked from commit 36f4460b3d6cc18e737edd7d4b18e4b2636e6ff9) --- dist/changes-4.5.1 | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 7bd7aa4..0d9c2a3 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -33,6 +33,13 @@ Third party components * Library * **************************************************************************** +- QAbstractItemModel + * [243195] Clrarified some warning messages printed if the model is invalid. + +- QAbstractEventDispatcher + * [248805] Duplicates timerid could happen when timer are running while + the QObject is moved to another thread, and would stop timers from working. + - QAbstractSocket * [192037] Emit disconnected only if we were connected before @@ -42,6 +49,9 @@ Third party components - QColorDialog * [247349] Fixed bug causing the wrong alpha value to be returned. +- QCombobox + * [248094] Fixed scrollbar appearing while not required. + - QCompleter * [250064] Fixed focus policy propagation regression. * [246056] Fixed assertion failure in setCompletionPrefix(). @@ -75,20 +85,43 @@ Third party components * [249175] Fix QPixmap::fromImage() of monochrome images to result in black/white pixels and not transparent/white pixels. +- QScrollBar + * [247985] Stylesheet: added ability to style scrollbar menus. + - QSharedPointer * [246843] Fixed a crash caused by using QSharedPointer in global statics +- QSortFilterProxyModel + * [247867] Properly sort when calling appendRows() + * [248868] Resort when the model is reset if dynamicSort is enabled. + * [248868] Fixed QSortFilterProxyModel::sort while dynamicSort was disabled. + - QSSlSocket * [245668] set also protocol, verifyMode and verifyDepth in setSslConfiguration() - QStyleSheetStyle * Improved support for setting background and foreground roles in styles - such as the text color in a combo box popup on Mac and Cleanlooks. + such as the text color in a combo box popup on Mac and Cleanlooks, or + the QScrollBar background. + * [188195] fix background of QAbstractScrollArea loosing its color if styled with pseudo-class. + * Fixed crash while styling the title bar of a QMdiArea. + * [246542] Fixed QToolButton::hover{ color:.... } + +- QTreeView + * Fixed crash that may occurs when event are processed just after QSortFilterProxyModel + has been invalidated + * [246025] Fixed auto-expand that occurs while quicly collapsing an item after clicking on a child + * [248805] Calling programatically QTreeView::sortByColumn was not working if manual + sorting is disabled + * [248163] Fixed possible crash in the paintEvent when spans are used. - QWizard * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. +- Q3ListView + * [248689] Q3ListView would not update under certain condition. + **************************************************************************** * Database Drivers * @@ -135,6 +168,11 @@ Qt for Linux/X11 * [248644] Fall back to Qt's subpixel rendering if Freetype's subpixel rendering is available at compile-time but not at run-time. +- QEventDispatcherGlib + * Event posted to a thread before it is started are not processed until + others events are posted. + + Qt for Windows -------------- @@ -185,6 +223,7 @@ Qt for Mac OS X - QTestLib * Activate the test application when launched from the command line. +- Fixed the focus frame transparency that would make widget difficult to use with widget stylesheet. Qt for Embedded Linux --------------------- -- cgit v0.12 From f2bcd350c6ed26bad325bcf37a450d7bc6a5fb20 Mon Sep 17 00:00:00 2001 From: Trond Kjernaasen Date: Tue, 14 Apr 2009 16:16:49 +0200 Subject: Fixes the composition demo for Mac/Cocoa in GL mode. QGLPixelBuffer::generateDynamicTexture() will bind the texture to the pbuffer regardless. Why this works on Carbon is a mystery, but if we're to follow our own docs, we should NOT bind the texture to the pbuffer by default. An explicit call to ::bindToDynamicTexture() is required for that. Task-number: 250664 Reviewed-by: Samuel BT: yes (cherry picked from commit e8877160e332d12958cf700a8a607c36e6c426e1) --- src/opengl/qglpixelbuffer_mac.mm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/opengl/qglpixelbuffer_mac.mm b/src/opengl/qglpixelbuffer_mac.mm index dbb073b..7658780 100644 --- a/src/opengl/qglpixelbuffer_mac.mm +++ b/src/opengl/qglpixelbuffer_mac.mm @@ -308,10 +308,6 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const GLuint texture; glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - [static_cast(d->share_ctx) - setTextureImageToPixelBuffer:static_cast(d->pbuf) - colorBuffer:GL_FRONT]; - glBindTexture(GL_TEXTURE_2D, texture); // updates texture target glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -322,8 +318,6 @@ GLuint QGLPixelBuffer::generateDynamicTexture() const GLuint texture; glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - aglTexImagePBuffer(d->share_ctx, d->pbuf, GL_FRONT); - glBindTexture(GL_TEXTURE_2D, texture); // updates texture target glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); return texture; -- cgit v0.12 From 64bf38d5ac94797adca7f7fe5a9452dce2f409a9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 14 Apr 2009 17:07:05 +0200 Subject: Update changes file with my WebKit changes as well as from external contributors. Reviewed-by: Trust me (cherry picked from commit 5dda84c32b38051ca64c3641ffaaa807e2406285) --- dist/changes-4.5.1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0d9c2a3..6062093 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -122,6 +122,14 @@ Third party components - Q3ListView * [248689] Q3ListView would not update under certain condition. +- QtWebKit + * Fix bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). + * Fixed support for calling from JavaScript into NPAPI plugins on Windows. + * Fixed updating state of WebActions (Erik Bunce) + * Fixed bug in HTML 5 Canvas clearRect() (Dirk Schulze) + * Fixed text field theming with KDE 4 Oxygen style (Zack Rusin) + * Fixed path fill styles (Zack Rusin) + * Fixed pre-edit text handling with input methods. **************************************************************************** * Database Drivers * -- cgit v0.12 From a97ee39a342c2f79a6f8bc64cd007df4e3bf2889 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 14 Apr 2009 16:55:24 +0200 Subject: Fix logic for autodetecting the embedded-linux package The previous version would get confused because the embedded package also contains _x11 files. Reviewed-by: Thiago (cherry picked from commit 28d2b22a940174b4e64f6fa2f5548a7832fc07e8) --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 6d67dee..ecdb92f 100755 --- a/configure +++ b/configure @@ -119,7 +119,13 @@ elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then # ~ src/gui/base/qapplication_qws.cpp is present # ~ this is the free or commercial edition # ~ this is the internal edition and Qt Embedded is explicitly enabled - PLATFORM_QWS=maybe + if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ]; then + # This is a depot build, or an all-platforms package + PLATFORM_QWS=maybe + else + # This must be the embedded package, since the Qt/Mac source files are not present + PLATFORM_QWS=yes + fi fi #----------------------------------------------------------------------------- -- cgit v0.12 From 290ac99356ffe4d30ffe3c1abd47b29133da884a Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 14 Apr 2009 18:05:26 +0200 Subject: QGraphicsItem: When an item is deleted and eventfilters installed The problem here is that we are filling the sceneEventFilters map when we install evenfilter but we never remove the references of an item if it has been removed from the scene or deleted. The deletion can keep stale pointers into the map and a crash can happen. BT:yes Task-number:250272 Reviewed-by: bnilsen Reviewed-by: andreas (cherry picked from commit 0bb526f8fab33a42df56c8a60c272e2cca4cc792) --- src/gui/graphicsview/qgraphicsscene.cpp | 19 +++++++++++++++++++ tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 25c8030..96710a4 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -740,6 +740,15 @@ void QGraphicsScenePrivate::_q_removeItemLater(QGraphicsItem *item) unpolishedItems.removeAll(item); dirtyItems.removeAll(item); + //We remove all references of item from the sceneEventFilter arrays + QMultiMap::iterator iterator = sceneEventFilters.begin(); + while (iterator != sceneEventFilters.end()) { + if (iterator.value() == item || iterator.key() == item) + iterator = sceneEventFilters.erase(iterator); + else + ++iterator; + } + // Remove from scene transform cache int transformIndex = item->d_func()->sceneTransformIndex; if (transformIndex != -1) { @@ -3154,6 +3163,16 @@ void QGraphicsScene::removeItem(QGraphicsItem *item) d->unpolishedItems.removeAll(item); d->dirtyItems.removeAll(item); + //We remove all references of item from the sceneEventFilter arrays + QMultiMap::iterator iterator = d->sceneEventFilters.begin(); + while (iterator != d->sceneEventFilters.end()) { + if (iterator.value() == item || iterator.key() == item) + iterator = d->sceneEventFilters.erase(iterator); + else + ++iterator; + } + + //Ensure dirty flag have the correct default value so the next time it will be added it will receive updates item->d_func()->dirty = 0; item->d_func()->dirtyChildren = 0; diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index bc90bf9..e61b69b 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -4019,6 +4019,25 @@ void tst_QGraphicsItem::sceneEventFilter() QCOMPARE(tester->filteredEventReceivers.at(6), static_cast(text2)); QVERIFY(text2->hasFocus()); + + //Let check if the items are correctly removed from the sceneEventFilters array + //to avoid stale pointers. + QGraphicsView gv; + QGraphicsScene *anotherScene = new QGraphicsScene; + QGraphicsTextItem *ti = anotherScene->addText("This is a test #1"); + ti->moveBy(50, 50); + QGraphicsTextItem *ti2 = anotherScene->addText("This is a test #2"); + QGraphicsTextItem *ti3 = anotherScene->addText("This is a test #3"); + gv.setScene(anotherScene); + gv.show(); + QTest::qWait(250); + ti->installSceneEventFilter(ti2); + ti3->installSceneEventFilter(ti); + delete ti2; + //we souldn't crash + QTest::mouseMove(gv.viewport(), gv.mapFromScene(ti->scenePos())); + QTest::qWait(250); + delete ti; } class GeometryChanger : public QGraphicsItem -- cgit v0.12 From 49db7ce18abb57c0fbcfc40cea869827b662757f Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 14 Apr 2009 18:28:19 +0200 Subject: My ChangeLog Reviewed-by: TrustMe (cherry picked from commit 94a9f77b41c2d924983e92df30e3e4cc7882cb75) --- dist/changes-4.5.1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 6062093..e8595ff 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -56,9 +56,24 @@ Third party components * [250064] Fixed focus policy propagation regression. * [246056] Fixed assertion failure in setCompletionPrefix(). +- QDirIterator + * [247645] Fix a bug that may loose all cached data inside the QFileInfo + - QFileInfo * [205244] return valid file info also for relative UNC paths +- QFileDialog + * [250194] QFileDialog and QSortFilterProxyModel index mapping issue + * [248332] QFileDialog is slow after visiting a large directory + * [221323] QFileDialog programatical file selection bug + +- QGraphicsItem + * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden + * [250272] When an item is deleted it does not get removed from the sceneeventfilters meaning a crash can occur + +-QGraphicsView + * [245766] Rubber Band drag mode not updated correctly when scrolling + - QHttp * [208445] cancel request upon receiving unknown authentication method -- cgit v0.12 From 3e3a0ab559ca752ee0e360a7a93be30569141985 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 14 Apr 2009 20:56:06 +0200 Subject: Fix auto-test failure since we remove the warning in QColor Reviewed-by: ogoffart (cherry picked from commit a94b601866740e483f093233f59f43b022a68735) --- tests/auto/qcssparser/tst_cssparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp index b59a9ab..1eeb8ef 100644 --- a/tests/auto/qcssparser/tst_cssparser.cpp +++ b/tests/auto/qcssparser/tst_cssparser.cpp @@ -272,7 +272,7 @@ void tst_CssParser::term_data() val.variant = QVariant(QColor("#ffbb00")); QTest::newRow("hexcolor2") << true << "#fb0" << val; - QTest::ignoreMessage(QtWarningMsg, "QColor::setNamedColor: Could not parse color '#cafebabe'"); + QTest::ignoreMessage(QtWarningMsg, "QCssParser::parseHexColor: Unknown color name '#cafebabe'"); QTest::newRow("hexcolor_failure") << false << "#cafebabe" << val; val.type = QCss::Value::Uri; -- cgit v0.12 From 75c49df25db724e2c742427a5396f25eebfe9a79 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 15 Apr 2009 11:21:13 +1000 Subject: Fix typo in documentation. Error was introduced in change 52f87de53328c661049acf09d5fedc1850aa9bfa. Reviewed-by: Trust Me (cherry picked from commit e3462ae7868c679bc88dc01de85ca39454651ff7) --- src/gui/painting/qpainter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index a60ee7c..899f381 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1465,7 +1465,7 @@ bool QPainter::isActive() const /*! Initializes the painters pen, background and font to the same as - the given \a widget. This function is automatically when the + the given \a widget. This function is called automatically when the painter is opened on a QWidget. \sa begin(), {QPainter#Settings}{Settings} -- cgit v0.12 From 3bf1b0432c411aaca24236d66d90d5143cab683e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 7 Apr 2009 16:59:01 +0200 Subject: compile with aCC (cherry picked from commit 3568aeef72bec8333650eb2200b12eba8fac1b71) --- tools/linguist/shared/translatormessage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/linguist/shared/translatormessage.h b/tools/linguist/shared/translatormessage.h index e5cab60..1a975f8 100644 --- a/tools/linguist/shared/translatormessage.h +++ b/tools/linguist/shared/translatormessage.h @@ -195,12 +195,12 @@ struct TranslatorMessagePtr { Q_DECLARE_TYPEINFO(TranslatorMessagePtr, Q_MOVABLE_TYPE); -static inline int qHash(TranslatorMessagePtr tmp) +inline int qHash(TranslatorMessagePtr tmp) { return qHash(*tmp.ptr); } -static inline bool operator==(TranslatorMessagePtr tmp1, TranslatorMessagePtr tmp2) +inline bool operator==(TranslatorMessagePtr tmp1, TranslatorMessagePtr tmp2) { return *tmp1.ptr == *tmp2.ptr; } -- cgit v0.12 From ac0ad48bba91530abd04624f36283d6dc82ec8e7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Apr 2009 12:50:32 +0200 Subject: Fixes: WDestructiveClose flag and the new WindowCancelButtonHint have the same value -> crash on SetTitle() Task: 242484 RevBy: mauricek AutoTest: Details: Since we do not respect binary compatibility on Windows CE we just change the enum (cherry picked from commit c1c30037292711f0fb05677e77ed2eb2112eca78) --- src/corelib/global/qnamespace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index e10b912..8db1756 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -280,9 +280,7 @@ public: WindowStaysOnTopHint = 0x00040000, // reserved for Qt3Support: // WMouseNoMask = 0x00080000, - WindowOkButtonHint = 0x00080000, // WDestructiveClose = 0x00100000, - WindowCancelButtonHint = 0x00100000, // WStaticContents = 0x00200000, // WGroupLeader = 0x00400000, // WShowModal = 0x00800000, @@ -291,7 +289,9 @@ public: WindowStaysOnBottomHint = 0x04000000, WindowCloseButtonHint = 0x08000000, MacWindowToolBarButtonHint = 0x10000000, - BypassGraphicsProxyWidget = 0x20000000 + BypassGraphicsProxyWidget = 0x20000000, + WindowOkButtonHint = 0x00080000, + WindowCancelButtonHint = 0x00100000 #ifdef QT3_SUPPORT , -- cgit v0.12 From a8fe6d8c6e49eb0399c15de3c939e8e30802b1f6 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 15 Apr 2009 10:47:29 +0200 Subject: Compile with namespace Reviewed-by: hjk (cherry picked from commit a59488d4799f6ac9ea034c0a88a468e73a64d517) --- src/corelib/tools/qvector.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 83076da..aba6f56 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -98,6 +98,8 @@ struct QVectorTypedData T array[1]; }; +class QRegion; + template class QVector { -- cgit v0.12 From 47bf9efe79f8f5750ab57945fe08a771f794c0a9 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 15 Apr 2009 10:30:17 +0200 Subject: Fix regression in QString::replace(int, int, QChar) when string is empty When QString::replace was optimized, this specific overload missed out on sanity checking of the arguments. Task-number: 249517 Reviewed-by: Joao Reviewed-by: hjk BT: yes (cherry picked from commit afb3848e0abe0cd2355e7ee7319fd904288e4636) --- src/corelib/tools/qstring.cpp | 34 ++++++++++++++++------------------ tests/auto/qstring/tst_qstring.cpp | 4 ++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 2050de5..68d6224 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -579,7 +579,7 @@ const QString::Null QString::null = { }; '\\0' character for a null string (\e not a null pointer), and QString() compares equal to QString(""). We recommend that you always use the isEmpty() function and avoid isNull(). - + \section1 Argument Formats In member functions where an argument \e format can be specified @@ -1433,7 +1433,7 @@ QString &QString::append(QChar ch) truncated at the specified \a position. \snippet doc/src/snippets/qstring/main.cpp 37 - + \sa insert(), replace() */ QString &QString::remove(int pos, int len) @@ -1552,7 +1552,7 @@ QString &QString::replace(int pos, int len, const QChar *unicode, int size) return *this; if (pos + len > d->size) len = d->size - pos; - + uint index = pos; replace_helper(&index, 1, len, unicode, size); return *this; @@ -1561,15 +1561,13 @@ QString &QString::replace(int pos, int len, const QChar *unicode, int size) /*! \fn QString &QString::replace(int position, int n, QChar after) \overload replace() - + Replaces \a n characters beginning at index \a position with the character \a after and returns a reference to this string. */ QString &QString::replace(int pos, int len, QChar after) { - uint index = pos; - replace_helper(&index, 1, len, &after, 1); - return *this; + return replace(pos, len, &after, 1); } /*! @@ -1602,7 +1600,7 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar { if (blen == alen) { detach(); - for (int i = 0; i < nIndices; ++i) + for (int i = 0; i < nIndices; ++i) memcpy(d->data + indices[i], after, alen * sizeof(QChar)); } else if (alen < blen) { detach(); @@ -1633,7 +1631,7 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar int newLen = d->size + adjust; int moveend = d->size; resize(newLen); - + while (nIndices) { --nIndices; int movestart = indices[nIndices] + blen; @@ -1685,7 +1683,7 @@ QString &QString::replace(const QChar *before, int blen, memcpy(copy, before, blen*sizeof(QChar)); b = copy; } - + QStringMatcher matcher(b, blen, cs); int index = 0; @@ -1712,7 +1710,7 @@ QString &QString::replace(const QChar *before, int blen, // index has to be adjusted in case we get back into the loop above. index += pos*(alen-blen); } - + if (a != after) ::free((QChar *)a); if (b != before) @@ -2250,7 +2248,7 @@ int QString::indexOf(const QLatin1String &str, int from, Qt::CaseSensitivity cs) QVarLengthArray s(len); for (int i = 0; i < len; ++i) s[i] = str.latin1()[i]; - + return qFindString(unicode(), length(), from, (const QChar *)s.data(), len, cs); } @@ -2346,7 +2344,7 @@ static int lastIndexOfHelper(const ushort *haystack, int from, const ushort *nee /* See indexOf() for explanations. */ - + const ushort *end = haystack; haystack += from; const int sl_minus_1 = sl-1; @@ -2408,7 +2406,7 @@ int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) c const int sl = str.d->size; if (sl == 1) return lastIndexOf(QChar(str.d->data[0]), from, cs); - + const int l = d->size; if (from < 0) from += l; @@ -2446,7 +2444,7 @@ int QString::lastIndexOf(const QLatin1String &str, int from, Qt::CaseSensitivity const int sl = qstrlen(str.latin1()); if (sl == 1) return lastIndexOf(QLatin1Char(str.latin1()[0]), from, cs); - + const int l = d->size; if (from < 0) from += l; @@ -5995,7 +5993,7 @@ QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersi } if (simple) return *this; - + QString s = *this; if (version != CURRENT_VERSION) { for (int i = 0; i < NumNormalizationCorrections; ++i) { @@ -6207,7 +6205,7 @@ static QString replaceArgEscapes(const QString &s, const ArgEscapeData &d, int f /*! Returns a copy of this string with the lowest numbered place marker replaced by string \a a, i.e., \c %1, \c %2, ..., \c %99. - + \a fieldWidth specifies the minimum amount of space that argument \a a shall occupy. If \a a requires less space than \a fieldWidth, it is padded to \a fieldWidth with character \a fillChar. A positive @@ -6819,7 +6817,7 @@ void QString::updateProperties() const Appends the given \a ch character onto the end of this string. */ -/*! +/*! \fn std::string QString::toStdString() const Returns a std::string object with the data contained in this diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 5c3c456..403ada0 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -432,6 +432,10 @@ void tst_QString::replace_uint_uint_data() QTest::newRow( "rep09" ) << QString("ACABCAB") << 4 << 2 << QString("XX") << QString("ACABXXB"); QTest::newRow( "rep10" ) << QString("ACABCAB") << 5 << 2 << QString("XX") << QString("ACABCXX"); QTest::newRow( "rep10" ) << QString("ACABCAB") << 6 << 2 << QString("XX") << QString("ACABCAXX"); + QTest::newRow( "rep12" ) << QString() << 0 << 10 << QString("X") << QString("X"); + QTest::newRow( "rep13" ) << QString("short") << 0 << 10 << QString("X") << QString("X"); + QTest::newRow( "rep14" ) << QString() << 0 << 10 << QString("XX") << QString("XX"); + QTest::newRow( "rep15" ) << QString("short") << 0 << 10 << QString("XX") << QString("XX"); } void tst_QString::replace_string_data() -- cgit v0.12 From c141a575930ae3eb7a98353838d9c7142dbe5b93 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 25 Feb 2009 12:18:28 +0100 Subject: Fixes: Optimize QGraphicsView::itemUpdated. Task: - RevBy: Andreas AutoTest: - Details: Accumulate the parentToItem transform as we iterate instead of creating it from bottom-up each time. (cherry picked from commit e27743bdeda7aa3cb42f2d81a521121f8ee04eae) --- src/gui/graphicsview/qgraphicsview.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 9e8a4f5..175e5a3 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -804,10 +804,17 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) if (item->isClipped()) { // Minimize unnecessary redraw. QGraphicsItem *p = item; + QTransform xform; + QGraphicsItem *lastTransformItem = 0; while ((p = p->d_ptr->parent)) { if (p->flags() & QGraphicsItem::ItemClipsChildrenToShape) { - updateRect &= p->itemTransform(item).mapRect(p->boundingRect()); - if (updateRect.isNull()) + if (!lastTransformItem) + xform = item->itemTransform(p); + else + xform *= lastTransformItem->itemTransform(p); + lastTransformItem = p; + updateRect &= xform.inverted().mapRect(p->boundingRect()); + if (updateRect.isEmpty()) return; } @@ -815,7 +822,7 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) break; } - if (updateRect.isNull()) + if (updateRect.isEmpty()) return; } -- cgit v0.12 From 2f1c9ca37b9ce2ab05aff9aa19b35c93990dcec7 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Feb 2009 14:49:47 +0100 Subject: Fixes: Optimize QGraphicsViewPrivate::updateRect()/updateRegion(). Details: Those cut-offs are extremely important. After few seconds interaction with the iphone demo, updateRect() was called approx. 3000 times with an empty rect. Then imagine what happens when having e.g. FullViewportUpdate. We do q->viewport()->update() JUST FOR FUN! (cherry picked from commit be6be8c73929f2ddee9a02f59db05c3ba453a63e) --- src/gui/graphicsview/qgraphicsview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 175e5a3..b7ce085 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -928,6 +928,9 @@ void QGraphicsViewPrivate::updateAll() void QGraphicsViewPrivate::updateRegion(const QRegion &r) { + if (r.isEmpty()) + return; + Q_Q(QGraphicsView); // Rect intersects viewport - update everything? @@ -976,6 +979,9 @@ void QGraphicsViewPrivate::updateRegion(const QRegion &r) void QGraphicsViewPrivate::updateRect(const QRect &r) { + if (r.isEmpty()) + return; + Q_Q(QGraphicsView); // Rect intersects viewport - update everything? -- cgit v0.12 From 36e4718fba72a9962299c1a5ee279fa4addddec3 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Feb 2009 15:00:08 +0100 Subject: Fixes: Cleanup calls to QGraphicsViewPrivate::updateRect()/updateRegion() Details: Checking for QRect::isNull() was wrong in the first place, and checking for isEmpty()/isNull() is overhead after 4a491a84aeba68279927597a261522dcc23bb3ff. (cherry picked from commit e9fa8ba1ad0b0b2d3363fb33635071677f42b983) --- src/gui/graphicsview/qgraphicsview.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index b7ce085..0e4d5be 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -829,17 +829,10 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) // Map the rect to view coordinates. QRect vr = viewport->rect(); - if (!item->d_ptr->hasBoundingRegionGranularity) { - QRect r = mapToViewRect(item, updateRect) & vr; - if (r.isNull()) - return; - this->updateRect(r); - } else { - QRegion r = mapToViewRegion(item, updateRect) & vr; - if (r.isEmpty()) - return; - updateRegion(r); - } + if (!item->d_ptr->hasBoundingRegionGranularity) + this->updateRect(mapToViewRect(item, updateRect) & vr); + else + updateRegion(mapToViewRegion(item, updateRect) & vr); } void QGraphicsViewPrivate::updateLater() @@ -863,9 +856,7 @@ void QGraphicsViewPrivate::_q_updateLaterSlot() for (int i = 0; i < dirtyItems.size(); ++i) { const QGraphicsItem *item = dirtyItems.at(i); QTransform x = item->sceneTransform() * viewTransform; - QRect viewRect = x.mapRect(item->boundingRect()).toAlignedRect() & vr; - if (!viewRect.isNull()) - updateRect(viewRect); + updateRect(x.mapRect(item->boundingRect()).toAlignedRect() & vr); } dirtyRectCount += dirtyRects.size(); -- cgit v0.12 From e87fd9a6fd06d57f4b007ab72c60041eaf0dec0f Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Feb 2009 15:47:04 +0100 Subject: Fixes: Use QRect::isEmpty() rather than isNull() if possible. RevBy: Andreas Details: Note that isNull() implies isEmpty(), but it only catches the cases where width and height is 0. (cherry picked from commit 8a2ebc96220f50be3a9c382c32d7eaab89921ff7) --- src/gui/graphicsview/qgraphicsitem.cpp | 2 +- src/gui/graphicsview/qgraphicsscene.cpp | 2 +- src/gui/graphicsview/qgraphicsview.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 4787b6c..e300628 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3757,7 +3757,7 @@ bool QGraphicsItemPrivate::isProxyWidget() const */ void QGraphicsItem::update(const QRectF &rect) { - if (d_ptr->dirty) + if (d_ptr->dirty || (rect.isEmpty() && !rect.isNull())) return; if (d_ptr->scene && isVisible()) { if (CacheMode(d_ptr->cacheMode) != NoCache) { diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 96710a4..0a53f7f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -3474,7 +3474,7 @@ QVariant QGraphicsScene::inputMethodQuery(Qt::InputMethodQuery query) const void QGraphicsScene::update(const QRectF &rect) { Q_D(QGraphicsScene); - if (d->updateAll) + if (d->updateAll || (rect.isEmpty() && !rect.isNull())) return; // Check if anyone's connected; if not, we can send updates directly to diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 0e4d5be..686f95c 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -862,7 +862,7 @@ void QGraphicsViewPrivate::_q_updateLaterSlot() dirtyRectCount += dirtyRects.size(); bool noUpdate = !fullUpdatePending && viewportUpdateMode == QGraphicsView::FullViewportUpdate; - if ((dirtyRectCount > 0 || !dirtyBoundingRect.isNull()) && !fullUpdatePending && !noUpdate) { + if ((dirtyRectCount > 0 || !dirtyBoundingRect.isEmpty()) && !fullUpdatePending && !noUpdate) { if (viewportUpdateMode == QGraphicsView::BoundingRectViewportUpdate || (viewportUpdateMode == QGraphicsView::SmartViewportUpdate && dirtyRectCount >= QGRAPHICSVIEW_REGION_RECT_THRESHOLD)) { @@ -3284,7 +3284,7 @@ void QGraphicsView::mouseMoveEvent(QMouseEvent *event) } // Update old rubberband - if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate && !d->rubberBandRect.isNull()) { + if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate && !d->rubberBandRect.isEmpty()) { if (d->viewportUpdateMode != FullViewportUpdate) viewport()->update(d->rubberBandRegion(viewport(), d->rubberBandRect)); else @@ -3466,7 +3466,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event) QPainter painter(viewport()); QTransform original = painter.worldTransform(); #ifndef QT_NO_RUBBERBAND - if (d->rubberBanding && !d->rubberBandRect.isNull()) + if (d->rubberBanding && !d->rubberBandRect.isEmpty()) painter.save(); #endif // Set up render hints @@ -3561,7 +3561,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event) #ifndef QT_NO_RUBBERBAND // Rubberband - if (d->rubberBanding && !d->rubberBandRect.isNull()) { + if (d->rubberBanding && !d->rubberBandRect.isEmpty()) { painter.restore(); QStyleOptionRubberBand option; option.initFrom(viewport()); @@ -3645,7 +3645,7 @@ void QGraphicsView::scrollContentsBy(int dx, int dy) #ifndef QT_NO_RUBBERBAND // Update old rubberband - if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate && !d->rubberBandRect.isNull()) { + if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate && !d->rubberBandRect.isEmpty()) { if (d->viewportUpdateMode != FullViewportUpdate) viewport()->update(d->rubberBandRegion(viewport(), d->rubberBandRect)); else -- cgit v0.12 From 50f92ce9b2cc8855a578423a1d309fba9b62dc5f Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 27 Feb 2009 16:00:55 +0100 Subject: Fixes: Small optimization: reduce calls to QTransform::type(). Task: none RevBy: Ariya Hidayat AutoTest: Still pass. Details: QTransform::type() is cached, so only the first call to it should be expensive. However, it is not inlined so there's an overhead involved (especially when these functions are called a gazillion times). (cherry picked from commit eda77b7c410a59d1b77c263994679452613d9d0b) --- src/gui/painting/qtransform.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 1a86e06..939a668 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1222,7 +1222,8 @@ static QPolygonF mapProjective(const QTransform &transform, const QPolygonF &pol */ QPolygonF QTransform::map(const QPolygonF &a) const { - if (type() >= QTransform::TxProject) + TransformationType t = type(); + if (t >= QTransform::TxProject) return mapProjective(*this, a); int size = a.size(); @@ -1231,7 +1232,6 @@ QPolygonF QTransform::map(const QPolygonF &a) const const QPointF *da = a.constData(); QPointF *dp = p.data(); - TransformationType t = type(); for(i = 0; i < size; ++i) { MAP(da[i].xp, da[i].yp, dp[i].xp, dp[i].yp); } @@ -1249,7 +1249,8 @@ QPolygonF QTransform::map(const QPolygonF &a) const */ QPolygon QTransform::map(const QPolygon &a) const { - if (type() >= QTransform::TxProject) + TransformationType t = type(); + if (t >= QTransform::TxProject) return mapProjective(*this, QPolygonF(a)).toPolygon(); int size = a.size(); @@ -1258,7 +1259,6 @@ QPolygon QTransform::map(const QPolygon &a) const const QPoint *da = a.constData(); QPoint *dp = p.data(); - TransformationType t = type(); for(i = 0; i < size; ++i) { qreal nx = 0, ny = 0; MAP(da[i].xp, da[i].yp, nx, ny); @@ -2061,10 +2061,11 @@ QTransform::operator QVariant() const Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale) { - if (transform.type() <= QTransform::TxTranslate) { + const QTransform::TransformationType type = transform.type(); + if (type <= QTransform::TxTranslate) { *scale = 1; return true; - } else if (transform.type() == QTransform::TxScale) { + } else if (type == QTransform::TxScale) { const qreal xScale = qAbs(transform.m11()); const qreal yScale = qAbs(transform.m22()); *scale = qMax(xScale, yScale); @@ -2076,7 +2077,7 @@ bool qt_scaleForTransform(const QTransform &transform, qreal *scale) const qreal yScale = transform.m12() * transform.m12() + transform.m22() * transform.m22(); *scale = qSqrt(qMax(xScale, yScale)); - return transform.type() == QTransform::TxRotate && qFuzzyCompare(xScale, yScale); + return type == QTransform::TxRotate && qFuzzyCompare(xScale, yScale); } QT_END_NAMESPACE -- cgit v0.12 From f2af9b8374a7e97345c621e6b62944e985b541e3 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 27 Feb 2009 18:10:08 +0100 Subject: Fixes: Get rid of a gazillion calls to QTransform::operator*=. Details: Be a little bit smarter before doing *= :) (cherry picked from commit b4456f8775c36bcb2ceef9ca1a00c7765f1d2735) --- src/gui/graphicsview/qgraphicsitem.cpp | 38 +++++++++++++++++++++------------ src/gui/graphicsview/qgraphicsscene.cpp | 5 +++-- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index e300628..86a8a9b 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2511,10 +2511,10 @@ QTransform QGraphicsItem::sceneTransform() const QTransform m; if (d_ptr->hasTransform) { m = transform(); - m *= QTransform::fromTranslate(d_ptr->pos.x(), d_ptr->pos.y()); - } else { - // ### ? QTransform::fromTranslate(d_ptr->pos.x(), d_ptr->pos.y()) - m.translate(d_ptr->pos.x(), d_ptr->pos.y()); + if (!d_ptr->pos.isNull()) + m *= QTransform::fromTranslate(d_ptr->pos.x(), d_ptr->pos.y()); + } else if (!d_ptr->pos.isNull()) { + m = QTransform::fromTranslate(d_ptr->pos.x(), d_ptr->pos.y()); } // Combine with parent and add to cache. @@ -2639,6 +2639,8 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co if (ok) *ok = true; const QPointF &itemPos = d_ptr->pos; + if (itemPos.isNull()) + return d_ptr->hasTransform ? transform() : QTransform(); if (d_ptr->hasTransform) return transform() * QTransform::fromTranslate(itemPos.x(), itemPos.y()); return QTransform::fromTranslate(itemPos.x(), itemPos.y()); @@ -2649,7 +2651,8 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co const QPointF &otherPos = other->d_ptr->pos; if (other->d_ptr->hasTransform) { QTransform otherToParent = other->transform(); - otherToParent *= QTransform::fromTranslate(otherPos.x(), otherPos.y()); + if (!otherPos.isNull()) + otherToParent *= QTransform::fromTranslate(otherPos.x(), otherPos.y()); return otherToParent.inverted(ok); } else { if (ok) @@ -2674,11 +2677,11 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co QTransform itemToParent = QTransform::fromTranslate(itemPos.x(), itemPos.y()); if (hasTr) - itemToParent = transform() * itemToParent; + itemToParent = itemPos.isNull() ? transform() : transform() * itemToParent; QTransform otherToParent = QTransform::fromTranslate(otherPos.x(), otherPos.y()); if (otherHasTr) - otherToParent = other->transform() * otherToParent; + otherToParent = otherPos.isNull() ? other->transform() : other->transform() * otherToParent; return itemToParent * otherToParent.inverted(ok); } @@ -2718,7 +2721,8 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co const QGraphicsItemPrivate *pd = p->d_ptr; if (pd->hasTransform) x *= p->transform(); - x *= QTransform::fromTranslate(pd->pos.x(), pd->pos.y()); + if (!pd->pos.isNull()) + x *= QTransform::fromTranslate(pd->pos.x(), pd->pos.y()); } while ((p = p->d_ptr->parent) && p != root); if (parentOfOther) return x.inverted(ok); @@ -2995,7 +2999,9 @@ QRectF QGraphicsItem::childrenBoundingRect() const QRectF childRect; foreach (QGraphicsItem *child, children()) { QPointF childPos = child->pos(); - QTransform matrix = child->transform() * QTransform::fromTranslate(childPos.x(), childPos.y()); + QTransform matrix = child->transform(); + if (!childPos.isNull()) + matrix *= QTransform::fromTranslate(childPos.x(), childPos.y()); childRect |= matrix.mapRect(child->boundingRect() | child->childrenBoundingRect()); } return childRect; @@ -8544,13 +8550,17 @@ void QGraphicsItemGroup::addToGroup(QGraphicsItem *item) QTransform oldSceneMatrix = item->sceneTransform(); item->setPos(mapFromItem(item, 0, 0)); item->setParentItem(this); - item->setTransform(oldSceneMatrix - * sceneTransform().inverted() - * QTransform::fromTranslate(-item->x(), -item->y())); + QTransform newItemTransform(oldSceneMatrix); + newItemTransform *= sceneTransform().inverted(); + if (!item->pos().isNull()) + newItemTransform *= QTransform::fromTranslate(-item->x(), -item->y()); + item->setTransform(newItemTransform); item->d_func()->setIsMemberOfGroup(true); prepareGeometryChange(); - d->itemsBoundingRect |= (item->transform() * QTransform::fromTranslate(item->x(), item->y())) - .mapRect(item->boundingRect() | item->childrenBoundingRect()); + QTransform itemTransform(item->transform()); + if (!item->pos().isNull()) + itemTransform *= QTransform::fromTranslate(item->x(), item->y()); + d->itemsBoundingRect |= itemTransform.mapRect(item->boundingRect() | item->childrenBoundingRect()); update(); } diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 0a53f7f..235362b 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4791,8 +4791,9 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte if (itemCache->allExposed || !itemCache->exposed.isEmpty() || !scrollExposure.isEmpty()) { // Construct an item-to-pixmap transform. QPointF p = deviceRect.topLeft(); - QTransform itemToPixmap = QTransform::fromTranslate(-p.x(), -p.y()); - itemToPixmap = painter->worldTransform() * itemToPixmap; + QTransform itemToPixmap = painter->worldTransform(); + if (!p.isNull()) + itemToPixmap *= QTransform::fromTranslate(-p.x(), -p.y()); // Map the item's logical expose to pixmap coordinates. QRegion pixmapExposed = scrollExposure; -- cgit v0.12 From d1b778012618961a60c915b5381007a33f0bafe9 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Mon, 2 Mar 2009 10:34:50 +0100 Subject: Fixes: Optimization: Important cut-offs for QTransform. Task: none RevBy: Samuel AutoTest: Still pass Details: Please do not perform (potentially expensive) calculations just for fun :) (cherry picked from commit fac3c7b73ba2c6b39332445ae00b2fe26a578913) --- src/gui/painting/qtransform.cpp | 29 ++++++++++++++++++++++++++--- src/gui/painting/qtransform.h | 8 ++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 939a668..72bfa9c 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -399,6 +399,9 @@ QTransform QTransform::inverted(bool *invertible) const */ QTransform & QTransform::translate(qreal dx, qreal dy) { + if (dx == 0 && dy == 0) + return *this; + switch(type()) { case TxNone: affine._dx = dx; @@ -435,7 +438,10 @@ QTransform & QTransform::translate(qreal dx, qreal dy) QTransform QTransform::fromTranslate(qreal dx, qreal dy) { QTransform transform(1, 0, 0, 1, dx, dy); - transform.m_dirty = TxTranslate; + if (dx == 0 && dy == 0) + transform.m_dirty = TxNone; + else + transform.m_dirty = TxTranslate; return transform; } @@ -447,6 +453,9 @@ QTransform QTransform::fromTranslate(qreal dx, qreal dy) */ QTransform & QTransform::scale(qreal sx, qreal sy) { + if (sx == 1 && sy == 1) + return *this; + switch(type()) { case TxNone: case TxTranslate: @@ -481,7 +490,10 @@ QTransform & QTransform::scale(qreal sx, qreal sy) QTransform QTransform::fromScale(qreal sx, qreal sy) { QTransform transform(sx, 0, 0, sy, 0, 0); - transform.m_dirty = TxScale; + if (sx == 1 && sy == 1) + transform.m_dirty = TxNone; + else + transform.m_dirty = TxScale; return transform; } @@ -544,6 +556,9 @@ const qreal inv_dist_to_plane = 1. / 1024.; */ QTransform & QTransform::rotate(qreal a, Qt::Axis axis) { + if (a == 0) + return *this; + qreal sina = 0; qreal cosa = 0; if (a == 90. || a == -270.) @@ -715,7 +730,15 @@ bool QTransform::operator!=(const QTransform &o) const */ QTransform & QTransform::operator*=(const QTransform &o) { - TransformationType t = qMax(type(), o.type()); + const TransformationType otherType = o.type(); + if (otherType == TxNone) + return *this; + + const TransformationType thisType = type(); + if (thisType == TxNone) + return operator=(o); + + TransformationType t = qMax(thisType, otherType); switch(t) { case TxNone: break; diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 6c725b5..9fb080b 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -257,6 +257,8 @@ inline qreal QTransform::dy() const inline QTransform &QTransform::operator*=(qreal num) { + if (num == 1.) + return *this; affine._m11 *= num; affine._m12 *= num; m_13 *= num; @@ -271,11 +273,15 @@ inline QTransform &QTransform::operator*=(qreal num) } inline QTransform &QTransform::operator/=(qreal div) { + if (div == 0) + return *this; div = 1/div; return operator*=(div); } inline QTransform &QTransform::operator+=(qreal num) { + if (num == 0) + return *this; affine._m11 += num; affine._m12 += num; m_13 += num; @@ -290,6 +296,8 @@ inline QTransform &QTransform::operator+=(qreal num) } inline QTransform &QTransform::operator-=(qreal num) { + if (num == 0) + return *this; affine._m11 -= num; affine._m12 -= num; m_13 -= num; -- cgit v0.12 From eb8a06def103b4ac79e7f99f27439f5636f7032e Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Mon, 2 Mar 2009 16:22:20 +0100 Subject: Fixes: Speed up QGrahicsItemPrivate::effectiveOpacity(). RevBy: Andreas AutoTest: tst_QGraphicsItem::opacity still passes (cherry picked from commit ab130a0019fadeff4622778ca9f8b3e630da14da) --- src/gui/graphicsview/qgraphicsitem.cpp | 12 +++++++++++- src/gui/graphicsview/qgraphicsitem_p.h | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 86a8a9b..9014648 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1862,6 +1862,9 @@ qreal QGraphicsItem::opacity() const */ qreal QGraphicsItem::effectiveOpacity() const { + if (!d_ptr->hasEffectiveOpacity) + return qreal(1.0); + QVariant effectiveOpacity = d_ptr->extra(QGraphicsItemPrivate::ExtraEffectiveOpacity); return effectiveOpacity.isNull() ? qreal(1.0) : qreal(effectiveOpacity.toDouble()); } @@ -3680,7 +3683,14 @@ void QGraphicsItemPrivate::resolveEffectiveOpacity(qreal parentEffectiveOpacity) } // Set this item's resolved opacity. - setExtra(ExtraEffectiveOpacity, myEffectiveOpacity); + if (qFuzzyCompare(myEffectiveOpacity, qreal(1.0))) { + // Opaque, unset effective opacity. + hasEffectiveOpacity = 0; + unsetExtra(ExtraEffectiveOpacity); + } else { + hasEffectiveOpacity = 1; + setExtra(ExtraEffectiveOpacity, myEffectiveOpacity); + } // Resolve children always. for (int i = 0; i < children.size(); ++i) diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 2815b8c..4db0e40 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -133,6 +133,7 @@ public: hasBoundingRegionGranularity(0), flags(0), hasOpacity(0), + hasEffectiveOpacity(0), isWidget(0), dirty(0), dirtyChildren(0), @@ -262,6 +263,7 @@ public: // New 32 bytes quint32 hasOpacity : 1; + quint32 hasEffectiveOpacity : 1; quint32 isWidget : 1; quint32 dirty : 1; quint32 dirtyChildren : 1; -- cgit v0.12 From 06244063a852e4d8b8d2d5641ae65ddcd83150c7 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 3 Mar 2009 13:06:05 +0100 Subject: Fixes: Optimize: QGraphicsItem::clipPath. RevBy: Andreas AutoTest: Still pass (cherry picked from commit 7f50f45da0ad4a9eedd3ad7d8a82f719f7f8dd73) --- src/gui/graphicsview/qgraphicsitem.cpp | 46 +++++++++++----------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9014648..6169d6a 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3143,48 +3143,32 @@ QPainterPath QGraphicsItem::clipPath() const // Start with the item's bounding rect. clip.addRect(boundingRect()); - bool clipAway = false; if (d->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) { - // Make list of parents up to the farthest ancestor that clips its - // children to its shape. - QVarLengthArray clippingAncestors; - const QGraphicsItem *parent = parentItem(); - const QGraphicsItem *clipOwner = 0; - do { + const QGraphicsItem *parent = this; + const QGraphicsItem *lastParent = this; + + // Intersect any in-between clips starting at the top and moving downwards. + while ((parent = parent->d_ptr->parent)) { if (parent->d_ptr->flags & ItemClipsChildrenToShape) { - clippingAncestors.append(parent); - clipOwner = parent; + // Map clip to the current parent and intersect with its shape. + clip = (lastParent->itemTransform(parent).map(clip)).intersected(parent->shape()); + if (clip.isEmpty()) + return clip; + lastParent = parent; } - } while ((parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) && (parent = parent->parentItem())); - - // Start with the topmost clip. - QPainterPath parentClip = clipOwner->shape(); - // Intersect any in-between clips starting at the bottom and moving - // upwards. - for (int i = clippingAncestors.size() - 2; i >= 0; --i) { - const QGraphicsItem *item = clippingAncestors[i]; - // ### what if itemtransform fails - if (clipOwner) - parentClip = clipOwner->itemTransform(item).map(parentClip); - parentClip = parentClip.intersected(item->shape()); - if (parentClip.isEmpty()) { - clip = parentClip; - clipAway = true; + if (!(parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) break; - } - clipOwner = item; } - if (!clipAway) { + if (lastParent != this) { + // Map clip back to the item's transform. // ### what if itemtransform fails - clip = clip.intersected(clipOwner->itemTransform(this).map(parentClip)); - if (clip.isEmpty()) - clipAway = true; + clip = lastParent->itemTransform(this).map(clip); } } - if (!clipAway && d->flags & ItemClipsToShape) + if (d->flags & ItemClipsToShape) clip = clip.intersected(shape()); return clip; -- cgit v0.12 From 920e77d9da68643aae483838b21330d032c00058 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 3 Mar 2009 13:30:33 +0100 Subject: Fixes: Small optimization in QGraphicsItem::clipPath(). RevBy: Andreas Details: Use QPainterPath::addRect() rather than addPolygon() and closeSubPath(). (cherry picked from commit b67dffcccea9166918ac93c281d87fd5eb3baf84) --- src/gui/graphicsview/qgraphicsitem.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 6169d6a..9b6dfde 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3259,8 +3259,8 @@ bool QGraphicsItem::collidesWithPath(const QPainterPath &path, Qt::ItemSelection return false; } - QRectF rectA = _q_adjustedRect(boundingRect()); - QRectF rectB = _q_adjustedRect(path.controlPointRect()); + const QRectF rectA = _q_adjustedRect(boundingRect()); + const QRectF rectB = _q_adjustedRect(path.controlPointRect()); if (!rectA.intersects(rectB)) { // This we can determine efficiently. If the two rects neither // intersect nor contain eachother, then the two items do not collide. @@ -3269,12 +3269,11 @@ bool QGraphicsItem::collidesWithPath(const QPainterPath &path, Qt::ItemSelection // For further testing, we need this item's shape or bounding rect. QPainterPath thisShape; - if (mode == Qt::IntersectsItemShape || mode == Qt::ContainsItemShape) { + if (mode == Qt::IntersectsItemShape || mode == Qt::ContainsItemShape) thisShape = (isClipped() && !d_ptr->localCollisionHack) ? clipPath() : shape(); - } else { - thisShape.addPolygon(_q_adjustedRect(boundingRect())); - thisShape.closeSubpath(); - } + else + thisShape.addRect(rectA); + if (thisShape == QPainterPath()) { // Empty shape? No collision. return false; -- cgit v0.12 From b1b5f92c18774904bb0d840cdc2f740cdccef883 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 3 Mar 2009 17:08:30 +0100 Subject: Fixes: Be a bit more smarter when calling setGeometry from itemChange RevBy: bnilsen AutoTest: Bench Details : if we come from setPosHelper (so itemChange) we don't need to do all the stuff regarding the size in setGeometry because the size doesn't change. I remove two calls to fullUpdateHelper and update() because prepareGeometryChange already call updateHelper and setPosHelper call fullUpdaterHelper too so we don't need to call them inside setGeometry. We can only call prepareGeometryChange only if we don't come from setPos. (cherry picked from commit d74f1a91b05b943c1a8ae7847de6ee50b2093b89) --- src/gui/graphicsview/qgraphicsitem.cpp | 6 +-- src/gui/graphicsview/qgraphicsitem_p.h | 2 +- src/gui/graphicsview/qgraphicswidget.cpp | 58 ++++++++++++--------- src/gui/graphicsview/qgraphicswidget_p.h | 2 + .../benchmarks/qgraphicswidget/qgraphicswidget.pro | 6 +++ .../qgraphicswidget/tst_qgraphicswidget.cpp | 60 ++++++++++++++++++++++ 6 files changed, 105 insertions(+), 29 deletions(-) create mode 100644 tests/benchmarks/qgraphicswidget/qgraphicswidget.pro create mode 100644 tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9b6dfde..976ee90 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2352,7 +2352,7 @@ QPointF QGraphicsItem::scenePos() const the item is also updated; otherwise it is not updated before and after the change. */ -void QGraphicsItemPrivate::setPosHelper(const QPointF &pos, bool update) +void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) { Q_Q(QGraphicsItem); if (this->pos == pos) @@ -2364,7 +2364,7 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos, bool update) return; // Update and repositition. - if (scene && update) { + if (scene) { fullUpdateHelper(true); q->prepareGeometryChange(); } @@ -2387,7 +2387,7 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos, bool update) */ void QGraphicsItem::setPos(const QPointF &pos) { - d_ptr->setPosHelper(pos, /* update = */ true); + d_ptr->setPosHelper(pos); } /*! diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 4db0e40..19c8d60 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -158,7 +158,7 @@ public: virtual QVariant inputMethodQueryHelper(Qt::InputMethodQuery query) const; static bool movableAncestorIsSelected(const QGraphicsItem *item); - void setPosHelper(const QPointF &pos, bool update); + void setPosHelper(const QPointF &pos); void setVisibleHelper(bool newVisible, bool explicitly, bool update = true); void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true); void updateHelper(const QRectF &rect = QRectF(), bool force = false); diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 0a0023e..e4e5728 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -366,32 +366,33 @@ void QGraphicsWidget::resize(const QSizeF &size) void QGraphicsWidget::setGeometry(const QRectF &rect) { QGraphicsWidgetPrivate *wd = QGraphicsWidget::d_func(); - const QGraphicsLayoutItemPrivate *d = QGraphicsLayoutItem::d_ptr; - setAttribute(Qt::WA_Resized); - QRectF newGeom = rect; - newGeom.setSize(rect.size().expandedTo(effectiveSizeHint(Qt::MinimumSize)) - .boundedTo(effectiveSizeHint(Qt::MaximumSize))); - if (newGeom == d->geom) - return; - - // Update and prepare to change the geometry (remove from index). - if (wd->scene) { - if (rect.topLeft() != d->geom.topLeft()) - wd->fullUpdateHelper(true); - else - update(); - } - prepareGeometryChange(); - - // setPos triggers ItemPositionChange, which can adjust position + QGraphicsLayoutItemPrivate *d = QGraphicsLayoutItem::d_ptr; + QRectF newGeom; QPointF oldPos = d->geom.topLeft(); - wd->inSetGeometry = 1; - wd->setPosHelper(newGeom.topLeft(), /* update = */ false); - wd->inSetGeometry = 0; - newGeom.moveTopLeft(pos()); - - if (newGeom == d->geom) - return; + if (!wd->inSetPos) { + setAttribute(Qt::WA_Resized); + newGeom = rect; + newGeom.setSize(rect.size().expandedTo(effectiveSizeHint(Qt::MinimumSize)) + .boundedTo(effectiveSizeHint(Qt::MaximumSize))); + if (newGeom == d->geom) + return; + + // setPos triggers ItemPositionChange, which can adjust position + wd->inSetGeometry = 1; + wd->setPosHelper(newGeom.topLeft()); + wd->inSetGeometry = 0; + newGeom.moveTopLeft(pos()); + + if (newGeom == d->geom) + return; + + // Update and prepare to change the geometry (remove from index) if the size has changed. + if (wd->scene) { + if (rect.topLeft() == d->geom.topLeft()) { + prepareGeometryChange(); + } + } + } // Update the layout item geometry bool moved = oldPos != pos(); @@ -401,6 +402,11 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) event.setOldPos(oldPos); event.setNewPos(pos()); QApplication::sendEvent(this, &event); + if (wd->inSetPos) { + //set the new pos + d->geom.moveTopLeft(pos()); + return; + } } QSizeF oldSize = size(); QGraphicsLayoutItem::setGeometry(newGeom); @@ -1016,9 +1022,11 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant & break; case ItemPositionHasChanged: if (!d->inSetGeometry) { + d->inSetPos = 1; // Ensure setGeometry is called (avoid recursion when setPos is // called from within setGeometry). setGeometry(QRectF(pos(), size())); + d->inSetPos = 0 ; } break; case ItemParentChange: { diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index 52c8f93..eb7b5ca 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -86,6 +86,7 @@ public: inheritedFontResolveMask(0), inSetGeometry(0), polished(0), + inSetPos(0), focusPolicy(Qt::NoFocus), focusNext(0), focusPrev(0), @@ -195,6 +196,7 @@ public: quint32 attributes : 10; quint32 inSetGeometry : 1; quint32 polished: 1; + quint32 inSetPos : 1; // Focus Qt::FocusPolicy focusPolicy; diff --git a/tests/benchmarks/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/qgraphicswidget/qgraphicswidget.pro new file mode 100644 index 0000000..f1ec54e --- /dev/null +++ b/tests/benchmarks/qgraphicswidget/qgraphicswidget.pro @@ -0,0 +1,6 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_qgraphicswidget +TEMPLATE = app +# Input +SOURCES += tst_qgraphicswidget.cpp diff --git a/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp new file mode 100644 index 0000000..97837e2 --- /dev/null +++ b/tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +****************************************************************************/ + +#include +#include +#include +#include +#include +//TESTED_FILES= + +class tst_QGraphicsWidget : public QObject +{ + Q_OBJECT + +public: + tst_QGraphicsWidget(); + virtual ~tst_QGraphicsWidget(); + +public slots: + void init(); + void cleanup(); + +private slots: + void move(); +}; + +tst_QGraphicsWidget::tst_QGraphicsWidget() +{ +} + +tst_QGraphicsWidget::~tst_QGraphicsWidget() +{ +} + +void tst_QGraphicsWidget::init() +{ +} + +void tst_QGraphicsWidget::cleanup() +{ +} + +void tst_QGraphicsWidget::move() +{ + QGraphicsScene scene; + QGraphicsWidget *widget = new QGraphicsWidget(); + scene.addItem(widget); + QGraphicsView view(&scene); + view.show(); + QBENCHMARK { + widget->setPos(qrand(),qrand()); + } +} + +QTEST_MAIN(tst_QGraphicsWidget) +#include "tst_qgraphicswidget.moc" -- cgit v0.12 From d4fcb7328efdd865ccc2db53ba428104073ed7ba Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Mon, 9 Mar 2009 14:33:02 +0100 Subject: Fixes: Don't fill the pixmap because we will copy the cache into it. RevBy: bnilsen AutoTest: All pass + plasma ok (cherry picked from commit 0985805ab3c7de5b15c115a98afb15944b6d93b9) --- src/gui/graphicsview/qgraphicsscene.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 235362b..7c982fe 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4755,11 +4755,9 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte if (newCacheIndent != deviceData->cacheIndent || deviceRect.size() != pix.size()) { QPoint diff = newCacheIndent - deviceData->cacheIndent; QPixmap newPix(deviceRect.size()); - // ### Investigate removing this fill (test with Plasma and - // graphicssystem raster). - newPix.fill(Qt::transparent); if (!pix.isNull()) { QPainter newPixPainter(&newPix); + newPixPainter.setCompositionMode(QPainter::CompositionMode_Source); newPixPainter.drawPixmap(-diff, pix); newPixPainter.end(); } -- cgit v0.12 From f064e645419e93d9a596bcc59436dbc4d34a4e0c Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 11 Mar 2009 17:24:41 +0100 Subject: Fixes: Optimization: Cache QGraphicsItem::clipPath(). RevBy: Alexis AutoTest: Still pass Details: No-brainer. (cherry picked from commit 4556bcbd40c8feb7185aae7da5f0686f12d87565) --- src/gui/graphicsview/qgraphicsitem.cpp | 46 ++++++++++++++++++++++++++++------ src/gui/graphicsview/qgraphicsitem_p.h | 14 +++++++++++ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 976ee90..64bca7e 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -631,6 +631,7 @@ void QGraphicsItemPrivate::updateAncestorFlag(QGraphicsItem::GraphicsItemFlag ch case QGraphicsItem::ItemClipsChildrenToShape: flag = AncestorClipsChildren; enabled = flags & QGraphicsItem::ItemClipsChildrenToShape; + invalidateCachedClipPathRecursively(/*childrenOnly=*/true); break; case QGraphicsItem::ItemIgnoresTransformations: flag = AncestorIgnoresTransformations; @@ -1270,6 +1271,9 @@ void QGraphicsItem::setFlags(GraphicsItemFlags flags) d_ptr->updateAncestorFlag(ItemClipsChildrenToShape); } + if ((flags & ItemClipsToShape) != (oldFlags & ItemClipsToShape)) + d_ptr->invalidateCachedClipPath(); + if ((flags & ItemIgnoresTransformations) != (oldFlags & ItemIgnoresTransformations)) { // Item children clipping changes. Propagate the ancestor flag to // all children. @@ -3136,10 +3140,15 @@ bool QGraphicsItem::isClipped() const QPainterPath QGraphicsItem::clipPath() const { Q_D(const QGraphicsItem); - QPainterPath clip; - if (!isClipped()) - return clip; + if (!d->dirtyClipPath) + return d->cachedClipPath; + + if (!isClipped()) { + d_ptr->setCachedClipPath(QPainterPath()); + return d->cachedClipPath; + } + QPainterPath clip; // Start with the item's bounding rect. clip.addRect(boundingRect()); @@ -3150,15 +3159,27 @@ QPainterPath QGraphicsItem::clipPath() const // Intersect any in-between clips starting at the top and moving downwards. while ((parent = parent->d_ptr->parent)) { if (parent->d_ptr->flags & ItemClipsChildrenToShape) { - // Map clip to the current parent and intersect with its shape. - clip = (lastParent->itemTransform(parent).map(clip)).intersected(parent->shape()); - if (clip.isEmpty()) + // Map clip to the current parent and intersect with its shape/clipPath + clip = lastParent->itemTransform(parent).map(clip); + if (!parent->d_ptr->dirtyClipPath) { + clip = clip.intersected(parent->d_ptr->cachedClipPath); + if (!(parent->d_ptr->flags & ItemClipsToShape)) + clip = clip.intersected(parent->shape()); + } else { + clip = clip.intersected(parent->shape()); + } + + if (clip.isEmpty()) { + d_ptr->setCachedClipPath(clip); return clip; + } lastParent = parent; } - if (!(parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) + if (!(parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) + || !parent->d_ptr->dirtyClipPath) { break; + } } if (lastParent != this) { @@ -3171,6 +3192,7 @@ QPainterPath QGraphicsItem::clipPath() const if (d->flags & ItemClipsToShape) clip = clip.intersected(shape()); + d_ptr->setCachedClipPath(clip); return clip; } @@ -3726,6 +3748,15 @@ void QGraphicsItemPrivate::removeExtraItemCache() unsetExtra(ExtraCacheData); } +void QGraphicsItemPrivate::invalidateCachedClipPathRecursively(bool childrenOnly) +{ + if (!childrenOnly) + invalidateCachedClipPath(); + // ### Return if this item doesn't clip its children? + for (int i = 0; i < children.size(); ++i) + children.at(i)->d_ptr->invalidateCachedClipPathRecursively(false); +} + /*! \internal @@ -5505,6 +5536,7 @@ void QGraphicsItem::prepareGeometryChange() QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); scenePrivate->removeFromIndex(this); + d_ptr->invalidateCachedClipPathRecursively(); } } diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 19c8d60..f1808aa 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -138,6 +138,7 @@ public: dirty(0), dirtyChildren(0), localCollisionHack(0), + dirtyClipPath(1), globalStackingOrder(-1), sceneTransformIndex(-1), q_ptr(0) @@ -234,6 +235,18 @@ public: QGraphicsItemCache *extraItemCache() const; void removeExtraItemCache(); + inline void setCachedClipPath(const QPainterPath &path) + { + cachedClipPath = path; + dirtyClipPath = 0; + } + + inline void invalidateCachedClipPath() + { dirtyClipPath = 1; } + + void invalidateCachedClipPathRecursively(bool childrenOnly = false); + + QPainterPath cachedClipPath; QPointF pos; qreal z; QGraphicsScene *scene; @@ -268,6 +281,7 @@ public: quint32 dirty : 1; quint32 dirtyChildren : 1; quint32 localCollisionHack : 1; + quint32 dirtyClipPath : 1; // Optional stacking order int globalStackingOrder; -- cgit v0.12 From 34edfc49ab0dac256bb536ce41a381741ca82236 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 3 Apr 2009 14:19:12 +0200 Subject: Fixes: Cleanup/Optimize QGraphicsView::findItems. RevBy: Alexis AutoTest: Still pass Details: findItems() does almost exactly the same as QGraphicsView::items, the only difference is that it checks whether we are about to redraw all items. Next step is to optimize the items_helper functions. The patch does also include a fix for ::items/childItems_helper(const QPainterPath ...); it didn't take Qt::Intersects/ContainsItemBoundingRect into account (in the same fashion as we do in the other helper functions). (cherry picked from commit f4547b98b52bfc95fb0c14ec58df204cfcec0db2) --- src/gui/graphicsview/qgraphicsscene.cpp | 80 ++++++++++++++++----- src/gui/graphicsview/qgraphicsview.cpp | 122 ++++++++------------------------ src/gui/graphicsview/qgraphicsview_p.h | 7 +- 3 files changed, 94 insertions(+), 115 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 7c982fe..c15633d 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1496,21 +1496,46 @@ QList QGraphicsScenePrivate::items_helper(const QPainterPath &p Qt::SortOrder order) const { QList items; + const QRectF pathRect = _q_adjustedRect(path.controlPointRect()); + // The index returns a rough estimate of what items are inside the rect. // Refine it by iterating through all returned items. - foreach (QGraphicsItem *item, estimateItemsInRect(_q_adjustedRect(path.controlPointRect()))) { + foreach (QGraphicsItem *item, estimateItemsInRect(pathRect)) { // Find the item's scene transform in a clever way. QTransform x = item->sceneTransform(); - bool ok; - QTransform xinv = x.inverted(&ok); - if (ok) { - QPainterPath mappedPath = xinv.map(path); - if (itemCollidesWithPath(item, mappedPath, mode)) { + bool keep = false; + + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + if (mode >= Qt::ContainsItemBoundingRect) { + // Path contains/intersects item's bounding rect + if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(x.mapRect(br))) + || (mode == Qt::ContainsItemBoundingRect && path.contains(x.mapRect(br)))) { items << item; - if (item->flags() & QGraphicsItem::ItemClipsChildrenToShape) - childItems_helper(&items, item, mappedPath, mode); + keep = true; + } + } else { + // Path contains/intersects item's shape + if (QRectF_intersects(pathRect, x.mapRect(br))) { + bool ok; + QTransform xinv = x.inverted(&ok); + if (ok) { + if (itemCollidesWithPath(item, xinv.map(path), mode)) { + items << item; + keep = true; + } + } } } + + if (keep && (item->flags() & QGraphicsItem::ItemClipsChildrenToShape)) { + bool ok; + QTransform xinv = x.inverted(&ok); + if (ok) + childItems_helper(&items, item, xinv.map(path), mode); + } } if (order != Qt::SortOrder(-1)) @@ -1638,29 +1663,46 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, Qt::ItemSelectionMode mode) const { bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); - QPainterPath intersectedPath = !parentClip ? path : path.intersected(parent->shape()); - if (intersectedPath.isEmpty()) + QRectF pathRect = _q_adjustedRect(path.boundingRect()); + QRectF r = !parentClip ? pathRect : pathRect.intersected(_q_adjustedRect(parent->boundingRect())); + if (r.isEmpty()) return; QList &children = parent->d_ptr->children; for (int i = 0; i < children.size(); ++i) { QGraphicsItem *item = children.at(i); + if (item->d_ptr->hasTransform && !item->transform().isInvertible()) + continue; // Skip invisible items. if (!item->d_ptr->visible || qFuzzyCompare(item->effectiveOpacity(), qreal(0.0))) continue; - QTransform x = item->sceneTransform(); - - bool ok; - QTransform xinv = x.inverted(&ok); - if (ok) { - QPainterPath mappedPath = xinv.map(path); - if (itemCollidesWithPath(item, mappedPath, mode)) { + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + bool keep = false; + if (mode >= Qt::ContainsItemBoundingRect) { + // Polygon contains/intersects item's bounding rect + if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) + || (mode == Qt::ContainsItemBoundingRect && path.contains(item->mapRectToParent(br)))) { items->append(item); - if (!item->d_ptr->children.isEmpty()) - childItems_helper(items, item, mappedPath, mode); + keep = true; } + } else { + // Path contains/intersects item's shape + if (QRectF_intersects(pathRect, item->mapRectToParent(br))) { + if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + items->append(item); + keep = true; + } + } + } + + if ((keep || !(item->flags() & QGraphicsItem::ItemClipsChildrenToShape)) && !item->d_ptr->children.isEmpty()) { + // Recurse into children that clip children. + childItems_helper(items, item, item->mapFromParent(path), mode); } } } diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 686f95c..819b75a 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1029,103 +1029,40 @@ void QGraphicsViewPrivate::freeStyleOptionsArray(QStyleOptionGraphicsItem *array extern QPainterPath qt_regionToPath(const QRegion ®ion); -QList QGraphicsViewPrivate::findItems(const QRegion &exposedRegion, - const QTransform &worldTransform, - bool *allItems) const +QList QGraphicsViewPrivate::findItems(const QRegion &exposedRegion, bool *allItems) const { Q_Q(const QGraphicsView); - QList itemList; - QSet tmp; - bool simpleTransform = worldTransform.type() <= QTransform::TxScale; - - QPainterPath path = qt_regionToPath(exposedRegion); - *allItems = path.contains(q->mapFromScene(scene->d_func()->growingItemsBoundingRect).boundingRect()); - QList exposedRects; - QList exposedPolys; - - // Transform the exposed viewport rects to scene rects or polygons - foreach (const QRect &rect, exposedRegion.rects()) { - QPolygonF exposedPoly = q->mapToScene(rect.adjusted(-1, -1, 1, 1)); - QRectF exposedRect = exposedPoly.boundingRect(); - if (!simpleTransform) - exposedPolys << exposedPoly; - exposedRects << exposedRect; - } - - // Find which items need to be drawn. - if (*allItems) { + const QPainterPath exposedPath(qt_regionToPath(exposedRegion)); + const QPainterPath exposedScenePath(q->mapToScene(exposedPath)); + + if (exposedScenePath.contains(scene->d_func()->growingItemsBoundingRect)) { + Q_ASSERT(allItems); + *allItems = true; + // All items are guaranteed within the exposed region, don't bother using the index. - foreach (QGraphicsItem *item, scene->items()) { + QList itemList(scene->items()); + int i = 0; + while (i < itemList.size()) { // But we only want to include items that are visible - if (item->isVisible()) - itemList << item; - } - } else if (simpleTransform) { - // Simple rect lookups will do. - if (exposedRects.size() > 1) { - foreach (const QRectF &rect, exposedRects) { - foreach (QGraphicsItem *item, scene->d_func()->items_helper(rect, Qt::IntersectsItemBoundingRect, Qt::SortOrder(-1) /* don't sort */)) { - if (!tmp.contains(item)) { - tmp << item; - itemList << item; - } - } - } - } else { - itemList += scene->d_func()->items_helper(exposedRects[0], Qt::IntersectsItemBoundingRect, Qt::SortOrder(-1) /* don't sort */); - } - } else { - // Polygon lookup is necessary. - if (exposedRects.size() > 1) { - foreach (const QPolygonF &poly, exposedPolys) { - foreach (QGraphicsItem *item, scene->d_func()->items_helper(poly, Qt::IntersectsItemBoundingRect, Qt::SortOrder(-1) /* don't sort */)) { - if (!tmp.contains(item)) { - tmp << item; - itemList << item; - } - } - } - } else { - itemList += scene->d_func()->items_helper(exposedPolys[0], Qt::IntersectsItemBoundingRect, Qt::SortOrder(-1) /* don't sort */); + if (!itemList.at(i)->isVisible()) + itemList.removeAt(i); + else + ++i; } - } - // Check for items that ignore inherited transformations, and add them if - // necessary. - QRectF untr = scene->d_func()->largestUntransformableItem; - if (!*allItems && !untr.isNull()) { - // Map the largest untransformable item subtree boundingrect from view - // to scene coordinates, and use this to expand all exposed rects in - // search for untransformable items. - QRectF ltri = matrix.inverted().mapRect(untr); - ltri.adjust(-untr.width(), -untr.height(), untr.width(), untr.height()); - - foreach (const QRect &rect, exposedRegion.rects()) { - QRectF exposed = q->mapToScene(rect.adjusted(-1, -1, 1, 1)).boundingRect(); - exposed.adjust(-ltri.width(), -ltri.height(), ltri.width(), ltri.height()); - - foreach (QGraphicsItem *item, scene->d_func()->estimateItemsInRect(exposed)) { - if (item->d_ptr->itemIsUntransformable()) { - if (!tmp.contains(item)) { - QPainterPath rectPath; - rectPath.addRect(rect); - QPainterPath path = item->deviceTransform(q->viewportTransform()).inverted().map(rectPath); - if (item->collidesWithPath(path, Qt::IntersectsItemBoundingRect)) { - itemList << item; - tmp << item; - } - } - } - } - } + // Sort the items. + QGraphicsScenePrivate::sortItems(&itemList, Qt::DescendingOrder, scene->d_func()->sortCacheEnabled); + return itemList; } - tmp.clear(); - // Sort the items. - QGraphicsScenePrivate::sortItems(&itemList, Qt::DescendingOrder, - scene->d_func()->sortCacheEnabled); + if (scene->d_func()->largestUntransformableItem.isNull()) { + return scene->d_func()->items_helper(exposedScenePath, + Qt::IntersectsItemBoundingRect, + Qt::DescendingOrder); + } - return itemList; + // NB! Path must be in viewport coordinates. + return itemsInArea(exposedPath, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder); } void QGraphicsViewPrivate::generateStyleOptions(const QList &itemList, @@ -2228,7 +2165,8 @@ QList QGraphicsView::items() const certainly room for improvement. */ QList QGraphicsViewPrivate::itemsInArea(const QPainterPath &path, - Qt::ItemSelectionMode mode) const + Qt::ItemSelectionMode mode, + Qt::SortOrder order) const { Q_Q(const QGraphicsView); @@ -2278,8 +2216,8 @@ QList QGraphicsViewPrivate::itemsInArea(const QPainterPath &pat } // ### Insertion sort would be faster. - QGraphicsScenePrivate::sortItems(&result, Qt::AscendingOrder, - scene->d_func()->sortCacheEnabled); + if (order != Qt::SortOrder(-1)) + QGraphicsScenePrivate::sortItems(&result, order, scene->d_func()->sortCacheEnabled); return result; } @@ -3485,7 +3423,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event) // Find all exposed items bool allItems = false; - QList itemList = d->findItems(exposedRegion, viewTransform, &allItems); + QList itemList = d->findItems(exposedRegion, &allItems); #ifdef QGRAPHICSVIEW_DEBUG int exposedTime = stopWatch.elapsed(); diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h index 401b37f..f0144e0 100644 --- a/src/gui/graphicsview/qgraphicsview_p.h +++ b/src/gui/graphicsview/qgraphicsview_p.h @@ -85,7 +85,8 @@ public: qint64 verticalScroll() const; QList itemsInArea(const QPainterPath &path, - Qt::ItemSelectionMode mode = Qt::IntersectsItemShape) const; + Qt::ItemSelectionMode mode = Qt::IntersectsItemShape, + Qt::SortOrder = Qt::AscendingOrder) const; QPointF mousePressItemPoint; QPointF mousePressScenePoint; @@ -172,9 +173,7 @@ public: void updateRegion(const QRegion ®ion); bool updateSceneSlotReimplementedChecked; - QList findItems(const QRegion &exposedRegion, - const QTransform &worldTransform, - bool *allItems) const; + QList findItems(const QRegion &exposedRegion, bool *allItems) const; void generateStyleOptions(const QList &itemList, QGraphicsItem **itemArray, -- cgit v0.12 From ac256e5eac02ec44557b6e90ad183a51c772bf33 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 3 Apr 2009 14:43:11 +0200 Subject: Add a cut-off for simple rectangle lookups. Make sure we use the rect-variation of QGraphicsScene's item lookup functions if the view has a simple transform and a simple expose region. Reviewed-by: Bjoern Erik Nilsen (cherry picked from commit 4020327503eaefae42da4bd6e71125b6972ac97f) --- src/gui/graphicsview/qgraphicsview.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 819b75a..f5170a4 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1056,6 +1056,11 @@ QList QGraphicsViewPrivate::findItems(const QRegion &exposedReg } if (scene->d_func()->largestUntransformableItem.isNull()) { + if (exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale) { + return scene->d_func()->items_helper(exposedScenePath.controlPointRect(), + Qt::IntersectsItemBoundingRect, + Qt::DescendingOrder); + } return scene->d_func()->items_helper(exposedScenePath, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder); -- cgit v0.12 From 4c5e1ebe44f2d5f10a1798af45f5f7a18c6e9e82 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 17 Mar 2009 11:42:07 +0100 Subject: Fixes: Only use the parent's cached clip path if it is clipped. RevBy: TrustMe Details: ...otherwise it'll be empty and too much will be clipped away. (cherry picked from commit 4d019e66fb62d6f25627144539abd7f59413abee) --- src/gui/graphicsview/qgraphicsitem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 64bca7e..3a67f6e 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3157,11 +3157,12 @@ QPainterPath QGraphicsItem::clipPath() const const QGraphicsItem *lastParent = this; // Intersect any in-between clips starting at the top and moving downwards. + bool foundValidClipPath = false; while ((parent = parent->d_ptr->parent)) { if (parent->d_ptr->flags & ItemClipsChildrenToShape) { // Map clip to the current parent and intersect with its shape/clipPath clip = lastParent->itemTransform(parent).map(clip); - if (!parent->d_ptr->dirtyClipPath) { + if ((foundValidClipPath = !parent->d_ptr->dirtyClipPath && parent->isClipped())) { clip = clip.intersected(parent->d_ptr->cachedClipPath); if (!(parent->d_ptr->flags & ItemClipsToShape)) clip = clip.intersected(parent->shape()); @@ -3177,7 +3178,7 @@ QPainterPath QGraphicsItem::clipPath() const } if (!(parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) - || !parent->d_ptr->dirtyClipPath) { + || foundValidClipPath) { break; } } -- cgit v0.12 From 53704a42dc50049806c27206ec361ab0c8cb01ed Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 18 Mar 2009 13:27:16 +0100 Subject: Fixes: Get rid of lots of calls to qFuzzyCompare. RevBy: Olivier AutoTest: Still pass. Details: Items usually don't have effective opacity, i.e. it is 1.0, so don't bother doing fuzzy compare if that's the case. (cherry picked from commit bd4b177e051852f0fb94df9c0ee2e512478e0d38) --- src/gui/graphicsview/qgraphicsitem_p.h | 6 ++++++ src/gui/graphicsview/qgraphicsscene.cpp | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index f1808aa..d7970a5 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -246,6 +246,12 @@ public: void invalidateCachedClipPathRecursively(bool childrenOnly = false); + inline bool isInvisible() const + { + return !visible || (hasEffectiveOpacity + && qFuzzyCompare(q_func()->effectiveOpacity() + 1.0, qreal(1.0))); + } + QPainterPath cachedClipPath; QPointF pos; qreal z; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index c15633d..05723cd 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1561,7 +1561,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, continue; // Skip invisible items and all their children. - if (!item->d_ptr->visible || qFuzzyCompare(item->effectiveOpacity(), qreal(0.0))) + if (item->d_ptr->isInvisible()) continue; // ### _q_adjustedRect is only needed because QRectF::intersects, @@ -1621,7 +1621,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, continue; // Skip invisible items. - if (!item->d_ptr->visible || qFuzzyCompare(item->effectiveOpacity() + 1, qreal(1.0))) + if (item->d_ptr->isInvisible()) continue; // ### _q_adjustedRect is only needed because QRectF::intersects, @@ -1675,7 +1675,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, continue; // Skip invisible items. - if (!item->d_ptr->visible || qFuzzyCompare(item->effectiveOpacity(), qreal(0.0))) + if (item->d_ptr->isInvisible()) continue; // ### _q_adjustedRect is only needed because QRectF::intersects, -- cgit v0.12 From 555ef800b922ddd48cbb2bee47276c88bf3778fb Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 19 Mar 2009 15:31:56 +0100 Subject: Fixes: Compile on funky scratchbox ARM compiler. (cherry picked from commit 5910dbe6e7a024301d431102703f9abe323ebd13) --- src/gui/graphicsview/qgraphicsitem_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index d7970a5..5314fb8 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -249,7 +249,7 @@ public: inline bool isInvisible() const { return !visible || (hasEffectiveOpacity - && qFuzzyCompare(q_func()->effectiveOpacity() + 1.0, qreal(1.0))); + && qFuzzyCompare(q_func()->effectiveOpacity() + 1, qreal(1.0))); } QPainterPath cachedClipPath; -- cgit v0.12 From 337e49cf264c460cd50992aca6b11cb47e8053c0 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 20 Mar 2009 18:06:05 +0100 Subject: Fixes: Clever invalidating of the cached clip path. RevBy: Andreas AutoTest: still pass Details: Adds emptyClipPath bit, a cut-off to test if the item has an empty clip path (i.e., is clipped away). Also adds code for invalidating the cache from inside setPos(). (cherry picked from commit c1909321a486621ef196dd4bb3cf354406d86d46) --- src/gui/graphicsview/qgraphicsitem.cpp | 124 ++++++++++++++++++++++++++++++--- src/gui/graphicsview/qgraphicsitem_p.h | 18 ++++- 2 files changed, 129 insertions(+), 13 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 3a67f6e..52f0b59 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2368,15 +2368,18 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) return; // Update and repositition. + inSetPosHelper = 1; if (scene) { fullUpdateHelper(true); q->prepareGeometryChange(); } this->pos = newPos; invalidateSceneTransformCache(); + updateCachedClipPathFromSetPosHelper(); // Send post-notification. q->itemChange(QGraphicsItem::ItemPositionHasChanged, newPos); + inSetPosHelper = 0; } /*! @@ -3141,7 +3144,7 @@ QPainterPath QGraphicsItem::clipPath() const { Q_D(const QGraphicsItem); if (!d->dirtyClipPath) - return d->cachedClipPath; + return d->emptyClipPath ? QPainterPath() : d->cachedClipPath; if (!isClipped()) { d_ptr->setCachedClipPath(QPainterPath()); @@ -3163,6 +3166,13 @@ QPainterPath QGraphicsItem::clipPath() const // Map clip to the current parent and intersect with its shape/clipPath clip = lastParent->itemTransform(parent).map(clip); if ((foundValidClipPath = !parent->d_ptr->dirtyClipPath && parent->isClipped())) { + if (parent->d_ptr->emptyClipPath) { + if (d_ptr->flags & ItemClipsChildrenToShape) + d_ptr->setEmptyCachedClipPathRecursively(); + else + d_ptr->setEmptyCachedClipPath(); + return QPainterPath(); + } clip = clip.intersected(parent->d_ptr->cachedClipPath); if (!(parent->d_ptr->flags & ItemClipsToShape)) clip = clip.intersected(parent->shape()); @@ -3171,7 +3181,10 @@ QPainterPath QGraphicsItem::clipPath() const } if (clip.isEmpty()) { - d_ptr->setCachedClipPath(clip); + if (d_ptr->flags & ItemClipsChildrenToShape) + d_ptr->setEmptyCachedClipPathRecursively(); + else + d_ptr->setEmptyCachedClipPath(); return clip; } lastParent = parent; @@ -3749,13 +3762,95 @@ void QGraphicsItemPrivate::removeExtraItemCache() unsetExtra(ExtraCacheData); } -void QGraphicsItemPrivate::invalidateCachedClipPathRecursively(bool childrenOnly) +void QGraphicsItemPrivate::setEmptyCachedClipPathRecursively(const QRectF &emptyIfOutsideThisRect) +{ + setEmptyCachedClipPath(); + + const bool checkRect = !emptyIfOutsideThisRect.isNull() + && !(flags & QGraphicsItem::ItemClipsChildrenToShape); + for (int i = 0; i < children.size(); ++i) { + if (!checkRect) { + children.at(i)->d_ptr->setEmptyCachedClipPathRecursively(); + continue; + } + + QGraphicsItem *child = children.at(i); + const QRectF rect = child->mapRectFromParent(emptyIfOutsideThisRect); + if (rect.intersects(child->boundingRect())) + child->d_ptr->invalidateCachedClipPathRecursively(false, rect); + else + child->d_ptr->setEmptyCachedClipPathRecursively(rect); + } +} + +void QGraphicsItemPrivate::invalidateCachedClipPathRecursively(bool childrenOnly, const QRectF &emptyIfOutsideThisRect) { if (!childrenOnly) invalidateCachedClipPath(); - // ### Return if this item doesn't clip its children? - for (int i = 0; i < children.size(); ++i) - children.at(i)->d_ptr->invalidateCachedClipPathRecursively(false); + + const bool checkRect = !emptyIfOutsideThisRect.isNull(); + for (int i = 0; i < children.size(); ++i) { + if (!checkRect) { + children.at(i)->d_ptr->invalidateCachedClipPathRecursively(false); + continue; + } + + QGraphicsItem *child = children.at(i); + const QRectF rect = child->mapRectFromParent(emptyIfOutsideThisRect); + if (rect.intersects(child->boundingRect())) + child->d_ptr->invalidateCachedClipPathRecursively(false, rect); + else + child->d_ptr->setEmptyCachedClipPathRecursively(rect); + } +} + +void QGraphicsItemPrivate::updateCachedClipPathFromSetPosHelper() +{ + Q_ASSERT(inSetPosHelper); + + if (!(ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) + return; // Not clipped by any ancestor. + + // Find closest clip ancestor. + QGraphicsItem *clipParent = parent; + while (clipParent && !(clipParent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape)) + clipParent = clipParent->d_ptr->parent; + + Q_ASSERT(clipParent); + Q_Q(QGraphicsItem); + + // From here everything is calculated in clip parent's coordinates. + const QTransform thisToParentTransform(q->itemTransform(clipParent)); + const QRectF parentBoundingRect(clipParent->boundingRect()); + const QRectF thisBoundingRect(thisToParentTransform.mapRect(q->boundingRect())); + + if (!parentBoundingRect.intersects(thisBoundingRect)) { + // Item is moved outside the clip parent's bounding rect, + // i.e. it is fully clipped and the clip path is empty. + if (flags & QGraphicsItem::ItemClipsChildrenToShape) + setEmptyCachedClipPathRecursively(); + else + setEmptyCachedClipPathRecursively(thisToParentTransform.inverted().mapRect(parentBoundingRect)); + return; + } + + const QPainterPath parentClip(clipParent->isClipped() ? clipParent->clipPath() : clipParent->shape()); + if (parentClip.contains(thisBoundingRect)) + return; // Item is inside the clip parent's shape. No update required. + + const QRectF parentClipRect(parentClip.controlPointRect()); + if (!parentClipRect.intersects(thisBoundingRect)) { + // Item is moved outside the clip parent's shape, + // i.e. it is fully clipped and the clip path is empty. + if (flags & QGraphicsItem::ItemClipsChildrenToShape) + setEmptyCachedClipPathRecursively(); + else + setEmptyCachedClipPathRecursively(thisToParentTransform.inverted().mapRect(parentClipRect)); + } else { + // Item is partially inside the clip parent's shape, + // i.e. the cached clip path must be invalidated. + invalidateCachedClipPathRecursively(false, thisToParentTransform.inverted().mapRect(parentClipRect)); + } } /*! @@ -5532,13 +5627,20 @@ void QGraphicsItem::removeFromIndex() */ void QGraphicsItem::prepareGeometryChange() { - if (d_ptr->scene) { - d_ptr->updateHelper(); + if (!d_ptr->scene) + return; + + d_ptr->updateHelper(); + QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); + scenePrivate->removeFromIndex(this); - QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); - scenePrivate->removeFromIndex(this); + if (d_ptr->inSetPosHelper) + return; + + if (d_ptr->flags & ItemClipsChildrenToShape) d_ptr->invalidateCachedClipPathRecursively(); - } + else + d_ptr->invalidateCachedClipPath(); } /*! diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 5314fb8..6329e26 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -139,6 +139,8 @@ public: dirtyChildren(0), localCollisionHack(0), dirtyClipPath(1), + emptyClipPath(0), + inSetPosHelper(0), globalStackingOrder(-1), sceneTransformIndex(-1), q_ptr(0) @@ -239,12 +241,22 @@ public: { cachedClipPath = path; dirtyClipPath = 0; + emptyClipPath = 0; } + inline void setEmptyCachedClipPath() + { + emptyClipPath = 1; + dirtyClipPath = 0; + } + + void setEmptyCachedClipPathRecursively(const QRectF &emptyIfOutsideThisRect = QRectF()); + inline void invalidateCachedClipPath() - { dirtyClipPath = 1; } + { /*static int count = 0 ;qWarning("%i", ++count);*/ dirtyClipPath = 1; emptyClipPath = 0; } - void invalidateCachedClipPathRecursively(bool childrenOnly = false); + void invalidateCachedClipPathRecursively(bool childrenOnly = false, const QRectF &emptyIfOutsideThisRect = QRectF()); + void updateCachedClipPathFromSetPosHelper(); inline bool isInvisible() const { @@ -288,6 +300,8 @@ public: quint32 dirtyChildren : 1; quint32 localCollisionHack : 1; quint32 dirtyClipPath : 1; + quint32 emptyClipPath : 1; + quint32 inSetPosHelper : 1; // Optional stacking order int globalStackingOrder; -- cgit v0.12 From a9ccf83b7b93891055efc46783f26dc4e9983e4a Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Mon, 23 Mar 2009 15:54:30 +0100 Subject: Fixes: Optimization: Clip path is empty if the bounding rect is empty. RevBy: TrustMe (cherry picked from commit 95fa7a93bc840e0f49ee30e76abb2b4f8579c997) --- src/gui/graphicsview/qgraphicsitem.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 52f0b59..6dd8529 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3151,9 +3151,18 @@ QPainterPath QGraphicsItem::clipPath() const return d->cachedClipPath; } + const QRectF thisBoundingRect(boundingRect()); + if (thisBoundingRect.isEmpty()) { + if (d_ptr->flags & ItemClipsChildrenToShape) + d_ptr->setEmptyCachedClipPathRecursively(); + else + d_ptr->setEmptyCachedClipPath(); + return QPainterPath(); + } + QPainterPath clip; // Start with the item's bounding rect. - clip.addRect(boundingRect()); + clip.addRect(thisBoundingRect); if (d->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) { const QGraphicsItem *parent = this; -- cgit v0.12 From 38c15ec2ef019f710579a58724933f5d9aa869f3 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Mon, 23 Mar 2009 19:37:41 +0100 Subject: Fixes: Don't bother processing items that are clipped away. RevBy: Andreas (cherry picked from commit deccc867b244fbc52ca58e21623febbc27310b05) --- src/gui/graphicsview/qgraphicsitem_p.h | 3 + src/gui/graphicsview/qgraphicsscene.cpp | 116 ++++++++++++++++++-------------- 2 files changed, 67 insertions(+), 52 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 6329e26..0ef47b5 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -264,6 +264,9 @@ public: && qFuzzyCompare(q_func()->effectiveOpacity() + 1, qreal(1.0))); } + inline bool isClippedAway() const + { return !dirtyClipPath && q_func()->isClipped() && (emptyClipPath || cachedClipPath.isEmpty()); } + QPainterPath cachedClipPath; QPointF pos; qreal z; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 05723cd..4f533ce 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1548,12 +1548,14 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, const QRectF &rect, Qt::ItemSelectionMode mode) const { - QPainterPath path; bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); + if (parentClip && parent->d_ptr->isClippedAway()) + return; QRectF r = !parentClip ? _q_adjustedRect(rect) : _q_adjustedRect(rect).intersected(_q_adjustedRect(parent->boundingRect())); if (r.isEmpty()) return; + QPainterPath path; QList &children = parent->d_ptr->children; for (int i = 0; i < children.size(); ++i) { QGraphicsItem *item = children.at(i); @@ -1564,28 +1566,30 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, if (item->d_ptr->isInvisible()) continue; - // ### _q_adjustedRect is only needed because QRectF::intersects, - // QRectF::contains and QTransform::map() and friends don't work with - // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); - QRectF mbr = item->mapRectToParent(br); bool keep = false; - if (mode >= Qt::ContainsItemBoundingRect) { - // Rect intersects/contains item's bounding rect - if ((mode == Qt::IntersectsItemBoundingRect && QRectF_intersects(rect, mbr)) - || (mode == Qt::ContainsItemBoundingRect && rect != mbr && rect.contains(br))) { - items->append(item); - keep = true; - } - } else { - // Rect intersects/contains item's shape - if (QRectF_intersects(rect, mbr)) { - if (path == QPainterPath()) - path.addRect(rect); - if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + if (!item->d_ptr->isClippedAway()) { + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + QRectF mbr = item->mapRectToParent(br); + if (mode >= Qt::ContainsItemBoundingRect) { + // Rect intersects/contains item's bounding rect + if ((mode == Qt::IntersectsItemBoundingRect && QRectF_intersects(rect, mbr)) + || (mode == Qt::ContainsItemBoundingRect && rect != mbr && rect.contains(br))) { items->append(item); keep = true; } + } else { + // Rect intersects/contains item's shape + if (QRectF_intersects(rect, mbr)) { + if (path == QPainterPath()) + path.addRect(rect); + if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + items->append(item); + keep = true; + } + } } } @@ -1607,13 +1611,15 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, const QPolygonF &polygon, Qt::ItemSelectionMode mode) const { - QPainterPath path; bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); + if (parentClip && parent->d_ptr->isClippedAway()) + return; QRectF polyRect = _q_adjustedRect(polygon.boundingRect()); QRectF r = !parentClip ? polyRect : polyRect.intersected(_q_adjustedRect(parent->boundingRect())); if (r.isEmpty()) return; + QPainterPath path; QList &children = parent->d_ptr->children; for (int i = 0; i < children.size(); ++i) { QGraphicsItem *item = children.at(i); @@ -1624,29 +1630,31 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, if (item->d_ptr->isInvisible()) continue; - // ### _q_adjustedRect is only needed because QRectF::intersects, - // QRectF::contains and QTransform::map() and friends don't work with - // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); bool keep = false; - if (mode >= Qt::ContainsItemBoundingRect) { - // Polygon contains/intersects item's bounding rect - if (path == QPainterPath()) - path.addPolygon(polygon); - if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) - || (mode == Qt::ContainsItemBoundingRect && path.contains(item->mapRectToParent(br)))) { - items->append(item); - keep = true; - } - } else { - // Polygon contains/intersects item's shape - if (QRectF_intersects(polyRect, item->mapRectToParent(br))) { + if (!item->d_ptr->isClippedAway()) { + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + if (mode >= Qt::ContainsItemBoundingRect) { + // Polygon contains/intersects item's bounding rect if (path == QPainterPath()) path.addPolygon(polygon); - if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) + || (mode == Qt::ContainsItemBoundingRect && path.contains(item->mapRectToParent(br)))) { items->append(item); keep = true; } + } else { + // Polygon contains/intersects item's shape + if (QRectF_intersects(polyRect, item->mapRectToParent(br))) { + if (path == QPainterPath()) + path.addPolygon(polygon); + if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + items->append(item); + keep = true; + } + } } } @@ -1663,6 +1671,8 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, Qt::ItemSelectionMode mode) const { bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); + if (parentClip && parent->d_ptr->isClippedAway()) + return; QRectF pathRect = _q_adjustedRect(path.boundingRect()); QRectF r = !parentClip ? pathRect : pathRect.intersected(_q_adjustedRect(parent->boundingRect())); if (r.isEmpty()) @@ -1678,25 +1688,27 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, if (item->d_ptr->isInvisible()) continue; - // ### _q_adjustedRect is only needed because QRectF::intersects, - // QRectF::contains and QTransform::map() and friends don't work with - // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); bool keep = false; - if (mode >= Qt::ContainsItemBoundingRect) { - // Polygon contains/intersects item's bounding rect - if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) - || (mode == Qt::ContainsItemBoundingRect && path.contains(item->mapRectToParent(br)))) { - items->append(item); - keep = true; - } - } else { - // Path contains/intersects item's shape - if (QRectF_intersects(pathRect, item->mapRectToParent(br))) { - if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + if (!item->d_ptr->isClippedAway()) { + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + if (mode >= Qt::ContainsItemBoundingRect) { + // Polygon contains/intersects item's bounding rect + if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) + || (mode == Qt::ContainsItemBoundingRect && path.contains(item->mapRectToParent(br)))) { items->append(item); keep = true; } + } else { + // Path contains/intersects item's shape + if (QRectF_intersects(pathRect, item->mapRectToParent(br))) { + if (itemCollidesWithPath(item, item->mapFromParent(path), mode)) { + items->append(item); + keep = true; + } + } } } -- cgit v0.12 From 5dfcac2bd8330fc2963e1e962e90bb66c14fcb7c Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 24 Mar 2009 15:50:26 +0100 Subject: Fixes: Discard update requests if possible. AutoTest: Still pass. Details: Update requests can be discarded if the item itself is clipped away and the item clips all its children to shape. This cut-off is extremely effective (and aggressive:)) (cherry picked from commit 0d959a6c402ea3a3a55d7076d453d4bdbf8dce8e) --- src/gui/graphicsview/qgraphicsitem.cpp | 54 ++++++++++++++++++++++------------ src/gui/graphicsview/qgraphicsitem_p.h | 9 ++++-- src/gui/graphicsview/qgraphicsview.cpp | 2 ++ 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 6dd8529..4d7d0e2 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1063,7 +1063,7 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) qVariantSetValue(variant, this); d_ptr->parent->itemChange(ItemChildAddedChange, variant); if (!implicitUpdate) - d_ptr->updateHelper(); + d_ptr->updateHelper(QRectF(), false, true); // Inherit ancestor flags from the new parent. d_ptr->updateAncestorFlag(QGraphicsItem::GraphicsItemFlag(-1)); @@ -1092,7 +1092,7 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) if (!d_ptr->enabled && !d_ptr->explicitlyDisabled) d_ptr->setEnabledHelper(true, /* explicit = */ false); - d_ptr->updateHelper(); + d_ptr->updateHelper(QRectF(), false, true); } if (d_ptr->scene) { @@ -1236,7 +1236,7 @@ void QGraphicsItem::setFlags(GraphicsItemFlags flags) int geomChangeFlagsMask = (ItemClipsChildrenToShape | ItemClipsToShape | ItemIgnoresTransformations); bool fullUpdate = (flags & geomChangeFlagsMask) != (d_ptr->flags & geomChangeFlagsMask); if (fullUpdate) - d_ptr->fullUpdateHelper(); + d_ptr->fullUpdateHelper(false, true); // Keep the old flags to compare the diff. GraphicsItemFlags oldFlags = this->flags(); @@ -1281,7 +1281,7 @@ void QGraphicsItem::setFlags(GraphicsItemFlags flags) } // ### Why updateHelper? - d_ptr->updateHelper(); + d_ptr->updateHelper(QRectF(), false, true); // Notify change. itemChange(ItemFlagsHaveChanged, quint32(flags)); @@ -2369,13 +2369,13 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) // Update and repositition. inSetPosHelper = 1; + updateCachedClipPathFromSetPosHelper(newPos); if (scene) { fullUpdateHelper(true); q->prepareGeometryChange(); } this->pos = newPos; invalidateSceneTransformCache(); - updateCachedClipPathFromSetPosHelper(); // Send post-notification. q->itemChange(QGraphicsItem::ItemPositionHasChanged, newPos); @@ -2771,7 +2771,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) return; // Update and set the new transformation. - d_ptr->fullUpdateHelper(true); + d_ptr->fullUpdateHelper(true, true); prepareGeometryChange(); d_ptr->hasTransform = !newTransform.isIdentity(); d_ptr->setExtra(QGraphicsItemPrivate::ExtraTransform, newTransform); @@ -2817,7 +2817,7 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine) return; // Update and set the new transformation. - d_ptr->fullUpdateHelper(true); + d_ptr->fullUpdateHelper(true, true); prepareGeometryChange(); d_ptr->hasTransform = !newTransform.isIdentity(); d_ptr->setExtra(QGraphicsItemPrivate::ExtraTransform, newTransform); @@ -3626,7 +3626,7 @@ void QGraphicsItem::setBoundingRegionGranularity(qreal granularity) only case where the item's background should be marked as dirty even when the item isn't visible. */ -void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force) +void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force, bool maybeDirtyClipPath) { // No scene, or if the scene is updating everything, means we have nothing // to do. The only exception is if the scene tracks the growing scene rect. @@ -3634,6 +3634,8 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force) return; if (!scene || (scene && scene->d_func()->updateAll && scene->d_func()->hasSceneRect)) return; + if (!force && !maybeDirtyClipPath && discardUpdateRequest()) + return; if (scene && (visible || force)) { if (rect.isNull()) dirty = 1; @@ -3646,17 +3648,19 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force) Propagates updates to \a item and all its children. */ -void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly) +void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyClipPath) { + if (!maybeDirtyClipPath && discardUpdateRequest()) + return; // No scene, or if the scene is updating everything, means we have nothing // to do. The only exception is if the scene tracks the growing scene rect. if (!scene || (scene && scene->d_func()->updateAll && scene->d_func()->hasSceneRect)) return; if (!childrenOnly && !dirty) - updateHelper(); + updateHelper(QRectF(), false, maybeDirtyClipPath); if (children.isEmpty() || dirtyChildren) return; - if (flags & QGraphicsItem::ItemClipsChildrenToShape) { + if (flags & QGraphicsItem::ItemClipsChildrenToShape || children.isEmpty()) { // ### mark all children dirty? // Unnecessary to update children as well. return; @@ -3683,7 +3687,7 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly) } } foreach (QGraphicsItem *child, children) - child->d_ptr->fullUpdateHelper(); + child->d_ptr->fullUpdateHelper(false, maybeDirtyClipPath); dirtyChildren = 1; } @@ -3813,23 +3817,35 @@ void QGraphicsItemPrivate::invalidateCachedClipPathRecursively(bool childrenOnly } } -void QGraphicsItemPrivate::updateCachedClipPathFromSetPosHelper() +void QGraphicsItemPrivate::updateCachedClipPathFromSetPosHelper(const QPointF &newPos) { Q_ASSERT(inSetPosHelper); if (!(ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) return; // Not clipped by any ancestor. - // Find closest clip ancestor. + // Find closest clip ancestor and transform. + Q_Q(QGraphicsItem); + QTransform thisToParentTransform = hasTransform + ? q->transform() * QTransform::fromTranslate(newPos.x(), newPos.y()) + : QTransform::fromTranslate(newPos.x(), newPos.y()); QGraphicsItem *clipParent = parent; - while (clipParent && !(clipParent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape)) + while (clipParent && !(clipParent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape)) { + if (clipParent->d_ptr->hasTransform) + thisToParentTransform *= clipParent->transform(); + if (!clipParent->d_ptr->pos.isNull()) { + thisToParentTransform *= QTransform::fromTranslate(clipParent->d_ptr->pos.x(), + clipParent->d_ptr->pos.y()); + } clipParent = clipParent->d_ptr->parent; + } + // thisToParentTransform is now the same as q->itemTransform(clipParent), except + // that the new position (which is not yet set on the item) is taken into account. Q_ASSERT(clipParent); - Q_Q(QGraphicsItem); + Q_ASSERT(clipParent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape); // From here everything is calculated in clip parent's coordinates. - const QTransform thisToParentTransform(q->itemTransform(clipParent)); const QRectF parentBoundingRect(clipParent->boundingRect()); const QRectF thisBoundingRect(thisToParentTransform.mapRect(q->boundingRect())); @@ -3894,6 +3910,8 @@ void QGraphicsItem::update(const QRectF &rect) { if (d_ptr->dirty || (rect.isEmpty() && !rect.isNull())) return; + if (d_ptr->discardUpdateRequest()) + return; if (d_ptr->scene && isVisible()) { if (CacheMode(d_ptr->cacheMode) != NoCache) { QGraphicsItemCache *cache = d_ptr->extraItemCache(); @@ -5639,7 +5657,7 @@ void QGraphicsItem::prepareGeometryChange() if (!d_ptr->scene) return; - d_ptr->updateHelper(); + d_ptr->updateHelper(QRectF(), false, /*maybeDirtyClipPath=*/!d_ptr->inSetPosHelper); QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); scenePrivate->removeFromIndex(this); diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 0ef47b5..d6fb550 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -164,8 +164,8 @@ public: void setPosHelper(const QPointF &pos); void setVisibleHelper(bool newVisible, bool explicitly, bool update = true); void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true); - void updateHelper(const QRectF &rect = QRectF(), bool force = false); - void fullUpdateHelper(bool childrenOnly = false); + void updateHelper(const QRectF &rect = QRectF(), bool force = false, bool maybeDirtyClipPath = false); + void fullUpdateHelper(bool childrenOnly = false, bool maybeDirtyClipPath = false); void resolveEffectiveOpacity(qreal effectiveParentOpacity); void resolveDepth(int parentDepth); void invalidateSceneTransformCache(); @@ -256,7 +256,7 @@ public: { /*static int count = 0 ;qWarning("%i", ++count);*/ dirtyClipPath = 1; emptyClipPath = 0; } void invalidateCachedClipPathRecursively(bool childrenOnly = false, const QRectF &emptyIfOutsideThisRect = QRectF()); - void updateCachedClipPathFromSetPosHelper(); + void updateCachedClipPathFromSetPosHelper(const QPointF &newPos); inline bool isInvisible() const { @@ -267,6 +267,9 @@ public: inline bool isClippedAway() const { return !dirtyClipPath && q_func()->isClipped() && (emptyClipPath || cachedClipPath.isEmpty()); } + inline bool discardUpdateRequest() const + { return ((flags & QGraphicsItem::ItemClipsChildrenToShape) || children.isEmpty()) && isClippedAway(); } + QPainterPath cachedClipPath; QPointF pos; qreal z; diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index f5170a4..9f3f6e3 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -855,6 +855,8 @@ void QGraphicsViewPrivate::_q_updateLaterSlot() const QList &dirtyItems = scene->d_func()->dirtyItems; for (int i = 0; i < dirtyItems.size(); ++i) { const QGraphicsItem *item = dirtyItems.at(i); + if (item->d_ptr->discardUpdateRequest()) + continue; QTransform x = item->sceneTransform() * viewTransform; updateRect(x.mapRect(item->boundingRect()).toAlignedRect() & vr); } -- cgit v0.12 From 5ecf0f4bd327bd3d860ae76b3bc7a833ea98e326 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 25 Mar 2009 12:38:35 +0100 Subject: Fixes: Optimize QGraphicsViewPrivate::itemUpdated. AutoTest: Still pass Details: Get rid of QTransform::inverted()/operator*= and do nothing if the item clips all its children and the update rect is outside the bounding rect. (cherry picked from commit 9ed299a3edba92791e1c5af64b8fd9c9fe74c0ea) --- src/gui/graphicsview/qgraphicsview.cpp | 40 ++++++++++++++++------------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 9f3f6e3..81169e7 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -801,38 +801,36 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) updateLater(); QRectF updateRect = rect; - if (item->isClipped()) { + if ((item->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape) || item->d_ptr->children.isEmpty()) { + updateRect &= item->boundingRect(); + if (updateRect.isEmpty()) + return; + } + + QGraphicsItem *clipItem = item; + if (item->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren) { // Minimize unnecessary redraw. - QGraphicsItem *p = item; - QTransform xform; - QGraphicsItem *lastTransformItem = 0; - while ((p = p->d_ptr->parent)) { - if (p->flags() & QGraphicsItem::ItemClipsChildrenToShape) { - if (!lastTransformItem) - xform = item->itemTransform(p); - else - xform *= lastTransformItem->itemTransform(p); - lastTransformItem = p; - updateRect &= xform.inverted().mapRect(p->boundingRect()); + QGraphicsItem *parent = item; + while ((parent = parent->d_ptr->parent)) { + if (parent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape) { + // Map update rect to the current parent and itersect with its bounding rect. + updateRect = clipItem->itemTransform(parent).mapRect(updateRect) & parent->boundingRect(); if (updateRect.isEmpty()) return; + clipItem = parent; } - if (!(p->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) + if (!(parent->d_ptr->ancestorFlags & QGraphicsItemPrivate::AncestorClipsChildren)) break; } - - if (updateRect.isEmpty()) - return; } - // Map the rect to view coordinates. - QRect vr = viewport->rect(); - + // Map update rect from clipItem coordinates to view coordinates. + Q_ASSERT(clipItem); if (!item->d_ptr->hasBoundingRegionGranularity) - this->updateRect(mapToViewRect(item, updateRect) & vr); + this->updateRect(mapToViewRect(clipItem, updateRect) & viewport->rect()); else - updateRegion(mapToViewRegion(item, updateRect) & vr); + updateRegion(mapToViewRegion(clipItem, updateRect) & viewport->rect()); } void QGraphicsViewPrivate::updateLater() -- cgit v0.12 From 757ece29df48f1579ce79574360489670994c073 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 25 Mar 2009 13:41:10 +0100 Subject: Fixes: Minimize QVariant constr/destr in setPosHelper. RevBy: TrustMe (cherry picked from commit a914eb155e085ba0efa5b95154bf7345d4be7cd7) --- src/gui/graphicsview/qgraphicsitem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 4d7d0e2..ef81d09 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2363,7 +2363,8 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) return; // Notify the item that the position is changing. - QPointF newPos = q->itemChange(QGraphicsItem::ItemPositionChange, pos).toPointF(); + const QVariant newPosVariant(q->itemChange(QGraphicsItem::ItemPositionChange, pos)); + QPointF newPos = newPosVariant.toPointF(); if (newPos == this->pos) return; @@ -2378,7 +2379,7 @@ void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) invalidateSceneTransformCache(); // Send post-notification. - q->itemChange(QGraphicsItem::ItemPositionHasChanged, newPos); + q->itemChange(QGraphicsItem::ItemPositionHasChanged, newPosVariant); inSetPosHelper = 0; } -- cgit v0.12 From 36090e1adee529610b28dd9f38c2a4d6a92f3657 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Mar 2009 16:48:48 +0100 Subject: Fixes: Don't check the force boolean. Details: It's clipped away regardless. (cherry picked from commit 5564ef89f46fe96aa0b22b888a9a8ba053eea6c7) --- src/gui/graphicsview/qgraphicsitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index ef81d09..695a01c 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3635,7 +3635,7 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force, bool may return; if (!scene || (scene && scene->d_func()->updateAll && scene->d_func()->hasSceneRect)) return; - if (!force && !maybeDirtyClipPath && discardUpdateRequest()) + if (!maybeDirtyClipPath && discardUpdateRequest()) return; if (scene && (visible || force)) { if (rect.isNull()) -- cgit v0.12 From bb8b1a349b83c7f329daf9315a8795c38121f8e5 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Mar 2009 17:05:59 +0100 Subject: Fixes: Do not update children if not required. AutoTest: Still pass (cherry picked from commit 15098c5ec73db5de8ca724f744a1484f888ed271) --- src/gui/graphicsview/qgraphicsitem.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 695a01c..b05d1d1 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1583,9 +1583,10 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo } // Update children with explicitly = false. + const bool updateChildren = update && !(flags & QGraphicsItem::ItemClipsChildrenToShape); foreach (QGraphicsItem *child, children) { if (!newVisible || !child->d_ptr->explicitlyHidden) - child->d_ptr->setVisibleHelper(newVisible, false); + child->d_ptr->setVisibleHelper(newVisible, false, updateChildren); } // Enable subfocus -- cgit v0.12 From 81f3767e24b95929c65fbd32cb24a9f30f3921cb Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 26 Mar 2009 17:16:36 +0100 Subject: Fixes: Don't bother updating hidden items. AutoTest: Still pass (cherry picked from commit d85835580463f88df6a71d27d2577739e5366f68) --- src/gui/graphicsview/qgraphicsitem.cpp | 2 +- src/gui/graphicsview/qgraphicsscene.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index b05d1d1..9788bba 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3652,7 +3652,7 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force, bool may */ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyClipPath) { - if (!maybeDirtyClipPath && discardUpdateRequest()) + if (!visible || (!maybeDirtyClipPath && discardUpdateRequest())) return; // No scene, or if the scene is updating everything, means we have nothing // to do. The only exception is if the scene tracks the growing scene rect. diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 4f533ce..9366c0e 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -5193,6 +5193,9 @@ void QGraphicsScene::itemUpdated(QGraphicsItem *item, const QRectF &rect) d->resetDirtyItemsLater(); } + if (!item->isVisible()) + return; // Hiding an item won't effect the largestUntransformableItem/sceneRect. + // Update d->largestUntransformableItem by mapping this item's bounding // rect back to the topmost untransformable item's untransformed // coordinate system (which sort of equals the 1:1 coordinate system of an -- cgit v0.12 From 3da4fd956eaa67dafaaf210e42e90cd83a156780 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 24 Mar 2009 15:50:26 +0100 Subject: Fixes: Discard update requests if possible. AutoTest: Still pass. Details: Update requests can be discarded if the item itself is clipped away and the item clips all its children to shape. This cut-off is extremely effective (and aggressive:)) (cherry picked from commit 23c73210fc79055f4bac44de0e43f9917f8d0e7f) --- src/gui/graphicsview/qgraphicsitem.cpp | 39 +++++++++++++++++++++++++--------- src/gui/graphicsview/qgraphicsitem_p.h | 6 ++++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9788bba..d559fc8 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1102,10 +1102,7 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) } // Resolve opacity. - if (QGraphicsItem *p = d_ptr->parent) - d_ptr->resolveEffectiveOpacity(p->effectiveOpacity()); - else - d_ptr->resolveEffectiveOpacity(1.0); + d_ptr->updateEffectiveOpacity(); // Resolve depth. d_ptr->resolveDepth(parent ? parent->d_ptr->depth : -1); @@ -1246,12 +1243,8 @@ void QGraphicsItem::setFlags(GraphicsItemFlags flags) // Reresolve effective opacity if the opacity flags change. static const quint32 opacityFlagsMask = ItemIgnoresParentOpacity | ItemDoesntPropagateOpacityToChildren; - if ((flags & opacityFlagsMask) != (oldFlags & opacityFlagsMask)) { - if (QGraphicsItem *p = d_ptr->parent) - d_ptr->resolveEffectiveOpacity(p->effectiveOpacity()); - else - d_ptr->resolveEffectiveOpacity(1.0); - } + if ((flags & opacityFlagsMask) != (oldFlags & opacityFlagsMask)) + d_ptr->updateEffectiveOpacity(); if (!(d_ptr->flags & ItemIsFocusable) && hasFocus()) { // Clear focus on the item if it has focus when the focusable flag @@ -3693,6 +3686,32 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyCl dirtyChildren = 1; } +static inline bool allChildrenCombineOpacity(QGraphicsItem *parent) +{ + Q_ASSERT(parent); + if (parent->flags() & QGraphicsItem::ItemDoesntPropagateOpacityToChildren) + return false; + + const QList children(parent->childItems()); + for (int i = 0; i < children.size(); ++i) { + if (children.at(i)->flags() & QGraphicsItem::ItemIgnoresParentOpacity) + return false; + } + return true; +} + +void QGraphicsItemPrivate::updateEffectiveOpacity() +{ + Q_Q(QGraphicsItem); + if (parent) { + resolveEffectiveOpacity(parent->effectiveOpacity()); + parent->d_ptr->allChildrenCombineOpacity = ::allChildrenCombineOpacity(parent); + } else { + resolveEffectiveOpacity(1.0); + } + allChildrenCombineOpacity = ::allChildrenCombineOpacity(q); +} + /*! \internal diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index d6fb550..fc03bbb 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -141,6 +141,7 @@ public: dirtyClipPath(1), emptyClipPath(0), inSetPosHelper(0), + allChildrenCombineOpacity(1), globalStackingOrder(-1), sceneTransformIndex(-1), q_ptr(0) @@ -166,6 +167,7 @@ public: void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true); void updateHelper(const QRectF &rect = QRectF(), bool force = false, bool maybeDirtyClipPath = false); void fullUpdateHelper(bool childrenOnly = false, bool maybeDirtyClipPath = false); + void updateEffectiveOpacity(); void resolveEffectiveOpacity(qreal effectiveParentOpacity); void resolveDepth(int parentDepth); void invalidateSceneTransformCache(); @@ -264,6 +266,9 @@ public: && qFuzzyCompare(q_func()->effectiveOpacity() + 1, qreal(1.0))); } + inline bool childrenCombineOpacity() const + { return allChildrenCombineOpacity || children.isEmpty(); } + inline bool isClippedAway() const { return !dirtyClipPath && q_func()->isClipped() && (emptyClipPath || cachedClipPath.isEmpty()); } @@ -308,6 +313,7 @@ public: quint32 dirtyClipPath : 1; quint32 emptyClipPath : 1; quint32 inSetPosHelper : 1; + quint32 allChildrenCombineOpacity : 1; // Optional stacking order int globalStackingOrder; -- cgit v0.12 From 4f4b9cc32c7396c0642578c6b36d7c6e5b2fc3fd Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 27 Mar 2009 18:53:02 +0100 Subject: Fixes: Simplify the cut-offs and be more agressive :-) AutoTest: Still pass. Details: It's easier to read and understand the code now. (cherry picked from commit 73ce29e6bc09651a4e70b5e61c36d56e568905c7) --- src/gui/graphicsview/qgraphicsitem.cpp | 84 ++++++++++++++++++++-------------- src/gui/graphicsview/qgraphicsitem_p.h | 21 ++++++--- src/gui/graphicsview/qgraphicsview.cpp | 5 +- 3 files changed, 68 insertions(+), 42 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index d559fc8..3396b68 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3613,6 +3613,24 @@ void QGraphicsItem::setBoundingRegionGranularity(qreal granularity) /*! \internal + Returns true if we can discard an update request; otherwise false. +*/ +bool QGraphicsItemPrivate::discardUpdateRequest(bool ignoreClipping, + bool ignoreVisibleBit, + bool ignoreDirtyBit) const +{ + // No scene, or if the scene is updating everything, means we have nothing + // to do. The only exception is if the scene tracks the growing scene rect. + return (!visible && !ignoreVisibleBit) + || (dirty && !ignoreDirtyBit) + || !scene + || (scene->d_func()->updateAll && scene->d_func()->hasSceneRect) + || (!ignoreClipping && (childrenClippedToShape() && isClippedAway())) + || (childrenCombineOpacity() && isFullyTransparent()); +} + +/*! + \internal Asks the scene to mark this item's scene rect as dirty, requesting a redraw. This does not invalidate any cache. @@ -3625,17 +3643,12 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force, bool may { // No scene, or if the scene is updating everything, means we have nothing // to do. The only exception is if the scene tracks the growing scene rect. - if (dirty) - return; - if (!scene || (scene && scene->d_func()->updateAll && scene->d_func()->hasSceneRect)) + if (discardUpdateRequest(/*ignoreClipping=*/maybeDirtyClipPath, /*ignoreVisibleBit=*/force)) return; - if (!maybeDirtyClipPath && discardUpdateRequest()) - return; - if (scene && (visible || force)) { - if (rect.isNull()) - dirty = 1; - scene->itemUpdated(q_ptr, rect); - } + + if (rect.isNull()) + dirty = 1; + scene->itemUpdated(q_ptr, rect); } /*! @@ -3645,21 +3658,23 @@ void QGraphicsItemPrivate::updateHelper(const QRectF &rect, bool force, bool may */ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyClipPath) { - if (!visible || (!maybeDirtyClipPath && discardUpdateRequest())) - return; - // No scene, or if the scene is updating everything, means we have nothing - // to do. The only exception is if the scene tracks the growing scene rect. - if (!scene || (scene && scene->d_func()->updateAll && scene->d_func()->hasSceneRect)) - return; - if (!childrenOnly && !dirty) - updateHelper(QRectF(), false, maybeDirtyClipPath); - if (children.isEmpty() || dirtyChildren) + if (discardUpdateRequest(/*ignoreClipping=*/maybeDirtyClipPath, + /*ignoreVisibleBit=*/false, + /*ignoreDirtyBit=*/true)) { return; - if (flags & QGraphicsItem::ItemClipsChildrenToShape || children.isEmpty()) { - // ### mark all children dirty? + } + + if (!childrenOnly && !dirty) { + // Effectively the same as updateHelper(QRectF(), false, maybeDirtyClipPath). + dirty = 1; + scene->itemUpdated(q_ptr, QRectF()); + } + + if (dirtyChildren || childrenClippedToShape()) { // Unnecessary to update children as well. return; } + if (ancestorFlags & AncestorClipsChildren) { Q_Q(QGraphicsItem); // Check if we can avoid updating all children. @@ -3929,22 +3944,23 @@ bool QGraphicsItemPrivate::isProxyWidget() const */ void QGraphicsItem::update(const QRectF &rect) { - if (d_ptr->dirty || (rect.isEmpty() && !rect.isNull())) + if ((rect.isEmpty() && !rect.isNull()) || d_ptr->discardUpdateRequest()) return; - if (d_ptr->discardUpdateRequest()) - return; - if (d_ptr->scene && isVisible()) { - if (CacheMode(d_ptr->cacheMode) != NoCache) { - QGraphicsItemCache *cache = d_ptr->extraItemCache(); - if (rect.isNull()) { - cache->allExposed = true; - cache->exposed.clear(); - } else { - cache->exposed.append(rect); - } + + if (CacheMode(d_ptr->cacheMode) != NoCache) { + QGraphicsItemCache *cache = d_ptr->extraItemCache(); + if (rect.isNull()) { + cache->allExposed = true; + cache->exposed.clear(); + } else { + cache->exposed.append(rect); } - d_ptr->updateHelper(rect); } + + // Effectively the same as updateHelper(rect); + if (rect.isNull()) + d_ptr->dirty = 1; + d_ptr->scene->itemUpdated(this, rect); } diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index fc03bbb..fe88b44 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -165,6 +165,9 @@ public: void setPosHelper(const QPointF &pos); void setVisibleHelper(bool newVisible, bool explicitly, bool update = true); void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true); + bool discardUpdateRequest(bool ignoreClipping = false, + bool ignoreVisibleBit = false, + bool ignoreDirtyBit = false) const; void updateHelper(const QRectF &rect = QRectF(), bool force = false, bool maybeDirtyClipPath = false); void fullUpdateHelper(bool childrenOnly = false, bool maybeDirtyClipPath = false); void updateEffectiveOpacity(); @@ -260,11 +263,8 @@ public: void invalidateCachedClipPathRecursively(bool childrenOnly = false, const QRectF &emptyIfOutsideThisRect = QRectF()); void updateCachedClipPathFromSetPosHelper(const QPointF &newPos); - inline bool isInvisible() const - { - return !visible || (hasEffectiveOpacity - && qFuzzyCompare(q_func()->effectiveOpacity() + 1, qreal(1.0))); - } + inline bool isFullyTransparent() const + { return hasEffectiveOpacity && qFuzzyCompare(q_func()->effectiveOpacity() + 1, qreal(1.0)); } inline bool childrenCombineOpacity() const { return allChildrenCombineOpacity || children.isEmpty(); } @@ -272,8 +272,15 @@ public: inline bool isClippedAway() const { return !dirtyClipPath && q_func()->isClipped() && (emptyClipPath || cachedClipPath.isEmpty()); } - inline bool discardUpdateRequest() const - { return ((flags & QGraphicsItem::ItemClipsChildrenToShape) || children.isEmpty()) && isClippedAway(); } + inline bool childrenClippedToShape() const + { return (flags & QGraphicsItem::ItemClipsChildrenToShape) || children.isEmpty(); } + + inline bool isInvisible() const + { + return !visible + || (childrenClippedToShape() && isClippedAway()) + || (childrenCombineOpacity() && isFullyTransparent()); + } QPainterPath cachedClipPath; QPointF pos; diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 81169e7..140bc71 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -853,8 +853,11 @@ void QGraphicsViewPrivate::_q_updateLaterSlot() const QList &dirtyItems = scene->d_func()->dirtyItems; for (int i = 0; i < dirtyItems.size(); ++i) { const QGraphicsItem *item = dirtyItems.at(i); - if (item->d_ptr->discardUpdateRequest()) + if (item->d_ptr->discardUpdateRequest(/*ignoreClipping=*/false, + /*ignoreVisibleBit=*/false, + /*ignoreDirtyBit=*/true)) { continue; + } QTransform x = item->sceneTransform() * viewTransform; updateRect(x.mapRect(item->boundingRect()).toAlignedRect() & vr); } -- cgit v0.12 From a2656fc6bf78da7cbcbeee7e222812117b586936 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 27 Mar 2009 22:17:10 +0100 Subject: Optimise QGraphicsScene/View::items(const QPointF &pos) Implement specialized (and more efficient versions) of item_helper() and child_helper() that test for QPointF in the scene. (cherry picked from commit 30d01c387179160c8c418ecedfb4506a55d282e8) --- src/gui/graphicsview/qgraphicsscene.cpp | 94 ++++++++++++++++++++++++++++----- src/gui/graphicsview/qgraphicsscene_p.h | 4 ++ src/gui/graphicsview/qgraphicsview.cpp | 4 +- 3 files changed, 88 insertions(+), 14 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 9366c0e..3f8cf9b 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1367,6 +1367,48 @@ QGraphicsWidget *QGraphicsScenePrivate::windowForItem(const QGraphicsItem *item) return 0; } + +QList QGraphicsScenePrivate::items_helper(const QPointF &pos) const +{ + QList items; + + // The index returns a rough estimate of what items are inside the rect. + // Refine it by iterating through all returned items. + QRectF adjustedRect = QRectF(pos, QSize(1,1)); + foreach (QGraphicsItem *item, estimateItemsInRect(adjustedRect)) { + // Find the item's scene transform in a clever way. + QTransform x = item->sceneTransform(); + bool keep = false; + + // ### _q_adjustedRect is only needed because QRectF::intersects, + // QRectF::contains and QTransform::map() and friends don't work with + // flat rectangles. + QRectF br = _q_adjustedRect(item->boundingRect()); + // Rect intersects/contains item's shape + if (QRectF_intersects(adjustedRect, x.mapRect(br))) { + bool ok; + QTransform xinv = x.inverted(&ok); + if (ok) { + if (item->contains(xinv.map(pos))) { + items << item; + keep = true; + } + } + } + + if (keep && (item->flags() & QGraphicsItem::ItemClipsChildrenToShape)) { + // Recurse into children that clip children. + bool ok; + QTransform xinv = x.inverted(&ok); + if (ok) + childItems_helper(&items, item, xinv.map(pos)); + } + } + + sortItems(&items, Qt::AscendingOrder, sortCacheEnabled); + return items; +} + QList QGraphicsScenePrivate::items_helper(const QRectF &rect, Qt::ItemSelectionMode mode, Qt::SortOrder order) const @@ -1401,7 +1443,7 @@ QList QGraphicsScenePrivate::items_helper(const QRectF &rect, bool ok; QTransform xinv = x.inverted(&ok); if (ok) { - if (path == QPainterPath()) + if (path.isEmpty()) path.addRect(rect); if (itemCollidesWithPath(item, xinv.map(path), mode)) { items << item; @@ -1545,6 +1587,42 @@ QList QGraphicsScenePrivate::items_helper(const QPainterPath &p void QGraphicsScenePrivate::childItems_helper(QList *items, const QGraphicsItem *parent, + const QPointF &pos) const +{ + bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); + if (parentClip && parent->d_ptr->isClippedAway()) + return; + // ### is this needed? + if (parentClip && !parent->boundingRect().contains(pos)) + return; + + QList &children = parent->d_ptr->children; + for (int i = 0; i < children.size(); ++i) { + QGraphicsItem *item = children.at(i); + if (item->d_ptr->hasTransform && !item->transform().isInvertible()) + continue; + + // Skip invisible items and all their children. + if (item->d_ptr->isInvisible()) + continue; + + bool keep = false; + if (!item->d_ptr->isClippedAway()) { + if (item->contains(item->mapFromParent(pos))) { + items->append(item); + keep = true; + } + } + + if ((keep || !(item->flags() & QGraphicsItem::ItemClipsChildrenToShape)) && !item->d_ptr->children.isEmpty()) + // Recurse into children. + childItems_helper(items, item, item->mapFromParent(pos)); + } +} + + +void QGraphicsScenePrivate::childItems_helper(QList *items, + const QGraphicsItem *parent, const QRectF &rect, Qt::ItemSelectionMode mode) const { @@ -1606,6 +1684,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, } } + void QGraphicsScenePrivate::childItems_helper(QList *items, const QGraphicsItem *parent, const QPolygonF &polygon, @@ -2389,17 +2468,8 @@ QList QGraphicsScene::items() const */ QList QGraphicsScene::items(const QPointF &pos) const { - QList itemsAtPoint; - - // Find all items within a 1x1 rect area starting at pos. This can be - // inefficient for scenes that use small coordinates (like unity - // coordinates), or for detailed graphs. ### The index should support - // fetching items at a pos to avoid this limitation. - foreach (QGraphicsItem *item, items(QRectF(pos, QSizeF(1, 1)), Qt::IntersectsItemBoundingRect)) { - if (item->contains(item->mapFromScene(pos))) - itemsAtPoint << item; - } - return itemsAtPoint; + Q_D(const QGraphicsScene); + return d->items_helper(pos); } diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index f72ce99..9215e00 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -197,6 +197,7 @@ public: void mousePressEventHandler(QGraphicsSceneMouseEvent *mouseEvent); QGraphicsWidget *windowForItem(const QGraphicsItem *item) const; + QList items_helper(const QPointF &pos) const; QList items_helper(const QRectF &rect, Qt::ItemSelectionMode mode, Qt::SortOrder order) const; @@ -208,6 +209,9 @@ public: Qt::SortOrder order) const; void childItems_helper(QList *items, const QGraphicsItem *parent, + const QPointF &pos) const; + void childItems_helper(QList *items, + const QGraphicsItem *parent, const QRectF &rect, Qt::ItemSelectionMode mode) const; void childItems_helper(QList *items, diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 140bc71..75b49b1 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2251,9 +2251,9 @@ QList QGraphicsView::items(const QPoint &pos) const if (d->scene->d_func()->largestUntransformableItem.isNull()) { if ((d->identityMatrix || d->matrix.type() <= QTransform::TxScale)) { QTransform xinv = viewportTransform().inverted(); - return d->scene->items(xinv.mapRect(QRectF(pos.x(), pos.y(), 1, 1))); + return d->scene->items(xinv.map(pos)); } - return d->scene->items(mapToScene(pos.x(), pos.y(), 2, 2)); + return d->scene->items(mapToScene(pos)); } QPainterPath path; -- cgit v0.12 From d61c8ae9d97baa0096d9804939de1db7e01d1e68 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 27 Mar 2009 22:18:47 +0100 Subject: Optimise QPainterPath::contains(QPointF) We can shortcut quite some calculations for the common case by first checking whether the point is contained in the control point rect. (cherry picked from commit bc3d96a902d16a9bb358c05de9f6bfede3594731) --- src/gui/painting/qpainterpath.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index ee048ac..25f8bfe 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1725,7 +1725,7 @@ static void qt_painterpath_isect_curve(const QBezier &bezier, const QPointF &pt, */ bool QPainterPath::contains(const QPointF &pt) const { - if (isEmpty()) + if (isEmpty() || !controlPointRect().contains(pt)) return false; QPainterPathData *d = d_func(); -- cgit v0.12 From 8b64e7771b5eb97d5022ffaa51f80dfcc3e4d4cc Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Tue, 31 Mar 2009 14:58:15 +0200 Subject: Fixes: Minimize QVariant overhead related to QGraphicsItem::itemChange. RevBy: Andreas AutoTest: included (cherry picked from commit d516e5fbed3a7eac20229ead34221c732f85cdb6) --- src/gui/graphicsview/qgraphicsitem.cpp | 70 ++++++++++++++------------ src/gui/graphicsview/qgraphicsscene.cpp | 24 +++++---- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 18 +++++++ 3 files changed, 69 insertions(+), 43 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 3396b68..9e2c93a 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1024,9 +1024,8 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) } if (parent == d_ptr->parent) return; - QVariant variant; - qVariantSetValue(variant, parent); - parent = qVariantValue(itemChange(ItemParentChange, variant)); + const QVariant newParentVariant(itemChange(ItemParentChange, qVariantFromValue(parent))); + parent = qVariantValue(newParentVariant); if (parent == d_ptr->parent) return; @@ -1041,11 +1040,11 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) // We anticipate geometry changes prepareGeometryChange(); + const QVariant thisPointerVariant(qVariantFromValue(this)); if (d_ptr->parent) { // Remove from current parent qt_graphicsitem_removeChild(this, &d_ptr->parent->d_func()->children); - qVariantSetValue(variant, this); - d_ptr->parent->itemChange(ItemChildRemovedChange, variant); + d_ptr->parent->itemChange(ItemChildRemovedChange, thisPointerVariant); } if ((d_ptr->parent = parent)) { @@ -1060,8 +1059,7 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) } d_ptr->parent->d_func()->children << this; - qVariantSetValue(variant, this); - d_ptr->parent->itemChange(ItemChildAddedChange, variant); + d_ptr->parent->itemChange(ItemChildAddedChange, thisPointerVariant); if (!implicitUpdate) d_ptr->updateHelper(QRectF(), false, true); @@ -1111,7 +1109,7 @@ void QGraphicsItem::setParentItem(QGraphicsItem *parent) d_ptr->invalidateSceneTransformCache(); // Deliver post-change notification - itemChange(QGraphicsItem::ItemParentHasChanged, qVariantFromValue(parent)); + itemChange(QGraphicsItem::ItemParentHasChanged, newParentVariant); } /*! @@ -1372,9 +1370,9 @@ QString QGraphicsItem::toolTip() const */ void QGraphicsItem::setToolTip(const QString &toolTip) { - QString newCursor = itemChange(ItemToolTipChange, toolTip).toString(); - d_ptr->setExtra(QGraphicsItemPrivate::ExtraToolTip, toolTip); - itemChange(ItemToolTipHasChanged, toolTip); + const QVariant toolTipVariant(itemChange(ItemToolTipChange, toolTip)); + d_ptr->setExtra(QGraphicsItemPrivate::ExtraToolTip, toolTipVariant.toString()); + itemChange(ItemToolTipHasChanged, toolTipVariant); } #endif // QT_NO_TOOLTIP @@ -1416,9 +1414,8 @@ QCursor QGraphicsItem::cursor() const */ void QGraphicsItem::setCursor(const QCursor &cursor) { - QCursor newCursor = qVariantValue(itemChange(ItemCursorChange, - qVariantFromValue(cursor))); - d_ptr->setExtra(QGraphicsItemPrivate::ExtraCursor, newCursor); + const QVariant cursorVariant(itemChange(ItemCursorChange, qVariantFromValue(cursor))); + d_ptr->setExtra(QGraphicsItemPrivate::ExtraCursor, qVariantValue(cursorVariant)); d_ptr->hasCursor = 1; if (d_ptr->scene) { foreach (QGraphicsView *view, d_ptr->scene->views()) { @@ -1435,7 +1432,7 @@ void QGraphicsItem::setCursor(const QCursor &cursor) } } } - itemChange(ItemCursorHasChanged, qVariantFromValue(newCursor)); + itemChange(ItemCursorHasChanged, cursorVariant); } /*! @@ -1529,7 +1526,9 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo return; // Modify the property. - newVisible = q_ptr->itemChange(QGraphicsItem::ItemVisibleChange, quint32(newVisible)).toBool(); + const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange, + quint32(newVisible))); + newVisible = newVisibleVariant.toBool(); if (visible == quint32(newVisible)) return; visible = newVisible; @@ -1591,7 +1590,7 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo } // Deliver post-change notification. - q_ptr->itemChange(QGraphicsItem::ItemVisibleHasChanged, quint32(visible)); + q_ptr->itemChange(QGraphicsItem::ItemVisibleHasChanged, newVisibleVariant); } /*! @@ -1697,7 +1696,9 @@ void QGraphicsItemPrivate::setEnabledHelper(bool newEnabled, bool explicitly, bo } // Modify the property. - enabled = q_ptr->itemChange(QGraphicsItem::ItemEnabledChange, quint32(newEnabled)).toBool(); + const QVariant newEnabledVariant(q_ptr->itemChange(QGraphicsItem::ItemEnabledChange, + quint32(newEnabled))); + enabled = newEnabledVariant.toBool(); // Schedule redraw. if (update) @@ -1709,7 +1710,7 @@ void QGraphicsItemPrivate::setEnabledHelper(bool newEnabled, bool explicitly, bo } // Deliver post-change notification. - q_ptr->itemChange(QGraphicsItem::ItemEnabledHasChanged, quint32(enabled)); + q_ptr->itemChange(QGraphicsItem::ItemEnabledHasChanged, newEnabledVariant); } /*! @@ -1796,7 +1797,8 @@ void QGraphicsItem::setSelected(bool selected) selected = false; if (d_ptr->selected == selected) return; - bool newSelected = itemChange(ItemSelectedChange, quint32(selected)).toBool(); + const QVariant newSelectedVariant(itemChange(ItemSelectedChange, quint32(selected))); + bool newSelected = newSelectedVariant.toBool(); if (d_ptr->selected == newSelected) return; d_ptr->selected = newSelected; @@ -1816,7 +1818,7 @@ void QGraphicsItem::setSelected(bool selected) } // Deliver post-change notification. - itemChange(QGraphicsItem::ItemSelectedHasChanged, quint32(d_ptr->selected)); + itemChange(QGraphicsItem::ItemSelectedHasChanged, newSelectedVariant); } /*! @@ -1892,7 +1894,8 @@ qreal QGraphicsItem::effectiveOpacity() const void QGraphicsItem::setOpacity(qreal opacity) { // Notify change. - qreal newOpacity = itemChange(ItemOpacityChange, double(opacity)).toDouble(); + const QVariant newOpacityVariant(itemChange(ItemOpacityChange, double(opacity))); + qreal newOpacity = newOpacityVariant.toDouble(); // Normalize. newOpacity = qBound(0.0, newOpacity, 1.0); @@ -2759,9 +2762,9 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) return; // Notify the item that the matrix is changing. - QVariant variant; - qVariantSetValue(variant, newTransform.toAffine()); - newTransform = QTransform(qVariantValue(itemChange(ItemMatrixChange, variant))); + QVariant newTransformVariant(itemChange(ItemMatrixChange, + qVariantFromValue(newTransform.toAffine()))); + newTransform = QTransform(qVariantValue(newTransformVariant)); if (oldTransform == newTransform) return; @@ -2773,7 +2776,9 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) d_ptr->invalidateSceneTransformCache(); // Send post-notification. - itemChange(ItemTransformHasChanged, newTransform); + // NB! We have to change the value from QMatrix to QTransform. + qVariantSetValue(newTransformVariant, newTransform); + itemChange(ItemTransformHasChanged, newTransformVariant); } /*! @@ -2805,9 +2810,9 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine) return; // Notify the item that the transformation matrix is changing. - QVariant variant; - qVariantSetValue(variant, newTransform); - newTransform = qVariantValue(itemChange(ItemTransformChange, variant)); + const QVariant newTransformVariant(itemChange(ItemTransformChange, + qVariantFromValue(newTransform))); + newTransform = qVariantValue(newTransformVariant); if (oldTransform == newTransform) return; @@ -2819,7 +2824,7 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine) d_ptr->invalidateSceneTransformCache(); // Send post-notification. - itemChange(ItemTransformHasChanged, newTransform); + itemChange(ItemTransformHasChanged, newTransformVariant); } /*! @@ -2967,7 +2972,8 @@ qreal QGraphicsItem::zValue() const */ void QGraphicsItem::setZValue(qreal z) { - qreal newZ = qreal(itemChange(ItemZValueChange, double(z)).toDouble()); + const QVariant newZVariant(itemChange(ItemZValueChange, double(z))); + qreal newZ = qreal(newZVariant.toDouble()); if (newZ == d_ptr->z) return; d_ptr->z = z; @@ -2979,7 +2985,7 @@ void QGraphicsItem::setZValue(qreal z) d_ptr->scene->d_func()->invalidateSortCache(); } - itemChange(ItemZValueHasChanged, double(newZ)); + itemChange(ItemZValueHasChanged, newZVariant); } /*! diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 3f8cf9b..172e0a2 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -632,10 +632,11 @@ void QGraphicsScenePrivate::_q_updateLater() */ void QGraphicsScenePrivate::_q_polishItems() { + const QVariant booleanTrueVariant(true); foreach (QGraphicsItem *item, unpolishedItems) { if (!item->d_ptr->explicitlyHidden) { - item->itemChange(QGraphicsItem::ItemVisibleChange, true); - item->itemChange(QGraphicsItem::ItemVisibleHasChanged, true); + item->itemChange(QGraphicsItem::ItemVisibleChange, booleanTrueVariant); + item->itemChange(QGraphicsItem::ItemVisibleHasChanged, booleanTrueVariant); } if (item->isWidget()) { QEvent event(QEvent::Polish); @@ -691,9 +692,8 @@ void QGraphicsScenePrivate::_q_removeItemLater(QGraphicsItem *item) Q_Q(QGraphicsScene); if (QGraphicsItem *parent = item->d_func()->parent) { - QVariant variant; - qVariantSetValue(variant, item); - parent->itemChange(QGraphicsItem::ItemChildRemovedChange, variant); + parent->itemChange(QGraphicsItem::ItemChildRemovedChange, + qVariantFromValue(item)); parent->d_func()->children.removeAll(item); } @@ -2856,8 +2856,9 @@ void QGraphicsScene::addItem(QGraphicsItem *item) // Notify the item that its scene is changing, and allow the item to // react. - QGraphicsScene *targetScene = qVariantValue(item->itemChange(QGraphicsItem::ItemSceneChange, - qVariantFromValue(this))); + const QVariant newSceneVariant(item->itemChange(QGraphicsItem::ItemSceneChange, + qVariantFromValue(this))); + QGraphicsScene *targetScene = qVariantValue(newSceneVariant); if (targetScene != this) { if (targetScene && item->scene() != targetScene) targetScene->addItem(item); @@ -2951,7 +2952,7 @@ void QGraphicsScene::addItem(QGraphicsItem *item) emit selectionChanged(); // Deliver post-change notification - item->itemChange(QGraphicsItem::ItemSceneHasChanged, qVariantFromValue(this)); + item->itemChange(QGraphicsItem::ItemSceneHasChanged, newSceneVariant); } /*! @@ -3215,8 +3216,9 @@ void QGraphicsScene::removeItem(QGraphicsItem *item) // Notify the item that it's scene is changing to 0, allowing the item to // react. - QGraphicsScene *targetScene = qVariantValue(item->itemChange(QGraphicsItem::ItemSceneChange, - qVariantFromValue(0))); + const QVariant newSceneVariant(item->itemChange(QGraphicsItem::ItemSceneChange, + qVariantFromValue(0))); + QGraphicsScene *targetScene = qVariantValue(newSceneVariant); if (targetScene != 0 && targetScene != this) { targetScene->addItem(item); return; @@ -3324,7 +3326,7 @@ void QGraphicsScene::removeItem(QGraphicsItem *item) emit selectionChanged(); // Deliver post-change notification - item->itemChange(QGraphicsItem::ItemSceneHasChanged, qVariantFromValue(0)); + item->itemChange(QGraphicsItem::ItemSceneHasChanged, newSceneVariant); } /*! diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index e61b69b..241c00e 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -3934,8 +3934,26 @@ void tst_QGraphicsItem::itemChange() tester.itemSceneChangeTargetScene = 0; tester.itemChangeReturnValue = QVariant(); scene.removeItem(&tester); + ++changeCount; // ItemSceneChange + ++changeCount; // ItemSceneHasChanged QCOMPARE(tester.scene(), (QGraphicsScene *)0); } + { + // ItemToolTipChange/ItemToolTipHasChanged + const QString toolTip(QLatin1String("I'm soo cool")); + const QString overridenToolTip(QLatin1String("No, you are not soo cool")); + tester.itemChangeReturnValue = overridenToolTip; + tester.setToolTip(toolTip); + ++changeCount; // ItemToolTipChange + ++changeCount; // ItemToolTipHasChanged + QCOMPARE(tester.changes.size(), changeCount); + QCOMPARE(tester.changes.at(changeCount - 2), QGraphicsItem::ItemToolTipChange); + QCOMPARE(tester.values.at(changeCount - 2).toString(), toolTip); + QCOMPARE(tester.changes.at(changeCount - 1), QGraphicsItem::ItemToolTipHasChanged); + QCOMPARE(tester.values.at(changeCount - 1).toString(), overridenToolTip); + QCOMPARE(tester.toolTip(), overridenToolTip); + tester.itemChangeReturnValue = QVariant(); + } } class EventFilterTesterItem : public QGraphicsLineItem -- cgit v0.12 From 87259e48aed0ac684fea18a656710ea96429518d Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Wed, 1 Apr 2009 11:25:01 +0200 Subject: Fixes: Partially revert 9b0af2395c84a6895a5ce6368f151d4ec00c8755 RevBy: Andreas AutoTest: tst_QGraphicsView::itemAt2 pass again Details: A QPoint in the view has to be mapped to a pixel in the scene, otherwise it won't be possible to e.g. click on items that are smaller than a pixel. So...we have to optimize the hit-testing code in another way (cherry picked from commit 79799ec4788692d44862832d85f80953d386cb27) --- src/gui/graphicsview/qgraphicsview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 75b49b1..140bc71 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2251,9 +2251,9 @@ QList QGraphicsView::items(const QPoint &pos) const if (d->scene->d_func()->largestUntransformableItem.isNull()) { if ((d->identityMatrix || d->matrix.type() <= QTransform::TxScale)) { QTransform xinv = viewportTransform().inverted(); - return d->scene->items(xinv.map(pos)); + return d->scene->items(xinv.mapRect(QRectF(pos.x(), pos.y(), 1, 1))); } - return d->scene->items(mapToScene(pos)); + return d->scene->items(mapToScene(pos.x(), pos.y(), 2, 2)); } QPainterPath path; -- cgit v0.12 From d715f695b96e408c5858ab708c18dca16b69d91e Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 3 Apr 2009 11:47:59 +0200 Subject: Fixes: Optimize the way we adjust rectangles. RevBy: Olivier AutoTest: Still pass (cherry picked from commit 32767aa5699937a3737b9515f4f82acc04ccdfcd) --- src/gui/graphicsview/qgraphicsitem.cpp | 39 ++++++++--------- src/gui/graphicsview/qgraphicsscene.cpp | 76 +++++++++++++++++++++------------ 2 files changed, 68 insertions(+), 47 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 9e2c93a..175b128 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -528,25 +528,22 @@ QT_BEGIN_NAMESPACE // QRectF::intersects() returns false always if either the source or target // rectangle's width or height are 0. This works around that problem. -static QRectF _q_adjustedRect(const QRectF &rect) -{ - static const qreal p = (qreal)0.00001; - QRectF r = rect; - if (!r.width()) - r.adjust(-p, 0, p, 0); - if (!r.height()) - r.adjust(0, -p, 0, p); - return r; +static inline void _q_adjustRect(QRectF *rect) +{ + Q_ASSERT(rect); + if (!rect->width()) + rect->adjust(-0.00001, 0, 0.00001, 0); + if (!rect->height()) + rect->adjust(0, -0.00001, 0, 0.00001); } -static QRect _q_adjustedRect(const QRect &rect) +static inline void _q_adjustRect(QRect *rect) { - QRect r = rect; - if (!r.width()) - r.adjust(0, 0, 1, 0); - if (!r.height()) - r.adjust(0, 0, 0, 1); - return r; + Q_ASSERT(rect); + if (!rect->width()) + rect->adjust(0, 0, 1, 0); + if (!rect->height()) + rect->adjust(0, 0, 0, 1); } /* @@ -3305,8 +3302,10 @@ bool QGraphicsItem::collidesWithPath(const QPainterPath &path, Qt::ItemSelection return false; } - const QRectF rectA = _q_adjustedRect(boundingRect()); - const QRectF rectB = _q_adjustedRect(path.controlPointRect()); + QRectF rectA(boundingRect()); + _q_adjustRect(&rectA); + QRectF rectB(path.controlPointRect()); + _q_adjustRect(&rectB); if (!rectA.intersects(rectB)) { // This we can determine efficiently. If the two rects neither // intersect nor contain eachother, then the two items do not collide. @@ -3489,7 +3488,9 @@ QRegion QGraphicsItem::boundingRegion(const QTransform &itemToDeviceTransform) c // into the bitmap, converts the result to a QRegion and scales the region // back to device space with inverse granularity. qreal granularity = boundingRegionGranularity(); - QRect deviceRect = _q_adjustedRect(itemToDeviceTransform.mapRect(boundingRect()).toRect()); + QRectF adjustedMappedBoundingRect(itemToDeviceTransform.mapRect(boundingRect())); + _q_adjustRect(&adjustedMappedBoundingRect); + QRect deviceRect = adjustedMappedBoundingRect.toRect(); if (granularity == 0.0) return QRegion(deviceRect); diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 172e0a2..e946f0f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -292,15 +292,21 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r) // QRectF::intersects() returns false always if either the source or target // rectangle's width or height are 0. This works around that problem. -static QRectF _q_adjustedRect(const QRectF &rect) +static inline void _q_adjustRect(QRectF *rect) { - static const qreal p = (qreal)0.00001; - QRectF r = rect; - if (!r.width()) - r.adjust(-p, 0, p, 0); - if (!r.height()) - r.adjust(0, -p, 0, p); - return r; + Q_ASSERT(rect); + if (!rect->width()) + rect->adjust(-0.00001, 0, 0.00001, 0); + if (!rect->height()) + rect->adjust(0, -0.00001, 0, 0.00001); +} + +static inline QRectF adjustedItemBoundingRect(const QGraphicsItem *item) +{ + Q_ASSERT(item); + QRectF boundingRect(item->boundingRect()); + _q_adjustRect(&boundingRect); + return boundingRect; } static void _q_hoverFromMouseEvent(QGraphicsSceneHoverEvent *hover, const QGraphicsSceneMouseEvent *mouseEvent) @@ -1383,7 +1389,7 @@ QList QGraphicsScenePrivate::items_helper(const QPointF &pos) c // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); // Rect intersects/contains item's shape if (QRectF_intersects(adjustedRect, x.mapRect(br))) { bool ok; @@ -1419,7 +1425,8 @@ QList QGraphicsScenePrivate::items_helper(const QRectF &rect, // The index returns a rough estimate of what items are inside the rect. // Refine it by iterating through all returned items. - QRectF adjustedRect = _q_adjustedRect(rect); + QRectF adjustedRect(rect); + _q_adjustRect(&adjustedRect); foreach (QGraphicsItem *item, estimateItemsInRect(adjustedRect)) { // Find the item's scene transform in a clever way. QTransform x = item->sceneTransform(); @@ -1428,7 +1435,7 @@ QList QGraphicsScenePrivate::items_helper(const QRectF &rect, // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); if (mode >= Qt::ContainsItemBoundingRect) { // Rect intersects/contains item's bounding rect QRectF mbr = x.mapRect(br); @@ -1480,7 +1487,8 @@ QList QGraphicsScenePrivate::items_helper(const QPolygonF &poly { QList items; - QRectF polyRect = _q_adjustedRect(polygon.boundingRect()); + QRectF polyRect(polygon.boundingRect()); + _q_adjustRect(&polyRect); QPainterPath path; // The index returns a rough estimate of what items are inside the rect. @@ -1493,7 +1501,7 @@ QList QGraphicsScenePrivate::items_helper(const QPolygonF &poly // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); if (mode >= Qt::ContainsItemBoundingRect) { // Polygon contains/intersects item's bounding rect if (path == QPainterPath()) @@ -1538,7 +1546,8 @@ QList QGraphicsScenePrivate::items_helper(const QPainterPath &p Qt::SortOrder order) const { QList items; - const QRectF pathRect = _q_adjustedRect(path.controlPointRect()); + QRectF pathRect(path.controlPointRect()); + _q_adjustRect(&pathRect); // The index returns a rough estimate of what items are inside the rect. // Refine it by iterating through all returned items. @@ -1550,7 +1559,7 @@ QList QGraphicsScenePrivate::items_helper(const QPainterPath &p // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); if (mode >= Qt::ContainsItemBoundingRect) { // Path contains/intersects item's bounding rect if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(x.mapRect(br))) @@ -1629,7 +1638,9 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); if (parentClip && parent->d_ptr->isClippedAway()) return; - QRectF r = !parentClip ? _q_adjustedRect(rect) : _q_adjustedRect(rect).intersected(_q_adjustedRect(parent->boundingRect())); + QRectF adjustedRect(rect); + _q_adjustRect(&adjustedRect); + QRectF r = !parentClip ? adjustedRect : adjustedRect.intersected(adjustedItemBoundingRect(parent)); if (r.isEmpty()) return; @@ -1649,7 +1660,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); QRectF mbr = item->mapRectToParent(br); if (mode >= Qt::ContainsItemBoundingRect) { // Rect intersects/contains item's bounding rect @@ -1693,8 +1704,9 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); if (parentClip && parent->d_ptr->isClippedAway()) return; - QRectF polyRect = _q_adjustedRect(polygon.boundingRect()); - QRectF r = !parentClip ? polyRect : polyRect.intersected(_q_adjustedRect(parent->boundingRect())); + QRectF polyRect(polygon.boundingRect()); + _q_adjustRect(&polyRect); + QRectF r = !parentClip ? polyRect : polyRect.intersected(adjustedItemBoundingRect(parent)); if (r.isEmpty()) return; @@ -1714,7 +1726,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); if (mode >= Qt::ContainsItemBoundingRect) { // Polygon contains/intersects item's bounding rect if (path == QPainterPath()) @@ -1752,8 +1764,9 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, bool parentClip = (parent->flags() & QGraphicsItem::ItemClipsChildrenToShape); if (parentClip && parent->d_ptr->isClippedAway()) return; - QRectF pathRect = _q_adjustedRect(path.boundingRect()); - QRectF r = !parentClip ? pathRect : pathRect.intersected(_q_adjustedRect(parent->boundingRect())); + QRectF pathRect(path.boundingRect()); + _q_adjustRect(&pathRect); + QRectF r = !parentClip ? pathRect : pathRect.intersected(adjustedItemBoundingRect(parent)); if (r.isEmpty()) return; @@ -1772,7 +1785,7 @@ void QGraphicsScenePrivate::childItems_helper(QList *items, // ### _q_adjustedRect is only needed because QRectF::intersects, // QRectF::contains and QTransform::map() and friends don't work with // flat rectangles. - QRectF br = _q_adjustedRect(item->boundingRect()); + const QRectF br(adjustedItemBoundingRect(item)); if (mode >= Qt::ContainsItemBoundingRect) { // Polygon contains/intersects item's bounding rect if ((mode == Qt::IntersectsItemBoundingRect && path.intersects(item->mapRectToParent(br))) @@ -4709,7 +4722,9 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte // Item's (local) bounding rect QRectF brect = item->boundingRect(); - if (_q_adjustedRect(brect).isEmpty()) + QRectF adjustedBrect(brect); + _q_adjustRect(&adjustedBrect); + if (adjustedBrect.isEmpty()) return; // Fetch the off-screen transparent buffer and exposed area info. @@ -5251,9 +5266,12 @@ void QGraphicsScene::itemUpdated(QGraphicsItem *item, const QRectF &rect) update(item->sceneBoundingRect()); } else { // ### Remove _q_adjustedRects(). - QRectF boundingRect = _q_adjustedRect(item->boundingRect()); - if (!rect.isNull()) - boundingRect &= _q_adjustedRect(rect); + QRectF boundingRect(adjustedItemBoundingRect(item)); + if (!rect.isNull()) { + QRectF adjustedRect(rect); + _q_adjustRect(&adjustedRect); + boundingRect &= adjustedRect; + } // Update each view directly. for (int i = 0; i < d->views.size(); ++i) @@ -5283,7 +5301,9 @@ void QGraphicsScene::itemUpdated(QGraphicsItem *item, const QRectF &rect) // defined scene rect. if (!d->hasSceneRect) { QRectF oldGrowingItemsBoundingRect = d->growingItemsBoundingRect; - d->growingItemsBoundingRect |= _q_adjustedRect(item->sceneBoundingRect()); + QRectF adjustedItemSceneBoundingRect(item->sceneBoundingRect()); + _q_adjustRect(&adjustedItemSceneBoundingRect); + d->growingItemsBoundingRect |= adjustedItemSceneBoundingRect; if (d->growingItemsBoundingRect != oldGrowingItemsBoundingRect) emit sceneRectChanged(d->growingItemsBoundingRect); } -- cgit v0.12 From 45e2f2f949b8655b6de9b3a875dd8509d1c5369e Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 3 Apr 2009 16:39:58 +0200 Subject: Fixes: We have to adjust the item's bounding rect. RevBy: Andreas AutoTest: Still pass Details: QRectF::intersects does not work with flat rectangles, so we cannot intersect the bounding rect without adjusting it first. (cherry picked from commit 3dc62362f3380fa653bc1225ce06e5e4cefa745a) --- src/gui/graphicsview/qgraphicsview.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 140bc71..24aae43 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -790,6 +790,19 @@ QRegion QGraphicsViewPrivate::mapToViewRegion(const QGraphicsItem *item, const Q return item->boundingRegion(itv) & itv.mapRect(rect).toAlignedRect(); } +// QRectF::intersects() returns false always if either the source or target +// rectangle's width or height are 0. This works around that problem. +static inline QRectF adjustedItemBoundingRect(const QGraphicsItem *item) +{ + Q_ASSERT(item); + QRectF boundingRect(item->boundingRect()); + if (!boundingRect.width()) + boundingRect.adjust(-0.00001, 0, 0.00001, 0); + if (!boundingRect.height()) + boundingRect.adjust(0, -0.00001, 0, 0.00001); + return boundingRect; +} + /*! \internal */ @@ -802,7 +815,7 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) QRectF updateRect = rect; if ((item->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape) || item->d_ptr->children.isEmpty()) { - updateRect &= item->boundingRect(); + updateRect &= adjustedItemBoundingRect(item); if (updateRect.isEmpty()) return; } @@ -814,7 +827,8 @@ void QGraphicsViewPrivate::itemUpdated(QGraphicsItem *item, const QRectF &rect) while ((parent = parent->d_ptr->parent)) { if (parent->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape) { // Map update rect to the current parent and itersect with its bounding rect. - updateRect = clipItem->itemTransform(parent).mapRect(updateRect) & parent->boundingRect(); + updateRect = clipItem->itemTransform(parent).mapRect(updateRect) + & adjustedItemBoundingRect(parent); if (updateRect.isEmpty()) return; clipItem = parent; -- cgit v0.12 From fdff47ac6baebf0611f98e7e25c90d54413fbe06 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 3 Apr 2009 16:52:10 +0200 Subject: Fixes: Wrong adjustment of rect added in 0aa2ef27249dc8e782c2942340776bb19de80a0d RevBy: TrustMe AutoTest: tst_QGraphicsItem::boundingRegion() pass again Details: The original code adjusted the QRect version of a mapped bounding rect, wheras my patch adjusted a mapped bounding rect (QRectF) and then converted it to a QRect. (cherry picked from commit 416fd77e653d089b7832002a68d5b7725fa492db) --- src/gui/graphicsview/qgraphicsitem.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 175b128..d8daaf4 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3488,9 +3488,8 @@ QRegion QGraphicsItem::boundingRegion(const QTransform &itemToDeviceTransform) c // into the bitmap, converts the result to a QRegion and scales the region // back to device space with inverse granularity. qreal granularity = boundingRegionGranularity(); - QRectF adjustedMappedBoundingRect(itemToDeviceTransform.mapRect(boundingRect())); - _q_adjustRect(&adjustedMappedBoundingRect); - QRect deviceRect = adjustedMappedBoundingRect.toRect(); + QRect deviceRect = itemToDeviceTransform.mapRect(boundingRect()).toRect(); + _q_adjustRect(&deviceRect); if (granularity == 0.0) return QRegion(deviceRect); -- cgit v0.12 From 66fe4167b123c644874216af4f1c1a2fb3c478b2 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Mon, 6 Apr 2009 13:31:02 +0200 Subject: Fixup update rect regression by adjusting expose rectangles. This change shows a limitation in Graphics View caused by QPen's default width being 0 (cosmetic), while Graphics View actually does not support cosmetic pens at all. Because items are at risk of drawing lines that poke 1 pixel outside their bounding rect, QGraphicsView must look for items that are up to one pixel larger than their bounding rect mapped to viewport coordinates. Furthermore, mapToScene(QRect) forces us to adjust the input rectangle by (0, 0, 1, 1), because it uses QRect::bottomRight() (etc) when mapping the rectangle to a polygon (which is _wrong_). Since this behavior has been there since 4.2, we don't want to fix it in a 4.5 patch release... The only _proper_ fix to this problem is for the view to know the item's "adjust" in device coordinates, allowing items to use cosmetic pens freely. Fex, we could introduce QGraphicsItem::viewportMargins() or so. Added an autotest to ensure this doesn't break again. Reviewed-by: bnilsen (cherry picked from commit cc18633fe45d599bfeac2a8b2737d155f1dd5564) --- src/gui/graphicsview/qgraphicsview.cpp | 42 ++++++++++++++---- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 61 ++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 8 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 24aae43..ae5cc24 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1046,13 +1046,24 @@ void QGraphicsViewPrivate::freeStyleOptionsArray(QStyleOptionGraphicsItem *array extern QPainterPath qt_regionToPath(const QRegion ®ion); +/*! + ### Adjustments in findItems: mapToScene(QRect) forces us to adjust the + input rectangle by (0, 0, 1, 1), because it uses QRect::bottomRight() + (etc) when mapping the rectangle to a polygon (which is _wrong_). In + addition, as QGraphicsItem::boundingRect() is defined in logical space, + but the default pen for QPainter is cosmetic with a width of 0, QPainter + is at risk of painting 1 pixel outside the bounding rect. Therefore we + must search for items with an adjustment of (-1, -1, 1, 1). +*/ QList QGraphicsViewPrivate::findItems(const QRegion &exposedRegion, bool *allItems) const { Q_Q(const QGraphicsView); - const QPainterPath exposedPath(qt_regionToPath(exposedRegion)); - const QPainterPath exposedScenePath(q->mapToScene(exposedPath)); - if (exposedScenePath.contains(scene->d_func()->growingItemsBoundingRect)) { + // Step 1) If all items are contained within the expose region, then + // return a list of all visible items. + const QRectF exposedRegionSceneBounds = q->mapToScene(exposedRegion.boundingRect().adjusted(-1, -1, 2, 2)) + .boundingRect(); + if (exposedRegionSceneBounds.contains(scene->d_func()->growingItemsBoundingRect)) { Q_ASSERT(allItems); *allItems = true; @@ -1072,12 +1083,27 @@ QList QGraphicsViewPrivate::findItems(const QRegion &exposedReg return itemList; } + // Step 2) If the expose region is a simple rect and the view is only + // translated or scaled, search for items using + // QGraphicsScene::items(QRectF). + bool simpleRectLookup = (scene->d_func()->largestUntransformableItem.isNull() + && exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale); + if (simpleRectLookup) { + return scene->d_func()->items_helper(exposedRegionSceneBounds, + Qt::IntersectsItemBoundingRect, + Qt::DescendingOrder); + } + + // If the region is complex or the view has a complex transform, adjust + // the expose region, convert it to a path, and then search for items + // using QGraphicsScene::items(QPainterPath); + QRegion adjustedRegion; + foreach (const QRect &r, exposedRegion.rects()) + adjustedRegion += r.adjusted(-1, -1, 1, 1); + + const QPainterPath exposedPath(qt_regionToPath(adjustedRegion)); if (scene->d_func()->largestUntransformableItem.isNull()) { - if (exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale) { - return scene->d_func()->items_helper(exposedScenePath.controlPointRect(), - Qt::IntersectsItemBoundingRect, - Qt::DescendingOrder); - } + const QPainterPath exposedScenePath(q->mapToScene(exposedPath)); return scene->d_func()->items_helper(exposedScenePath, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder); diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index e046514..535730a 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -155,6 +155,8 @@ private slots: void fitInView(); void itemsAtPoint(); void itemsInRect(); + void itemsInRect_cosmeticAdjust_data(); + void itemsInRect_cosmeticAdjust(); void itemsInPoly(); void itemsInPath(); void itemAt(); @@ -1310,6 +1312,65 @@ void tst_QGraphicsView::itemsInRect() QCOMPARE(items.takeFirst()->zValue(), qreal(3)); } +class CountPaintItem : public QGraphicsRectItem +{ +public: + int numPaints; + + CountPaintItem(const QRectF &rect) + : QGraphicsRectItem(rect), numPaints(0) + { } + + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) + { + ++numPaints; + QGraphicsRectItem::paint(painter, option, widget); + } +}; + +void tst_QGraphicsView::itemsInRect_cosmeticAdjust_data() +{ + QTest::addColumn("updateRect"); + QTest::addColumn("numPaints"); + + QTest::newRow("nil") << QRect() << 1; + QTest::newRow("0, 0, 300, 100") << QRect(0, 0, 300, 100) << 1; + QTest::newRow("0, 0, 100, 300") << QRect(0, 0, 100, 300) << 1; + QTest::newRow("200, 0, 100, 300") << QRect(200, 0, 100, 300) << 1; + QTest::newRow("0, 200, 300, 100") << QRect(0, 200, 300, 100) << 1; + QTest::newRow("0, 0, 300, 99") << QRect(0, 0, 300, 99) << 0; + QTest::newRow("0, 0, 99, 300") << QRect(0, 0, 99, 300) << 0; + QTest::newRow("201, 0, 99, 300") << QRect(201, 0, 99, 300) << 0; + QTest::newRow("0, 201, 300, 99") << QRect(0, 201, 300, 99) << 0; +} + +void tst_QGraphicsView::itemsInRect_cosmeticAdjust() +{ + QFETCH(QRect, updateRect); + QFETCH(int, numPaints); + + QGraphicsScene scene(-100, -100, 200, 200); + CountPaintItem *rect = new CountPaintItem(QRectF(-50, -50, 100, 100)); + scene.addItem(rect); + + QGraphicsView view(&scene); + view.setFrameStyle(0); + view.resize(300, 300); + view.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&view); +#endif + QTest::qWait(125); + + rect->numPaints = 0; + if (updateRect.isNull()) + view.viewport()->update(); + else + view.viewport()->update(updateRect); + qApp->processEvents(); + QCOMPARE(rect->numPaints, numPaints); +} + void tst_QGraphicsView::itemsInPoly() { QGraphicsScene scene; -- cgit v0.12 From b71648ec602a52667403bfb83d2e48718948a2a9 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 14 Apr 2009 18:01:26 +0200 Subject: QGraphicsView: Rubber Band drag mode not updated correctly when scrolling [regression] The problem was that we didn't update the new region when we paint the rubber band and we scroll at the same time BT:yes Task-number: 245766 Reviewed-by: bnilsen Reviewed-by: andreas (cherry picked from commit 0f6950e11389a3ddf657116a98ee8f4ec0753eb4) --- src/gui/graphicsview/qgraphicsview.cpp | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index ae5cc24..716798d 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3621,30 +3621,30 @@ void QGraphicsView::scrollContentsBy(int dx, int dy) if (isRightToLeft()) dx = -dx; - if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate - && d->viewportUpdateMode != QGraphicsView::FullViewportUpdate) { - for (int i = 0; i < d->dirtyRects.size(); ++i) - d->dirtyRects[i].translate(dx, dy); - for (int i = 0; i < d->dirtyRegions.size(); ++i) - d->dirtyRegions[i].translate(dx, dy); - } - + if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate) { + if (d->viewportUpdateMode != QGraphicsView::FullViewportUpdate) { + for (int i = 0; i < d->dirtyRects.size(); ++i) + d->dirtyRects[i].translate(dx, dy); + for (int i = 0; i < d->dirtyRegions.size(); ++i) + d->dirtyRegions[i].translate(dx, dy); + if (d->accelerateScrolling) { #ifndef QT_NO_RUBBERBAND - // Update old rubberband - if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate && !d->rubberBandRect.isEmpty()) { - if (d->viewportUpdateMode != FullViewportUpdate) - viewport()->update(d->rubberBandRegion(viewport(), d->rubberBandRect)); - else - viewport()->update(); - } + // Update new and old rubberband regions + if (!d->rubberBandRect.isEmpty()) { + QRegion rubberBandRegion(d->rubberBandRegion(viewport(), d->rubberBandRect)); + rubberBandRegion += rubberBandRegion.translated(-dx, -dy); + viewport()->update(rubberBandRegion); + } #endif - - if (d->viewportUpdateMode != QGraphicsView::NoViewportUpdate){ - if (d->accelerateScrolling && d->viewportUpdateMode != FullViewportUpdate) - viewport()->scroll(dx, dy); - else + viewport()->scroll(dx, dy); + } else { + viewport()->update(); + } + } else { viewport()->update(); + } } + d->updateLastCenterPoint(); if ((d->cacheMode & CacheBackground) -- cgit v0.12 From 9c7374464544aca8b005773223b7541a9cc9eea0 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 15 Apr 2009 10:23:08 +0200 Subject: BT: Fix a regression to 4.4 in Graphics View's handling of child clippers Regression caused by optimizations in QGraphicsItem and QGraphicsScene. The changes in QGraphicsItem fix bugs in QGraphicsItem::mapToParent functions, which did the translation before applying the transformation, instead of the other way (transform, then translate). This bug caused almost all mapToParent and mapRectToParent functions to behave wrongly. Unfortunately the new helper functions in QGraphicsScene for discovering items made use of these functions, which introduced a regression. Fixing these functions also fixes item discovery. The other part of this change fixes a regression caused by c1909321, which luckily happened after 4.5.0 and never saw the light of day. The fix is to also invalidate the cached clip path even if there is no scene, which is necessary if you build your scene graph outside the scene, and finish off by adding the root item to the scene. Task-number: 250680 Reviewed-by: Alexis (cherry picked from commit 7a0f9ae94ca7a47dc285431d31f6839c07870194) --- src/gui/graphicsview/qgraphicsitem.cpp | 30 +++++---- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 83 ++++++++++++++++++++++++ tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 26 ++++++++ 3 files changed, 125 insertions(+), 14 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index d8daaf4..0f5f50d 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -4223,9 +4223,9 @@ QPolygonF QGraphicsItem::mapToItem(const QGraphicsItem *item, const QRectF &rect */ QPolygonF QGraphicsItem::mapToParent(const QRectF &rect) const { - if (!d_ptr->hasTransform) - return QPolygonF(rect.translated(d_ptr->pos)); - return transform().map(rect.translated(d_ptr->pos)); + QPolygonF p = !d_ptr->hasTransform ? rect : transform().map(rect); + p.translate(d_ptr->pos); + return p; } /*! @@ -4292,8 +4292,8 @@ QRectF QGraphicsItem::mapRectToItem(const QGraphicsItem *item, const QRectF &rec */ QRectF QGraphicsItem::mapRectToParent(const QRectF &rect) const { - QRectF r = rect.translated(d_ptr->pos.x(), d_ptr->pos.y()); - return !d_ptr->hasTransform ? r : transform().mapRect(r); + QRectF r = !d_ptr->hasTransform ? rect : transform().mapRect(rect); + return r.translated(d_ptr->pos); } /*! @@ -4424,9 +4424,9 @@ QPolygonF QGraphicsItem::mapToItem(const QGraphicsItem *item, const QPolygonF &p */ QPolygonF QGraphicsItem::mapToParent(const QPolygonF &polygon) const { - QPolygonF p = polygon; + QPolygonF p = !d_ptr->hasTransform ? polygon : transform().map(polygon); p.translate(d_ptr->pos); - return d_ptr->hasTransform ? transform().map(p) : p; + return p; } /*! @@ -4468,7 +4468,10 @@ QPainterPath QGraphicsItem::mapToItem(const QGraphicsItem *item, const QPainterP */ QPainterPath QGraphicsItem::mapToParent(const QPainterPath &path) const { - return d_ptr->parent ? itemTransform(d_ptr->parent).map(path) : mapToScene(path); + QTransform x = QTransform::fromTranslate(d_ptr->pos.x(), d_ptr->pos.y()); + if (d_ptr->hasTransform) + x = transform() * x; + return x.map(path); } /*! @@ -5697,12 +5700,11 @@ void QGraphicsItem::removeFromIndex() */ void QGraphicsItem::prepareGeometryChange() { - if (!d_ptr->scene) - return; - - d_ptr->updateHelper(QRectF(), false, /*maybeDirtyClipPath=*/!d_ptr->inSetPosHelper); - QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); - scenePrivate->removeFromIndex(this); + if (d_ptr->scene) { + d_ptr->updateHelper(QRectF(), false, /*maybeDirtyClipPath=*/!d_ptr->inSetPosHelper); + QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); + scenePrivate->removeFromIndex(this); + } if (d_ptr->inSetPosHelper) return; diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 241c00e..29b6cdd 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -162,6 +162,8 @@ private slots: void mapFromToParent(); void mapFromToScene(); void mapFromToItem(); + void mapRectFromToParent_data(); + void mapRectFromToParent(); void isAncestorOf(); void commonAncestorItem(); void data(); @@ -2515,6 +2517,87 @@ void tst_QGraphicsItem::mapFromToItem() delete item4; } +void tst_QGraphicsItem::mapRectFromToParent_data() +{ + QTest::addColumn("parent"); + QTest::addColumn("parentPos"); + QTest::addColumn("parentTransform"); + QTest::addColumn("pos"); + QTest::addColumn("transform"); + QTest::addColumn("inputRect"); + QTest::addColumn("outputRect"); + + QTest::newRow("nil") << false << QPointF() << QTransform() << QPointF() << QTransform() << QRectF() << QRectF(); + QTest::newRow("simple") << false << QPointF() << QTransform() << QPointF() << QTransform() + << QRectF(0, 0, 10, 10) << QRectF(0, 0, 10, 10); + QTest::newRow("simple w/parent") << true + << QPointF() << QTransform() + << QPointF() << QTransform() + << QRectF(0, 0, 10, 10) << QRectF(0, 0, 10, 10); + QTest::newRow("simple w/parent parentPos") << true + << QPointF(50, 50) << QTransform() + << QPointF() << QTransform() + << QRectF(0, 0, 10, 10) << QRectF(0, 0, 10, 10); + QTest::newRow("simple w/parent parentPos parentRotation") << true + << QPointF(50, 50) << QTransform().rotate(45) + << QPointF() << QTransform() + << QRectF(0, 0, 10, 10) << QRectF(0, 0, 10, 10); + QTest::newRow("pos w/parent") << true + << QPointF() << QTransform() + << QPointF(50, 50) << QTransform() + << QRectF(0, 0, 10, 10) << QRectF(50, 50, 10, 10); + QTest::newRow("rotation w/parent") << true + << QPointF() << QTransform() + << QPointF() << QTransform().rotate(90) + << QRectF(0, 0, 10, 10) << QRectF(-10, 0, 10, 10); + QTest::newRow("pos rotation w/parent") << true + << QPointF() << QTransform() + << QPointF(50, 50) << QTransform().rotate(90) + << QRectF(0, 0, 10, 10) << QRectF(40, 50, 10, 10); + QTest::newRow("pos rotation w/parent parentPos parentRotation") << true + << QPointF(-170, -190) << QTransform().rotate(90) + << QPointF(50, 50) << QTransform().rotate(90) + << QRectF(0, 0, 10, 10) << QRectF(40, 50, 10, 10); +} + +void tst_QGraphicsItem::mapRectFromToParent() +{ + QFETCH(bool, parent); + QFETCH(QPointF, parentPos); + QFETCH(QTransform, parentTransform); + QFETCH(QPointF, pos); + QFETCH(QTransform, transform); + QFETCH(QRectF, inputRect); + QFETCH(QRectF, outputRect); + + QGraphicsRectItem *rect = new QGraphicsRectItem; + rect->setPos(pos); + rect->setTransform(transform); + + if (parent) { + QGraphicsRectItem *rectParent = new QGraphicsRectItem; + rect->setParentItem(rectParent); + rectParent->setPos(parentPos); + rectParent->setTransform(parentTransform); + } + + // Make sure we use non-destructive transform operations (e.g., 90 degree + // rotations). + QCOMPARE(rect->mapRectToParent(inputRect), outputRect); + QCOMPARE(rect->mapRectFromParent(outputRect), inputRect); + QCOMPARE(rect->itemTransform(rect->parentItem()).mapRect(inputRect), outputRect); + QCOMPARE(rect->mapToParent(inputRect).boundingRect(), outputRect); + QCOMPARE(rect->mapToParent(QPolygonF(inputRect)).boundingRect(), outputRect); + QCOMPARE(rect->mapFromParent(outputRect).boundingRect(), inputRect); + QCOMPARE(rect->mapFromParent(QPolygonF(outputRect)).boundingRect(), inputRect); + QPainterPath inputPath; + inputPath.addRect(inputRect); + QPainterPath outputPath; + outputPath.addRect(outputRect); + QCOMPARE(rect->mapToParent(inputPath).boundingRect(), outputPath.boundingRect()); + QCOMPARE(rect->mapFromParent(outputPath).boundingRect(), inputPath.boundingRect()); +} + void tst_QGraphicsItem::isAncestorOf() { QGraphicsItem *grandPa = new QGraphicsRectItem; diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index ad3b167..235b229 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -245,6 +245,7 @@ private slots: void task139782_containsItemBoundingRect(); void task176178_itemIndexMethodBreaksSceneRect(); void task160653_selectionChanged(); + void task250680_childClip(); }; void tst_QGraphicsScene::initTestCase() @@ -3384,6 +3385,31 @@ void tst_QGraphicsScene::task160653_selectionChanged() QCOMPARE(spy.count(), 1); } +void tst_QGraphicsScene::task250680_childClip() +{ + QGraphicsRectItem *clipper = new QGraphicsRectItem; + clipper->setFlag(QGraphicsItem::ItemClipsChildrenToShape); + clipper->setPen(QPen(Qt::green)); + clipper->setRect(200, 200, 640, 480); + + QGraphicsRectItem *rect = new QGraphicsRectItem(clipper); + rect->setPen(QPen(Qt::red)); + rect->setBrush(QBrush(QColor(255, 0, 0, 75))); + rect->setPos(320, 240); + rect->setRect(-25, -25, 50, 50); + + QGraphicsScene scene; + scene.addItem(clipper); + + QPainterPath path; + path.addRect(-25, -25, 50, 50); + QCOMPARE(rect->clipPath(), path); + + QCOMPARE(scene.items(QRectF(320, 240, 5, 5)).size(), 2); + rect->rotate(45); + QCOMPARE(scene.items(QRectF(320, 240, 5, 5)).size(), 2); +} + void tst_QGraphicsScene::sorting_data() { QTest::addColumn("cache"); -- cgit v0.12 From 8c8eac0a780c719f487c89009988d582c1db1112 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Apr 2009 15:04:31 +0200 Subject: BT: compilefix for Qt in namespace RevBy: mauricek Details: using prefix qt_ instead of ::global namespace (cherry picked from commit 9904f77b26d3b75f8ed53e82c14ff8e9baf710dc) --- src/gui/graphicsview/qgraphicsitem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 0f5f50d..801ba99 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3707,7 +3707,7 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyCl dirtyChildren = 1; } -static inline bool allChildrenCombineOpacity(QGraphicsItem *parent) +static inline bool qt_allChildrenCombineOpacity(QGraphicsItem *parent) { Q_ASSERT(parent); if (parent->flags() & QGraphicsItem::ItemDoesntPropagateOpacityToChildren) @@ -3726,11 +3726,11 @@ void QGraphicsItemPrivate::updateEffectiveOpacity() Q_Q(QGraphicsItem); if (parent) { resolveEffectiveOpacity(parent->effectiveOpacity()); - parent->d_ptr->allChildrenCombineOpacity = ::allChildrenCombineOpacity(parent); + parent->d_ptr->allChildrenCombineOpacity = qt_allChildrenCombineOpacity(parent); } else { resolveEffectiveOpacity(1.0); } - allChildrenCombineOpacity = ::allChildrenCombineOpacity(q); + allChildrenCombineOpacity = qt_allChildrenCombineOpacity(q); } /*! -- cgit v0.12 From efb0f94e592fca447c37e5f729015fa3ba97b1c2 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 15 Apr 2009 20:39:09 +1000 Subject: Revert "Fixup update rect regression by adjusting expose rectangles." This reverts commit 66fe4167b123c644874216af4f1c1a2fb3c478b2. Oops, missed the bit in the comment about not fixing for a 4.5 patch release. --- src/gui/graphicsview/qgraphicsview.cpp | 42 ++++-------------- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 61 -------------------------- 2 files changed, 8 insertions(+), 95 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 716798d..2e6c08d 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1046,24 +1046,13 @@ void QGraphicsViewPrivate::freeStyleOptionsArray(QStyleOptionGraphicsItem *array extern QPainterPath qt_regionToPath(const QRegion ®ion); -/*! - ### Adjustments in findItems: mapToScene(QRect) forces us to adjust the - input rectangle by (0, 0, 1, 1), because it uses QRect::bottomRight() - (etc) when mapping the rectangle to a polygon (which is _wrong_). In - addition, as QGraphicsItem::boundingRect() is defined in logical space, - but the default pen for QPainter is cosmetic with a width of 0, QPainter - is at risk of painting 1 pixel outside the bounding rect. Therefore we - must search for items with an adjustment of (-1, -1, 1, 1). -*/ QList QGraphicsViewPrivate::findItems(const QRegion &exposedRegion, bool *allItems) const { Q_Q(const QGraphicsView); + const QPainterPath exposedPath(qt_regionToPath(exposedRegion)); + const QPainterPath exposedScenePath(q->mapToScene(exposedPath)); - // Step 1) If all items are contained within the expose region, then - // return a list of all visible items. - const QRectF exposedRegionSceneBounds = q->mapToScene(exposedRegion.boundingRect().adjusted(-1, -1, 2, 2)) - .boundingRect(); - if (exposedRegionSceneBounds.contains(scene->d_func()->growingItemsBoundingRect)) { + if (exposedScenePath.contains(scene->d_func()->growingItemsBoundingRect)) { Q_ASSERT(allItems); *allItems = true; @@ -1083,27 +1072,12 @@ QList QGraphicsViewPrivate::findItems(const QRegion &exposedReg return itemList; } - // Step 2) If the expose region is a simple rect and the view is only - // translated or scaled, search for items using - // QGraphicsScene::items(QRectF). - bool simpleRectLookup = (scene->d_func()->largestUntransformableItem.isNull() - && exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale); - if (simpleRectLookup) { - return scene->d_func()->items_helper(exposedRegionSceneBounds, - Qt::IntersectsItemBoundingRect, - Qt::DescendingOrder); - } - - // If the region is complex or the view has a complex transform, adjust - // the expose region, convert it to a path, and then search for items - // using QGraphicsScene::items(QPainterPath); - QRegion adjustedRegion; - foreach (const QRect &r, exposedRegion.rects()) - adjustedRegion += r.adjusted(-1, -1, 1, 1); - - const QPainterPath exposedPath(qt_regionToPath(adjustedRegion)); if (scene->d_func()->largestUntransformableItem.isNull()) { - const QPainterPath exposedScenePath(q->mapToScene(exposedPath)); + if (exposedRegion.numRects() == 1 && matrix.type() <= QTransform::TxScale) { + return scene->d_func()->items_helper(exposedScenePath.controlPointRect(), + Qt::IntersectsItemBoundingRect, + Qt::DescendingOrder); + } return scene->d_func()->items_helper(exposedScenePath, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder); diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 535730a..e046514 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -155,8 +155,6 @@ private slots: void fitInView(); void itemsAtPoint(); void itemsInRect(); - void itemsInRect_cosmeticAdjust_data(); - void itemsInRect_cosmeticAdjust(); void itemsInPoly(); void itemsInPath(); void itemAt(); @@ -1312,65 +1310,6 @@ void tst_QGraphicsView::itemsInRect() QCOMPARE(items.takeFirst()->zValue(), qreal(3)); } -class CountPaintItem : public QGraphicsRectItem -{ -public: - int numPaints; - - CountPaintItem(const QRectF &rect) - : QGraphicsRectItem(rect), numPaints(0) - { } - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) - { - ++numPaints; - QGraphicsRectItem::paint(painter, option, widget); - } -}; - -void tst_QGraphicsView::itemsInRect_cosmeticAdjust_data() -{ - QTest::addColumn("updateRect"); - QTest::addColumn("numPaints"); - - QTest::newRow("nil") << QRect() << 1; - QTest::newRow("0, 0, 300, 100") << QRect(0, 0, 300, 100) << 1; - QTest::newRow("0, 0, 100, 300") << QRect(0, 0, 100, 300) << 1; - QTest::newRow("200, 0, 100, 300") << QRect(200, 0, 100, 300) << 1; - QTest::newRow("0, 200, 300, 100") << QRect(0, 200, 300, 100) << 1; - QTest::newRow("0, 0, 300, 99") << QRect(0, 0, 300, 99) << 0; - QTest::newRow("0, 0, 99, 300") << QRect(0, 0, 99, 300) << 0; - QTest::newRow("201, 0, 99, 300") << QRect(201, 0, 99, 300) << 0; - QTest::newRow("0, 201, 300, 99") << QRect(0, 201, 300, 99) << 0; -} - -void tst_QGraphicsView::itemsInRect_cosmeticAdjust() -{ - QFETCH(QRect, updateRect); - QFETCH(int, numPaints); - - QGraphicsScene scene(-100, -100, 200, 200); - CountPaintItem *rect = new CountPaintItem(QRectF(-50, -50, 100, 100)); - scene.addItem(rect); - - QGraphicsView view(&scene); - view.setFrameStyle(0); - view.resize(300, 300); - view.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&view); -#endif - QTest::qWait(125); - - rect->numPaints = 0; - if (updateRect.isNull()) - view.viewport()->update(); - else - view.viewport()->update(updateRect); - qApp->processEvents(); - QCOMPARE(rect->numPaints, numPaints); -} - void tst_QGraphicsView::itemsInPoly() { QGraphicsScene scene; -- cgit v0.12 From db6bc0f9d47ddf43112f67cc99c8ba86d5e42de3 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Wed, 15 Apr 2009 11:51:17 +0200 Subject: The submenu of a multicolumn menu have an incorrect position The submenu would always appear to the side of the menu instead of its right. Task-number: 250673 Reviewed-by: ogoffart (cherry picked from commit 8f223e03effba1aef6be5e50caf7482af1d7dd8a) --- src/gui/widgets/qmenu.cpp | 4 ++-- tests/auto/qmenu/tst_qmenu.cpp | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 0dd1b8a..5b5ba82 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -2889,8 +2889,8 @@ void QMenu::internalDelayedPopup() int subMenuOffset = style()->pixelMetric(QStyle::PM_SubMenuOverlap, 0, this); const QRect actionRect(d->actionRect(d->currentAction)); const QSize menuSize(d->activeMenu->sizeHint()); - const QPoint rightPos(mapToGlobal(QPoint(rect().right() + subMenuOffset + 1, actionRect.top()))); - const QPoint leftPos(mapToGlobal(QPoint(rect().left() - subMenuOffset - menuSize.width(), actionRect.top()))); + const QPoint rightPos(mapToGlobal(QPoint(actionRect.right() + subMenuOffset + 1, actionRect.top()))); + const QPoint leftPos(mapToGlobal(QPoint(actionRect.left() - subMenuOffset - menuSize.width(), actionRect.top()))); QPoint pos(rightPos); QMenu *caused = qobject_cast(d->activeMenu->d_func()->causedPopup.widget); diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 4d4a233..af94bc4 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -92,6 +92,7 @@ private slots: void activeSubMenuPosition(); void task242454_sizeHint(); void task176201_clear(); + void task250673_activeMutliColumnSubMenuPosition(); protected slots: void onActivated(QAction*); void onHighlighted(QAction*); @@ -678,6 +679,39 @@ void tst_QMenu::task176201_clear() QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center()); } +void tst_QMenu::task250673_activeMutliColumnSubMenuPosition() +{ + class MyMenu : public QMenu + { + public: + friend class tst_QMenu; + }; + + QMenu sub; + sub.addAction("Sub-Item1"); + QAction *subAction = sub.addAction("Sub-Item2"); + + MyMenu main; + main.addAction("Item 1"); + QAction *menuAction = main.addMenu(&sub); + main.popup(QPoint(200,200)); + + uint i = 2; + while (main.columnCount() < 2) { + main.addAction(QString("Item %1").arg(i)); + ++i; + Q_ASSERT(i<1000); + } + main.setActiveAction(menuAction); + sub.setActiveAction(subAction); + QVERIFY(main.isVisible()); + QCOMPARE(main.activeAction(), menuAction); + QVERIFY(sub.isVisible()); + QVERIFY(sub.pos().x() > main.pos().x()); + + const int subMenuOffset = main.style()->pixelMetric(QStyle::PM_SubMenuOverlap, 0, &main); + QVERIFY((sub.geometry().left() - subMenuOffset + 5) < main.geometry().right()); +} QTEST_MAIN(tst_QMenu) #include "tst_qmenu.moc" -- cgit v0.12 From 377247af15599229aa30d1217f552bd1fe950c48 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 15 Apr 2009 11:58:54 +0200 Subject: BT: QAbstractSocket: fix check for closing state (typo) emit disconnected() if we were in ConnectedState or in ClosingState before Reviewed-by: Thiago Task-number: 250976 (cherry picked from commit 85db19b2eef0f7933fa28e8e5e1d365aab72458a) --- src/network/socket/qabstractsocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 9dbc054..3e665c9 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2279,7 +2279,7 @@ void QAbstractSocket::disconnectFromHostImplementation() emit delayedCloseFinished(); // compat signal #endif // only emit disconnected if we were connected before - if (previousState == ConnectedState || ClosingState) + if (previousState == ConnectedState || previousState == ClosingState) emit disconnected(); d->localPort = 0; -- cgit v0.12 From 4e7da9af8da61dd4e99ed847b326285d2e512636 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 15 Apr 2009 12:08:35 +0200 Subject: BT: Fix a crash on certain theme changes in GNOME We did not update initGtkWidgets on theme changes which could lead to crashes as the contents of the widget hash depend on certain properties in the style. A simple way to reproduce this would be to change between the redmond gtk theme and cleanlooks. Task-number: 251115 Reviewed-by: paul (cherry picked from commit a55f477b2a40b89e690fe6b61509cf665e96243b) --- src/gui/styles/gtksymbols.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index 4210aaa..023dfbb 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -549,6 +549,7 @@ void QGtkStyleUpdateScheduler::updateTheme() QPalette newPalette = qApp->style()->standardPalette(); QApplicationPrivate::setSystemPalette(newPalette); QApplication::setPalette(newPalette); + QGtk::initGtkWidgets(); QGtk::applyCustomPaletteHash(); QList widgets = QApplication::allWidgets(); // Notify all widgets that size metrics might have changed -- cgit v0.12 From 5fed02a83a722ffa8c4ca2a50e4635ea8cc6e392 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 15 Apr 2009 12:11:39 +0200 Subject: BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear. The NSOpenGLContext seems to be tied to the window. So if the view changes from one window to another, the OpenGL context needs to be cleared. We can do this by hooking into the viewWillChangeWindow and viewDidChangeWindow events and clear and reset the drawable respectively. We also found out that QCocoaOpenGLView was not being used at all, so just remove it to get rid of any confusion. Task-number: 250066 Reviewed-by: Trond (cherry picked from commit b4234ab3f4dbd8c7017d749888b2d8effd3c5983) --- src/corelib/kernel/qcoreevent.h | 1 + src/gui/kernel/qcocoaview_mac.mm | 21 +++++++++++++++++++++ src/opengl/qgl.cpp | 4 ++++ src/opengl/qgl_mac.mm | 28 +++++----------------------- src/opengl/qgl_p.h | 1 + 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index f0ee4b3..8fe4ef4 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -264,6 +264,7 @@ public: GrabKeyboard = 188, UngrabKeyboard = 189, CocoaRequestModal = 190, // Internal for requesting an application modal Cocoa Window + MacGLClearDrawable = 191, // Internal Cocoa, the window has changed, so we must clear // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 7c235c5..722e3e2 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -915,6 +915,27 @@ extern "C" { } } +- (void)viewWillMoveToWindow:(NSWindow *)window +{ + if (qwidget->windowFlags() & Qt::MSWindowsOwnDC + && (window != [self window])) { // OpenGL Widget + // Create a stupid ClearDrawable Event + QEvent event(QEvent::MacGLClearDrawable); + qApp->sendEvent(qwidget, &event); + } +} + +- (void)viewDidMoveToWindow +{ + if (qwidget->windowFlags() & Qt::MSWindowsOwnDC && [self window]) { + // call update paint event + qwidgetprivate->needWindowChange = true; + QEvent event(QEvent::MacGLWindowChange); + qApp->sendEvent(qwidget, &event); + } +} + + // NSTextInput Protocol implementation - (void) insertText:(id)aString diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index edd5c45..76ac8da 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3234,6 +3234,10 @@ bool QGLWidget::event(QEvent *e) update(); } return true; +# if defined(QT_MAC_USE_COCOA) + } else if (e->type() == QEvent::MacGLClearDrawable) { + d->glcx->d_ptr->clearDrawable(); +# endif } #endif diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index 3c0134a..cc7d9a7 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -87,29 +87,6 @@ QT_FORWARD_DECLARE_CLASS(QWidget) QT_FORWARD_DECLARE_CLASS(QWidgetPrivate) QT_FORWARD_DECLARE_CLASS(QGLWidgetPrivate) -@interface QT_MANGLE_NAMESPACE(QCocoaOpenGLView) : QT_MANGLE_NAMESPACE(QCocoaView) -{ -} -- (id)initWithQWidget:(QWidget *)widget widgetPrivate:(QWidgetPrivate *)widgetprivate; -@end - -@implementation QT_MANGLE_NAMESPACE(QCocoaOpenGLView) -- (id)initWithQWidget:(QWidget *)widget widgetPrivate:(QWidgetPrivate *)widgetprivate -{ - self = [super initWithQWidget:widget widgetPrivate:widgetprivate]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(_surfaceNeedsUpdate:) - name:NSViewGlobalFrameDidChangeNotification - object:self]; - return self; -} - -- (void) _surfaceNeedsUpdate:(NSNotification*)notification -{ - Q_UNUSED(notification); - static_cast(qwidgetprivate)->glcx->updatePaintDevice(); -} -@end QT_BEGIN_NAMESPACE void *qt_current_nsopengl_context() @@ -435,6 +412,11 @@ void *QGLContextPrivate::tryFormat(const QGLFormat &format) #endif } +void QGLContextPrivate::clearDrawable() +{ + [static_cast(cx) clearDrawable]; +} + /*! \bold{Mac OS X only:} This virtual function tries to find a visual that matches the format, reducing the demands if the original request diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 049d846..20a59311 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -234,6 +234,7 @@ public: #if defined(Q_WS_MAC) bool update; void *tryFormat(const QGLFormat &format); + void clearDrawable(); #endif QGLFormat glFormat; QGLFormat reqFormat; -- cgit v0.12 From f56623c144d8a00203b0ebd37aeebf3aaad92f11 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 15 Apr 2009 12:27:05 +0200 Subject: Added remark about XML input Stated a remark about the need to use well-formed XML as input to the example. Rev-by: Geir Vattekar (cherry picked from commit e0706ca2fbce063c263bad9a1eee24f057f170bd) --- doc/src/examples/qxmlstreambookmarks.qdoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc index 55fb7b7..4bdc3b5 100644 --- a/doc/src/examples/qxmlstreambookmarks.qdoc +++ b/doc/src/examples/qxmlstreambookmarks.qdoc @@ -103,8 +103,11 @@ The \c read() function accepts a QIODevice and sets it using \l{QXmlStreamReader::setDevice()}{setDevice()}. The actual process - of reading only takes place in event the file is a valid XBEL 1.0 - file. Otherwise, the \l{QXmlStreamReader::raiseError()} + of reading only takes place if the file is a valid XBEL 1.0 file. + Note that the XML input needs to be well-formed to be accepted by + QXmlStreamReader. + + Otherwise, the \l{QXmlStreamReader::raiseError()} {raiseError()} function is used to display an error message. \snippet examples/xml/streambookmarks/xbelreader.cpp 1 -- cgit v0.12 From eb09ad608caad17a8da400dea908f5560925dcea Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 15 Apr 2009 11:59:56 +0200 Subject: BT: OpenGL ES 2.0 now compiles properly for Windows CE glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey (cherry picked from commit 9f6146dd3a7c111923e79c490c9504f39b205f0b) --- src/opengl/opengl.pro | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 48d7caf..78aaddb 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -25,18 +25,16 @@ HEADERS += qgl.h \ qglcolormap.h \ qglpixelbuffer.h \ qglframebufferobject.h \ - qglpixmapfilter_p.h SOURCES += qgl.cpp \ qglcolormap.cpp \ qglpixelbuffer.cpp \ qglframebufferobject.cpp \ qglextensions.cpp \ - qglpixmapfilter.cpp !contains(QT_CONFIG, opengles2) { - HEADERS += qpaintengine_opengl_p.h - SOURCES += qpaintengine_opengl.cpp + HEADERS += qpaintengine_opengl_p.h qglpixmapfilter_p.h + SOURCES += qpaintengine_opengl.cpp qglpixmapfilter.cpp } contains(QT_CONFIG, opengles2) { @@ -130,6 +128,10 @@ wince*: { contains(QT_CONFIG,opengles1cl) { QMAKE_LIBS += "libGLES_CL.lib" } + contains(QT_CONFIG,opengles2) { + QMAKE_LIBS += "libGLESv2.lib" + } + } else { QMAKE_LIBS += $$QMAKE_LIBS_OPENGL } -- cgit v0.12 From 15f574942a1cfe907d86889fdf78fd76dde93919 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 15 Apr 2009 12:37:32 +0200 Subject: Correcting paragraph Made a mistake when pushing e0706ca2fbce063c263bad9a1eee24f057f170bd I Corrected this. Task-number: 250254 Rev-by: Frans Englich Rev-by: Geir Vattekar (cherry picked from commit 809b192f245f24e3e17655e4f5f335bee4bcad79) --- doc/src/examples/qxmlstreambookmarks.qdoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/src/examples/qxmlstreambookmarks.qdoc b/doc/src/examples/qxmlstreambookmarks.qdoc index 4bdc3b5..76d3029 100644 --- a/doc/src/examples/qxmlstreambookmarks.qdoc +++ b/doc/src/examples/qxmlstreambookmarks.qdoc @@ -105,9 +105,7 @@ \l{QXmlStreamReader::setDevice()}{setDevice()}. The actual process of reading only takes place if the file is a valid XBEL 1.0 file. Note that the XML input needs to be well-formed to be accepted by - QXmlStreamReader. - - Otherwise, the \l{QXmlStreamReader::raiseError()} + QXmlStreamReader. Otherwise, the \l{QXmlStreamReader::raiseError()} {raiseError()} function is used to display an error message. \snippet examples/xml/streambookmarks/xbelreader.cpp 1 -- cgit v0.12 From a0d1f211f11ecd3d2e3cdda33d87a69f2d09f524 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 15 Apr 2009 12:45:09 +0200 Subject: My ChangeLog. Reviewed-by: Trust Me (cherry picked from commit 8fc0d4ed0d306e131276ce6e4dd236ca42582d9a) --- dist/changes-4.5.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index e8595ff..68edc78 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -25,6 +25,9 @@ General Improvements - Documentation and Examples +- Embedded Dialogs demo + * [246517] Fixed warnings and bugs in hover handling on Mac OS X + Third party components ---------------------- @@ -69,7 +72,12 @@ Third party components - QGraphicsItem * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden - * [250272] When an item is deleted it does not get removed from the sceneeventfilters meaning a crash can occur + * [250272] When an item is deleted it does not get removed from the + sceneeventfilters meaning a crash can occur + * Fixed slowdown regression in QGraphicsItem::ItemCoordinateCache + +- QGraphicsScene + * [243707] Fixed crash when adding child before parent to scene -QGraphicsView * [245766] Rubber Band drag mode not updated correctly when scrolling -- cgit v0.12 From 6bd49c80ee06fc6217c8e4779389be597c71741a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 15 Apr 2009 11:01:24 +0200 Subject: My changes for 4.5.1 BT: yes (cherry picked from commit 61abefeb649fdbc4653bd69415431cabd640e4ce) --- dist/changes-4.5.1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 68edc78..bbf0bf1 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -49,6 +49,9 @@ Third party components - QAuthenticator * [237979] fix implemenation of md5-sess +- QByteArray + * [246233] QByteArray::fromHex() fails with input of size 1 + - QColorDialog * [247349] Fixed bug causing the wrong alpha value to be returned. @@ -62,6 +65,10 @@ Third party components - QDirIterator * [247645] Fix a bug that may loose all cached data inside the QFileInfo +- QFile + * [244500] QFile::rename() doesn't always return false when the method fails + * [244485] Renaming a file does not change QFile::fileName() + - QFileInfo * [205244] return valid file info also for relative UNC paths @@ -301,6 +308,7 @@ Qt for Windows CE - moc + * [240368] moc parsing issue with "unsigned" subphrase - uic * [244998] Fixed include file generation for phonon widgets. @@ -314,6 +322,8 @@ Qt for Windows CE - qmake * [248806] Ensure that the Xcode generator includes the right path to frameworks. + * [201495] Comment processing in qmake prevented file from being moc'ed + * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA - configure -- cgit v0.12 From 6ff69411bf81267f613ff7bcbace6fa049283415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 15 Apr 2009 10:12:34 +0200 Subject: Don't crash or loop infinitely when we retrieving the accessible accel. qt_accHotKey() was pretty buggy; it could both crash or spin forever in some cases. Task-number: 221731 Reviewed-by: alexis (cherry picked from commit b33ebce3de3efd98a45c8ca0a349f78aac09c875) --- src/gui/accessible/qaccessiblewidget.cpp | 13 ++++-- tests/auto/qaccessibility/tst_qaccessibility.cpp | 52 +++++++++++++++++++++--- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp index 5bb587b..eb6d07d 100644 --- a/src/gui/accessible/qaccessiblewidget.cpp +++ b/src/gui/accessible/qaccessiblewidget.cpp @@ -131,9 +131,16 @@ QString Q_GUI_EXPORT qt_accHotKey(const QString &text) int fa = 0; QChar ac; while ((fa = text.indexOf(QLatin1Char('&'), fa)) != -1) { - if (fa == text.length() - 1 || text.at(fa+1) != QLatin1Char('&')) { - ac = text.at(fa+1); - break; + ++fa; + if (fa < text.length()) { + // ignore "&&" + if (text.at(fa) == QLatin1Char('&')) { + ++fa; + continue; + } else { + ac = text.at(fa); + break; + } } } if (ac.isNull()) diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index a1a57f2..e8ef7f0 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -275,6 +275,7 @@ private slots: void accessibleName(); void treeWidgetTest(); void labelTest(); + void accelerators(); private: QWidget *createGUI(); @@ -2592,8 +2593,8 @@ void tst_QAccessibility::menuTest() QTestAccessibility::clearEvents(); mw.hide(); - - + + // Do not crash if the menu don't have a parent QMenu *menu = new QMenu; menu->addAction(QLatin1String("one")); @@ -2607,7 +2608,7 @@ void tst_QAccessibility::menuTest() delete iface2; delete iface; delete menu; - + } QTestAccessibility::clearEvents(); #else @@ -3988,13 +3989,13 @@ void tst_QAccessibility::treeWidgetTest() QCOMPARE(entry, 0); QCOMPARE(accTreeItem2->text(QAccessible::Name, 0), QLatin1String("row: 1")); - - // test selected/focused state + + // test selected/focused state QItemSelectionModel *selModel = tree->selectionModel(); QVERIFY(selModel); selModel->select(QItemSelection(tree->model()->index(0, 0), tree->model()->index(3, 0)), QItemSelectionModel::Select); selModel->setCurrentIndex(tree->model()->index(1, 0), QItemSelectionModel::Current); - + for (int i = 1; i < 10 ; ++i) { QAccessible::State expected; if (i <= 5 && i >= 2) @@ -4046,6 +4047,45 @@ void tst_QAccessibility::labelTest() #endif } +void tst_QAccessibility::accelerators() +{ +#ifdef QTEST_ACCESSIBILITY + QWidget *window = new QWidget; + QHBoxLayout *lay = new QHBoxLayout(window); + QLabel *label = new QLabel(tr("&Line edit"), window); + QLineEdit *le = new QLineEdit(window); + lay->addWidget(label); + lay->addWidget(le); + label->setBuddy(le); + + window->show(); + + QAccessibleInterface *accLineEdit = QAccessible::queryAccessibleInterface(le); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("L"))); + label->setText(tr("Q &")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + label->setText(tr("Q &&")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + label->setText(tr("Q && A")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + label->setText(tr("Q &&&A")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("A"))); + label->setText(tr("Q &&A")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + label->setText(tr("Q &A&B")); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("A"))); + +#if defined(Q_WS_X11) + qt_x11_wait_for_window_manager(window); +#endif + QTest::qWait(100); + delete window; + QTestAccessibility::clearEvents(); +#else + QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); +#endif +} + QTEST_MAIN(tst_QAccessibility) -- cgit v0.12 From 7595377387345efb0a6fd7274f73718891cdb92e Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Wed, 15 Apr 2009 16:29:51 +0200 Subject: Adding the KNOWN.ISSUES file for 4.5.1, pre doc review. --- KNOWN.ISSUES | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 KNOWN.ISSUES diff --git a/KNOWN.ISSUES b/KNOWN.ISSUES new file mode 100644 index 0000000..035b1c1a --- /dev/null +++ b/KNOWN.ISSUES @@ -0,0 +1,15 @@ +This is a list of known issues for this release. If you +hit any of these issues or discover a new one, please use the following form +to report the problem: + +http://www.qtsoftware.com/developer/bugreport-form/ + +Some of these issues happen infrequently. We therefore need your +help in sending us information about how you reproduced the +issue. If you come across a crash, please include a stack trace in +your email. + +249881 - Mac OS X wrong architecture detection. + +On OSX when running configure with the -arch x86_64 flag, tests are built using the native compiler. This means that if the native compiler is 32 bits then the tests will be built on 32 bits. The problem comes when a library was compiled on 64 bits mode, configure will complain that the library was built for a different architecture. +As a workaround, use -continue to make configure disregard the error. -- cgit v0.12 From 79f71c5d085828d532cfa93e5db1a645db32c502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 15 Apr 2009 13:25:22 +0200 Subject: My changes (cherry picked from commit 869c85e2f965a226416f0a142572ff749b30ba9e) --- dist/changes-4.5.1 | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index bbf0bf1..8d90ac9 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -46,6 +46,11 @@ Third party components - QAbstractSocket * [192037] Emit disconnected only if we were connected before +- QAccessible + * [241161] Fixed bug in browsing menus with the keyboard. + * [221731] Fixed bug where the accessibility plugin could crash if there + was an "&" at the end or spin forever if a label had a sequence of "&&". + - QAuthenticator * [237979] fix implemenation of md5-sess @@ -83,12 +88,20 @@ Third party components sceneeventfilters meaning a crash can occur * Fixed slowdown regression in QGraphicsItem::ItemCoordinateCache +- QGraphicsGridLayout + * [242472] Fix a bug where the calculation of the maximum width of a column + was not calculated correctly. + - QGraphicsScene * [243707] Fixed crash when adding child before parent to scene -QGraphicsView * [245766] Rubber Band drag mode not updated correctly when scrolling +- QGraphicsWidget + * [246215] Fixed a regression where we could cache the wrong size hint + because we called the virtual sizeHint() from the constructor. + - QHttp * [208445] cancel request upon receiving unknown authentication method @@ -142,7 +155,7 @@ Third party components * Fixed crash that may occurs when event are processed just after QSortFilterProxyModel has been invalidated * [246025] Fixed auto-expand that occurs while quicly collapsing an item after clicking on a child - * [248805] Calling programatically QTreeView::sortByColumn was not working if manual + * [248805] Calling programatically QTreeView::sortByColumn was not working if manual sorting is disabled * [248163] Fixed possible crash in the paintEvent when spans are used. @@ -184,13 +197,13 @@ Qt for Linux/X11 CD playback. - QGtkStyle - * The system palette is no longer strictly forced. Also behavior related + * The system palette is no longer strictly forced. Also behavior related to system theme changes have been improved. * [249363] QFrame is now styled as a GtkScrolledWindow. * [247653] Fixed a compilation issue on solaris. - * Fixed palette and styling issues with the background color of + * Fixed palette and styling issues with the background color of combo box popups. - * [239829] Disabled alt-key navigation for QGtkStyle to follow + * [239829] Disabled alt-key navigation for QGtkStyle to follow GTK+ behavior. * [238196] Allow middle click to set scrollbar position to follow GTK+ behavior. @@ -250,8 +263,8 @@ Qt for Mac OS X - Fix a crash when showing a widget that is window modal but has no parent. - [248803] Showing two dialogs at the same time don't get shared activation. -- Added QSysInfo::MV_10_6 as an enum to test against. -- Various compile fixes for Snow Leopard (preliminary support). +- Added QSysInfo::MV_10_6 as an enum to test against. +- Various compile fixes for Snow Leopard (preliminary support). - The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. -- cgit v0.12 From cd21a97b85f9dfea2589961de1ca24f77b3a1dd9 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 15 Apr 2009 13:14:31 +0200 Subject: BT: Namespace compile fixes for Cocoa. It worked in 4.5.0, so it should work in 4.5.1 too. (cherry picked from commit d7e8586e6ab009a6da1eb63aa6798d7c6a34c30d) --- src/gui/kernel/qcocoapanel_mac.mm | 8 +++++--- src/gui/kernel/qcocoawindow_mac.mm | 7 ++++--- src/gui/widgets/qcocoamenu_mac.mm | 6 ++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm index 9a7237d..ad0d8f6 100644 --- a/src/gui/kernel/qcocoapanel_mac.mm +++ b/src/gui/kernel/qcocoapanel_mac.mm @@ -49,8 +49,10 @@ #include +QT_FORWARD_DECLARE_CLASS(QWidget); +QT_BEGIN_NAMESPACE extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm - +QT_END_NAMESPACE QT_USE_NAMESPACE @implementation QT_MANGLE_NAMESPACE(QCocoaPanel) @@ -108,7 +110,7 @@ QT_USE_NAMESPACE [self retain]; QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; - QCocoaView *view = static_cast(qt_mac_nativeview_for(widget)); + QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast(qt_mac_nativeview_for(widget)); Qt::MouseButton mouseButton = cocoaButton2QtButton([event buttonNumber]); // sometimes need to redirect mouse events to the popup. @@ -172,7 +174,7 @@ QT_USE_NAMESPACE + (Class)frameViewClassForStyleMask:(NSUInteger)styleMask { if (styleMask & QtMacCustomizeWindow) - return [QCocoaWindowCustomThemeFrame class]; + return [QT_MANGLE_NAMESPACE(QCocoaWindowCustomThemeFrame) class]; return [super frameViewClassForStyleMask:styleMask]; } diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm index b5ee5a6..4158469 100644 --- a/src/gui/kernel/qcocoawindow_mac.mm +++ b/src/gui/kernel/qcocoawindow_mac.mm @@ -53,9 +53,10 @@ #include QT_FORWARD_DECLARE_CLASS(QWidget); -QT_USE_NAMESPACE - +QT_BEGIN_NAMESPACE extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm +QT_END_NAMESPACE +QT_USE_NAMESPACE @implementation NSWindow (QT_MANGLE_NAMESPACE(QWidgetIntegration)) @@ -130,7 +131,7 @@ extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview. [self retain]; QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; - QCocoaView *view = static_cast(qt_mac_nativeview_for(widget)); + QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast(qt_mac_nativeview_for(widget)); Qt::MouseButton mouseButton = cocoaButton2QtButton([event buttonNumber]); // sometimes need to redirect mouse events to the popup. diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index 8d3239e..147e591 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -55,11 +55,17 @@ QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QWidget) QT_FORWARD_DECLARE_CLASS(QApplication) +QT_FORWARD_DECLARE_CLASS(QCoreApplication) +QT_FORWARD_DECLARE_CLASS(QApplicationPrivate) +QT_FORWARD_DECLARE_CLASS(QKeyEvent) +QT_FORWARD_DECLARE_CLASS(QEvent) QT_BEGIN_NAMESPACE extern bool qt_sendSpontaneousEvent(QObject*, QEvent*); //qapplication.cpp QT_END_NAMESPACE +QT_USE_NAMESPACE + @implementation QT_MANGLE_NAMESPACE(QCocoaMenu) - (id)initWithQMenu:(QMenu*)menu -- cgit v0.12 From c076d7b1ef32f53ca871cc80e16c742dff9f3b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Wed, 15 Apr 2009 13:34:09 +0200 Subject: Reparenting QGLWidgets did sometimes caused warnings to be printed on Mac/Cocoa. Check if the view is visible before attaching it to a context. Task-number: related to 250066 Reviewed-by: Norwegian Rock Cat BT: yes (cherry picked from commit b646787cf0d67f4df00212f62a83432c641eae95) --- src/opengl/qgl_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index cc7d9a7..ad42efb 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -629,7 +629,7 @@ void QGLContext::updatePaintDevice() // ideally we would use QWidget::isVisible(), but we get "invalid drawable" errors if (![(NSWindow *)qt_mac_window_for(w) isVisible]) return; - if ([static_cast(d->cx) view] != view) + if ([static_cast(d->cx) view] != view && ![view isHidden]) [static_cast(d->cx) setView:view]; } else if (d->paintDevice->devType() == QInternal::Pixmap) { const QPixmap *pm = static_cast(d->paintDevice); -- cgit v0.12 From 5595bb2f99d5d6a3c8bb20d3f150915cddc560de Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 15 Apr 2009 13:49:57 +0200 Subject: BT: Updated configure for OpenGL ES 2.0 Windows CE (cherry picked from commit 4cb80de7ade662deb5542f77cd3a36517fa9cd9b) --- configure.exe | Bin 1134592 -> 860160 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 13ca0e5..ff71f08 100644 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12 From 4f32aaebc26709daf449b460f3be68592bd29d12 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 15 Apr 2009 14:14:27 +0200 Subject: Update the item if the text has changed but the boundingRect is the same. updateBoudingRect update the item only if the boundingRect change but if we have 123 as an initial text and then we set 321 as the new text, then nothing happen because the rect is the same. In case the boundingRect change then we call update 2 times but the item is already dirty so the second call will just return. BT:yes Reviewed-by: Andreas (cherry picked from commit 36b16a126e24cb8d8e5c34cfd807bc7c51ea49cf) --- src/gui/graphicsview/qgraphicsitem.cpp | 1 + tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 34 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 801ba99..de4332c 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -8489,6 +8489,7 @@ void QGraphicsSimpleTextItem::setText(const QString &text) return; d->text = text; d->updateBoundingRect(); + update(); } /*! diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 29b6cdd..ef84f50 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -222,6 +222,7 @@ private slots: // task specific tests below me void task141694_textItemEnsureVisible(); void task128696_textItemEnsureMovable(); + void ensureUpdateOnTextItem(); void task177918_lineItemUndetected(); void task240400_clickOnTextItem_data(); void task240400_clickOnTextItem(); @@ -5272,6 +5273,39 @@ void tst_QGraphicsItem::task240400_clickOnTextItem() QCOMPARE(item->textCursor().columnNumber(), 0); } +class TextItem : public QGraphicsSimpleTextItem +{ +public: + TextItem(const QString& text) : QGraphicsSimpleTextItem(text) + { + updates = 0; + } + + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) + { + updates++; + QGraphicsSimpleTextItem::paint(painter, option, widget); + } + + int updates; +}; + +void tst_QGraphicsItem::ensureUpdateOnTextItem() +{ + QGraphicsScene scene; + TextItem *text1 = new TextItem(QLatin1String("123")); + scene.addItem(text1); + QGraphicsView view(&scene); + view.show(); + QTest::qWait(250); + QCOMPARE(text1->updates,1); + + //same bouding rect but we have to update + text1->setText(QLatin1String("321")); + QTest::qWait(250); + QCOMPARE(text1->updates,2); +} + void tst_QGraphicsItem::task243707_addChildBeforeParent() { // Task reports that adding the child before the parent leads to an -- cgit v0.12 From 1ff9a2a4b9ce6d48fe468026a87795928e34c6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 15 Apr 2009 14:35:32 +0200 Subject: My 4.5.1 changes. (cherry picked from commit 4e9c2364e8e9580aa317e9387338d45207ac4baa) --- dist/changes-4.5.1 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 8d90ac9..4fb155a 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -67,6 +67,9 @@ Third party components * [250064] Fixed focus policy propagation regression. * [246056] Fixed assertion failure in setCompletionPrefix(). +- QtConcurrent + * [244718] Reduce the number of calls to QThread::idealThreadCount(). + - QDirIterator * [247645] Fix a bug that may loose all cached data inside the QFileInfo @@ -260,13 +263,24 @@ Qt for Mac OS X * Modify the colliding mice example to work better with coalesced updates. * Fixed a bug where the drag cursor was not updated when modifier keys are used. * [247947] Fixed a crash in drag and drop. + * The command + h shortcut is now enabled. (Hides the current window.) + +- QDesktopWidget + * [244004] Support multiple screens that have different sizes properly. + +- macdeployqt + * The binary packages now includes the macdeployqt tool. + * macdeployqt now runs 'strip' on the deployed binaries. + * Fixed issue preventing the QtSvg from being deployed. + +- configure script + * Now supports "-arch i386" as an alias for "-arch x86". + * Detects invalid arch arguemnts and exits. - Fix a crash when showing a widget that is window modal but has no parent. - [248803] Showing two dialogs at the same time don't get shared activation. - Added QSysInfo::MV_10_6 as an enum to test against. - Various compile fixes for Snow Leopard (preliminary support). - - - The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. - Document a bit clearer how qt_mac_set_dock_menu() works. -- cgit v0.12 From 64b58a408129f845b897a225d20ace31d0427e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 15 Apr 2009 14:03:49 +0200 Subject: Prevent crash in qt_scrollRectInImage. Clip both against the source and target device rectangles. Task-number: 247937 Reviewed-by: Trond BT: yes (cherry picked from commit 9da65ead69c92df717b1a63fe3c98c0cc73270f9) --- dist/changes-4.5.1 | 4 ++++ src/gui/painting/qwindowsurface.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 4fb155a..bda151f 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -162,6 +162,10 @@ Third party components sorting is disabled * [248163] Fixed possible crash in the paintEvent when spans are used. +- QWidget + * [250388] Fixed potential crash in QWidget::scroll() when using the raster + graphics system. + - QWizard * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp index 1adbcc5..7cb0dea2 100644 --- a/src/gui/painting/qwindowsurface.cpp +++ b/src/gui/painting/qwindowsurface.cpp @@ -310,10 +310,13 @@ void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset) int lineskip = img.bytesPerLine(); int depth = img.depth() >> 3; - - const QRect r = rect & QRect(0, 0, img.width(), img.height()); + const QRect imageRect(0, 0, img.width(), img.height()); + const QRect r = rect & imageRect & imageRect.translated(-offset); const QPoint p = rect.topLeft() + offset; + if (r.isEmpty()) + return; + const uchar *src; uchar *dest; -- cgit v0.12 From 793310766ff5db8739136847f4bc896999eae9e9 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Wed, 15 Apr 2009 14:26:59 +0200 Subject: Doc - clarified that on Windows, for 32-bit programs running in WOW64 mode, the settings are stored in HKEY_LOCAL_MACHINE\Software\WOW6432node. Task-number: 232011 Reviewed-by: Martin Petersson (cherry picked from commit bbad83a64373b7e01f6abee98d854380f03aa6b6) --- src/corelib/io/qsettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 876a251..4ae1c17 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2330,6 +2330,10 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, \o \c{HKEY_LOCAL_MACHINE\Software\MySoft} \endlist + \note On Windows, for 32-bit programs running in WOW64 mode, settings are + stored in the following registry path: + \c{HKEY_LOCAL_MACHINE\Software\WOW6432node}. + If the file format is IniFormat, the following files are used on Unix and Mac OS X: -- cgit v0.12 From 4282da271dab554c020f8b24e6679fea69d8e815 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 15 Apr 2009 15:15:25 +0200 Subject: Make the configured namespace part of QT_BUILD_KEY_COMPAT too. The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin() Task: 250185 Reviewed-by: dt BT: yes (cherry picked from commit cca58cff45ea248ab9c65fd8ce088433af1c0fe0) --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index ecdb92f..83d4078 100755 --- a/configure +++ b/configure @@ -6210,6 +6210,9 @@ QT_BUILD_KEY_COMPAT= if [ "$QT_CROSS_COMPILE" = "no" ]; then # previous versions of Qt used a build key built from the uname QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" + if [ -n "$QT_NAMESPACE" ]; then + QT_BUILD_KEY_COMPAT="$QT_BUILD_KEY_COMPAT $QT_NAMESPACE" + fi fi # strip out leading/trailing/extra whitespace QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` -- cgit v0.12 From 78d04fbe2cd9f4e38f859aa400f08b123433f041 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 15 Apr 2009 15:16:17 +0200 Subject: Update changelog with my changes (cherry picked from commit 0da501b644c0799d4e5e357b27847cb7a58583e4) --- dist/changes-4.5.1 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index bda151f..9a64352 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -51,6 +51,9 @@ Third party components * [221731] Fixed bug where the accessibility plugin could crash if there was an "&" at the end or spin forever if a label had a sequence of "&&". +- QAtomicInt + * [216492] Fix compilation on 64-bit PowerPC machines with gcc 4.3. + - QAuthenticator * [237979] fix implemenation of md5-sess @@ -108,6 +111,13 @@ Third party components - QHttp * [208445] cancel request upon receiving unknown authentication method +- QHostAddress + * [247330] Fix compilation on MinGW by adding a missing QPair include. + +- QLocalSocket + * Fix a bug that would cause QLocalSocket to disconnect 30 seconds + after a succesful delayed connection on UNIX. + - QMacStyle * [248769] Fix regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. * Adjust the opacity value for popups. @@ -115,6 +125,14 @@ Third party components - QMainWindow * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. +- QMetaType + * [248890] Detailed description of QMetaType no longer contradicts + documentation of QMetaType::type() + +- QMutex + * Fix performance regression for contended mutexes as reported on + the qt4-preview-feedback list. + - QPainter * [247492] Fix rendering bug in raster paint engine causing one-pixel offset when drawing premultiplied ARGB32 images on RGB16 images. @@ -131,6 +149,10 @@ Third party components * [249175] Fix QPixmap::fromImage() of monochrome images to result in black/white pixels and not transparent/white pixels. +- QProcess + * [247865] Fix a crash when calling QProcess::start() and + startDetached() with an empty program string. + - QScrollBar * [247985] Stylesheet: added ability to style scrollbar menus. @@ -154,6 +176,10 @@ Third party components * Fixed crash while styling the title bar of a QMdiArea. * [246542] Fixed QToolButton::hover{ color:.... } +- QThread + * [249997] Add documentation indicating that the priority set by + the programmer may be ignored, for example on Linux. + - QTreeView * Fixed crash that may occurs when event are processed just after QSortFilterProxyModel has been invalidated -- cgit v0.12 From 939d9a8f3daffbc2e812040731e4cfc4a88e055e Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 15 Apr 2009 16:14:09 +0200 Subject: Updated changes (cherry picked from commit 0da3eabece2d33e2f8cdf421bbd8e95787c170f7) --- dist/changes-4.5.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 9a64352..dd81f7c 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -168,6 +168,9 @@ Third party components * [245668] set also protocol, verifyMode and verifyDepth in setSslConfiguration() +- QString + * [249517] Fixed regression in replace(int, int, QChar) when string is empty + - QStyleSheetStyle * Improved support for setting background and foreground roles in styles such as the text color in a combo box popup on Mac and Cleanlooks, or -- cgit v0.12 From 6bb5d34b9452d87f9c537e08efcb620d3752b0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 15 Apr 2009 16:15:14 +0200 Subject: Fixed and improved the example code (cherry picked from commit a1a3dd96aef2b2edd7eb7c563fabee124cdbfe5a) --- examples/layouts/flowlayout/flowlayout.cpp | 63 ++++++++++++++++++++++++------ examples/layouts/flowlayout/flowlayout.h | 9 ++++- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/examples/layouts/flowlayout/flowlayout.cpp b/examples/layouts/flowlayout/flowlayout.cpp index 5464c7c..f628e94 100644 --- a/examples/layouts/flowlayout/flowlayout.cpp +++ b/examples/layouts/flowlayout/flowlayout.cpp @@ -43,16 +43,16 @@ #include "flowlayout.h" -FlowLayout::FlowLayout(QWidget *parent, int margin, int spacing) - : QLayout(parent) +FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing) + : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing) { setMargin(margin); - setSpacing(spacing); } -FlowLayout::FlowLayout(int spacing) +FlowLayout::FlowLayout(int margin, int hSpacing, int vSpacing) + : m_hSpace(hSpacing), m_vSpace(vSpacing) { - setSpacing(spacing); + setMargin(margin); } FlowLayout::~FlowLayout() @@ -67,6 +67,24 @@ void FlowLayout::addItem(QLayoutItem *item) itemList.append(item); } +int FlowLayout::horizontalSpacing() const +{ + if (m_hSpace >= 0) { + return m_hSpace; + } else { + return smartSpacing(QStyle::PM_LayoutHorizontalSpacing); + } +} + +int FlowLayout::verticalSpacing() const +{ + if (m_vSpace >= 0) { + return m_vSpace; + } else { + return smartSpacing(QStyle::PM_LayoutVerticalSpacing); + } +} + int FlowLayout::count() const { return itemList.size(); @@ -125,20 +143,27 @@ QSize FlowLayout::minimumSize() const int FlowLayout::doLayout(const QRect &rect, bool testOnly) const { - int x = rect.x(); - int y = rect.y(); + int left, top, right, bottom; + getContentsMargins(&left, &top, &right, &bottom); + QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom); + int x = effectiveRect.x(); + int y = effectiveRect.y(); int lineHeight = 0; QLayoutItem *item; foreach (item, itemList) { QWidget *wid = item->widget(); - int spaceX = spacing() + wid->style()->layoutSpacing( + int spaceX = horizontalSpacing(); + if (spaceX == -1) + spaceX = wid->style()->layoutSpacing( QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal); - int spaceY = spacing() + wid->style()->layoutSpacing( + int spaceY = verticalSpacing(); + if (spaceY == -1) + spaceY = wid->style()->layoutSpacing( QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical); int nextX = x + item->sizeHint().width() + spaceX; - if (nextX - spaceX > rect.right() && lineHeight > 0) { - x = rect.x(); + if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) { + x = effectiveRect.x(); y = y + lineHeight + spaceY; nextX = x + item->sizeHint().width() + spaceX; lineHeight = 0; @@ -150,5 +175,19 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const x = nextX; lineHeight = qMax(lineHeight, item->sizeHint().height()); } - return y + lineHeight - rect.y(); + return y + lineHeight - rect.y() + bottom; } + +int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const +{ + QObject *parent = this->parent(); + if (!parent) { + return -1; + } else if (parent->isWidgetType()) { + QWidget *pw = static_cast(parent); + return pw->style()->pixelMetric(pm, 0, pw); + } else { + return static_cast(parent)->spacing(); + } +} + diff --git a/examples/layouts/flowlayout/flowlayout.h b/examples/layouts/flowlayout/flowlayout.h index 24f4c4b..192501c 100644 --- a/examples/layouts/flowlayout/flowlayout.h +++ b/examples/layouts/flowlayout/flowlayout.h @@ -49,11 +49,13 @@ class FlowLayout : public QLayout { public: - FlowLayout(QWidget *parent, int margin = -1, int spacing = 0); - FlowLayout(int spacing = 0); + FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1); + FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1); ~FlowLayout(); void addItem(QLayoutItem *item); + int horizontalSpacing() const; + int verticalSpacing() const; Qt::Orientations expandingDirections() const; bool hasHeightForWidth() const; int heightForWidth(int) const; @@ -66,8 +68,11 @@ public: private: int doLayout(const QRect &rect, bool testOnly) const; + int smartSpacing(QStyle::PixelMetric pm) const; QList itemList; + int m_hSpace; + int m_vSpace; }; #endif -- cgit v0.12 From 6f7dfdc9a1c6f0b2bc090033f1c315e04dfd6611 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Tue, 14 Apr 2009 13:09:00 +0200 Subject: Changelog for 4.5.1 (cherry picked from commit c4846a0e62482abb28cdc973fb4823be3e71f4f7) --- dist/changes-4.5.1 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index dd81f7c..0b06315 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -195,6 +195,14 @@ Third party components * [250388] Fixed potential crash in QWidget::scroll() when using the raster graphics system. +- QWidget + * [246852] Better handling WindowMaximizeButtonHint for widget with + layouts. + +-QLocale + * String-to-number conversion functions are now ignore trailing and + leading whitespaces in all locales as it is documented. + - QWizard * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. @@ -222,6 +230,37 @@ Third party components Qt for Linux/X11 ---------------- + * Proper resetting input contexts when switching between multiple + input context plugins. + + * [244337] Improved input method handling when the widgets native + window id is recreated. + + * Input methods preedit strings are properly reset when user + switches focus without commiting a string. + + * [244607] Current focus widget is properly set and input method is + properly initialized when showing a toplevel that accepts + keyboard input. + + * Unicode conversion functions will handle Latin-1 character set + only if they are used before QCoreApplication/QApplication is + constructed. + + * Improved handling of failed unicode conversion. + + * [232632] Fixed reparenting widgets to a difference X11 screen. + + * [241888] The background of the drag-n-drop cursor is respected + according to the stylesheet. + + * Fixed clipboard handling when the user manually creates an + instance of the QDesktopWidget. + + * [226048] Fixed emitting a QDesktopWidget::resized() signal when + new screen appears or screen geometry is changed without + affecting the whole desktop geometry. + - Phonon/GStreamer * [244259] Fixed a problem where the backend would fail to indicate an error when streaming fails. @@ -263,6 +302,9 @@ Qt for Linux/X11 Qt for Windows -------------- + * [243583] Improved drag-and-drop handling when switching mouse + buttons fast. + - QCoreApplication * [247401] Fixed a bug that would cause a restarted timer to fire too early, causing Javascript in QtWebKit to consume 100% CPU on -- cgit v0.12 From 53297e17ee5cd602078d1fdcb51b6b326e46a4a5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 Apr 2009 15:26:16 +0200 Subject: add some comments (cherry picked from commit 4f66b3c550ca1c90c33952ad8603cc6c1a702280) --- tools/linguist/shared/ui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/linguist/shared/ui.cpp b/tools/linguist/shared/ui.cpp index 02a3539..d30f6e5 100644 --- a/tools/linguist/shared/ui.cpp +++ b/tools/linguist/shared/ui.cpp @@ -95,7 +95,7 @@ bool UiReader::startElement(const QString &namespaceURI, Q_UNUSED(namespaceURI); Q_UNUSED(localName); - if (qName == QLatin1String("item")) { + if (qName == QLatin1String("item")) { // UI3 menu entries flush(); if (!atts.value(QLatin1String("text")).isEmpty()) m_source = atts.value(QLatin1String("text")); @@ -123,15 +123,15 @@ bool UiReader::endElement(const QString &namespaceURI, m_accum.replace(QLatin1String("\r\n"), QLatin1String("\n")); - if (qName == QLatin1String("class")) { + if (qName == QLatin1String("class")) { // UI "header" if (m_context.isEmpty()) m_context = m_accum; } else if (qName == QLatin1String("string") && m_isTrString) { m_source = m_accum; - } else if (qName == QLatin1String("comment")) { + } else if (qName == QLatin1String("comment")) { // FIXME: what's that? m_comment = m_accum; flush(); - } else if (qName == QLatin1String("function")) { + } else if (qName == QLatin1String("function")) { // UI3 embedded code fetchtrInlinedCpp(m_accum, m_translator, m_context); } else { flush(); -- cgit v0.12 From 7c49be8d8053532bd4c42eff4536c18366f8208a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 14 Apr 2009 18:48:02 +0200 Subject: Fixes QSortFilterProxyModel not reporting child if the model need to fetchMore QSortFilterProxyModel::hasChildren need to construct the mapping. And when it tries to construct the mapping, it needs to fetch the childs, so there is none. Task-number: 250023 Reviewed-by: Marius Bugge Monsen (cherry picked from commit fd5f83e612729cebc5395c992bd98628bb9ea25f) --- src/gui/itemviews/qsortfilterproxymodel.cpp | 3 + .../tst_qsortfilterproxymodel.cpp | 87 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 7cef88f..e49f40a 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -274,6 +274,9 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping( Mapping *m = new Mapping; + if (model->canFetchMore(source_parent)) + model->fetchMore(source_parent); + int source_rows = model->rowCount(source_parent); for (int i = 0; i < source_rows; ++i) { if (q->filterAcceptsRow(i, source_parent)) diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index cf9b4aa..3a3d895 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -131,6 +131,7 @@ private slots: void task247867_insertRowsSort(); void task248868_staticSorting(); void task248868_dynamicSorting(); + void task250023_fetchMore(); protected: void buildHierarchy(const QStringList &data, QAbstractItemModel *model); @@ -2590,6 +2591,92 @@ void tst_QSortFilterProxyModel::task248868_dynamicSorting() } } +class QtTestModel: public QAbstractItemModel +{ + public: + QtTestModel(int _rows, int _cols, QObject *parent = 0): QAbstractItemModel(parent), + rows(_rows), cols(_cols), wrongIndex(false) { } + + bool canFetchMore(const QModelIndex &idx) const { + return !fetched.contains(idx); + } + + void fetchMore(const QModelIndex &idx) { + fetched.insert(idx); + } + + bool hasChildren(const QModelIndex & = QModelIndex()) const { + return true; + } + + int rowCount(const QModelIndex& parent = QModelIndex()) const { + return fetched.contains(parent) ? rows : 0; + } + int columnCount(const QModelIndex& parent = QModelIndex()) const { + return fetched.contains(parent) ? cols : 0; + } + + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const + { + if (row < 0 || column < 0 || column >= cols || row >= rows) { + return QModelIndex(); + } + QModelIndex i = createIndex(row, column, int(parent.internalId() + 1)); + parentHash[i] = parent; + return i; + } + + QModelIndex parent(const QModelIndex &index) const + { + if (!parentHash.contains(index)) + return QModelIndex(); + return parentHash[index]; + } + + QVariant data(const QModelIndex &idx, int role) const + { + if (!idx.isValid()) + return QVariant(); + + if (role == Qt::DisplayRole) { + if (idx.row() < 0 || idx.column() < 0 || idx.column() >= cols || idx.row() >= rows) { + wrongIndex = true; + qWarning("Invalid modelIndex [%d,%d,%p]", idx.row(), idx.column(), + idx.internalPointer()); + } + return QString("[%1,%2]").arg(idx.row()).arg(idx.column()); + } + return QVariant(); + } + + QSet fetched; + int rows, cols; + mutable bool wrongIndex; + mutable QMap parentHash; +}; + +void tst_QSortFilterProxyModel::task250023_fetchMore() +{ + QtTestModel model(10,10); + QSortFilterProxyModel proxy; + proxy.setSourceModel(&model); + QVERIFY(proxy.canFetchMore(QModelIndex())); + QVERIFY(proxy.hasChildren()); + while (proxy.canFetchMore(QModelIndex())) + proxy.fetchMore(QModelIndex()); + QCOMPARE(proxy.rowCount(), 10); + QCOMPARE(proxy.columnCount(), 10); + + QModelIndex idx = proxy.index(1,1); + QVERIFY(idx.isValid()); + QVERIFY(proxy.canFetchMore(idx)); + QVERIFY(proxy.hasChildren(idx)); + while (proxy.canFetchMore(idx)) + proxy.fetchMore(idx); + QCOMPARE(proxy.rowCount(idx), 10); + QCOMPARE(proxy.columnCount(idx), 10); +} + QTEST_MAIN(tst_QSortFilterProxyModel) #include "tst_qsortfilterproxymodel.moc" -- cgit v0.12 From 5174ef058693fb3c5420bd9ed555ebf0dfc758a2 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 16 Apr 2009 11:06:09 +1000 Subject: Remove obsolete pre-processor directives that check QT_VERSION. Reviewed-by: Kent Hansen --- .../debugging/qscriptbreakpointswidget.cpp | 8 -------- src/scripttools/debugging/qscriptcompletiontask.cpp | 8 -------- src/scripttools/debugging/qscriptdebugger.cpp | 6 ------ src/scripttools/debugging/qscriptdebuggeragent.cpp | 19 ------------------- src/scripttools/debugging/qscriptdebuggeragent_p.h | 3 --- src/scripttools/debugging/qscriptdebuggeragent_p_p.h | 6 ------ src/scripttools/debugging/qscriptdebuggerbackend.cpp | 2 -- .../debugging/qscriptdebuggercommandexecutor.cpp | 4 ---- .../debugging/qscriptdebuggerconsoleglobalobject.cpp | 5 ----- .../debugging/qscriptdebuggerlocalswidget.cpp | 8 -------- .../qscriptdebuggerscriptedconsolecommand.cpp | 18 ------------------ src/scripttools/debugging/qscriptedit.cpp | 10 ---------- src/scripttools/debugging/qscriptenginedebugger.h | 4 ---- 13 files changed, 101 deletions(-) diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp index aea1fe7..efb3047 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp +++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp @@ -225,7 +225,6 @@ public: bool eventFilter(QObject *editor, QEvent *event) { -#if QT_VERSION >= 0x040500 if (QLineEdit *le = qobject_cast(editor)) { if (event->type() == QEvent::KeyPress) { int key = static_cast(event)->key(); @@ -237,21 +236,18 @@ public: } } } -#endif return QStyledItemDelegate::eventFilter(editor, event); } void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { -#if QT_VERSION >= 0x040500 if (index.column() == 2) { // check that the syntax is OK QString condition = qobject_cast(editor)->text(); if (QScriptEngine::checkSyntax(condition).state() != QScriptSyntaxCheckResult::Valid) return; } -#endif QStyledItemDelegate::setModelData(editor, model, index); } @@ -261,11 +257,7 @@ private Q_SLOTS: QWidget *editor = qobject_cast(sender()); QPalette pal = editor->palette(); QColor col; -#if QT_VERSION >= 0x040500 bool ok = (QScriptEngine::checkSyntax(text).state() == QScriptSyntaxCheckResult::Valid); -#else - bool ok = true; -#endif if (ok) { col = Qt::white; } else { diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp index 3767505..119b96a 100644 --- a/src/scripttools/debugging/qscriptcompletiontask.cpp +++ b/src/scripttools/debugging/qscriptcompletiontask.cpp @@ -162,11 +162,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression() obj = ctx->thisObject(); } else { QScriptValueList scopeChain; -#if QT_VERSION >= 0x040500 scopeChain = ctx->scopeChain(); -#else - scopeChain.append(ctx->activationObject()); -#endif for (int i = 0; i < scopeChain.size(); ++i) { QScriptValue oo = scopeChain.at(i).property(topLevelIdent); if (oo.isObject()) { @@ -180,11 +176,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression() if (obj.isValid()) objects.append(obj); } else { -#if QT_VERSION >= 0x040500 objects << ctx->scopeChain(); -#else - objects.append(ctx->activationObject()); -#endif QStringList keywords; keywords.append(QString::fromLatin1("this")); keywords.append(QString::fromLatin1("true")); diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index 5a356ae..ce43572 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -663,11 +663,7 @@ QString QScriptDebuggerPrivate::toolTip(int frameIndex, int lineNumber, objects.append(ctx->thisObject()); ++pathIndex; } else { -#if QT_VERSION >= 0x040500 objects << ctx->scopeChain(); -#else - objects.append(ctx->activationObject()); -#endif } for (int i = 0; i < objects.size(); ++i) { QScriptValue val = objects.at(i); @@ -991,13 +987,11 @@ public: qint64 scriptId = m_added.at(m_index); m_debugger->scriptsModel->addScript(scriptId, data); -#if QT_VERSION >= 0x040500 // ### could be slow, might want to do this in a separate thread QString xml = qt_scriptToXml(data.contents(), data.baseLineNumber()); QScriptXmlParser::Result extraInfo = QScriptXmlParser::parse(xml); m_debugger->scriptsModel->addExtraScriptInfo( scriptId, extraInfo.functionsInfo, extraInfo.executableLineNumbers); -#endif if (++m_index < m_added.size()) frontend.scheduleGetScriptData(m_added.at(m_index)); diff --git a/src/scripttools/debugging/qscriptdebuggeragent.cpp b/src/scripttools/debugging/qscriptdebuggeragent.cpp index fcba033..0ea9c99 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent.cpp +++ b/src/scripttools/debugging/qscriptdebuggeragent.cpp @@ -88,16 +88,9 @@ QScriptDebuggerAgentPrivate *QScriptDebuggerAgentPrivate::get( */ QScriptDebuggerAgent::QScriptDebuggerAgent( QScriptDebuggerBackendPrivate *backend, QScriptEngine *engine) -#if QT_VERSION >= 0x040500 : QScriptEngineAgent(*new QScriptDebuggerAgentPrivate, engine) -#else - : QScriptEngineAgent(engine), d_ptr(new QScriptDebuggerAgentPrivate) -#endif { Q_D(QScriptDebuggerAgent); -#if QT_VERSION < 0x040500 - d_ptr->q_ptr = this; -#endif d->backend = backend; QScriptContext *ctx = engine->currentContext(); @@ -117,9 +110,6 @@ QScriptDebuggerAgent::~QScriptDebuggerAgent() Q_D(QScriptDebuggerAgent); if (d->backend) d->backend->agentDestroyed(this); -#if QT_VERSION < 0x040500 - delete d_ptr; -#endif } /*! @@ -712,12 +702,7 @@ void QScriptDebuggerAgent::exceptionCatch(qint64 scriptId, */ bool QScriptDebuggerAgent::supportsExtension(Extension extension) const { -#if QT_VERSION >= 0x040500 return (extension == DebuggerInvocationRequest); -#else - Q_UNUSED(extension); - return false; -#endif } /*! @@ -727,7 +712,6 @@ QVariant QScriptDebuggerAgent::extension(Extension extension, const QVariant &argument) { Q_UNUSED(extension); -#if QT_VERSION >= 0x040500 Q_D(QScriptDebuggerAgent); Q_ASSERT(extension == DebuggerInvocationRequest); QVariantList lst = argument.toList(); @@ -739,9 +723,6 @@ QVariant QScriptDebuggerAgent::extension(Extension extension, d->backend->debuggerInvocationRequest( scriptId, lineNumber, columnNumber); } -#else - Q_UNUSED(argument); -#endif return QVariant(); } diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h index 556b17b..28ec46a 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h @@ -125,9 +125,6 @@ public: const QVariant &argument = QVariant()); private: -#if QT_VERSION < 0x040500 - QScriptDebuggerAgentPrivate *d_ptr; -#endif Q_DECLARE_PRIVATE(QScriptDebuggerAgent) Q_DISABLE_COPY(QScriptDebuggerAgent) }; diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h index cf6fd1a..313b1c0 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p_p.h @@ -68,9 +68,7 @@ QT_BEGIN_NAMESPACE class QScriptDebuggerAgent; class QScriptDebuggerAgentPrivate -#if QT_VERSION >= 0x040500 : public QScriptEngineAgentPrivate -#endif { Q_DECLARE_PUBLIC(QScriptDebuggerAgent) public: @@ -125,10 +123,6 @@ public: int statementCounter; QScriptDebuggerBackendPrivate *backend; - -#if QT_VERSION < 0x040500 - QScriptDebuggerAgent *q_ptr; -#endif }; QT_END_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerbackend.cpp b/src/scripttools/debugging/qscriptdebuggerbackend.cpp index 24a3847..3c29130 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend.cpp +++ b/src/scripttools/debugging/qscriptdebuggerbackend.cpp @@ -615,13 +615,11 @@ void QScriptDebuggerBackend::doPendingEvaluate(bool postEvent) // push a new context and initialize its scope chain etc. { QScriptContext *evalContext = engine()->pushContext(); -#if QT_VERSION >= 0x040500 QScriptValueList scopeChain = ctx->scopeChain(); if (scopeChain.isEmpty()) scopeChain.append(engine()->globalObject()); while (!scopeChain.isEmpty()) evalContext->pushScope(scopeChain.takeLast()); -#endif evalContext->setActivationObject(ctx->activationObject()); evalContext->setThisObject(ctx->thisObject()); } diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index e36386d..1be8c5f 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -287,13 +287,9 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( QScriptContext *ctx = backend->context(command.contextIndex()); if (ctx) { QScriptDebuggerValueList dest; -#if QT_VERSION >= 0x040500 QScriptValueList src = ctx->scopeChain(); for (int i = 0; i < src.size(); ++i) dest.append(src.at(i)); -#else - dest.append(ctx->activationObject()); -#endif response.setResult(dest); } else { response.setError(QScriptDebuggerResponse::InvalidContextIndex); diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp index 0018b92..f923508 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp @@ -448,12 +448,7 @@ QStringList QScriptDebuggerConsoleGlobalObject::getCommandCompletions(const QStr bool QScriptDebuggerConsoleGlobalObject::checkSyntax(const QString &program) { -#if QT_VERSION >= 0x040500 return (QScriptEngine::checkSyntax(program).state() == QScriptSyntaxCheckResult::Valid); -#else - Q_UNUSED(program); - return true; -#endif } void QScriptDebuggerConsoleGlobalObject::setEvaluateAction(int action) diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index a4919be..60fe48d 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -206,11 +206,7 @@ private Q_SLOTS: QWidget *editor = qobject_cast(sender()); QPalette pal = editor->palette(); QColor col; -#if QT_VERSION >= 0x040500 bool ok = (QScriptEngine::checkSyntax(text).state() == QScriptSyntaxCheckResult::Valid); -#else - bool ok = true; -#endif if (ok) { col = Qt::white; } else { @@ -277,12 +273,10 @@ bool QScriptDebuggerLocalsItemDelegate::eventFilter(QObject *watched, QEvent *ev return QStyledItemDelegate::eventFilter(watched, event); QKeyEvent *ke = static_cast(event); if ((ke->key() == Qt::Key_Enter) || (ke->key() == Qt::Key_Return)) { -#if QT_VERSION >= 0x040500 if (QScriptEngine::checkSyntax(le->text()).state() != QScriptSyntaxCheckResult::Valid) { // ignore when script contains syntax error return true; } -#endif } if (ke->key() != Qt::Key_Tab) return QStyledItemDelegate::eventFilter(watched, event); @@ -296,14 +290,12 @@ void QScriptDebuggerLocalsItemDelegate::setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { -#if QT_VERSION >= 0x040500 if (index.column() == 1) { // check that the syntax is OK QString expression = qobject_cast(editor)->text(); if (QScriptEngine::checkSyntax(expression).state() != QScriptSyntaxCheckResult::Valid) return; } -#endif QStyledItemDelegate::setModelData(editor, model, index); } diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp index 20350f6..fa30d84 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp @@ -410,11 +410,7 @@ void QScriptDebuggerScriptedConsoleCommandJob::start() for (int i = 0; i < d->arguments.size(); ++i) args.append(QScriptValue(engine, d->arguments.at(i))); QScriptDebuggerConsoleGlobalObject *global; -#if QT_VERSION >= 0x040500 global = qobject_cast(engine->globalObject().toQObject()); -#else - global = qobject_cast(engine->globalObject().scope().toQObject()); -#endif Q_ASSERT(global != 0); global->setScheduler(this); global->setResponseHandler(this); @@ -444,11 +440,7 @@ void QScriptDebuggerScriptedConsoleCommandJob::handleResponse( args.append(qScriptValueFromValue(engine, response)); args.append(QScriptValue(engine, commandId)); QScriptDebuggerConsoleGlobalObject *global; -#if QT_VERSION >= 0x040500 global = qobject_cast(engine->globalObject().toQObject()); -#else - global = qobject_cast(engine->globalObject().scope().toQObject()); -#endif Q_ASSERT(global != 0); global->setScheduler(this); global->setResponseHandler(this); @@ -566,12 +558,7 @@ QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::pa QScriptDebuggerConsoleGlobalObject *cppGlobal = new QScriptDebuggerConsoleGlobalObject(); QScriptValue global = engine->newQObject(cppGlobal, QScriptEngine::ScriptOwnership, -#if QT_VERSION >= 0x040500 QScriptEngine::ExcludeSuperClassContents); -#else - QScriptEngine::ExcludeSuperClassMethods - | QScriptEngine::ExcludeSuperClassProperties); -#endif { QScriptValueIterator it(engine->globalObject()); while (it.hasNext()) { @@ -579,12 +566,7 @@ QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::pa global.setProperty(it.scriptName(), it.value(), it.flags()); } } -#if QT_VERSION >= 0x040500 engine->setGlobalObject(global); -#else - engine->globalObject().setScope(global); - global = engine->globalObject(); -#endif cppGlobal->setMessageHandler(messageHandler); QScriptValue ret = engine->evaluate(program, fileName); diff --git a/src/scripttools/debugging/qscriptedit.cpp b/src/scripttools/debugging/qscriptedit.cpp index 2bc0a40..7c2a72c 100644 --- a/src/scripttools/debugging/qscriptedit.cpp +++ b/src/scripttools/debugging/qscriptedit.cpp @@ -342,11 +342,9 @@ void QScriptEdit::extraAreaPaintEvent(QPaintEvent *e) icon.paint(&painter, r, Qt::AlignCenter); } -#if QT_VERSION >= 0x040500 if (!m_executableLineNumbers.contains(lineNumber)) painter.setPen(pal.color(QPalette::Mid)); else -#endif painter.setPen(QColor(Qt::darkCyan)); QString number = QString::number(lineNumber); painter.drawText(rect.x() + markWidth, (int)top, rect.x() + extraAreaWidth - markWidth - 4, @@ -370,10 +368,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) if (e->type() == QEvent::MouseMove && e->buttons() == 0) { // mouse tracking bool hand = (e->pos().x() <= markWidth); -#if QT_VERSION >= 0x040500 int lineNumber = cursor.blockNumber() + m_baseLineNumber; hand = hand && m_executableLineNumbers.contains(lineNumber); -#endif #ifndef QT_NO_CURSOR if (hand != (m_extraArea->cursor().shape() == Qt::PointingHandCursor)) m_extraArea->setCursor(hand ? Qt::PointingHandCursor : Qt::ArrowCursor); @@ -382,12 +378,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) if (e->type() == QEvent::MouseButtonPress) { if (e->button() == Qt::LeftButton) { -#if QT_VERSION >= 0x040500 int lineNumber = cursor.blockNumber() + m_baseLineNumber; bool executable = m_executableLineNumbers.contains(lineNumber); -#else - bool executable = true; -#endif if ((e->pos().x() <= markWidth) && executable) m_extraAreaToggleBlockNumber = cursor.blockNumber(); else @@ -402,10 +394,8 @@ void QScriptEdit::extraAreaMouseEvent(QMouseEvent *e) } } else if (e->button() == Qt::RightButton) { int lineNumber = cursor.blockNumber() + m_baseLineNumber; -#if QT_VERSION >= 0x040500 if (!m_executableLineNumbers.contains(lineNumber)) return; -#endif bool has = m_breakpoints.contains(lineNumber); QMenu *popup = new QMenu(); QAction *toggleAct = new QAction(QObject::tr("Toggle Breakpoint"), popup); diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index d5e127f..a4853f0 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -48,11 +48,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#if QT_VERSION >= 0x040500 QT_MODULE(ScriptTools) -#else -# define Q_SCRIPTTOOLS_EXPORT -#endif class QAction; class QScriptEngine; -- cgit v0.12 From b01d52de1f942755c59e22d50b84dd37ffc8e3fe Mon Sep 17 00:00:00 2001 From: Bill King Date: Thu, 16 Apr 2009 13:48:20 +1000 Subject: Add sql changes to 4.5.1 changelog --- dist/changes-4.5.1 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0b06315..8d306d9 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -218,10 +218,28 @@ Third party components * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. +- QSqlTableModel + * [189093] QSqlTableModel did not handle updates when one of the fields + had a NULL value. + * Made setTable() try and use the db's casing of the passed tablename. + **************************************************************************** * Database Drivers * **************************************************************************** + * Fixed DB2 driver returning double field as empty + * Fixed memory leak in DB2 driver + * [249059] Fixed QPSQL datetime/time fields with negative timezone offsets + not being handled correctly. + * Fixed DB2 not enquoting table/field names properly. + * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. + * Fixed sqlite2 driver not returning false on failing to exec a statement. + * PrecisionPolicy now works in the oracle driver. + * Fixed ODBC driver returning a list of tables when requested. + * Fixed Interbase retrieving scale/precision information on numeric/decimal fields. + * Stopped drivers doing quoting again when escapeIdentifier called twice. + * Fixed sqlite2 driver not quoting fields correctly. + * [232769] Fixed memory overflow issue on bound out strings in ODBC Driver **************************************************************************** * Platform Specific Changes * -- cgit v0.12 From 1ae4c7b989b04f89a5069d5a5db78c0d8914972b Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 16 Apr 2009 08:45:58 +0200 Subject: QX11Embed crashes on 64-bit Solaris The data passed to XChangeProperty should be long arrays, as this is what Xlib expects. Task-number: 244062 Reviewed-by: Rhys Weatherley --- src/gui/kernel/qx11embed_x11.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index e49c4d6..6329135 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -481,7 +481,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) | ExposureMask | StructureNotifyMask | SubstructureNotifyMask | PropertyChangeMask); - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*) data, 2); @@ -1571,7 +1571,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } @@ -1587,8 +1587,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; - + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } -- cgit v0.12 From 876d4b64acce6f9f786d5a59612d73688167ef64 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 16 Apr 2009 17:54:07 +1000 Subject: Remove obsolete pre-processor directives that check QT_VERSION. Reviewed-by: Trust Me ....though discussed with three devs. --- .../qtpropertybrowser/qtbuttonpropertybrowser.cpp | 4 ---- .../qtpropertybrowser/qtbuttonpropertybrowser.h | 4 ---- tools/shared/qtpropertybrowser/qteditorfactory.cpp | 4 ---- tools/shared/qtpropertybrowser/qteditorfactory.h | 4 ---- .../qtgroupboxpropertybrowser.cpp | 4 ---- .../qtpropertybrowser/qtgroupboxpropertybrowser.h | 4 ---- .../shared/qtpropertybrowser/qtpropertybrowser.cpp | 4 ---- tools/shared/qtpropertybrowser/qtpropertybrowser.h | 6 ----- .../qtpropertybrowser/qtpropertybrowserutils.cpp | 7 ------ .../qtpropertybrowser/qtpropertybrowserutils_p.h | 4 ---- .../shared/qtpropertybrowser/qtpropertymanager.cpp | 27 ---------------------- tools/shared/qtpropertybrowser/qtpropertymanager.h | 4 ---- .../qtpropertybrowser/qttreepropertybrowser.cpp | 4 ---- .../qtpropertybrowser/qttreepropertybrowser.h | 4 ---- .../shared/qtpropertybrowser/qtvariantproperty.cpp | 8 ------- tools/shared/qtpropertybrowser/qtvariantproperty.h | 4 ---- 16 files changed, 96 deletions(-) diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp index ecdaf16..09394e7 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp @@ -48,9 +48,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtButtonPropertyBrowserPrivate { @@ -626,8 +624,6 @@ bool QtButtonPropertyBrowser::isExpanded(QtBrowserItem *item) const return false; } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtbuttonpropertybrowser.cpp" diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h index 0833c2d..0238f5c 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h @@ -44,9 +44,7 @@ #include "qtpropertybrowser.h" -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtButtonPropertyBrowserPrivate; @@ -82,8 +80,6 @@ private: }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.cpp b/tools/shared/qtpropertybrowser/qteditorfactory.cpp index 3e9336f..a2e3917 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/tools/shared/qtpropertybrowser/qteditorfactory.cpp @@ -62,9 +62,7 @@ # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ #endif -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif // Set a hard coded left margin to account for the indentation // of the tree view icon when switching to an editor @@ -2583,9 +2581,7 @@ void QtFontEditorFactory::disconnectPropertyManager(QtFontPropertyManager *manag disconnect(manager, SIGNAL(valueChanged(QtProperty*,QFont)), this, SLOT(slotPropertyChanged(QtProperty*,QFont))); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qteditorfactory.cpp" #include "qteditorfactory.moc" diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h index 044dd5e..d86f9f6 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.h +++ b/tools/shared/qtpropertybrowser/qteditorfactory.h @@ -44,9 +44,7 @@ #include "qtpropertymanager.h" -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtSpinBoxFactoryPrivate; @@ -394,8 +392,6 @@ private: Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp index d7c8f0b..9ac9744 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp @@ -47,9 +47,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtGroupBoxPropertyBrowserPrivate { @@ -528,8 +526,6 @@ void QtGroupBoxPropertyBrowser::itemChanged(QtBrowserItem *item) d_ptr->propertyChanged(item); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtgroupboxpropertybrowser.cpp" diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h index 29422bd..6d1b2b1 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h @@ -44,9 +44,7 @@ #include "qtpropertybrowser.h" -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtGroupBoxPropertyBrowserPrivate; @@ -73,8 +71,6 @@ private: }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp index 7254245..cca082d 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -48,9 +48,7 @@ # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ #endif -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtPropertyPrivate { @@ -1958,8 +1956,6 @@ void QtAbstractPropertyBrowser::setCurrentItem(QtBrowserItem *item) emit currentItemChanged(item); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtpropertybrowser.cpp" diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h index 649a9e3..20ffb81 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h @@ -45,11 +45,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif - - class QtAbstractPropertyManager; class QtPropertyPrivate; @@ -308,8 +304,6 @@ private: }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif // QTPROPERTYBROWSER_H diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp index d689e60..94b0285 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp @@ -48,9 +48,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif QtCursorDatabase::QtCursorDatabase() { @@ -426,9 +424,4 @@ bool QtKeySequenceEdit::event(QEvent *e) return QWidget::event(e); } - - - -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h index 2eab3c8..fe8c6d1 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h @@ -58,9 +58,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QMouseEvent; class QCheckBox; @@ -154,8 +152,6 @@ private: QLineEdit *m_lineEdit; }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp index 8b84eb9..47b8c9b 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -61,9 +61,7 @@ # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ #endif -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif template static void setSimpleMinimumData(PrivateData *data, const Value &minVal) @@ -421,23 +419,6 @@ private: QMetaEnum m_policyEnum; }; -#if QT_VERSION < 0x040300 - -static QList countriesForLanguage(QLocale::Language language) -{ - QList countries; - QLocale::Country country = QLocale::AnyCountry; - while (country <= QLocale::LastCountry) { - QLocale locale(language, country); - if (locale.language() == language && !countries.contains(locale.country())) - countries << locale.country(); - country = (QLocale::Country)((uint)country + 1); // ++country - } - return countries; -} - -#endif - static QList sortCountries(const QList &countries) { QMultiMap nameToCountry; @@ -469,11 +450,7 @@ void QtMetaEnumProvider::initLocale() while (itLang.hasNext()) { QLocale::Language language = itLang.next(); QList countries; -#if QT_VERSION < 0x040300 - countries = countriesForLanguage(language); -#else countries = QLocale::countriesForLanguage(language); -#endif if (countries.isEmpty() && language == system.language()) countries << system.country(); @@ -5789,9 +5766,7 @@ QtFontPropertyManager::QtFontPropertyManager(QObject *parent) { d_ptr = new QtFontPropertyManagerPrivate; d_ptr->q_ptr = this; -#if QT_VERSION >= 0x040500 QObject::connect(qApp, SIGNAL(fontDatabaseChanged()), this, SLOT(slotFontDatabaseChanged())); -#endif d_ptr->m_intPropertyManager = new QtIntPropertyManager(this); connect(d_ptr->m_intPropertyManager, SIGNAL(valueChanged(QtProperty *, int)), @@ -6485,9 +6460,7 @@ void QtCursorPropertyManager::uninitializeProperty(QtProperty *property) d_ptr->m_values.remove(property); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtpropertymanager.cpp" #include "qtpropertymanager.moc" diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h index 90fe5c0..2fb69bf 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.h +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h @@ -44,9 +44,7 @@ #include "qtpropertybrowser.h" -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QDate; class QTime; @@ -743,8 +741,6 @@ private: Q_DISABLE_COPY(QtCursorPropertyManager) }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp index ed262e5..1ad3f6b 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -52,9 +52,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtPropertyEditorView; @@ -1040,9 +1038,7 @@ void QtTreePropertyBrowser::editItem(QtBrowserItem *item) d_ptr->editItem(item); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qttreepropertybrowser.cpp" #include "qttreepropertybrowser.moc" diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h index 63bd7f6..813e050 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h @@ -44,9 +44,7 @@ #include "qtpropertybrowser.h" -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QTreeWidgetItem; class QtTreePropertyBrowserPrivate; @@ -131,8 +129,6 @@ private: }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #endif diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp index 7e1975e..f712ba6 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -51,9 +51,7 @@ # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ #endif -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif class QtEnumPropertyType { @@ -69,17 +67,13 @@ class QtGroupPropertyType { }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif Q_DECLARE_METATYPE(QtEnumPropertyType) Q_DECLARE_METATYPE(QtFlagPropertyType) Q_DECLARE_METATYPE(QtGroupPropertyType) -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif /*! Returns the type id for an enum property. @@ -2275,8 +2269,6 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager d_ptr->m_checkBoxFactory->removePropertyManager(itFlag.next()->subBoolPropertyManager()); } -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif #include "moc_qtvariantproperty.cpp" diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h index 91397d8..9253809 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.h +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h @@ -46,9 +46,7 @@ #include #include -#if QT_VERSION >= 0x040400 QT_BEGIN_NAMESPACE -#endif typedef QMap QtIconMap; @@ -172,9 +170,7 @@ private: Q_DISABLE_COPY(QtVariantEditorFactory) }; -#if QT_VERSION >= 0x040400 QT_END_NAMESPACE -#endif Q_DECLARE_METATYPE(QIcon) Q_DECLARE_METATYPE(QtIconMap) -- cgit v0.12 From a4c4f994fa51ff216f0d43098824617e14b8a284 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Thu, 16 Apr 2009 09:52:15 +0200 Subject: QFileDialog: When passing an invalid path in static functions the native dialog don't appear on Windows. The problem is with the directory that you can specify when calling the static functions. It can include a file in that path which means that the file will be selected by default when the dialog appears. But if you give an invalid file as a selection to the Windows API, then it simply don't display the dialog. The patch is basically checking the dir we get when we are called. workingDirectory tested it already and fallback to the current directory if the argument is invalid. I just check now if workingDirectory changed the path (that means the parameter value was incorrect) and select nothing in that case. Using this trick avoid stating again the complete path to check if the selection exist. (i.e. path() on QFileInfo don't call stat()). Task-number: 250120 Reviewed-by: jan-arve Reviewed-by: jasplin --- src/gui/dialogs/qfiledialog.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index b20321f..f70669c 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1593,7 +1593,12 @@ QString QFileDialog::getOpenFileName(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - args.selection = QFileDialogPrivate::initialSelection(dir); + //If workingDirectory returned a different path than the initial one, + //it means that the initial path was invalid. There is no point to try select a file + if (args.directory != QFileInfo(dir).path()) + args.selection = QString(); + else + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = ExistingFile; args.options = options; @@ -1678,7 +1683,12 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - args.selection = QFileDialogPrivate::initialSelection(dir); + //If workingDirectory returned a different path than the initial one, + //it means that the initial path was invalid. There is no point to try select a file + if (args.directory != QFileInfo(dir).path()) + args.selection = QString(); + else + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = ExistingFiles; args.options = options; @@ -1764,7 +1774,12 @@ QString QFileDialog::getSaveFileName(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - args.selection = QFileDialogPrivate::initialSelection(dir); + //If workingDirectory returned a different path than the initial one, + //it means that the initial path was invalid. There is no point to try select a file + if (args.directory != QFileInfo(dir).path()) + args.selection = QString(); + else + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = AnyFile; args.options = options; -- cgit v0.12 From 063a1b16582a03dee72f889cc126745eaca66464 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 8 Apr 2009 14:50:34 +0200 Subject: Fixed titlebar on X11 for fixed size windows with Qt::CustomizeWindowHint Task-number: 250326 Reviewed-by: Brad --- src/gui/kernel/qwidget_x11.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index ea8af93..76734d4 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1750,8 +1750,8 @@ void QWidgetPrivate::show_sys() mwmhints.functions &= ~MWM_FUNC_RESIZE; } - mwmhints.flags |= MWM_HINTS_DECORATIONS; if (mwmhints.decorations == MWM_DECOR_ALL) { + mwmhints.flags |= MWM_HINTS_DECORATIONS; mwmhints.decorations = (MWM_DECOR_BORDER | MWM_DECOR_TITLE | MWM_DECOR_MENU); @@ -1760,10 +1760,12 @@ void QWidgetPrivate::show_sys() } if (q->windowFlags() & Qt::WindowMinimizeButtonHint) { + mwmhints.flags |= MWM_HINTS_DECORATIONS; mwmhints.decorations |= MWM_DECOR_MINIMIZE; mwmhints.functions |= MWM_FUNC_MINIMIZE; } if (q->windowFlags() & Qt::WindowMaximizeButtonHint) { + mwmhints.flags |= MWM_HINTS_DECORATIONS; mwmhints.decorations |= MWM_DECOR_MAXIMIZE; mwmhints.functions |= MWM_FUNC_MAXIMIZE; } -- cgit v0.12 From 125252e1c85889295311a0e20d9edec2498c4aca Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Apr 2009 10:23:12 +0200 Subject: Fix a bug that made it hard to click the top items in a list widget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our "view under tranparent view" function was sound, but it didn't take into consideration that fact that views in the hierarchy could be hidden. This is most prominent when you have a QFocusFrame over a QAbstractScrollArea. Task-number: 251008 Reviewed-by: Morten Sørvig --- src/gui/kernel/qcocoaview_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 7668d66..e84af90 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -630,7 +630,7 @@ extern "C" { for (NSView *lookView in viewsToLookAt) { NSPoint tmpPoint = [lookView convertPoint:windowPoint fromView:nil]; for (NSView *view in [lookView subviews]) { - if (view == mouseView) + if (view == mouseView || [view isHidden]) continue; NSRect frameRect = [view frame]; if (NSMouseInRect(tmpPoint, [view frame], [view isFlipped])) @@ -649,7 +649,7 @@ extern "C" { NSPoint tmpPoint = [viewForDescent convertPoint:windowPoint fromView:nil]; // Apply same rule as above wrt z-order. for (NSView *view in [viewForDescent subviews]) { - if (NSMouseInRect(tmpPoint, [view frame], [view isFlipped])) + if (![view isHidden] && NSMouseInRect(tmpPoint, [view frame], [view isFlipped])) lowerView = view; } if (!lowerView) // Low as we can be at this point. -- cgit v0.12 From 97ff2bde044838be0d5210a86c2fafd23c05d994 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 16 Apr 2009 10:24:56 +0200 Subject: My 4.5.1 changes. --- dist/changes-4.5.1 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 8d306d9..271f25d 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -28,6 +28,19 @@ General Improvements - Embedded Dialogs demo * [246517] Fixed warnings and bugs in hover handling on Mac OS X + +Optimizations +------------- + +- Graphics View has been optimized in several areas + * Improved the performance of QGraphicsItem::clipPath. + * Improved the performance of QGraphicsItem::setPos. + * Improved the performance of QGraphicsItem::effectiveOpacity. + * Improved the performance of QGrahicsScene::items(*). + * Improved update handling. + * Reduced the number of floating point operations. + * Reduced QVariant overhead. + Third party components ---------------------- @@ -316,6 +329,10 @@ Qt for Linux/X11 * Event posted to a thread before it is started are not processed until others events are posted. +- QWidget + * [213512] Fixed a bug that would cause wrong clipping when using the + Qt::WA_PaintOutsidePaintEvent attribute. + Qt for Windows -------------- @@ -331,6 +348,10 @@ Qt for Windows * [248036] Fixed an issue where tool buttons would incorrectly hover when disabled. +- QWidget + * [248391] Fixed a bug that made it impossible to dynamically switch + from QPainter based graphics to native graphics API and back. + - [249576] Fixed a crash when using a combobox with Qt::NoFocus. - [244875] System menu will now be shown for a fullscreen window. - [240891] Corrected the focus behavior of native file dialogs, when application has multiple toplevels. @@ -357,6 +378,7 @@ Qt for Mac OS X * Fixed a bug where the drag cursor was not updated when modifier keys are used. * [247947] Fixed a crash in drag and drop. * The command + h shortcut is now enabled. (Hides the current window.) + * [239043] Fixed a bug that would cause QGraphicsProxyWidget to shrink when moving it. - QDesktopWidget * [244004] Support multiple screens that have different sizes properly. -- cgit v0.12 From 2412e3c0fedb4eba5fecffb23c3b9a31ad803ea0 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 16 Apr 2009 19:59:31 +1000 Subject: Remove obsolete code from autotests. Each version of Qt has its own set of autotests, therefore preprocessor directives relating to obsolete QT_VERSION's are not necessary. Reviewed-by: Carlos Duclos --- tests/arthur/common/paintcommands.cpp | 19 +- tests/arthur/common/qengines.cpp | 4 - tests/auto/bic/tst_bic.cpp | 19 - tests/auto/collections/tst_collections.cpp | 38 +- .../auto/compilerwarnings/tst_compilerwarnings.cpp | 2 - tests/auto/moc/tst_moc.cpp | 28 -- tests/auto/q3accel/tst_q3accel.cpp | 86 +--- tests/auto/q3cstring/tst_q3cstring.cpp | 86 +--- tests/auto/q3header/tst_q3header.cpp | 4 - tests/auto/q3ptrlist/tst_q3ptrlist.cpp | 13 - tests/auto/q3table/tst_q3table.cpp | 1 - tests/auto/q3textedit/tst_q3textedit.cpp | 2 - tests/auto/q3textstream/tst_q3textstream.cpp | 10 - tests/auto/q3timeedit/tst_q3timeedit.cpp | 4 - tests/auto/q3valuelist/tst_q3valuelist.cpp | 6 - .../qabstractitemmodel/tst_qabstractitemmodel.cpp | 5 - .../qabstractitemview/tst_qabstractitemview.cpp | 25 -- tests/auto/qabstractslider/tst_qabstractslider.cpp | 4 - tests/auto/qaccessibility/tst_qaccessibility.cpp | 475 ++++++++++----------- tests/auto/qalgorithms/tst_qalgorithms.cpp | 8 - tests/auto/qbitarray/tst_qbitarray.cpp | 163 ++++--- tests/auto/qbuttongroup/tst_qbuttongroup.cpp | 19 +- tests/auto/qcache/tst_qcache.cpp | 14 +- tests/auto/qcheckbox/tst_qcheckbox.cpp | 6 +- tests/auto/qcombobox/tst_qcombobox.cpp | 28 +- .../qcommandlinkbutton/tst_qcommandlinkbutton.cpp | 4 - tests/auto/qcssparser/tst_cssparser.cpp | 8 +- tests/auto/qdatastream/tst_qdatastream.cpp | 4 - tests/auto/qdate/tst_qdate.cpp | 21 - tests/auto/qdatetime/tst_qdatetime.cpp | 15 - .../auto/qdesktopservices/tst_qdesktopservices.cpp | 5 - tests/auto/qdialog/tst_qdialog.cpp | 21 +- tests/auto/qdir/tst_qdir.cpp | 4 - tests/auto/qdirmodel/tst_qdirmodel.cpp | 2 - tests/auto/qfile/tst_qfile.cpp | 32 +- .../qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 6 - tests/auto/qfont/tst_qfont.cpp | 3 - tests/auto/qfontdatabase/tst_qfontdatabase.cpp | 2 - tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 5 - .../tst_qgraphicsitemanimation.cpp | 6 - tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 5 - tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 5 - tests/auto/qhash/tst_qhash.cpp | 25 +- tests/auto/qhttp/tst_qhttp.cpp | 2 - .../auto/qicoimageformat/tst_qticoimageformat.cpp | 35 +- tests/auto/qicon/tst_qicon.cpp | 2 - tests/auto/qimage/tst_qimage.cpp | 5 +- tests/auto/qimagereader/tst_qimagereader.cpp | 27 +- tests/auto/qiodevice/tst_qiodevice.cpp | 6 - .../qitemeditorfactory/tst_qitemeditorfactory.cpp | 4 - tests/auto/qitemmodel/modelstotest.cpp | 9 +- tests/auto/qitemview/tst_qitemview.cpp | 20 +- tests/auto/qkeysequence/tst_qkeysequence.cpp | 8 - tests/auto/qlabel/tst_qlabel.cpp | 2 - tests/auto/qlibrary/tst_qlibrary.cpp | 11 +- tests/auto/qlineedit/tst_qlineedit.cpp | 4 - tests/auto/qmainwindow/tst_qmainwindow.cpp | 10 - tests/auto/qmake/testdata/functions/functions.pro | 14 +- tests/auto/qmap/tst_qmap.cpp | 10 - tests/auto/qmetaobject/tst_qmetaobject.cpp | 4 - tests/auto/qmetatype/tst_qmetatype.cpp | 2 - tests/auto/qmovie/tst_qmovie.cpp | 5 - tests/auto/qmutexlocker/tst_qmutexlocker.cpp | 4 - .../tst_qnativesocketengine.cpp | 6 - .../qnetworkinterface/tst_qnetworkinterface.cpp | 6 - tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 4 - tests/auto/qobject/tst_qobject.cpp | 6 - tests/auto/qpainter/tst_qpainter.cpp | 17 - tests/auto/qpainterpath/tst_qpainterpath.cpp | 5 - tests/auto/qpicture/tst_qpicture.cpp | 2 - tests/auto/qprinter/tst_qprinter.cpp | 20 - tests/auto/qprocess/tst_qprocess.cpp | 2 - tests/auto/qpushbutton/tst_qpushbutton.cpp | 4 - tests/auto/qreadlocker/tst_qreadlocker.cpp | 4 - tests/auto/qrect/tst_qrect.cpp | 40 -- tests/auto/qregexp/tst_qregexp.cpp | 18 - tests/auto/qregion/tst_qregion.cpp | 13 - tests/auto/qset/tst_qset.cpp | 8 - tests/auto/qsettings/tst_qsettings.cpp | 14 +- tests/auto/qsizef/tst_qsizef.cpp | 23 - .../tst_qsortfilterproxymodel.cpp | 6 - .../qstandarditemmodel/tst_qstandarditemmodel.cpp | 52 +-- tests/auto/qstyle/tst_qstyle.cpp | 7 +- tests/auto/qsvgdevice/tst_qsvgdevice.cpp | 10 +- tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp | 5 - tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp | 7 +- tests/auto/qtextcursor/tst_qtextcursor.cpp | 10 - tests/auto/qtextdocument/tst_qtextdocument.cpp | 81 +--- .../tst_qtextdocumentfragment.cpp | 15 - tests/auto/qtextlayout/tst_qtextlayout.cpp | 3 - .../qtextscriptengine/tst_qtextscriptengine.cpp | 2 +- tests/auto/qtextstream/tst_qtextstream.cpp | 4 - tests/auto/qthread/tst_qthread.cpp | 5 - tests/auto/qtime/tst_qtime.cpp | 14 - tests/auto/qtimeline/tst_qtimeline.cpp | 6 - tests/auto/qtreeview/tst_qtreeview.cpp | 14 - tests/auto/qtreewidget/tst_qtreewidget.cpp | 9 - .../tst_qtreewidgetitemiterator.cpp | 14 +- tests/auto/qudpsocket/tst_qudpsocket.cpp | 4 - tests/auto/qurl/tst_qurl.cpp | 8 - tests/auto/qvariant/tst_qvariant.cpp | 4 - tests/auto/qwaitcondition/tst_qwaitcondition.cpp | 14 +- tests/auto/qwidget/tst_qwidget.cpp | 21 +- tests/auto/qwmatrix/tst_qwmatrix.cpp | 17 +- tests/auto/qwritelocker/tst_qwritelocker.cpp | 4 - tests/auto/rcc/tst_rcc.cpp | 15 +- tests/benchmarks/qimagereader/tst_qimagereader.cpp | 2 - tests/benchmarks/qobject/main.cpp | 14 +- tests/benchmarks/qpainter/tst_qpainter.cpp | 6 - 109 files changed, 415 insertions(+), 1576 deletions(-) diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index a72e689..6ab71f8 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -1886,7 +1886,6 @@ void PaintCommands::command_setBrushOrigin(QRegExp re) /***************************************************************************************************/ void PaintCommands::command_brushTranslate(QRegExp re) { -#if QT_VERSION > 0x040200 QStringList caps = re.capturedTexts(); double dx = convertToDouble(caps.at(1)); double dy = convertToDouble(caps.at(2)); @@ -1899,13 +1898,11 @@ void PaintCommands::command_brushTranslate(QRegExp re) brush_matrix.translate(dx, dy); new_brush.setTransform(brush_matrix); m_painter->setBrush(new_brush); -#endif } /***************************************************************************************************/ void PaintCommands::command_brushScale(QRegExp re) { -#if QT_VERSION > 0x040200 QStringList caps = re.capturedTexts(); double sx = convertToDouble(caps.at(1)); double sy = convertToDouble(caps.at(2)); @@ -1918,13 +1915,11 @@ void PaintCommands::command_brushScale(QRegExp re) brush_matrix.scale(sx, sy); new_brush.setTransform(brush_matrix); m_painter->setBrush(new_brush); -#endif } /***************************************************************************************************/ void PaintCommands::command_brushRotate(QRegExp re) { -#if QT_VERSION > 0x040200 QStringList caps = re.capturedTexts(); double rot = convertToDouble(caps.at(1)); @@ -1936,13 +1931,11 @@ void PaintCommands::command_brushRotate(QRegExp re) brush_matrix.rotate(rot); new_brush.setTransform(brush_matrix); m_painter->setBrush(new_brush); -#endif } /***************************************************************************************************/ void PaintCommands::command_brushShear(QRegExp re) { -#if QT_VERSION > 0x040200 QStringList caps = re.capturedTexts(); double sx = convertToDouble(caps.at(1)); double sy = convertToDouble(caps.at(2)); @@ -1955,7 +1948,6 @@ void PaintCommands::command_brushShear(QRegExp re) brush_matrix.shear(sx, sy); new_brush.setTransform(brush_matrix); m_painter->setBrush(new_brush); -#endif } /***************************************************************************************************/ @@ -2326,10 +2318,8 @@ void PaintCommands::command_gradient_setLinear(QRegExp re) lg.setSpread(m_gradientSpread); lg.setCoordinateMode(m_gradientCoordinate); QBrush brush(lg); -#if QT_VERSION > 0x040200 QTransform brush_matrix = m_painter->brush().transform(); brush.setTransform(brush_matrix); -#endif m_painter->setBrush(brush); } @@ -2375,10 +2365,8 @@ void PaintCommands::command_gradient_setRadial(QRegExp re) rg.setSpread(m_gradientSpread); rg.setCoordinateMode(m_gradientCoordinate); QBrush brush(rg); -#if QT_VERSION > 0x040200 QTransform brush_matrix = m_painter->brush().transform(); brush.setTransform(brush_matrix); -#endif m_painter->setBrush(brush); } @@ -2400,10 +2388,8 @@ void PaintCommands::command_gradient_setConical(QRegExp re) cg.setSpread(m_gradientSpread); cg.setCoordinateMode(m_gradientCoordinate); QBrush brush(cg); -#if QT_VERSION > 0x040200 QTransform brush_matrix = m_painter->brush().transform(); brush.setTransform(brush_matrix); -#endif m_painter->setBrush(brush); } @@ -2448,7 +2434,6 @@ void PaintCommands::command_surface_begin(QRegExp re) m_surface_painter = m_painter; -#if QT_VERSION > 0x040200 if (m_type == OpenGLType || m_type == OpenGLPBufferType) { #ifndef QT_NO_OPENGL m_surface_pbuffer = new QGLPixelBuffer(qRound(w), qRound(h)); @@ -2461,9 +2446,7 @@ void PaintCommands::command_surface_begin(QRegExp re) m_surface_pixmap.fill(Qt::transparent); m_painter = new QPainter(&m_surface_pixmap); #endif - } else -#endif - { + } else { m_surface_image = QImage(qRound(w), qRound(h), QImage::Format_ARGB32_Premultiplied); m_surface_image.fill(0); m_painter = new QPainter(&m_surface_image); diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp index 46f4e6b..9cd2389 100644 --- a/tests/arthur/common/qengines.cpp +++ b/tests/arthur/common/qengines.cpp @@ -243,11 +243,7 @@ void GLEngine::prepare(const QSize &_size, const QColor &color) size = _size; fillColor = color; if (usePixelBuffers) { -#if (QT_VERSION < 0x040200) && defined(Q_WS_MAC) - pbuffer = new QGLPixelBuffer(QSize(512, 512), QGLFormat(QGL::SampleBuffers)); -#else pbuffer = new QGLPixelBuffer(size, QGLFormat(QGL::SampleBuffers)); -#endif } else { widget = new QGLWidget(QGLFormat(QGL::SampleBuffers)); widget->setAutoFillBackground(false); diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp index e0f42f0..181c275 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -195,29 +195,10 @@ void tst_Bic::sizesAndVTables_data() && archFileName420.isEmpty()) QSKIP("No reference files found for this platform", SkipAll); -#if QT_VERSION >= 0x040100 bool isPatchRelease400 = false; -#else - bool isPatchRelease400 = true; -#endif - -#if QT_VERSION >= 0x040200 bool isPatchRelease410 = false; -#else - bool isPatchRelease410 = true; -#endif - -#if QT_VERSION >= 0x040300 bool isPatchRelease420 = false; -#else - bool isPatchRelease420 = true; -#endif - -#if QT_VERSION >= 0x040400 bool isPatchRelease430 = false; -#else - bool isPatchRelease430 = true; -#endif QTest::addColumn("oldLib"); QTest::addColumn("isPatchRelease"); diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index 6d3d1df..c05d8da 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -161,9 +161,7 @@ private slots: void q_init(); void pointersize(); void containerInstantiation(); -#if QT_VERSION >= 0x040101 void qtimerList(); -#endif void containerTypedefs(); void forwardDeclared(); }; @@ -1907,11 +1905,9 @@ void tst_Collections::map() i.toFront(); while(i.hasNext()) { sum += i.next().value(); -#if QT_VERSION >= 0x040100 i.setValue(10); i.value() += 22; QVERIFY(i.value() == 32); -#endif } QVERIFY(sum == 11); } @@ -2870,10 +2866,8 @@ void tst_Collections::javaStyleIterators() while (i.hasPrevious()) { i.previous(); QVERIFY(i.value().isEmpty()); -#if QT_VERSION >= 0x040100 i.value() = "x"; QCOMPARE(i.value(), QString("x")); -#endif } } @@ -3355,7 +3349,6 @@ void tst_Collections::containerInstantiation() instantiateRandomAccess(); } -#if QT_VERSION >= 0x040101 void tst_Collections::qtimerList() { QList foo; @@ -3378,7 +3371,6 @@ void tst_Collections::qtimerList() } QFAIL("QList preallocates too much memory"); } -#endif template void testContainerTypedefs(Container container) @@ -3387,11 +3379,11 @@ void testContainerTypedefs(Container container) { typedef typename Container::value_type Foo; } { typedef typename Container::iterator Foo; } { typedef typename Container::const_iterator Foo; } - { typedef typename Container::reference Foo; } - { typedef typename Container::const_reference Foo; } - { typedef typename Container::pointer Foo; } - { typedef typename Container::difference_type Foo; } - { typedef typename Container::size_type Foo; } + { typedef typename Container::reference Foo; } + { typedef typename Container::const_reference Foo; } + { typedef typename Container::pointer Foo; } + { typedef typename Container::difference_type Foo; } + { typedef typename Container::size_type Foo; } } template @@ -3403,11 +3395,11 @@ void testPairAssociativeContainerTypedefs(Container container) // { typedef typename Container::value_type Foo; } // { typedef typename Container::const_iterator Foo; } // { typedef typename Container::reference Foo; } -// { typedef typename Container::const_reference Foo; } -// { typedef typename Container::pointer Foo; } +// { typedef typename Container::const_reference Foo; } +// { typedef typename Container::pointer Foo; } - { typedef typename Container::difference_type Foo; } - { typedef typename Container::size_type Foo; } + { typedef typename Container::difference_type Foo; } + { typedef typename Container::size_type Foo; } { typedef typename Container::iterator Foo; } { typedef typename Container::key_type Foo; } { typedef typename Container::mapped_type Foo; } @@ -3422,11 +3414,11 @@ void testSetContainerTypedefs(Container container) Q_UNUSED(container) { typedef typename Container::iterator Foo; } { typedef typename Container::const_iterator Foo; } - { typedef typename Container::reference Foo; } - { typedef typename Container::const_reference Foo; } - { typedef typename Container::pointer Foo; } - { typedef typename Container::difference_type Foo; } - { typedef typename Container::size_type Foo; } + { typedef typename Container::reference Foo; } + { typedef typename Container::const_reference Foo; } + { typedef typename Container::pointer Foo; } + { typedef typename Container::difference_type Foo; } + { typedef typename Container::size_type Foo; } { typedef typename Container::key_type Foo; } } @@ -3450,7 +3442,7 @@ void tst_Collections::containerTypedefs() } #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) -class Key1 +class Key1 {}; class T1 {}; diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index 232af55..1f5f479 100644 --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -173,9 +173,7 @@ void tst_CompilerWarnings::warnings() << "-Wno-long-long" << "-Wshadow" << "-Wpacked" << "-Wunreachable-code" << "-Wundef" << "-Wchar-subscripts" << "-Wformat-nonliteral" << "-Wformat-security" << "-Wcast-align" -#if QT_VERSION >= 0x040100 << "-Wfloat-equal" -#endif << "-o" << tmpFile << tmpSourceFile; #elif defined(Q_CC_XLC) diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 4e4f6e7..afb31f6 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -151,7 +151,6 @@ public slots: Q_DECLARE_METATYPE(MyStruct) Q_DECLARE_METATYPE(MyStruct*) -#if QT_VERSION >= 0x040200 namespace myNS { struct Points { @@ -161,7 +160,6 @@ namespace myNS { } Q_DECLARE_METATYPE(myNS::Points) -#endif class TestClassinfoWithEscapes: public QObject { @@ -195,10 +193,7 @@ class TestClass : public MyNamespace::TestSuperClass, public DONT_CONFUSE_MOC(My public DONT_CONFUSE_MOC_EVEN_MORE(MyStruct2, dummy, ignored) { Q_OBJECT -#if QT_VERSION >= 0x040101 Q_CLASSINFO("help", QT_TR_NOOP("Opening this will let you configure something")) -#endif -#if QT_VERSION >= 0x040102 Q_PROPERTY(short int shortIntProperty READ shortIntProperty) Q_PROPERTY(unsigned short int unsignedShortIntProperty READ unsignedShortIntProperty) Q_PROPERTY(signed short int signedShortIntProperty READ signedShortIntProperty) @@ -206,10 +201,7 @@ class TestClass : public MyNamespace::TestSuperClass, public DONT_CONFUSE_MOC(My Q_PROPERTY(unsigned long int unsignedLongIntProperty READ unsignedLongIntProperty) Q_PROPERTY(signed long int signedLongIntProperty READ signedLongIntProperty) Q_PROPERTY(long double longDoubleProperty READ longDoubleProperty) -#endif -#if QT_VERSION >= 0x040200 Q_PROPERTY(myNS::Points points READ points WRITE setPoints) -#endif Q_CLASSINFO("Multi" "line", @@ -294,9 +286,7 @@ private slots: #ifndef NOLONGLONG void slotWithULongLong(unsigned long long) {} -#if QT_VERSION >= 0x040101 void slotWithULongLongP(unsigned long long*) {} -#endif void slotWithULong(unsigned long) {} void slotWithLongLong(long long) {} void slotWithLong(long) {} @@ -304,9 +294,7 @@ private slots: void slotWithColonColonType(::Int::Type) {} -#if QT_VERSION >= 0x040101 TestClass &slotWithReferenceReturnType() { return *this; } -#endif #if (0 && 1) || 1 void expressionEvaluationShortcut1() {} @@ -321,7 +309,6 @@ public slots: void slotWithNamedArray(const double namedArray[3]) {} void slotWithMultiArray(const double[3][4]) {} -#if QT_VERSION >= 0x040102 short int shortIntProperty() { return 0; } unsigned short int unsignedShortIntProperty() { return 0; } signed short int signedShortIntProperty() { return 0; } @@ -329,12 +316,9 @@ public slots: unsigned long int unsignedLongIntProperty() { return 0; } signed long int signedLongIntProperty() { return 0; } long double longDoubleProperty() { return 0.0; } -#endif -#if QT_VERSION >= 0x040200 myNS::Points points() { return m_points; } void setPoints(myNS::Points points) { m_points = points; } -#endif signals: void signalWithArray(const double[3]); @@ -384,10 +368,8 @@ public: public slots: void slotWithVoidStar(void *) {} -#if QT_VERSION >= 0x040200 private: myNS::Points m_points; -#endif private slots: inline virtual void blub1() {} @@ -628,10 +610,8 @@ void tst_Moc::uLongLong() QVERIFY(idx != -1); idx = mobj->indexOfSlot("slotWithULongLong(unsigned long long)"); QVERIFY(idx != -1); -#if QT_VERSION >= 0x040101 idx = mobj->indexOfSlot("slotWithULongLongP(unsigned long long*)"); QVERIFY(idx != -1); -#endif idx = mobj->indexOfSlot("slotWithLong(long)"); QVERIFY(idx != -1); @@ -707,22 +687,14 @@ void tst_Moc::supportConstSignals() void tst_Moc::task87883() { -#if QT_VERSION >= 0x040101 QVERIFY(Task87883::staticMetaObject.className()); -#else - QSKIP("Fixed in >= 4.1.1", SkipAll); -#endif } #include "c-comments.h" void tst_Moc::multilineComments() { -#if QT_VERSION >= 0x040101 QVERIFY(IfdefedClass::staticMetaObject.className()); -#else - QSKIP("Fixed in >= 4.1.1", SkipAll); -#endif } void tst_Moc::classinfoWithEscapes() diff --git a/tests/auto/q3accel/tst_q3accel.cpp b/tests/auto/q3accel/tst_q3accel.cpp index c2ba9dd..7b1c8ae 100644 --- a/tests/auto/q3accel/tst_q3accel.cpp +++ b/tests/auto/q3accel/tst_q3accel.cpp @@ -142,10 +142,8 @@ void tst_Q3Accel::initTestCase() edit->setObjectName("test_edit"); connect( accel1, SIGNAL(activated(int)), this, SLOT(accelTrig1()) ); connect( accel2, SIGNAL(activated(int)), this, SLOT(accelTrig2()) ); -#if QT_VERSION >= 0x30100 connect( accel1, SIGNAL(activatedAmbiguously(int)), this, SLOT(ambig1()) ); connect( accel2, SIGNAL(activatedAmbiguously(int)), this, SLOT(ambig2()) ); -#endif mainW->setCentralWidget( edit ); connect( mainW->statusBar(), SIGNAL(messageChanged(const QString&)), this, SLOT(statusMessage(const QString&)) ); @@ -160,11 +158,9 @@ int tst_Q3Accel::toButtons( int key ) result |= Qt::ShiftModifier; if ( key & Qt::CTRL ) result |= Qt::ControlModifier; -#if QT_VERSION >= 0x30100 - if ( key & Qt::META ) + if ( key & Qt::META ) result |= Qt::MetaModifier; -#endif - if ( key & Qt::ALT ) + if ( key & Qt::ALT ) result |= Qt::AltModifier; return result; } @@ -185,7 +181,6 @@ void tst_Q3Accel::defElements() QTest::addColumn("theResult"); } -#if QT_VERSION >= 0x30100 void tst_Q3Accel::number() { testElement(); @@ -369,34 +364,17 @@ void tst_Q3Accel::number_data() int(Qt::Key_Aring) UNICODE_ACCEL + int(Qt::Key_K) */ - /* The #ifdefs for Qt4 are there, because accelerators are always case insensitive in Qt4. - It was not wise to differentiate between ASCII (where accelerators where case insensitive) and all other - unicode chars in 3.x. - */ QTest::newRow( "N06 - sA1" ) << int(SetupAccel) << int(Accel1) << QString("") << int(Qt::Key_aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); -#if QT_VERSION < 0x040000 - QTest::newRow( "N07 - sA2" ) << int(SetupAccel) << int(Accel2) << QString("") - << int(Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); -#endif QTest::newRow( "N08 - sA2" ) << int(SetupAccel) << int(Accel1) << QString("") << int(Qt::UNICODE_ACCEL) + int(Qt::Key_K) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); QTest::newRow( "N:int(Qt::Key_aring)" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#if QT_VERSION < 0x040000 - QTest::newRow( "N:int(Qt::Key_Aring)" ) << int(TestAccel) << int(NoWidget) << QString("") - << int(Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel2Triggered); -#endif QTest::newRow( "N:int(Qt::Key_aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_unknown) << 0xE5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#if QT_VERSION < 0x040000 - QTest::newRow( "N:int(Qt::Key_Aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") - << int(Qt::Key_unknown) << 0xC5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel2Triggered); -#else QTest::newRow( "N:int(Qt::Key_Aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_unknown) << 0xC5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#endif QTest::newRow( "N:UNICODE_ACCEL + int(Qt::Key_K)" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::UNICODE_ACCEL) + int(Qt::Key_K) << int('k') << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); @@ -615,28 +593,15 @@ void tst_Q3Accel::text_data() /* see comments above on the #ifdef'ery */ QTest::newRow( "T06 - sA1" ) << int(SetupAccel) << int(Accel1) << QString("\x0E5") << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); -#if QT_VERSION < 0x040000 - QTest::newRow( "T07 - sA2" ) << int(SetupAccel) << int(Accel2) << QString("\x0C5") - << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); -#endif QTest::newRow( "T08 - sA2" ) << int(SetupAccel) << int(Accel1) << QString("K") << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(NoResult); QTest::newRow( "T:int(Qt::Key_aring)" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#if QT_VERSION < 0x040000 - QTest::newRow( "T:int(Qt::Key_Aring)" ) << int(TestAccel) << int(NoWidget) << QString("") - << int(Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel2Triggered); -#endif QTest::newRow( "T:int(Qt::Key_aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_unknown) << 0xE5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#if QT_VERSION < 0x040000 - QTest::newRow( "T:int(Qt::Key_Aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") - << int(Qt::Key_unknown) << 0xC5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel2Triggered); -#else QTest::newRow( "T:int(Qt::Key_Aring) - Text Form" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::Key_unknown) << 0xC5 << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); -#endif QTest::newRow( "T:UNICODE_ACCEL + int(Qt::Key_K)" ) << int(TestAccel) << int(NoWidget) << QString("") << int(Qt::UNICODE_ACCEL) + int(Qt::Key_K) << int('k') << 0 << 0 << 0 << 0 << 0 << 0 << int(Accel1Triggered); @@ -986,11 +951,7 @@ void tst_Q3Accel::sendKeyEvents( int k1, QChar c1, int k2, QChar c2, int k3, QCh k2 &= ~Qt::MODIFIER_MASK; k3 &= ~Qt::MODIFIER_MASK; k4 &= ~Qt::MODIFIER_MASK; -#if QT_VERSION < 0x040000 - QKeyEvent ke( QEvent::Accel, k1, k1, b1, QString(c1) ); -#else QKeyEvent ke( QEvent::Accel, k1, (Qt::KeyboardModifiers)b1, QString(c1) ); -#endif QApplication::sendEvent( mainW, &ke ); if ( k2 ) { QKeyEvent ke( QEvent::Accel, k2, k2, b2, QString(c2) ); @@ -1006,48 +967,5 @@ void tst_Q3Accel::sendKeyEvents( int k1, QChar c1, int k2, QChar c2, int k3, QCh } } -// ---------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- - -#else // For Qt < 3.1 -void tst_Q3Accel::number_data() -{ - QTest::addColumn("bogus"); - QTest::newRow( "b01" ) << 0; -} - -void tst_Q3Accel::number() -{ - QSKIP( "Accel test for Qt < 3.1 not implemented", SkipAll); -} - -void tst_Q3Accel::text_data() -{ - QTest::addColumn("bogus"); - QTest::newRow( "b02" ) << 0; -} - -void tst_Q3Accel::text() -{ - QSKIP( "Accel test for Qt < 3.1 not implemented", SkipAll); -} -void tst_Q3Accel::disabledItems() -{ - QSKIP( "Accel test for Qt < 3.1 not implemented", SkipAll); -} -void tst_Q3Accel::ambiguousItems() -{ - QSKIP( "Amibguous signals non-existant in Qt < 3.1", SkipAll); -} -void tst_Q3Accel::unicodeCompare() -{ - QSKIP( "Accel test for Qt < 3.1 not implemented", SkipAll); -} -void tst_Q3Accel::unicodeCompose() -{ - QSKIP( "Unicode composing non-existant in Qt < 3.1", SkipAll); -} -#endif // QT_VERSION >= 0x30100 - QTEST_MAIN(tst_Q3Accel) #include "tst_q3accel.moc" diff --git a/tests/auto/q3cstring/tst_q3cstring.cpp b/tests/auto/q3cstring/tst_q3cstring.cpp index f9bdf6b..60a66a9 100644 --- a/tests/auto/q3cstring/tst_q3cstring.cpp +++ b/tests/auto/q3cstring/tst_q3cstring.cpp @@ -69,8 +69,6 @@ private slots: void replace_uint_uint(); void replace_string_data(); void replace_string(); - void replace_regexp_data(); - void replace_regexp(); void remove_uint_uint_data(); void remove_uint_uint(); void prepend(); @@ -132,11 +130,6 @@ void tst_Q3CString::remove_string_data() replace_string_data(); } -void tst_Q3CString::remove_regexp_data() -{ - replace_regexp_data(); -} - void tst_Q3CString::length_data() { QTest::addColumn("s1"); @@ -202,9 +195,6 @@ void tst_Q3CString::replace_string_data() QTest::newRow( "rem13" ) << Q3CString("") << Q3CString("A") << Q3CString(0) << Q3CString(""); QTest::newRow( "rem14" ) << Q3CString(0) << Q3CString("A") << Q3CString("") << Q3CString(0); QTest::newRow( "rem15" ) << Q3CString(0) << Q3CString("A") << Q3CString(0) << Q3CString(0); -#if QT_VERSION < 0x040000 - QTest::newRow( "rem16" ) << Q3CString(0) << Q3CString("") << Q3CString("A") << Q3CString(0); -#endif QTest::newRow( "rem17" ) << Q3CString(0) << Q3CString("") << Q3CString("") << Q3CString(0); // ### how should the one below behave in Q3CString???? // QTest::newRow( "rem18" ) << Q3CString("") << Q3CString(0) << Q3CString("A") << Q3CString("A"); @@ -216,7 +206,7 @@ void tst_Q3CString::replace_string_data() QTest::newRow( "rep03" ) << Q3CString("") << Q3CString("") << Q3CString("X") << Q3CString("X"); } -void tst_Q3CString::replace_regexp_data() +void tst_Q3CString::remove_regexp_data() { QTest::addColumn("string"); QTest::addColumn("regexp"); @@ -224,20 +214,16 @@ void tst_Q3CString::replace_regexp_data() QTest::addColumn("result"); QTest::newRow( "rem00" ) << Q3CString("alpha") << Q3CString("a+") << Q3CString("") << Q3CString("lph"); -#if QT_VERSION >= 0x030100 QTest::newRow( "rem01" ) << Q3CString("banana") << Q3CString("^.a") << Q3CString("") << Q3CString("nana"); -#endif QTest::newRow( "rem02" ) << Q3CString("") << Q3CString("^.a") << Q3CString("") << Q3CString(""); QTest::newRow( "rem03" ) << Q3CString("") << Q3CString("^.a") << Q3CString(0) << Q3CString(""); QTest::newRow( "rem04" ) << Q3CString(0) << Q3CString("^.a") << Q3CString("") << Q3CString(0); QTest::newRow( "rem05" ) << Q3CString(0) << Q3CString("^.a") << Q3CString(0) << Q3CString(0); -#if QT_VERSION >= 0x030100 QTest::newRow( "rep00" ) << Q3CString("A bon mot.") << Q3CString("([^<]*)") << Q3CString("\\emph{\\1}") << Q3CString("A \\emph{bon mot}."); QTest::newRow( "rep01" ) << Q3CString("banana") << Q3CString("^.a()") << Q3CString("\\1") << Q3CString("nana"); QTest::newRow( "rep02" ) << Q3CString("banana") << Q3CString("(ba)") << Q3CString("\\1X\\1") << Q3CString("baXbanana"); QTest::newRow( "rep03" ) << Q3CString("banana") << Q3CString("(ba)(na)na") << Q3CString("\\2X\\1") << Q3CString("naXba"); -#endif } void tst_Q3CString::length() @@ -364,11 +350,7 @@ void tst_Q3CString::acc_01() QCOMPARE('X'+a,(Q3CString)"XABC"); a = (const char*)0; QVERIFY(a.isNull()); -#if QT_VERSION < 0x040000 - QVERIFY((const char*)a==0); -#else QVERIFY(*((const char *)a) == 0); -#endif { QFile f("COMPARE.txt"); @@ -420,11 +402,7 @@ void tst_Q3CString::constructor() QCOMPARE(a,ca); QVERIFY(a.isNull()); -#if QT_VERSION < 0x040000 - QVERIFY(a != (Q3CString)""); -#else QVERIFY(a == Q3CString("")); -#endif QCOMPARE(b,cb); QCOMPARE(c,cc); QCOMPARE(d,(Q3CString)"String D"); @@ -509,18 +487,6 @@ void tst_Q3CString::find() //QCOMPARE(a.find('G',-1),14); // -ve does what? Parameter should be uint? //QCOMPARE(a.find('G',-2),11); // -ve does what? Parameter should be uint? QCOMPARE(a.find('f'),10); -#if QT_VERSION < 0x040000 - // case sensitive find has been removed in 4.0 - QCOMPARE(a.find('f',0,FALSE),5); - QCOMPARE(a.find('g',0,TRUE),-1); - QCOMPARE(a.find("fgh",0,FALSE),5); - QCOMPARE(a.find("fgh",0,TRUE),-1); - QCOMPARE(a.find("EFG",5,TRUE),12); - QCOMPARE(a.find("EFG",5,FALSE),9); - QCOMPARE(a.find("EFG",4,TRUE),4); - QCOMPARE(a.find("EfG",4,FALSE),4); - QCOMPARE(a.find("EfG",4,TRUE),9); -#endif // QCOMPARE(a.find("efg",-1,FALSE),12); // -ve does what? Parameter should be uint? // QCOMPARE(a.find("efg",-2,FALSE),12); // -ve does what? Parameter should be uint? // QCOMPARE(a.find("efg",-3,FALSE),12); // -ve does what? Parameter should be uint? @@ -544,14 +510,6 @@ void tst_Q3CString::findRev() QCOMPARE(a.findRev('B'),1); QCOMPARE(a.findRev('B',1),1); QCOMPARE(a.findRev('B',0),-1); -#if QT_VERSION < 0x040000 - QCOMPARE(a.findRev("efg",99,FALSE),-1); -// QCOMPARE(a.findRev("efg",15,FALSE),-1); - QCOMPARE(a.findRev("efg",16,FALSE),-1); - QCOMPARE(a.findRev("efg",14,FALSE),12); - QCOMPARE(a.findRev("efg",12,FALSE),12); - QCOMPARE(a.findRev("efg",11,FALSE),9); -#endif // QCOMPARE(a.findRev(QRegExp("[EFG][EFG]"),14),13); // QCOMPARE(a.findRev(QRegExp("[EFG][EFG]"),11),11); } @@ -560,15 +518,6 @@ void tst_Q3CString::contains() { Q3CString a; a="ABCDEFGHIEfGEFG"; // 15 chars -#if QT_VERSION < 0x040000 - QCOMPARE(a.contains('A'),1); - QCOMPARE(a.contains('Z'),0); - QCOMPARE(a.contains('E'),3); - QCOMPARE(a.contains('F'),2); - QCOMPARE(a.contains('F',FALSE),3); - QCOMPARE(a.contains("FG"),2); - QCOMPARE(a.contains("FG",FALSE),3); -#else QVERIFY(a.contains('A')); QVERIFY(!a.contains('Z')); QVERIFY(a.contains('E')); @@ -579,7 +528,6 @@ void tst_Q3CString::contains() QCOMPARE(a.count('E'),3); QCOMPARE(a.count('F'),2); QCOMPARE(a.count("FG"),2); -#endif // QCOMPARE(a.contains(QRegExp("[FG][HI]")),1); // QCOMPARE(a.contains(QRegExp("[G][HE]")),2); } @@ -771,7 +719,6 @@ void tst_Q3CString::replace_uint_uint() void tst_Q3CString::replace_string() { -#if QT_VERSION >= 0x030100 QFETCH( Q3CString, string ); QFETCH( Q3CString, before ); QFETCH( Q3CString, after ); @@ -788,37 +735,6 @@ void tst_Q3CString::replace_string() Q3CString s3 = string; s3.replace( before, after ); QCOMPARE( s3, result ); - -#if QT_VERSION < 0x040000 - if ( !string.isNull() ) { - /* - I've changed the isNull() behavior in QString::replace() in - Qt 3.2, according to the philosophy that null and empty - should behave mostly the same. - */ - Q3CString s4 = string; - s4.replace( QRegExp(QRegExp::escape(before)), after ); - QVERIFY( s4 == result ); - } -#endif -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif -} - -void tst_Q3CString::replace_regexp() -{ -#if QT_VERSION >= 0x040000 - QSKIP("This functionality has been removed in Qt 4.", SkipAll); -#else - QFETCH( Q3CString, string ); - QFETCH( Q3CString, regexp ); - QFETCH( Q3CString, after ); - QFETCH( Q3CString, result ); - - string.replace( QRegExp(regexp), after ); - QVERIFY( string == result ); -#endif } void tst_Q3CString::remove_uint_uint() diff --git a/tests/auto/q3header/tst_q3header.cpp b/tests/auto/q3header/tst_q3header.cpp index f0ad9d4..fe290e8 100644 --- a/tests/auto/q3header/tst_q3header.cpp +++ b/tests/auto/q3header/tst_q3header.cpp @@ -59,9 +59,7 @@ public slots: void cleanupTestCase(); private slots: void bug_setOffset(); -#if QT_VERSION >= 0x040101 void nullStringLabel(); -#endif private: Q3Header *testW; @@ -108,7 +106,6 @@ void tst_Q3Header::bug_setOffset() QCOMPARE( testW->offset(), offs ); } -#if QT_VERSION >= 0x040101 // Task 95640 void tst_Q3Header::nullStringLabel() { @@ -123,7 +120,6 @@ void tst_Q3Header::nullStringLabel() QCOMPARE(testW->label(testW->addLabel(QString())), QString()); QCOMPARE(testW->label(testW->addLabel(QString(""))), QString("")); } -#endif QTEST_MAIN(tst_Q3Header) #include "tst_q3header.moc" diff --git a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp index 49b5a3e..c3d8b16 100644 --- a/tests/auto/q3ptrlist/tst_q3ptrlist.cpp +++ b/tests/auto/q3ptrlist/tst_q3ptrlist.cpp @@ -92,7 +92,6 @@ void tst_Q3PtrList::cleanup() void tst_Q3PtrList::replace() { -#if QT_VERSION >= 0x030100 Q3PtrList list; int foo = 4; list.setAutoDelete( TRUE ); @@ -110,15 +109,10 @@ void tst_Q3PtrList::replace() int *p = new int(7); QCOMPARE( list.insert(2, p), (bool)TRUE ); QCOMPARE( list.replace(2, p), (bool)TRUE ); - -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_Q3PtrList::replaceStrDeep() { -#if QT_VERSION >= 0x030100 Q3StrList list; const char *str; @@ -137,14 +131,10 @@ void tst_Q3PtrList::replaceStrDeep() QCOMPARE( list.insert(2, str), (bool)TRUE ); QCOMPARE( list.replace(2, str), (bool)TRUE ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_Q3PtrList::replaceStrShallow() { -#if QT_VERSION >= 0x030100 Q3StrList list( FALSE ); char str1[] = "This is string 1"; char str2[] = "This is string 2"; @@ -166,9 +156,6 @@ void tst_Q3PtrList::replaceStrShallow() QCOMPARE( list.insert(2, str), (bool)TRUE ); QCOMPARE( list.replace(2, str), (bool)TRUE ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_Q3PtrList::take() diff --git a/tests/auto/q3table/tst_q3table.cpp b/tests/auto/q3table/tst_q3table.cpp index 2fab3eb..7db0a40 100644 --- a/tests/auto/q3table/tst_q3table.cpp +++ b/tests/auto/q3table/tst_q3table.cpp @@ -387,7 +387,6 @@ public: void tst_Q3Table::selectComboTableItem() { -// #if QT_VERSION >= 0x030100 #if 0 MyTable table(4,4,0,"subclassTestWidget"); // Test for task #25026 diff --git a/tests/auto/q3textedit/tst_q3textedit.cpp b/tests/auto/q3textedit/tst_q3textedit.cpp index 21bc8b5..1fcce7b 100644 --- a/tests/auto/q3textedit/tst_q3textedit.cpp +++ b/tests/auto/q3textedit/tst_q3textedit.cpp @@ -159,12 +159,10 @@ void tst_Q3TextEdit::getSetCheck() Q3TextDocument *var2 = new Q3TextDocument(0); obj1.setDocument(var2); QCOMPARE(obj1.document(), var2); -#if QT_VERSION >= 0x040200 // Should've done as QTextEdit, and created a new document, if you setDocument(0). // Unfortunately it doesn't, and we cannot change it. obj1.setDocument((Q3TextDocument *)0); QCOMPARE(obj1.document(), var2); -#endif // delete var2; // No delete, since Q3TextEdit takes ownership } diff --git a/tests/auto/q3textstream/tst_q3textstream.cpp b/tests/auto/q3textstream/tst_q3textstream.cpp index 7932b79..b13e83f 100644 --- a/tests/auto/q3textstream/tst_q3textstream.cpp +++ b/tests/auto/q3textstream/tst_q3textstream.cpp @@ -346,9 +346,6 @@ void tst_Q3TextStream::operator_shiftleft() QFETCH( QString, device ); QFETCH( QString, encoding ); QFETCH( QByteArray, encoded ); -#if QT_VERSION < 0x040000 - encoded.resize( encoded.size() - 1 ); -#endif if ( device == "file" ) { QFile outFile( "qtextstream.out" ); @@ -400,9 +397,6 @@ void tst_Q3TextStream::operator_shiftright() QFETCH( int, intVal ); QFETCH( QString, stringVal ); QFETCH( QByteArray, encoded ); -#if QT_VERSION < 0x040000 - encoded.resize( encoded.size() - 1 ); -#endif if ( device == "file" ) { QFile outFile( "qtextstream.out" ); @@ -1295,7 +1289,6 @@ void tst_Q3TextStream::write_Q3CString( Q3TextStream *s ) void tst_Q3TextStream::task28319() { /* -#if QT_VERSION >= 0x040000 // Specific test for task 28319 QFile f("28319.txt"); if (f.open(IO_WriteOnly)) { @@ -1324,9 +1317,6 @@ void tst_Q3TextStream::task28319() } else { QVERIFY(FALSE); } -#else - QSKIP( "A minor bug we don't want to fix in 3.2.", SkipAll); -#endif */ } diff --git a/tests/auto/q3timeedit/tst_q3timeedit.cpp b/tests/auto/q3timeedit/tst_q3timeedit.cpp index 967bb51..1cdd87c 100644 --- a/tests/auto/q3timeedit/tst_q3timeedit.cpp +++ b/tests/auto/q3timeedit/tst_q3timeedit.cpp @@ -130,10 +130,8 @@ void tst_Q3TimeEdit::init() QTime maximumTime(23, 59, 59); testWidget->setMinValue(minimumTime); testWidget->setMaxValue(maximumTime); -#if QT_VERSION >= 0x030100 // We don't want the locale impacting on the test testWidget->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes | Q3TimeEdit::Seconds); -#endif testWidget->setTime(QTime(11, 0, 0)); // make sure we start with the hour focused @@ -174,10 +172,8 @@ void tst_Q3TimeEdit::valueRange() QTime maximumTime(maximumHours, maximumMinutes, maximumSeconds); testWidget->setMinValue(minimumTime); testWidget->setMaxValue(maximumTime); -#if QT_VERSION >= 0x030100 // We don't want the locale impacting on the test testWidget->setDisplay(Q3TimeEdit::Hours | Q3TimeEdit::Minutes | Q3TimeEdit::Seconds); -#endif // When pressing Key_Up we want to check it goes to the minimum time testWidget->setTime(maximumTime); diff --git a/tests/auto/q3valuelist/tst_q3valuelist.cpp b/tests/auto/q3valuelist/tst_q3valuelist.cpp index 8abeee2..b10664a 100644 --- a/tests/auto/q3valuelist/tst_q3valuelist.cpp +++ b/tests/auto/q3valuelist/tst_q3valuelist.cpp @@ -296,7 +296,6 @@ void tst_Q3ValueList::beginEnd() QCOMPARE( *(cit1), 2 ); QCOMPARE( *(cit2), 200 ); -#if (QT_VERSION >= 0x030200) Q3ValueList b; b.append( 1 ); Q3ValueList b2 = b; @@ -305,7 +304,6 @@ void tst_Q3ValueList::beginEnd() b2.append( 2 ); QVERIFY( b.constBegin() != b2.constBegin() ); QVERIFY( b2.constBegin() == b2.constBegin() ); -#endif } void tst_Q3ValueList::pushing() @@ -593,11 +591,7 @@ void tst_Q3ValueList::opStreamOut() class ListVerifier : public Q3ValueList { public: -#if QT_VERSION < 0x040000 - void* pointer() { return sh; } -#else const int* pointer() const { return &*begin(); } -#endif }; void tst_Q3ValueList::shared() { diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp index b613b81..c0ffea0 100644 --- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -346,14 +346,11 @@ void tst_QAbstractItemModel::match() QCOMPARE(res.count(), 2); res = model.match(start, Qt::DisplayRole, QVariant(".*O.*"), -1, Qt::MatchRegExp | Qt::MatchCaseSensitive); QCOMPARE(res.count(), 0); - // MatchFixedString seems new in 4.2 -#if QT_VERSION >= 0x040200 res = model.match(start, Qt::DisplayRole, QVariant("BOAR"), -1, Qt::MatchFixedString); QCOMPARE(res.count(), 1); res = model.match(start, Qt::DisplayRole, QVariant("bat"), -1, Qt::MatchFixedString | Qt::MatchCaseSensitive); QCOMPARE(res.count(), 1); -#endif } typedef QPair Position; @@ -582,7 +579,6 @@ void tst_QAbstractItemModel::dropMimeData_data() << (qStringTableRow("" , "" , "A")) << (qStringTableRow("" , "" , "B"))); } -#if QT_VERSION >= 0x040200 { QTest::newRow("2x 1x2 dropped at [3, 2] (different rows)") << (STRINGTABLE // source table @@ -624,7 +620,6 @@ void tst_QAbstractItemModel::dropMimeData_data() << (qStringTableRow("" , "" , "B")) << (qStringTableRow("" , "" , "H"))); } -#endif } void tst_QAbstractItemModel::dropMimeData() diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp index 086c551..3a845e1 100644 --- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp @@ -234,11 +234,8 @@ void tst_QAbstractItemView::getSetCheck() MyAbstractItemDelegate *var1 = new MyAbstractItemDelegate; obj1->setItemDelegate(var1); QCOMPARE((QAbstractItemDelegate*)var1, obj1->itemDelegate()); -#if QT_VERSION >= 0x040200 - // Itemviews in Qt < 4.2 have asserts for this. Qt >= 4.2 should handle this gracefully obj1->setItemDelegate((QAbstractItemDelegate *)0); QCOMPARE((QAbstractItemDelegate *)0, obj1->itemDelegate()); -#endif delete var1; // EditTriggers QAbstractItemView::editTriggers() @@ -279,26 +276,6 @@ void tst_QAbstractItemView::getSetCheck() obj1->setAlternatingRowColors(true); QCOMPARE(true, obj1->alternatingRowColors()); -#if QT_VERSION < 0x040200 - // int QAbstractItemView::horizontalStepsPerItem() - // void QAbstractItemView::setHorizontalStepsPerItem(int) - obj1->tst_setHorizontalStepsPerItem(0); - QCOMPARE(0, obj1->tst_horizontalStepsPerItem()); - obj1->tst_setHorizontalStepsPerItem(INT_MIN); - QCOMPARE(INT_MIN, obj1->tst_horizontalStepsPerItem()); - obj1->tst_setHorizontalStepsPerItem(INT_MAX); - QCOMPARE(INT_MAX, obj1->tst_horizontalStepsPerItem()); - - // int QAbstractItemView::verticalStepsPerItem() - // void QAbstractItemView::setVerticalStepsPerItem(int) - obj1->tst_setVerticalStepsPerItem(0); - QCOMPARE(0, obj1->tst_verticalStepsPerItem()); - obj1->tst_setVerticalStepsPerItem(INT_MIN); - QCOMPARE(INT_MIN, obj1->tst_verticalStepsPerItem()); - obj1->tst_setVerticalStepsPerItem(INT_MAX); - QCOMPARE(INT_MAX, obj1->tst_verticalStepsPerItem()); -#endif - // State QAbstractItemView::state() // void QAbstractItemView::setState(State) obj1->tst_setState(TestView::tst_State(TestView::NoState)); @@ -314,13 +291,11 @@ void tst_QAbstractItemView::getSetCheck() obj1->tst_setState(TestView::tst_State(TestView::CollapsingState)); QCOMPARE(TestView::tst_State(TestView::CollapsingState), obj1->tst_state()); -#if QT_VERSION >= 0x040200 // QWidget QAbstractScrollArea::viewport() // void setViewport(QWidget*) QWidget *vp = new QWidget; obj1->setViewport(vp); QCOMPARE(vp, obj1->viewport()); -#endif QCOMPARE(16, obj1->autoScrollMargin()); obj1->setAutoScrollMargin(20); diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/qabstractslider/tst_qabstractslider.cpp index 9e3acb8..dc1c866 100644 --- a/tests/auto/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/qabstractslider/tst_qabstractslider.cpp @@ -864,11 +864,7 @@ void tst_QAbstractSlider::wheelEvent() QVERIFY(applicationInstance->sendEvent(slider,&event)); QCOMPARE(slider->sliderPosition(),expectedSliderPosition); int expectedSignalCount = (initialSliderPosition == expectedSliderPosition) ? 0 : 1; -#if QT_VERSION >= 0x040200 QCOMPARE(spy1.count(), expectedSignalCount); -#else - QCOMPARE(spy1.count(), 0); -#endif QCOMPARE(spy2.count(), expectedSignalCount); if (expectedSignalCount) QVERIFY(actionTriggeredTimeStamp < valueChangedTimeStamp); diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index 1aca624..dc52416 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -218,8 +218,6 @@ public: tst_QAccessibility(); virtual ~tst_QAccessibility(); - - public slots: void initTestCase(); void cleanupTestCase(); @@ -409,15 +407,15 @@ public: QtTestAccessibleWidgetIface(QtTestAccessibleWidget *w): QAccessibleWidget(w) {} QString text(Text t, int control) const { - if (t == Help) - return QString::fromLatin1("Help yourself"); - return QAccessibleWidget::text(t, control); + if (t == Help) + return QString::fromLatin1("Help yourself"); + return QAccessibleWidget::text(t, control); } static QAccessibleInterface *ifaceFactory(const QString &key, QObject *o) { - if (key == "QtTestAccessibleWidget") - return new QtTestAccessibleWidgetIface(static_cast(o)); - return 0; + if (key == "QtTestAccessibleWidget") + return new QtTestAccessibleWidgetIface(static_cast(o)); + return 0; } }; #endif @@ -455,15 +453,15 @@ void tst_QAccessibility::cleanup() #ifdef QTEST_ACCESSIBILITY const EventList list = QTestAccessibility::events(); if (!list.isEmpty()) { - qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), - QString(QTest::currentTestFunction()).toAscii().constData()); - for (int i = 0; i < list.count(); ++i) - qWarning(" %d: Object: %p Event: '%s' (%d) Child: %d", i + 1, list.at(i).object, - eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child); + qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), + QString(QTest::currentTestFunction()).toAscii().constData()); + for (int i = 0; i < list.count(); ++i) + qWarning(" %d: Object: %p Event: '%s' (%d) Child: %d", i + 1, list.at(i).object, + eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child); } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -486,7 +484,7 @@ void tst_QAccessibility::eventTest() delete button; #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -505,7 +503,7 @@ void tst_QAccessibility::customWidget() delete iface; delete widget; #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -523,7 +521,7 @@ void tst_QAccessibility::deletedWidget() QVERIFY(!iface->isValid()); delete iface; #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -542,52 +540,52 @@ QWidget *tst_QAccessibility::createGUI() topLeft->setSpacing(2); grid->addWidget(topLeft, 0, 0); - Q3VButtonGroup *group1 = new Q3VButtonGroup("Title1:", topLeft, "group1"); - /*QPushButton *pb1 = */ new QPushButton("Button&1", group1, "pb1"); - Q3VButtonGroup *group2 = new Q3VButtonGroup("Title2:", topLeft, "group2"); - /*QPushButton *pb2 = */ new QPushButton("Button2", group2, "pb2"); + Q3VButtonGroup *group1 = new Q3VButtonGroup("Title1:", topLeft, "group1"); + /*QPushButton *pb1 = */ new QPushButton("Button&1", group1, "pb1"); + Q3VButtonGroup *group2 = new Q3VButtonGroup("Title2:", topLeft, "group2"); + /*QPushButton *pb2 = */ new QPushButton("Button2", group2, "pb2"); - Q3WidgetStack *stack = new Q3WidgetStack(topLeft, "stack"); - QLabel *page1 = new QLabel("Page 1", stack, "page1"); - stack->addWidget(page1); - QLabel *page2 = new QLabel("Page 2", stack, "page2"); - stack->addWidget(page2); - QLabel *page3 = new QLabel("Page 3", stack, "page3"); - stack->addWidget(page3); + Q3WidgetStack *stack = new Q3WidgetStack(topLeft, "stack"); + QLabel *page1 = new QLabel("Page 1", stack, "page1"); + stack->addWidget(page1); + QLabel *page2 = new QLabel("Page 2", stack, "page2"); + stack->addWidget(page2); + QLabel *page3 = new QLabel("Page 3", stack, "page3"); + stack->addWidget(page3); // topRight - controlling Q3VBox *topRight= new Q3VBox(toplevel, "topRight"); grid->addWidget(topRight, 0, 1); - QPushButton *pbOk = new QPushButton("Ok", topRight, "pbOk" ); - pbOk->setDefault(TRUE); - QSlider *slider = new QSlider(Qt::Horizontal, topRight, "slider"); - QLCDNumber *sliderLcd = new QLCDNumber(topRight, "sliderLcd"); - QSpinBox *spinBox = new QSpinBox(topRight, "spinBox"); + QPushButton *pbOk = new QPushButton("Ok", topRight, "pbOk" ); + pbOk->setDefault(TRUE); + QSlider *slider = new QSlider(Qt::Horizontal, topRight, "slider"); + QLCDNumber *sliderLcd = new QLCDNumber(topRight, "sliderLcd"); + QSpinBox *spinBox = new QSpinBox(topRight, "spinBox"); - connect(pbOk, SIGNAL(clicked()), toplevel, SLOT(close()) ); - connect(slider, SIGNAL(valueChanged(int)), sliderLcd, SLOT(display(int))); - connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); + connect(pbOk, SIGNAL(clicked()), toplevel, SLOT(close()) ); + connect(slider, SIGNAL(valueChanged(int)), sliderLcd, SLOT(display(int))); + connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); - spinBox->setValue(50); + spinBox->setValue(50); // bottomLeft - labeling and controlling Q3HBox *bottomLeft = new Q3HBox(toplevel, "bottomLeft"); grid->addWidget(bottomLeft, 1, 0); - QLabel *label = new QLabel("This is a &lineedit:", bottomLeft, "label"); - QLineEdit *lineedit = new QLineEdit(bottomLeft, "lineedit"); - label->setBuddy(lineedit); - QLabel *label2 = new QLabel(bottomLeft, "label2"); + QLabel *label = new QLabel("This is a &lineedit:", bottomLeft, "label"); + QLineEdit *lineedit = new QLineEdit(bottomLeft, "lineedit"); + label->setBuddy(lineedit); + QLabel *label2 = new QLabel(bottomLeft, "label2"); - connect(lineedit, SIGNAL(textChanged(const QString&)), label2, SLOT(setText(const QString&))); + connect(lineedit, SIGNAL(textChanged(const QString&)), label2, SLOT(setText(const QString&))); - Q3VButtonGroup *radiogroup = new Q3VButtonGroup("Exclusive &choices:", bottomLeft, "radiogroup"); - QLineEdit *frequency = new QLineEdit(radiogroup, "frequency"); - frequency->setText("100 Mhz"); - QRadioButton *radioAM = new QRadioButton("&AM", radiogroup, "radioAM"); - /* QRadioButton *radioFM = */ new QRadioButton("&FM", radiogroup, "radioFM"); - /* QRadioButton *radioSW = */ new QRadioButton("&Shortwave", radiogroup, "radioSW"); + Q3VButtonGroup *radiogroup = new Q3VButtonGroup("Exclusive &choices:", bottomLeft, "radiogroup"); + QLineEdit *frequency = new QLineEdit(radiogroup, "frequency"); + frequency->setText("100 Mhz"); + QRadioButton *radioAM = new QRadioButton("&AM", radiogroup, "radioAM"); + /* QRadioButton *radioFM = */ new QRadioButton("&FM", radiogroup, "radioFM"); + /* QRadioButton *radioSW = */ new QRadioButton("&Shortwave", radiogroup, "radioSW"); // bottomRight - ### empty Q3HBox *bottomRight = new Q3HBox(toplevel, "bottomRight"); @@ -626,23 +624,23 @@ void tst_QAccessibility::childAt() QObjectList children = toplevel->queryList("QWidget", 0, 0, 0); for (int c = 1; c <= children.count(); ++c) { - QWidget *child = qobject_cast(children.at(c-1)); - QAccessibleInterface *acc_child = QAccessible::queryAccessibleInterface(child); - QVERIFY(acc_child); - QCOMPARE(acc_child->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, QAccessible::Child); - - QPoint center(child->mapToGlobal(child->rect().center())); - QRect childRect(child->geometry()); - childRect.moveCenter(center); - - QCOMPARE(acc_child->rect(0), childRect); - QCOMPARE(acc_toplevel->childAt(childRect.center().x(), childRect.center().y()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.bottom()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.bottom()), c); - - QCOMPARE(acc_toplevel->indexOfChild(acc_child), c); + QWidget *child = qobject_cast(children.at(c-1)); + QAccessibleInterface *acc_child = QAccessible::queryAccessibleInterface(child); + QVERIFY(acc_child); + QCOMPARE(acc_child->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, QAccessible::Child); + + QPoint center(child->mapToGlobal(child->rect().center())); + QRect childRect(child->geometry()); + childRect.moveCenter(center); + + QCOMPARE(acc_child->rect(0), childRect); + QCOMPARE(acc_toplevel->childAt(childRect.center().x(), childRect.center().y()), c); + QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.top()), c); + QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.bottom()), c); + QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.top()), c); + QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.bottom()), c); + + QCOMPARE(acc_toplevel->indexOfChild(acc_child), c); delete acc_child; } @@ -650,7 +648,7 @@ void tst_QAccessibility::childAt() delete toplevel; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -694,7 +692,7 @@ void tst_QAccessibility::childCount() delete toplevel; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -716,33 +714,33 @@ void tst_QAccessibility::relationTo() QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - QAccessibleInterface *acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); - QAccessibleInterface *acc_group1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")); - QVERIFY(topLeft->child("group1")); - QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")->child("pb1")); - QAccessibleInterface *acc_group2 = QAccessible::queryAccessibleInterface(topLeft->child("group2")); - QAccessibleInterface *acc_pb2 = 0; - QAccessibleInterface *acc_stack = QAccessible::queryAccessibleInterface(topLeft->child("stack")); - QAccessibleInterface *acc_page1 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page1")); - QAccessibleInterface *acc_page2 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page2")); - QAccessibleInterface *acc_page3 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page3")); - QAccessibleInterface *acc_topRight = QAccessible::queryAccessibleInterface(topRight); - QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); - QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); - - QAccessibleInterface *acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); - QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(bottomLeft->child("label2")); - QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); - QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); - QAccessibleInterface *acc_radioFM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioFM")); - QAccessibleInterface *acc_radioSW = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioSW")); - QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); - - QAccessibleInterface *acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); + QAccessibleInterface *acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); + QAccessibleInterface *acc_group1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")); + QVERIFY(topLeft->child("group1")); + QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")->child("pb1")); + QAccessibleInterface *acc_group2 = QAccessible::queryAccessibleInterface(topLeft->child("group2")); + QAccessibleInterface *acc_pb2 = 0; + QAccessibleInterface *acc_stack = QAccessible::queryAccessibleInterface(topLeft->child("stack")); + QAccessibleInterface *acc_page1 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page1")); + QAccessibleInterface *acc_page2 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page2")); + QAccessibleInterface *acc_page3 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page3")); + QAccessibleInterface *acc_topRight = QAccessible::queryAccessibleInterface(topRight); + QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); + QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); + QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); + QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); + + QAccessibleInterface *acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); + QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); + QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); + QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(bottomLeft->child("label2")); + QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); + QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); + QAccessibleInterface *acc_radioFM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioFM")); + QAccessibleInterface *acc_radioSW = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioSW")); + QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); + + QAccessibleInterface *acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); QVERIFY(acc_toplevel); QVERIFY(acc_topLeft); @@ -769,49 +767,49 @@ void tst_QAccessibility::relationTo() // hierachy relations QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Self); + QAccessible::Self); QCOMPARE(acc_toplevel->relationTo(1, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 1) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_topLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_group1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_toplevel->relationTo(0, acc_page1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); + QAccessible::Ancestor); QCOMPARE(acc_group1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); + QAccessible::Descendent); QCOMPARE(acc_stack->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); + QAccessible::Descendent); QCOMPARE(acc_page1->relationTo(0, acc_stack, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_page1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); + QAccessible::Descendent); QCOMPARE(acc_topLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_topRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_bottomLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_bottomRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); + QAccessible::Child); QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); + QAccessible::Sibling); QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); + QAccessible::Sibling); QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); + QAccessible::Sibling); QCOMPARE(acc_pb1->relationTo(0, acc_pb2, 0), QAccessible::Unrelated); @@ -836,25 +834,25 @@ void tst_QAccessibility::relationTo() // logical relations - focus QCOMPARE(acc_radioAM->relationTo(0, acc_radioFM, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); + QAccessible::Unrelated); QCOMPARE(acc_radioAM->relationTo(0, acc_radiogroup, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); + QAccessible::FocusChild); QCOMPARE(acc_radioAM->relationTo(0, acc_bottomLeft, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); + QAccessible::FocusChild); QCOMPARE(acc_radioAM->relationTo(0, acc_topLeft, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); + QAccessible::Unrelated); QCOMPARE(acc_radioAM->relationTo(0, acc_toplevel, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); + QAccessible::FocusChild); // logical relations - labels QCOMPARE(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Label); + QAccessible::Label); QCOMPARE(acc_lineedit->relationTo(0, acc_label, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); + QAccessible::Labelled); QCOMPARE(acc_label->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); + QAccessible::Unrelated); QCOMPARE(acc_lineedit->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); + QAccessible::Unrelated); QEXPECT_FAIL("", "Make me accessible", Continue); QCOMPARE(acc_radiogroup->relationTo(0, acc_radioAM, 0) & QAccessible::LogicalMask, @@ -866,21 +864,21 @@ void tst_QAccessibility::relationTo() QCOMPARE(acc_radiogroup->relationTo(0, acc_radioSW, 0) & QAccessible::LogicalMask, QAccessible::Label | QAccessible::Controlled); QCOMPARE(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::LogicalMask, - QAccessible::Label); + QAccessible::Label); QCOMPARE(acc_frequency->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); + QAccessible::Labelled); QCOMPARE(acc_radiogroup->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); + QAccessible::Unrelated); // logical relations - controller QCOMPARE(acc_pbOk->relationTo(0, acc_toplevel, 0) & QAccessible::LogicalMask, - QAccessible::Controller); + QAccessible::Controller); QCOMPARE(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::LogicalMask, - QAccessible::Controller); + QAccessible::Controller); QCOMPARE(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::LogicalMask, - QAccessible::Controller); + QAccessible::Controller); QCOMPARE(acc_lineedit->relationTo(0, acc_label2, 0) & QAccessible::LogicalMask, - QAccessible::Controller); + QAccessible::Controller); delete acc_toplevel; delete acc_topLeft; @@ -911,7 +909,7 @@ void tst_QAccessibility::relationTo() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -934,8 +932,8 @@ void tst_QAccessibility::navigateGeometric() QtTestAccessibleWidget *aw = 0; int i; for (i = 0; i < 360; i += skip) { - aw = new QtTestAccessibleWidget(w, QString::number(i).toLatin1()); - aw->move( int(200.0 + 100.0 * sin(step * (double)i)), int(200.0 + 100.0 * cos(step * (double)i)) ); + aw = new QtTestAccessibleWidget(w, QString::number(i).toLatin1()); + aw->move( int(200.0 + 100.0 * sin(step * (double)i)), int(200.0 + 100.0 * cos(step * (double)i)) ); } aw = new QtTestAccessibleWidget(w, "Earth"); @@ -950,25 +948,24 @@ void tst_QAccessibility::navigateGeometric() QTest::qWait(100); #endif - // let one widget rotate around center for (i = 0; i < 360; i+=skip) { - aw->move( int(200.0 + 75.0 * sin(step * (double)i)), int(200.0 + 75.0 * cos(step * (double)i)) ); - - if (i < 45 || i > 315) { - QCOMPARE(iface->navigate(QAccessible::Down, 0, &target), 0); - } else if ( i < 135 ) { - QCOMPARE(iface->navigate(QAccessible::Right, 0, &target), 0); - } else if ( i < 225 ) { - QCOMPARE(iface->navigate(QAccessible::Up, 0, &target), 0); - } else { - QCOMPARE(iface->navigate(QAccessible::Left, 0, &target), 0); + aw->move( int(200.0 + 75.0 * sin(step * (double)i)), int(200.0 + 75.0 * cos(step * (double)i)) ); + + if (i < 45 || i > 315) { + QCOMPARE(iface->navigate(QAccessible::Down, 0, &target), 0); + } else if ( i < 135 ) { + QCOMPARE(iface->navigate(QAccessible::Right, 0, &target), 0); + } else if ( i < 225 ) { + QCOMPARE(iface->navigate(QAccessible::Up, 0, &target), 0); + } else { + QCOMPARE(iface->navigate(QAccessible::Left, 0, &target), 0); } - QVERIFY(target); - QVERIFY(target->isValid()); - QVERIFY(target->object()); - QCOMPARE(target->object()->objectName(), aw->objectName()); + QVERIFY(target); + QVERIFY(target->isValid()); + QVERIFY(target->object()); + QCOMPARE(target->object()->objectName(), aw->objectName()); delete target; target = 0; } @@ -1016,7 +1013,7 @@ void tst_QAccessibility::navigateGeometric() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1050,7 +1047,7 @@ void tst_QAccessibility::navigateSlider() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1092,43 +1089,43 @@ void tst_QAccessibility::navigateCovered() QVERIFY(iface3 == 0); for (int loop = 0; loop < 2; ++loop) { - for (int x = 0; x < w->width(); ++x) { - for (int y = 0; y < w->height(); ++y) { - w1->move(x, y); - if (w1->geometry().intersects(w2->geometry())) { - QVERIFY(iface1->relationTo(0, iface2, 0) & QAccessible::Covers); - QVERIFY(iface2->relationTo(0, iface1, 0) & QAccessible::Covered); - QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), 0); - QVERIFY(iface3 != 0); - QVERIFY(iface3->isValid()); - QCOMPARE(iface3->object(), iface2->object()); + for (int x = 0; x < w->width(); ++x) { + for (int y = 0; y < w->height(); ++y) { + w1->move(x, y); + if (w1->geometry().intersects(w2->geometry())) { + QVERIFY(iface1->relationTo(0, iface2, 0) & QAccessible::Covers); + QVERIFY(iface2->relationTo(0, iface1, 0) & QAccessible::Covered); + QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), 0); + QVERIFY(iface3 != 0); + QVERIFY(iface3->isValid()); + QCOMPARE(iface3->object(), iface2->object()); delete iface3; iface3 = 0; - QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), 0); - QVERIFY(iface3 != 0); - QVERIFY(iface3->isValid()); - QCOMPARE(iface3->object(), iface1->object()); + QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), 0); + QVERIFY(iface3 != 0); + QVERIFY(iface3->isValid()); + QCOMPARE(iface3->object(), iface1->object()); delete iface3; iface3 = 0; - } else { - QVERIFY(!(iface1->relationTo(0, iface2, 0) & QAccessible::Covers)); - QVERIFY(!(iface2->relationTo(0, iface1, 0) & QAccessible::Covered)); - QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), -1); - QVERIFY(iface3 == 0); - QCOMPARE(iface1->navigate(QAccessible::Covers, 1, &iface3), -1); - QVERIFY(iface3 == 0); - QCOMPARE(iface2->navigate(QAccessible::Covered, 1, &iface3), -1); - QVERIFY(iface3 == 0); - QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), -1); - QVERIFY(iface3 == 0); - } - } - } - if (!loop) { - // switch children for second loop - w2->raise(); - QAccessibleInterface *temp = iface1; - iface1 = iface2; - iface2 = temp; - } + } else { + QVERIFY(!(iface1->relationTo(0, iface2, 0) & QAccessible::Covers)); + QVERIFY(!(iface2->relationTo(0, iface1, 0) & QAccessible::Covered)); + QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), -1); + QVERIFY(iface3 == 0); + QCOMPARE(iface1->navigate(QAccessible::Covers, 1, &iface3), -1); + QVERIFY(iface3 == 0); + QCOMPARE(iface2->navigate(QAccessible::Covered, 1, &iface3), -1); + QVERIFY(iface3 == 0); + QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), -1); + QVERIFY(iface3 == 0); + } + } + } + if (!loop) { + // switch children for second loop + w2->raise(); + QAccessibleInterface *temp = iface1; + iface1 = iface2; + iface2 = temp; + } } delete iface1; iface1 = 0; delete iface2; iface2 = 0; @@ -1160,7 +1157,7 @@ void tst_QAccessibility::navigateCovered() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1263,7 +1260,7 @@ void tst_QAccessibility::navigateHierarchy() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1278,11 +1275,11 @@ void tst_QAccessibility::navigateControllers() #ifdef QTEST_ACCESSIBILITY { Q3VBox vbox; - QSlider slider(&vbox); - QSpinBox spinBox(&vbox); - QLCDNumber lcd1(&vbox); - QLCDNumber lcd2(&vbox); - QLabel label(&vbox); + QSlider slider(&vbox); + QSpinBox spinBox(&vbox); + QLCDNumber lcd1(&vbox); + QLCDNumber lcd2(&vbox); + QLabel label(&vbox); vbox.show(); slider.setObjectName("slider"); @@ -1359,7 +1356,7 @@ void tst_QAccessibility::navigateControllers() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -1374,24 +1371,24 @@ void tst_QAccessibility::navigateLabels() Q3VBox vbox; Q3HBox hbox(&vbox); - QLabel label(&hbox); + QLabel label(&hbox); label.setText("This is a lineedit:"); - QLineEdit lineedit(&hbox); + QLineEdit lineedit(&hbox); label.setBuddy(&lineedit); Q3VButtonGroup groupbox(&vbox); groupbox.setTitle("Be my children!"); QRadioButton radio(&groupbox); - QLabel label2(&groupbox); + QLabel label2(&groupbox); label2.setText("Another lineedit:"); - QLineEdit lineedit2(&groupbox); + QLineEdit lineedit2(&groupbox); label2.setBuddy(&lineedit2); Q3GroupBox groupbox2(&groupbox); groupbox2.setTitle("Some grand-children"); - QLineEdit grandchild(&groupbox2); + QLineEdit grandchild(&groupbox2); Q3GroupBox border(&vbox); - QLineEdit lineedit3(&border); + QLineEdit lineedit3(&border); vbox.show(); QTestAccessibility::clearEvents(); @@ -1492,7 +1489,7 @@ void tst_QAccessibility::navigateLabels() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -1571,7 +1568,7 @@ void tst_QAccessibility::accessibleName() delete toplevel; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1678,7 +1675,7 @@ void tst_QAccessibility::text() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // !QT3_SUPPORT } @@ -1714,7 +1711,7 @@ void tst_QAccessibility::setText() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif //QT3_SUPPORT } @@ -1749,7 +1746,7 @@ void tst_QAccessibility::hideShowTest() delete window; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1786,7 +1783,7 @@ void tst_QAccessibility::userActionCount() QCOMPARE(test->userActionCount(-1), 0); delete test; test = 0; #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1811,7 +1808,7 @@ void tst_QAccessibility::actionText() delete test; test = 0; #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -1820,7 +1817,7 @@ void tst_QAccessibility::doAction() #ifdef QTEST_ACCESSIBILITY QSKIP("TODO: Implement me", SkipAll); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2007,7 +2004,7 @@ void tst_QAccessibility::buttonTest() QTestAccessibility::clearEvents(); #else -// QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); +// QSKIP("Test needs accessibility support.", SkipAll); QSKIP("No action interface in Qt 4 yet.", SkipAll); #endif } @@ -2207,7 +2204,7 @@ void tst_QAccessibility::sliderTest() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif //!QT3_SUPPORT } @@ -2305,7 +2302,7 @@ void tst_QAccessibility::scrollBarTest() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2349,7 +2346,7 @@ void tst_QAccessibility::tabTest() delete interface; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2537,8 +2534,6 @@ void tst_QAccessibility::menuTest() } delete iface; - - // "New" item entry = interface->navigate(QAccessible::Child, 1, &iface); QCOMPARE(entry, 0); @@ -2569,11 +2564,6 @@ void tst_QAccessibility::menuTest() delete iface; - - -#if QT_VERSION < 0x040102 - QEXPECT_FAIL("", "Submenus don't open, task 99301", Continue); -#endif // move mouse pointer away, since that might influence the // subsequent tests QTest::mouseMove(&mw, QPoint(-1, -1)); @@ -2583,9 +2573,6 @@ void tst_QAccessibility::menuTest() interface->doAction(QAccessible::DefaultAction, 1); QTestEventLoop::instance().enterLoop(2); -#if defined (Q_OS_WIN) && QT_VERSION < 0x040300 && !defined(Q_OS_WINCE) - QEXPECT_FAIL("", "Don't expect the File menu to be visible in 4.2", Continue); -#endif QVERIFY(file->isVisible()); QVERIFY(fileNew->isVisible()); QVERIFY(!edit->isVisible()); @@ -2639,7 +2626,7 @@ void tst_QAccessibility::spinBoxTest() delete spinBox; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2666,7 +2653,7 @@ void tst_QAccessibility::doubleSpinBoxTest() delete doubleSpinBox; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2688,7 +2675,7 @@ void tst_QAccessibility::textEditTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2712,7 +2699,7 @@ void tst_QAccessibility::textBrowserTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2785,7 +2772,7 @@ void tst_QAccessibility::listViewTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2842,7 +2829,7 @@ void tst_QAccessibility::mdiAreaTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -2972,7 +2959,7 @@ void tst_QAccessibility::mdiSubWindowTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3037,7 +3024,7 @@ void tst_QAccessibility::lineEditTest() delete toplevel; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3098,7 +3085,7 @@ void tst_QAccessibility::workspaceTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3218,7 +3205,7 @@ void tst_QAccessibility::dialogButtonBoxTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3267,7 +3254,7 @@ void tst_QAccessibility::dialTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3281,7 +3268,7 @@ void tst_QAccessibility::rubberBandTest() delete interface; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3446,7 +3433,7 @@ void tst_QAccessibility::abstractScrollAreaTest() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3467,7 +3454,7 @@ void tst_QAccessibility::scrollAreaTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3512,7 +3499,7 @@ void tst_QAccessibility::tableWidgetTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3630,7 +3617,7 @@ void tst_QAccessibility::tableViewTest() QCOMPARE(client->role(0), QAccessible::Client); QRect globalRect = client->rect(0); QVERIFY(globalRect.isValid()); - // make sure we don't hit the vertical header ##### + // make sure we don't hit the vertical header ##### QPoint p = globalRect.topLeft() + QPoint(8, 8); p.ry() += 50 * (y - 1); p.rx() += 100 * (x - 1); @@ -3678,7 +3665,7 @@ void tst_QAccessibility::tableViewTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3779,7 +3766,7 @@ void tst_QAccessibility::calendarWidgetTest() } QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // QT_NO_CALENDARWIDGET } @@ -3857,7 +3844,7 @@ void tst_QAccessibility::dockWidgetTest() delete mw; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif // QT_NO_DOCKWIDGET } @@ -3903,7 +3890,7 @@ void tst_QAccessibility::pushButtonTest() delete toplevel; QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif #endif //QT3_SUPPORT } @@ -3950,7 +3937,7 @@ void tst_QAccessibility::comboBoxTest() QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } @@ -3989,7 +3976,6 @@ void tst_QAccessibility::treeWidgetTest() QCOMPARE(entry, 0); QCOMPARE(accTreeItem2->text(QAccessible::Name, 0), QLatin1String("row: 1")); - // test selected/focused state QItemSelectionModel *selModel = tree->selectionModel(); QVERIFY(selModel); @@ -4015,10 +4001,9 @@ void tst_QAccessibility::treeWidgetTest() delete acc; delete w; - QTestAccessibility::clearEvents(); #else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); + QSKIP("Test needs accessibility support.", SkipAll); #endif } diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp index 9c2fa50..423cf69 100644 --- a/tests/auto/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -574,10 +574,8 @@ void tst_QAlgorithms::test_qLowerBound() QCOMPARE(qLowerBound(data.constBegin(), data.constEnd(), resultValue), data.constBegin() + resultIndex); QCOMPARE(qLowerBound(data.begin(), data.end(), resultValue), data.begin() + resultIndex); -#if QT_VERSION >= 0x040200 QCOMPARE(qLowerBound(data, resultValue), data.constBegin() + resultIndex); QCOMPARE(qLowerBound(data.constBegin(), data.constEnd(), resultValue, qLess()), data.constBegin() + resultIndex); -#endif } void tst_QAlgorithms::test_qUpperBound_data() @@ -597,10 +595,8 @@ void tst_QAlgorithms::test_qUpperBound() QCOMPARE(qUpperBound(data.constBegin(), data.constEnd(), resultValue), data.constBegin() + resultIndex); QCOMPARE(qUpperBound(data.begin(), data.end(), resultValue), data.begin() + resultIndex); -#if QT_VERSION >= 0x040200 QCOMPARE(qUpperBound(data, resultValue), data.constBegin() + resultIndex); QCOMPARE(qUpperBound(data.constBegin(), data.constEnd(), resultValue, qLess()), data.constBegin() + resultIndex); -#endif } void tst_QAlgorithms::test_qBinaryFind_data() @@ -618,10 +614,8 @@ void tst_QAlgorithms::test_qBinaryFind() QCOMPARE(*qBinaryFind(data.constBegin(), data.constEnd(), resultValue), resultValue); QCOMPARE(*qBinaryFind(data.begin(), data.end(), resultValue), resultValue); -#if QT_VERSION >= 0x040200 QCOMPARE(*qBinaryFind(data, resultValue), resultValue); QCOMPARE(*qBinaryFind(data.constBegin(), data.constEnd(), resultValue, qLess()), resultValue); -#endif } void tst_QAlgorithms::qBinaryFindOneEntry() @@ -802,7 +796,6 @@ void tst_QAlgorithms::stableSortCorrectnessTest() void tst_QAlgorithms::convenienceAPI() { // Compile-test for QAlgorithm convenience functions. -#if QT_VERSION >= 0x040200 QList list, list2; qCopy(list.begin(), list.end(), list2.begin()); @@ -844,7 +837,6 @@ void tst_QAlgorithms::convenienceAPI() QList pointerList; qDeleteAll(pointerList); qDeleteAll(pointerList.begin(), pointerList.end()); -#endif } template diff --git a/tests/auto/qbitarray/tst_qbitarray.cpp b/tests/auto/qbitarray/tst_qbitarray.cpp index bbcb087..ecdffda 100644 --- a/tests/auto/qbitarray/tst_qbitarray.cpp +++ b/tests/auto/qbitarray/tst_qbitarray.cpp @@ -212,10 +212,8 @@ void tst_QBitArray::countBits() } QCOMPARE(bits.count(), numBits); -#if QT_VERSION >= 0x040100 QCOMPARE(bits.count(true), onBits); QCOMPARE(bits.count(false), numBits - onBits); -#endif } void tst_QBitArray::countBits2() @@ -314,7 +312,7 @@ void tst_QBitArray::toggleBit_data() } void tst_QBitArray::toggleBit() -{ +{ QFETCH(int,index); QFETCH(QBitArray, input); QFETCH(QBitArray, res); @@ -322,7 +320,6 @@ void tst_QBitArray::toggleBit() input.toggleBit(index); QCOMPARE(input, res); - } void tst_QBitArray::operator_andeq_data() @@ -331,33 +328,33 @@ void tst_QBitArray::operator_andeq_data() QTest::addColumn("input2"); QTest::addColumn("res"); - QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("00101100")); - QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("00001000")); - QTest::newRow( "data2" ) << QStringToQBitArray(QString("11011011111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data2" ) << QStringToQBitArray(QString("11011011111")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("00001000000")); - QTest::newRow( "data3" ) << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("00101100111")) + QTest::newRow( "data3" ) << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("00101100111")) << QStringToQBitArray(QString("00001000000")); - QTest::newRow( "data4" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString("00101100111")) + QTest::newRow( "data4" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString("00101100111")) << QStringToQBitArray(QString("00000000000")); - QTest::newRow( "data5" ) << QStringToQBitArray(QString("00101100111")) - << QStringToQBitArray(QString()) + QTest::newRow( "data5" ) << QStringToQBitArray(QString("00101100111")) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString("00000000000")); - QTest::newRow( "data6" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString()) + QTest::newRow( "data6" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString()); } @@ -370,7 +367,6 @@ void tst_QBitArray::operator_andeq() input1&=input2; QCOMPARE(input1, res); - } void tst_QBitArray::operator_oreq_data() @@ -379,37 +375,37 @@ void tst_QBitArray::operator_oreq_data() QTest::addColumn("input2"); QTest::addColumn("res"); - QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("11111111")); - QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("11111111")); - QTest::newRow( "data2" ) << QStringToQBitArray(QString("01000010")) - << QStringToQBitArray(QString("10100001")) + QTest::newRow( "data2" ) << QStringToQBitArray(QString("01000010")) + << QStringToQBitArray(QString("10100001")) << QStringToQBitArray(QString("11100011")); - QTest::newRow( "data3" ) << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("00101100000")) + QTest::newRow( "data3" ) << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("00101100000")) << QStringToQBitArray(QString("11111111000")); - QTest::newRow( "data4" ) << QStringToQBitArray(QString("11011011111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data4" ) << QStringToQBitArray(QString("11011011111")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("11111111111")); - QTest::newRow( "data5" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString("00101100111")) + QTest::newRow( "data5" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString("00101100111")) << QStringToQBitArray(QString("00101100111")); - QTest::newRow( "data6" ) << QStringToQBitArray(QString("00101100111")) - << QStringToQBitArray(QString()) + QTest::newRow( "data6" ) << QStringToQBitArray(QString("00101100111")) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString("00101100111")); - - QTest::newRow( "data7" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString()) + + QTest::newRow( "data7" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString()); } @@ -422,7 +418,6 @@ void tst_QBitArray::operator_oreq() input1|=input2; QCOMPARE(input1, res); - } void tst_QBitArray::operator_xoreq_data() @@ -430,36 +425,36 @@ void tst_QBitArray::operator_xoreq_data() QTest::addColumn("input1"); QTest::addColumn("input2"); QTest::addColumn("res"); - QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("11010011")); - QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("00101100")) << QStringToQBitArray(QString("11110111")); - QTest::newRow( "data2" ) << QStringToQBitArray(QString("01000010")) - << QStringToQBitArray(QString("10100001")) + QTest::newRow( "data2" ) << QStringToQBitArray(QString("01000010")) + << QStringToQBitArray(QString("10100001")) << QStringToQBitArray(QString("11100011")); - QTest::newRow( "data3" ) << QStringToQBitArray(QString("01000010")) - << QStringToQBitArray(QString("10100001101")) + QTest::newRow( "data3" ) << QStringToQBitArray(QString("01000010")) + << QStringToQBitArray(QString("10100001101")) << QStringToQBitArray(QString("11100011101")); - QTest::newRow( "data4" ) << QStringToQBitArray(QString("01000010111")) - << QStringToQBitArray(QString("101000011")) + QTest::newRow( "data4" ) << QStringToQBitArray(QString("01000010111")) + << QStringToQBitArray(QString("101000011")) << QStringToQBitArray(QString("11100011011")); - QTest::newRow( "data5" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString("00101100111")) + QTest::newRow( "data5" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString("00101100111")) << QStringToQBitArray(QString("00101100111")); - QTest::newRow( "data6" ) << QStringToQBitArray(QString("00101100111")) - << QStringToQBitArray(QString()) + QTest::newRow( "data6" ) << QStringToQBitArray(QString("00101100111")) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString("00101100111")); - - QTest::newRow( "data7" ) << QStringToQBitArray(QString()) - << QStringToQBitArray(QString()) + + QTest::newRow( "data7" ) << QStringToQBitArray(QString()) + << QStringToQBitArray(QString()) << QStringToQBitArray(QString()); } @@ -472,7 +467,6 @@ void tst_QBitArray::operator_xoreq() input1^=input2; QCOMPARE(input1, res); - } @@ -481,37 +475,37 @@ void tst_QBitArray::operator_neg_data() QTest::addColumn("input"); QTest::addColumn("res"); - QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) + QTest::newRow( "data0" ) << QStringToQBitArray(QString("11111111")) << QStringToQBitArray(QString("00000000")); - QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) + QTest::newRow( "data1" ) << QStringToQBitArray(QString("11011011")) << QStringToQBitArray(QString("00100100")); - QTest::newRow( "data2" ) << QStringToQBitArray(QString("00000000")) + QTest::newRow( "data2" ) << QStringToQBitArray(QString("00000000")) << QStringToQBitArray(QString("11111111")); - QTest::newRow( "data3" ) << QStringToQBitArray(QString()) + QTest::newRow( "data3" ) << QStringToQBitArray(QString()) << QStringToQBitArray(QString()); - QTest::newRow( "data4" ) << QStringToQBitArray("1") + QTest::newRow( "data4" ) << QStringToQBitArray("1") << QStringToQBitArray("0"); - QTest::newRow( "data5" ) << QStringToQBitArray("0") + QTest::newRow( "data5" ) << QStringToQBitArray("0") << QStringToQBitArray("1"); - QTest::newRow( "data6" ) << QStringToQBitArray("01") + QTest::newRow( "data6" ) << QStringToQBitArray("01") << QStringToQBitArray("10"); - QTest::newRow( "data7" ) << QStringToQBitArray("1110101") + QTest::newRow( "data7" ) << QStringToQBitArray("1110101") << QStringToQBitArray("0001010"); - QTest::newRow( "data8" ) << QStringToQBitArray("01110101") + QTest::newRow( "data8" ) << QStringToQBitArray("01110101") << QStringToQBitArray("10001010"); - QTest::newRow( "data9" ) << QStringToQBitArray("011101010") + QTest::newRow( "data9" ) << QStringToQBitArray("011101010") << QStringToQBitArray("100010101"); - QTest::newRow( "data10" ) << QStringToQBitArray("0111010101111010") + QTest::newRow( "data10" ) << QStringToQBitArray("0111010101111010") << QStringToQBitArray("1000101010000101"); } @@ -521,9 +515,8 @@ void tst_QBitArray::operator_neg() QFETCH(QBitArray, res); input = ~input; - - QCOMPARE(input, res); + QCOMPARE(input, res); } void tst_QBitArray::datastream_data() @@ -554,7 +547,7 @@ void tst_QBitArray::datastream() QFETCH(QString, bitField); QFETCH(int, numBits); QFETCH(int, onBits); - + QBuffer buffer; QVERIFY(buffer.open(QBuffer::ReadWrite)); QDataStream stream(&buffer); @@ -566,11 +559,9 @@ void tst_QBitArray::datastream() } QCOMPARE(bits.count(), numBits); -#if QT_VERSION >= 0x040100 QCOMPARE(bits.count(true), onBits); QCOMPARE(bits.count(false), numBits - onBits); -#endif - + stream << bits << bits << bits; buffer.close(); @@ -583,10 +574,8 @@ void tst_QBitArray::datastream() stream2 >> array1 >> array2 >> array3; QCOMPARE(array1.count(), numBits); -#if QT_VERSION >= 0x040100 QCOMPARE(array1.count(true), onBits); QCOMPARE(array1.count(false), numBits - onBits); -#endif QCOMPARE(array1, bits); QCOMPARE(array2, bits); @@ -595,7 +584,7 @@ void tst_QBitArray::datastream() void tst_QBitArray::invertOnNull() const { - QBitArray a; + QBitArray a; QCOMPARE(a = ~a, QBitArray()); } @@ -605,28 +594,28 @@ void tst_QBitArray::operator_noteq_data() QTest::addColumn("input2"); QTest::addColumn("res"); - QTest::newRow("data0") << QStringToQBitArray(QString("11111111")) - << QStringToQBitArray(QString("00101100")) + QTest::newRow("data0") << QStringToQBitArray(QString("11111111")) + << QStringToQBitArray(QString("00101100")) << true; - QTest::newRow("data1") << QStringToQBitArray(QString("11011011")) - << QStringToQBitArray(QString("11011011")) + QTest::newRow("data1") << QStringToQBitArray(QString("11011011")) + << QStringToQBitArray(QString("11011011")) << false; - QTest::newRow("data2") << QStringToQBitArray(QString()) - << QStringToQBitArray(QString("00101100111")) + QTest::newRow("data2") << QStringToQBitArray(QString()) + << QStringToQBitArray(QString("00101100111")) << true; - QTest::newRow("data3") << QStringToQBitArray(QString()) - << QStringToQBitArray(QString()) + QTest::newRow("data3") << QStringToQBitArray(QString()) + << QStringToQBitArray(QString()) << false; - QTest::newRow("data4") << QStringToQBitArray(QString("00101100")) - << QStringToQBitArray(QString("11111111")) + QTest::newRow("data4") << QStringToQBitArray(QString("00101100")) + << QStringToQBitArray(QString("11111111")) << true; - QTest::newRow("data5") << QStringToQBitArray(QString("00101100111")) - << QStringToQBitArray(QString()) + QTest::newRow("data5") << QStringToQBitArray(QString("00101100111")) + << QStringToQBitArray(QString()) << true; } diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp index c38fb66..15cca56 100644 --- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/qbuttongroup/tst_qbuttongroup.cpp @@ -95,10 +95,7 @@ private slots: void checkedButton(); - // fixed for Qt 4.2.0 -#if QT_VERSION >= 0x040200 void task106609(); -#endif void task209485_removeFromGroupInEventHandler_data(); void task209485_removeFromGroupInEventHandler(); @@ -211,7 +208,6 @@ void tst_QButtonGroup::arrowKeyNavigation() void tst_QButtonGroup::exclusiveWithActions() { -#if QT_VERSION > 0x040100 QDialog dlg(0); QHBoxLayout layout(&dlg); QAction *action1 = new QAction("Action 1", &dlg); @@ -235,7 +231,7 @@ void tst_QButtonGroup::exclusiveWithActions() buttonGroup->addButton(toolButton2, 2); buttonGroup->addButton(toolButton3, 3); dlg.show(); - + QTest::mouseClick(toolButton1, Qt::LeftButton); QVERIFY(toolButton1->isChecked()); QVERIFY(action1->isChecked()); @@ -251,7 +247,7 @@ void tst_QButtonGroup::exclusiveWithActions() QVERIFY(!toolButton3->isChecked()); QVERIFY(!action1->isChecked()); QVERIFY(!action3->isChecked()); - + QTest::mouseClick(toolButton3, Qt::LeftButton); QVERIFY(toolButton3->isChecked()); QVERIFY(action3->isChecked()); @@ -259,7 +255,7 @@ void tst_QButtonGroup::exclusiveWithActions() QVERIFY(!toolButton2->isChecked()); QVERIFY(!action1->isChecked()); QVERIFY(!action2->isChecked()); - + QTest::mouseClick(toolButton2, Qt::LeftButton); QVERIFY(toolButton2->isChecked()); QVERIFY(action2->isChecked()); @@ -267,7 +263,6 @@ void tst_QButtonGroup::exclusiveWithActions() QVERIFY(!toolButton3->isChecked()); QVERIFY(!action1->isChecked()); QVERIFY(!action3->isChecked()); -#endif } void tst_QButtonGroup::exclusive() @@ -289,7 +284,7 @@ void tst_QButtonGroup::exclusive() buttonGroup->addButton(pushButton2, 2); buttonGroup->addButton(pushButton3, 3); dlg.show(); - + QTest::mouseClick(pushButton1, Qt::LeftButton); QVERIFY(pushButton1->isChecked()); QVERIFY(!pushButton2->isChecked()); @@ -299,12 +294,12 @@ void tst_QButtonGroup::exclusive() QVERIFY(pushButton2->isChecked()); QVERIFY(!pushButton1->isChecked()); QVERIFY(!pushButton3->isChecked()); - + QTest::mouseClick(pushButton3, Qt::LeftButton); QVERIFY(pushButton3->isChecked()); QVERIFY(!pushButton1->isChecked()); QVERIFY(!pushButton2->isChecked()); - + QTest::mouseClick(pushButton2, Qt::LeftButton); QVERIFY(pushButton2->isChecked()); QVERIFY(!pushButton1->isChecked()); @@ -363,7 +358,6 @@ void tst_QButtonGroup::testSignals() QVERIFY(releasedIdSpy.takeFirst().at(0).toInt() == 23); } -#if QT_VERSION >= 0x040200 void tst_QButtonGroup::task106609() { // task is: @@ -403,7 +397,6 @@ void tst_QButtonGroup::task106609() QCOMPARE(spy2.count(), 2); QCOMPARE(spy1.count(), 2); } -#endif void tst_QButtonGroup::checkedButton() { diff --git a/tests/auto/qcache/tst_qcache.cpp b/tests/auto/qcache/tst_qcache.cpp index f0d0454..2b61467 100644 --- a/tests/auto/qcache/tst_qcache.cpp +++ b/tests/auto/qcache/tst_qcache.cpp @@ -39,10 +39,8 @@ ** ****************************************************************************/ - #include - #include //TESTED_CLASS= @@ -56,7 +54,6 @@ public: tst_QCache(); virtual ~tst_QCache(); - public slots: void initTestCase(); void cleanupTestCase(); @@ -344,7 +341,7 @@ void tst_QCache::remove() QCOMPARE(cache.totalCost(), 20); } - cache.setMaxCost(1); + cache.setMaxCost(1); QCOMPARE(cache.size(), 0); cache.remove("beta"); QCOMPARE(cache.size(), 0); @@ -377,7 +374,7 @@ void tst_QCache::take() QCOMPARE(cache.size(), 1); QCOMPARE(cache.totalCost(), 20); - cache.setMaxCost(1); + cache.setMaxCost(1); QCOMPARE(cache.size(), 0); QCOMPARE(cache.take("beta"), (Foo*)0); QCOMPARE(cache.size(), 0); @@ -389,15 +386,8 @@ struct KeyType KeyType(int x) : foo(x) {} - /* - Qt 4.0 and 4.1 require a default ctor and an operator=(). - */ -#if QT_VERSION < 0x040200 - KeyType() : foo(0) {} -#else private: KeyType &operator=(const KeyType &); -#endif }; struct ValueType diff --git a/tests/auto/qcheckbox/tst_qcheckbox.cpp b/tests/auto/qcheckbox/tst_qcheckbox.cpp index be1095a..9ffeb07 100644 --- a/tests/auto/qcheckbox/tst_qcheckbox.cpp +++ b/tests/auto/qcheckbox/tst_qcheckbox.cpp @@ -377,10 +377,8 @@ void tst_QCheckBox::onStateChanged( int state ) void tst_QCheckBox::stateChanged() { -#if QT_VERSION > 0x040101 QSignalSpy stateChangedSpy(testWidget, SIGNAL(stateChanged(int))); -#endif - connect(testWidget, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int))); + connect(testWidget, SIGNAL(stateChanged(int)), this, SLOT(onStateChanged(int))); cur_state = -1; testWidget->setChecked( TRUE ); qApp->processEvents(); @@ -396,12 +394,10 @@ void tst_QCheckBox::stateChanged() qApp->processEvents(); QCOMPARE( cur_state, (int)1 ); -#if QT_VERSION > 0x040101 QCOMPARE(stateChangedSpy.count(), 3); testWidget->setCheckState(Qt::PartiallyChecked); qApp->processEvents(); QCOMPARE(stateChangedSpy.count(), 3); -#endif } void tst_QCheckBox::isToggleButton() diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 70059f2..6a87e3c 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -283,13 +283,9 @@ void tst_QComboBox::getSetCheck() QLineEdit *var8 = new QLineEdit(0); obj1.setLineEdit(var8); QCOMPARE(var8, obj1.lineEdit()); -#if QT_VERSION >= 0x040200 - // QComboBox in Qt < 4.2 have asserts for this, but handles the situation by ignoring it. - // Qt >= 4.2 should handle this gracefully (no asserts, but define behavior as keeping current) QTest::ignoreMessage(QtWarningMsg, "QComboBox::setLineEdit: cannot set a 0 line edit"); obj1.setLineEdit((QLineEdit *)0); QCOMPARE(var8, obj1.lineEdit()); -#endif // delete var8; // No delete, since QComboBox takes ownership // const QValidator * QComboBox::validator() @@ -306,13 +302,9 @@ void tst_QComboBox::getSetCheck() MyAbstractItemDelegate *var10 = new MyAbstractItemDelegate; obj1.setItemDelegate(var10); QCOMPARE(obj1.itemDelegate(), (QAbstractItemDelegate *)var10); -#if QT_VERSION >= 0x040200 - // QComboBox in Qt < 4.2 have asserts for this, but handles the situation by ignoring it. - // Qt >= 4.2 should handle this gracefully (no asserts, but define behavior as keeping current) QTest::ignoreMessage(QtWarningMsg, "QComboBox::setItemDelegate: cannot set a 0 delegate"); obj1.setItemDelegate((QAbstractItemDelegate *)0); QCOMPARE(obj1.itemDelegate(), (QAbstractItemDelegate *)var10); -#endif // delete var10; // No delete, since QComboBox takes ownership // QAbstractItemModel * QComboBox::model() @@ -320,13 +312,9 @@ void tst_QComboBox::getSetCheck() MyAbstractItemModel *var11 = new MyAbstractItemModel; obj1.setModel(var11); QCOMPARE(obj1.model(), (QAbstractItemModel *)var11); -#if QT_VERSION >= 0x040200 - // QComboBox in Qt < 4.2 have asserts for this, but handles the situation by ignoring it. - // Qt >= 4.2 should handle this gracefully (no asserts, but define behavior as keeping current) QTest::ignoreMessage(QtWarningMsg, "QComboBox::setModel: cannot set a 0 model"); obj1.setModel((QAbstractItemModel *)0); QCOMPARE(obj1.model(), (QAbstractItemModel *)var11); -#endif delete var11; obj1.model(); @@ -345,13 +333,9 @@ void tst_QComboBox::getSetCheck() MyAbstractItemView *var13 = new MyAbstractItemView; obj1.setView(var13); QCOMPARE(obj1.view(), (QAbstractItemView *)var13); -#if QT_VERSION >= 0x040200 - // QComboBox in Qt < 4.2 have asserts for this - // Qt >= 4.2 should handle this gracefully (no asserts, but define behavior as keeping current view) QTest::ignoreMessage(QtWarningMsg, "QComboBox::setView: cannot set a 0 view"); obj1.setView((QAbstractItemView *)0); QCOMPARE(obj1.view(), (QAbstractItemView *)var13); -#endif delete var13; // int QComboBox::currentIndex() @@ -512,13 +496,9 @@ void tst_QComboBox::sizeAdjustPolicy() testWidget->addItem("small"); QCOMPARE(testWidget->sizeHint(), content); testWidget->addItem("looooooooooooooooooooooong item"); -#if QT_VERSION >= 0x040200 // minimumContentsLength() > sizeof("looooooooooooooooooooooong item"), so the sizeHint() // stays the same QCOMPARE(testWidget->sizeHint(), content); -#else - QVERIFY(testWidget->sizeHint().width() > content.width()); -#endif // over 60 characters (cf. setMinimumContentsLength() call above) testWidget->addItem("loooooooooooooooooooooooooooooooooooooooooooooo" "ooooooooooooooooooooooooooooooooooooooooooooooo" @@ -535,10 +515,8 @@ void tst_QComboBox::sizeAdjustPolicy() content = testWidget->sizeHint(); while (testWidget->count()) testWidget->removeItem(0); -#if QT_VERSION >= 0x040200 QCOMPARE(testWidget->sizeHint(), content); testWidget->setMinimumContentsLength(0); -#endif QVERIFY(testWidget->sizeHint().width() < content.width()); } @@ -831,13 +809,9 @@ void tst_QComboBox::autoCompletionCaseSensitivity() QTest::keyClick(testWidget->lineEdit(), Qt::Key_B); qApp->processEvents(); -#if QT_VERSION < 0x040200 - // autocompletions are case-preserving in < 4.2 - QCOMPARE(testWidget->currentText(), QString("aBCDEF")); -#else // autocompletions preserve userkey-case from 4.2 QCOMPARE(testWidget->currentText(), QString("abCDEF")); -#endif + QTest::keyClick(testWidget->lineEdit(), Qt::Key_Enter); qApp->processEvents(); QCOMPARE(testWidget->currentText(), QString("aBCDEF")); // case restored to item's case diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index 5665e6e..45a4301 100644 --- a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -211,11 +211,7 @@ void tst_QCommandLinkButton::setAutoRepeat() QVERIFY( !testWidget->isCheckable() ); // verify autorepeat is off by default. -#if QT_VERSION < 0x040000 - QButton tmp( 0 ); -#else QCommandLinkButton tmp( 0 ); -#endif tmp.setObjectName("tmp"); QVERIFY( !tmp.autoRepeat() ); diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_cssparser.cpp index 9a984c8..ab6bad6 100644 --- a/tests/auto/qcssparser/tst_cssparser.cpp +++ b/tests/auto/qcssparser/tst_cssparser.cpp @@ -44,7 +44,6 @@ //TESTED_CLASS=QCss //TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h -#if QT_VERSION >= 0x040200 #include "private/qcssparser_p.h" class tst_CssParser : public QObject @@ -1592,13 +1591,13 @@ void tst_CssParser::quotedAndUnquotedIdentifiers() QCss::Parser parser("foo { font-style: \"italic\"; font-weight: bold }"); QCss::StyleSheet sheet; QVERIFY(parser.parse(&sheet)); - + QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1); QCss::StyleRule rule = (!sheet.styleRules.isEmpty()) ? sheet.styleRules.at(0) : *sheet.nameIndex.begin(); const QVector decls = rule.declarations; QCOMPARE(decls.size(), 2); - + QCOMPARE(decls.at(0).d->values.first().type, QCss::Value::String); QCOMPARE(decls.at(0).d->property, QLatin1String("font-style")); QCOMPARE(decls.at(0).d->values.first().toString(), QLatin1String("italic")); @@ -1610,6 +1609,3 @@ void tst_CssParser::quotedAndUnquotedIdentifiers() QTEST_MAIN(tst_CssParser) #include "tst_cssparser.moc" -#else -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index a112c10..d7ca7bc 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -163,10 +163,8 @@ private slots: void setVersion_data(); void setVersion(); -#if QT_VERSION >= 0x040100 void skipRawData_data(); void skipRawData(); -#endif void status_qint8_data(); void status_qint8(); @@ -2435,7 +2433,6 @@ private: int offset; }; -#if QT_VERSION >= 0x040100 void tst_QDataStream::skipRawData_data() { QTest::addColumn("deviceType"); @@ -2486,7 +2483,6 @@ void tst_QDataStream::skipRawData() delete dev; } -#endif #define TEST_qint(T, UT) \ void tst_QDataStream::status_##T() \ diff --git a/tests/auto/qdate/tst_qdate.cpp b/tests/auto/qdate/tst_qdate.cpp index 121167a..d4273d0 100644 --- a/tests/auto/qdate/tst_qdate.cpp +++ b/tests/auto/qdate/tst_qdate.cpp @@ -143,10 +143,8 @@ void tst_QDate::isValid_data() QTest::newRow("century leap") << 2100 << 2 << 29 << 0U << false; QTest::newRow("400-years leap") << 2000 << 2 << 29 << 2451604U << true; QTest::newRow("400-years leap 2") << 2400 << 2 << 29 << 2597701U << true; -#if QT_VERSION >= 0x040200 QTest::newRow("400-years leap 3") << 1600 << 2 << 29 << 2305507U << true; QTest::newRow("year 0") << 0 << 2 << 27 << 0U << false; -#endif // test the number of days in months: QTest::newRow("jan") << 2000 << 1 << 31 << 2451575U << true; @@ -177,7 +175,6 @@ void tst_QDate::isValid_data() QTest::newRow("idec") << 2000 << 12 << 32 << 0U << false; // the beginning of the Julian Day calendar: -#if QT_VERSION >= 0x040200 QTest::newRow("jd negative1") << -4714 << 1 << 1 << 0U << false; QTest::newRow("jd negative2") << -4713 << 1 << 1 << 0U << false; QTest::newRow("jd negative3") << -4713 << 1 << 2 << 1U << true; @@ -185,7 +182,6 @@ void tst_QDate::isValid_data() QTest::newRow("jd 0") << -4713 << 1 << 1 << 0U << false; QTest::newRow("jd 1") << -4713 << 1 << 2 << 1U << true; QTest::newRow("imminent overflow") << 11754508 << 12 << 13 << 4294967295U << true; -#endif } void tst_QDate::isValid() @@ -243,17 +239,12 @@ void tst_QDate::weekNumber_data() QTest::newRow( "data4" ) << 1 << 2001 << 2001 << 1 << 1; QTest::newRow( "data5" ) << 53 << 1998 << 1998 << 12 << 31; QTest::newRow( "data6" ) << 1 << 1985 << 1984 << 12 << 31; -#if QT_VERSION >= 0x030300 - // This is a bug that was fixed for 3.3 QTest::newRow( "data7" ) << 52 << 2006 << 2006 << 12 << 31; -#endif } void tst_QDate::weekNumber() { -#if QT_VERSION >= 0x030100 int yearNumber; -// int weekNumber; QFETCH( int, year ); QFETCH( int, month ); QFETCH( int, day ); @@ -262,9 +253,6 @@ void tst_QDate::weekNumber() QDate dt1( year, month, day ); QCOMPARE( dt1.weekNumber( &yearNumber ), expectedWeekNum ); QCOMPARE( yearNumber, expectedYearNum ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_QDate::weekNumber_invalid_data() @@ -281,14 +269,9 @@ void tst_QDate::weekNumber_invalid_data() void tst_QDate::weekNumber_invalid() { -#if QT_VERSION >= 0x030100 QDate dt; int yearNumber; -// int weekNumber; QCOMPARE( dt.weekNumber( &yearNumber ), 0 ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_QDate::addDays() @@ -616,14 +599,12 @@ void tst_QDate::fromString_data() QDate d( 1999, 11, 14 ); QTest::newRow( "data2" ) << d.toString( Qt::TextDate ) << d.toString( Qt::ISODate ) << d; -#if QT_VERSION >= 0x040200 QTest::newRow( "data3" ) << QString("xxx Jan 1 0999") << QString("0999-01-01") << QDate(999, 1, 1); QTest::newRow( "data3b" ) << QString("xxx Jan 1 999") << QString("0999-01-01") << QDate(999, 1, 1); QTest::newRow( "data4" ) << QString("xxx Jan 1 12345") << QString() << QDate(12345, 1, 1); QTest::newRow( "data5" ) << QString("xxx Jan 1 -0001") << QString() << QDate(-1, 1, 1); QTest::newRow( "data6" ) << QString("xxx Jan 1 -4712") << QString() << QDate(-4712, 1, 1); QTest::newRow( "data7" ) << QString("xxx Nov 25 -4713") << QString() << QDate(-4713, 11, 25); -#endif } void tst_QDate::fromString() @@ -647,9 +628,7 @@ void tst_QDate::toString_format_data() QTest::newRow( "data1" ) << QDate(2002,12,17) << QString("dd-MM-yyyy") << QString("17-12-2002"); QTest::newRow( "data2" ) << QDate(1995,5,20) << QString("M-yy") << QString("5-95"); QTest::newRow( "data3" ) << QDate(2002,12,17) << QString("dd") << QString("17"); -#if (QT_VERSION-0 >= 0x030200) QTest::newRow( "data4" ) << QDate() << QString("dd-mm-yyyy") << QString(); -#endif } void tst_QDate::toString_format() diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp index 9e73d6d..69d8a62 100644 --- a/tests/auto/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/qdatetime/tst_qdatetime.cpp @@ -220,18 +220,10 @@ void tst_QDateTime::isNull() dt1.setDate(QDate(2004, 1, 2)); QVERIFY(!dt1.isNull()); -#if QT_VERSION < 0x040100 - dt1.setDate(QDate()); - QVERIFY(dt1.isNull()); -#endif dt1.setTime(QTime(12, 34, 56)); QVERIFY(!dt1.isNull()); dt1.setTime(QTime()); -#if QT_VERSION >= 0x040100 QVERIFY(!dt1.isNull()); -#else - QVERIFY(dt1.isNull()); -#endif } void tst_QDateTime::isValid() @@ -1010,15 +1002,10 @@ void tst_QDateTime::toString_strformat_data() void tst_QDateTime::toString_strformat() { -#if (QT_VERSION-0 >= 0x030200) QFETCH( QDateTime, dt ); QFETCH( QString, format ); QFETCH( QString, str ); QCOMPARE( dt.toString( format ), str ); -#else - QSKIP( "No test implemented for < 3.2 yet", SkipAll); -#endif - } void tst_QDateTime::fromStringTextDate_data() @@ -1068,7 +1055,6 @@ void tst_QDateTime::fromStringTextDate_data() << 28 << 6 << 2005 << 7 << 57 << 30 << 110 << int(Qt::LocalTime); -#if QT_VERSION >= 0x040200 QTest::newRow("Year 0999") << QString("Tue Jun 17 08:00:10 0999") << int(Qt::TextDate) << 17 << 6 << 999 << 8 << 0 << 10 << 0 @@ -1088,7 +1074,6 @@ void tst_QDateTime::fromStringTextDate_data() << int(Qt::TextDate) << 1 << 1 << -4712 << 0 << 01 << 02 << 0 << int(Qt::LocalTime); -#endif } void tst_QDateTime::fromStringTextDate() diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp index 49f8922..81b35ac 100644 --- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp @@ -41,9 +41,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else #include #include #include @@ -172,5 +169,3 @@ void tst_qdesktopservices::storageLocationDoesNotEndWithSlash() QTEST_MAIN(tst_qdesktopservices) #include "tst_qdesktopservices.moc" -#endif - diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp index e77167e..a1cf1c1 100644 --- a/tests/auto/qdialog/tst_qdialog.cpp +++ b/tests/auto/qdialog/tst_qdialog.cpp @@ -375,14 +375,11 @@ void tst_QDialog::showAsTool() testWidget->activateWindow(); dialog.exec(); QTest::qWait(100); - if (testWidget->style()->styleHint(QStyle::SH_Widget_ShareActivation, 0, testWidget)) { -#if defined(Q_WS_QWS) && QT_VERSION < 0x040400 - QEXPECT_FAIL(0, "Qtopia Core has messed up WStyle_Tool (task 126435)", Continue); -#endif - QCOMPARE(dialog.wasActive(), true); - } else { - QCOMPARE(dialog.wasActive(), false); - } + if (testWidget->style()->styleHint(QStyle::SH_Widget_ShareActivation, 0, testWidget)) { + QCOMPARE(dialog.wasActive(), true); + } else { + QCOMPARE(dialog.wasActive(), false); + } } // Verify that pos() returns the same before and after show() @@ -392,10 +389,10 @@ void tst_QDialog::toolDialogPosition() #if defined(Q_OS_WINCE) QSKIP("No real support for Qt::Tool on WinCE", SkipAll); #endif - QDialog dialog(0, Qt::Tool); - dialog.move(QPoint(100,100)); + QDialog dialog(0, Qt::Tool); + dialog.move(QPoint(100,100)); const QPoint beforeShowPosition = dialog.pos(); - dialog.show(); + dialog.show(); const QPoint afterShowPosition = dialog.pos(); QCOMPARE(afterShowPosition, beforeShowPosition); } @@ -445,7 +442,7 @@ public slots: void tst_QDialog::throwInExec() { #ifdef Q_WS_MAC - QSKIP("Qt/Mac: Throwing exceptions in excec() is not supported.", SkipAll); + QSKIP("Qt/Mac: Throwing exceptions in exec() is not supported.", SkipAll); #endif int caughtExceptions = 0; try { diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index f680f46..91ce5b3 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -787,9 +787,7 @@ void tst_QDir::cd_data() #endif QTest::newRow("non existant") << "." << "../anonexistingdir" << false << QDir::currentPath(); QTest::newRow("self") << "." << (QString("../") + QFileInfo(QDir::currentPath()).fileName()) << true << QDir::currentPath(); -#if QT_VERSION > 0x040100 QTest::newRow("file") << "." << "qdir.pro" << false << ""; -#endif } void tst_QDir::cd() @@ -827,10 +825,8 @@ void tst_QDir::setNameFilters_data() << QString("foo. bar,foo.bar").split(","); QTest::newRow("files1") << appPath + "testdir/dir" << QString("*r.cpp *.pro").split(" ") << QString("qdir.pro,qrc_qdir.cpp,tst_qdir.cpp").split(","); -#if QT_VERSION >= 0x040000 QTest::newRow("resources1") << QString(":/tst_qdir/resources/entryList") << QStringList("*.data") << QString("file1.data,file2.data,file3.data").split(','); -#endif } void tst_QDir::setNameFilters() diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index f6887da..2084535 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -614,7 +614,6 @@ void tst_QDirModel::task196768_sorting() QCOMPARE(index.data(), index2.data()); } -#if QT_VERSION >= 0x040102 void tst_QDirModel::filter() { QDirModel model; @@ -625,7 +624,6 @@ void tst_QDirModel::filter() Q_ASSERT(!index2.isValid()); Q_ASSERT(model.rowCount(index) == 0); } -#endif void tst_QDirModel::task244669_remove() { diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index 829e0b3..98e1859 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -76,10 +76,6 @@ #include "../network-settings.h" -#if QT_VERSION < 0x040200 -#define symLinkTarget readLink -#endif - Q_DECLARE_METATYPE(QFile::FileError) //TESTED_CLASS= @@ -990,12 +986,8 @@ void tst_QFile::link() #ifdef Q_OS_WIN // on windows links are always absolute QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath()); #else -#if QT_VERSION < 0x040101 - QCOMPARE(info2.symLinkTarget(), info1.filePath()); -#else QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath()); #endif -#endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) QString wd = getWorkingDirectoryForLink(info2.absoluteFilePath()); @@ -1061,19 +1053,12 @@ void tst_QFile::readBrokenLink() #ifdef Q_OS_WIN // on windows links are alway absolute QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath()); #else -#if QT_VERSION < 0x040101 - QCOMPARE(info2.symLinkTarget(), info1.filePath()); -#else QCOMPARE(info2.symLinkTarget(), info1.absoluteFilePath()); #endif -#endif QVERIFY(QFile::remove(info2.absoluteFilePath())); - -#if QT_VERSION >= 0x040101 QVERIFY(QFile::link("ole/..", "myLink2.lnk")); QCOMPARE(QFileInfo("myLink2.lnk").symLinkTarget(), QDir::currentPath()); -#endif } void tst_QFile::readTextFile_data() @@ -1281,10 +1266,6 @@ void tst_QFile::bufferedRead() QCOMPARE(file.pos(), qlonglong(2)); } -#if QT_VERSION <= 0x040100 - QCOMPARE(int(ftell(stdFile)), 2); -#endif - fclose(stdFile); } @@ -1604,12 +1585,7 @@ void tst_QFile::longFileName() } { QFile file(fileName); -#if QT_VERSION < 0x040100 -# ifdef Q_OS_WIN - QEXPECT_FAIL("244 chars", "Fixed in 4.1", Continue); - QEXPECT_FAIL("244 chars to absolutepath", "Fixed in 4.1", Continue); -# endif -#elif defined(Q_WS_WIN) +#if defined(Q_WS_WIN) #if !defined(Q_OS_WINCE) QT_WA({ if (false) ; }, { QEXPECT_FAIL("244 chars", "Full pathname must be less than 260 chars", Abort); @@ -1834,10 +1810,6 @@ void tst_QFile::removeOpenFile() void tst_QFile::fullDisk() { -#if QT_VERSION < 0x040102 - QSKIP("Fixed for 4.1.2", SkipAll); -#endif - QFile file("/dev/full"); if (!file.exists()) QSKIP("/dev/full doesn't exist on this system", SkipAll); @@ -1981,9 +1953,7 @@ void tst_QFile::virtualFile() // read all: data = f.readAll(); QVERIFY(f.pos() != 0); -#if QT_VERSION >= 0x040200 QVERIFY(!data.isEmpty()); -#endif // seeking QVERIFY(f.seek(1)); diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 87f9ba3..334acce 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #ifdef Q_OS_LINUX @@ -403,5 +399,3 @@ void tst_QFileSystemWatcher::removePaths() QTEST_MAIN(tst_QFileSystemWatcher) #include "tst_qfilesystemwatcher.moc" - -#endif diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/qfont/tst_qfont.cpp index 58e837e..e3a5ffc 100644 --- a/tests/auto/qfont/tst_qfont.cpp +++ b/tests/auto/qfont/tst_qfont.cpp @@ -537,9 +537,6 @@ void tst_QFont::insertAndRemoveSubstitutions() QStringList moreFonts; moreFonts << "Bar" << "Baz"; QFont::insertSubstitutions("BogusFontFamily", moreFonts); -#if (QT_VERSION <= 0x040102) - QEXPECT_FAIL("", "Uppercase/Lowercase issues fixed in 4.1.3 and beyond", Abort); -#endif QCOMPARE(QFont::substitutes("BogusFontFamily").count(), 3); QCOMPARE(QFont::substitutes("bogusfontfamily").count(), 3); diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp index 28f490a..9c42b49 100644 --- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp @@ -149,9 +149,7 @@ void tst_QFontDatabase::fixedPitch() if (!fdb.families().contains(font)) QSKIP( "Font not installed", SkipSingle); -#if QT_VERSION >= 0x030200 QCOMPARE(fdb.isFixedPitch(font), fixedPitch); -#endif QFont qfont(font); QFontInfo fi(qfont); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index d500182..5565aa6 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #include #include @@ -6044,4 +6040,3 @@ void tst_QGraphicsItem::cacheMode() QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" -#endif diff --git a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp index d43d0ae..6d20716 100644 --- a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp +++ b/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp @@ -42,12 +42,7 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include - #include #include @@ -195,4 +190,3 @@ void tst_QGraphicsItemAnimation::setTimeLine() QTEST_MAIN(tst_QGraphicsItemAnimation) #include "tst_qgraphicsitemanimation.moc" -#endif diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 354d81a..da99c30 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -45,10 +45,6 @@ #include #endif -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #include @@ -3589,4 +3585,3 @@ void tst_QGraphicsScene::stickyFocus() QTEST_MAIN(tst_QGraphicsScene) #include "tst_qgraphicsscene.moc" -#endif diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 412c6c5..b5af115 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #include #include @@ -3050,4 +3046,3 @@ void tst_QGraphicsView::centerOnDirtyItem() QTEST_MAIN(tst_QGraphicsView) #include "tst_qgraphicsview.moc" -#endif diff --git a/tests/auto/qhash/tst_qhash.cpp b/tests/auto/qhash/tst_qhash.cpp index 9343504..f300eec 100644 --- a/tests/auto/qhash/tst_qhash.cpp +++ b/tests/auto/qhash/tst_qhash.cpp @@ -39,16 +39,10 @@ ** ****************************************************************************/ - #include - -#if QT_VERSION >= 0x040000 #include #include -#endif - - //TESTED_CLASS= //TESTED_FILES= @@ -65,7 +59,7 @@ private slots: void insert1(); void erase(); void key(); - + void count(); // copied from tst_QMap void clear(); // copied from tst_QMap void empty(); // copied from tst_QMap @@ -80,9 +74,7 @@ private slots: void qmultihash_specific(); void compare(); -#if QT_VERSION > 0x040100 void compare2(); -#endif // QT_VERSION void iterators(); // sligthly modified from tst_QMap void keys_values_uniqueKeys(); // slightly modified from tst_QMap void noNeedlessRehashes(); @@ -799,7 +791,6 @@ void tst_QHash::compare() QVERIFY(hash1 != hash2); } -#if QT_VERSION > 0x040100 void tst_QHash::compare2() { QHash a; @@ -838,7 +829,6 @@ void tst_QHash::compare2() QVERIFY(!(a == b)); QVERIFY(!(b == a)); } -#endif // QT_VERSION //sligthly modified from tst_QMap void tst_QHash::iterators() @@ -996,9 +986,6 @@ void tst_QHash::rehash_isnt_quadratic() class Bar { public: -#if QT_VERSION < 0x040100 - Bar() : j(0) {} -#endif Bar(int i) : j(i) {} int j; @@ -1180,37 +1167,27 @@ QList sorted(const QList &list) void tst_QHash::keys_values_uniqueKeys() { QHash hash; -#if QT_VERSION >= 0x040200 QVERIFY(hash.uniqueKeys().isEmpty()); -#endif QVERIFY(hash.keys().isEmpty()); QVERIFY(hash.values().isEmpty()); hash.insertMulti("alpha", 1); QVERIFY(sorted(hash.keys()) == (QList() << "alpha")); -#if QT_VERSION >= 0x040200 QVERIFY(hash.keys() == hash.uniqueKeys()); -#endif QVERIFY(hash.values() == (QList() << 1)); hash.insertMulti("beta", -2); QVERIFY(sorted(hash.keys()) == (QList() << "alpha" << "beta")); -#if QT_VERSION >= 0x040200 QVERIFY(hash.keys() == hash.uniqueKeys()); -#endif QVERIFY(sorted(hash.values()) == sorted(QList() << 1 << -2)); hash.insertMulti("alpha", 2); -#if QT_VERSION >= 0x040200 QVERIFY(sorted(hash.uniqueKeys()) == (QList() << "alpha" << "beta")); -#endif QVERIFY(sorted(hash.keys()) == (QList() << "alpha" << "alpha" << "beta")); QVERIFY(sorted(hash.values()) == sorted(QList() << 2 << 1 << -2)); hash.insertMulti("beta", 4); -#if QT_VERSION >= 0x040200 QVERIFY(sorted(hash.uniqueKeys()) == (QList() << "alpha" << "beta")); -#endif QVERIFY(sorted(hash.keys()) == (QList() << "alpha" << "alpha" << "beta" << "beta")); QVERIFY(sorted(hash.values()) == sorted(QList() << 2 << 1 << 4 << -2)); } diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index e4a798e..46bd8cd 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -253,11 +253,9 @@ void tst_QHttp::constructing() } -#if QT_VERSION >= 0x040102 { QHttpResponseHeader header(200); } -#endif } void tst_QHttp::invalidRequests() diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp index 9fca6df..7d7f4ac 100644 --- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp +++ b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp @@ -264,42 +264,35 @@ void tst_QtIcoImageFormat::nextImageDelay_data() { QTest::addColumn("fileName"); QTest::addColumn("count"); - QTest::addColumn("delay"); - - QTest::newRow("floppy (16px,32px - 16 colors)") << "valid/35FLOPPY.ICO" << 2 << 0; - QTest::newRow("16px,32px,48px - 256,16M colors") << "valid/abcardWindow.ico" << 6 << 0; - QTest::newRow("16px - 16 colors") << "valid/App.ico" << 1 << 0; - QTest::newRow("16px,32px,48px - 16,256,16M colors") << "valid/Obj_N2_Internal_Mem.ico" << 9 << 0; - QTest::newRow("16px - 16,256,16M colors") << "valid/Status_Play.ico" << 3 << 0; - QTest::newRow("16px,32px - 16 colors") << "valid/TIMER01.ICO" << 2 << 0; - QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLD.ico" << 3 << 0; - QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLDH.ico" << 3 << 0; - QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << -1 << -1; - QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9 << 0; + + QTest::newRow("floppy (16px,32px - 16 colors)") << "valid/35FLOPPY.ICO" << 2; + QTest::newRow("16px,32px,48px - 256,16M colors") << "valid/abcardWindow.ico" << 6; + QTest::newRow("16px - 16 colors") << "valid/App.ico" << 1; + QTest::newRow("16px,32px,48px - 16,256,16M colors") << "valid/Obj_N2_Internal_Mem.ico" << 9; + QTest::newRow("16px - 16,256,16M colors") << "valid/Status_Play.ico" << 3; + QTest::newRow("16px,32px - 16 colors") << "valid/TIMER01.ICO" << 2; + QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLD.ico" << 3; + QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLDH.ico" << 3; + QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << -1; + QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9; } void tst_QtIcoImageFormat::nextImageDelay() { QFETCH(QString, fileName); QFETCH(int, count); - QFETCH(int, delay); - -#if QT_VERSION > 0x040001 - delay = 0; -#endif QImageReader reader(m_IconPath + "/" + fileName); if (count == -1) { - QCOMPARE(reader.nextImageDelay(), delay); - + QCOMPARE(reader.nextImageDelay(), 0); } else { int i; for (i = 0; i < count; i++) { - QVERIFY(reader.jumpToImage(i)); - QCOMPARE(reader.nextImageDelay(), delay); + QCOMPARE(reader.nextImageDelay(), 0); } } } + QTEST_MAIN(tst_QtIcoImageFormat) #include "tst_qticoimageformat.moc" diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/qicon/tst_qicon.cpp index 7e515a5..4e9a880 100644 --- a/tests/auto/qicon/tst_qicon.cpp +++ b/tests/auto/qicon/tst_qicon.cpp @@ -186,10 +186,8 @@ void tst_QIcon::actualSize2() QFETCH(QSize, argument); QFETCH(QSize, result); -#if QT_VERSION >= 0x040200 QCOMPARE(icon.actualSize(argument), result); QCOMPARE(icon.pixmap(argument).size(), result); -#endif } void tst_QIcon::svgActualSize() diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index 132e373..ee4ece2 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -95,9 +95,8 @@ private slots: void rotate_data(); void rotate(); -#if QT_VERSION >= 0x040102 void copy(); -#endif + void setPixel_data(); void setPixel(); @@ -974,7 +973,6 @@ void tst_QImage::rotate() QCOMPARE(original, dest); } -#if QT_VERSION >= 0x040102 void tst_QImage::copy() { // Task 99250 @@ -983,7 +981,6 @@ void tst_QImage::copy() img.copy(QRect(1000,1,1,1)); } } -#endif void tst_QImage::setPixel_data() { diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index e256227..3841111 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -128,30 +128,22 @@ private slots: void physicalDpi_data(); void physicalDpi(); -#if QT_VERSION > 0x040100 void sizeBeforeRead_data(); void sizeBeforeRead(); -#endif -#if QT_VERSION > 0x040400 void imageFormatBeforeRead_data(); void imageFormatBeforeRead(); -#endif #if defined QTEST_HAVE_GIF void gifHandlerBugs(); #endif -#if QT_VERSION >= 0x040200 void readCorruptImage_data(); void readCorruptImage(); -#endif void readCorruptBmp(); -#if QT_VERSION >= 0x040200 void supportsOption_data(); void supportsOption(); -#endif #if defined QTEST_HAVE_TIFF void tiffCompression_data(); @@ -210,9 +202,7 @@ void tst_QImageReader::readImage_data() QTest::newRow("BMP: 4bpp RLE") << QString("4bpp-rle.bmp") << true << QByteArray("bmp"); QTest::newRow("BMP: 4bpp uncompressed") << QString("tst7.bmp") << true << QByteArray("bmp"); QTest::newRow("BMP: 16bpp") << QString("16bpp.bmp") << true << QByteArray("bmp"); -#if QT_VERSION >= 0x040200 QTest::newRow("BMP: negative height") << QString("negativeheight.bmp") << true << QByteArray("bmp"); -#endif QTest::newRow("XPM: marble") << QString("marble.xpm") << true << QByteArray("xpm"); QTest::newRow("PNG: kollada") << QString("kollada.png") << true << QByteArray("png"); QTest::newRow("PPM: teapot") << QString("teapot.ppm") << true << QByteArray("ppm"); @@ -604,7 +594,6 @@ void tst_QImageReader::supportsAnimation() QCOMPARE(io.supportsAnimation(), success); } -#if QT_VERSION > 0x040100 void tst_QImageReader::sizeBeforeRead_data() { imageFormat_data(); @@ -627,9 +616,7 @@ void tst_QImageReader::sizeBeforeRead() QVERIFY(!image.isNull()); QCOMPARE(size, image.size()); } -#endif // QT_VERSION -#if QT_VERSION > 0x040400 void tst_QImageReader::imageFormatBeforeRead_data() { imageFormat_data(); @@ -649,7 +636,6 @@ void tst_QImageReader::imageFormatBeforeRead() QCOMPARE(image.format(), fileFormat); } } -#endif #if defined QTEST_HAVE_GIF void tst_QImageReader::gifHandlerBugs() @@ -662,7 +648,6 @@ void tst_QImageReader::gifHandlerBugs() QVERIFY(count == 34); } -#if QT_VERSION >= 0x040102 // Task 95166 { QImageReader io1("images/bat1.gif"); @@ -675,9 +660,7 @@ void tst_QImageReader::gifHandlerBugs() QVERIFY(!im2.isNull()); QCOMPARE(im1, im2); } -#endif -#if QT_VERSION >= 0x040104 // Task 9994 { QImageReader io1("images/noclearcode.gif"); @@ -687,7 +670,6 @@ void tst_QImageReader::gifHandlerBugs() QVERIFY(!im1.isNull()); QVERIFY(!im2.isNull()); QCOMPARE(im1.convertToFormat(QImage::Format_ARGB32), im2.convertToFormat(QImage::Format_ARGB32)); } -#endif } #endif @@ -872,11 +854,7 @@ void tst_QImageReader::readFromFileAfterJunk() QVERIFY(!imageData.isNull()); int iterations = 10; -#if QT_VERSION < 0x040200 - if (format == "ppm" || format == "pbm" || format == "pgm" || format == "xpm" || format == "jpeg") -#else if (format == "ppm" || format == "pbm" || format == "pgm") -#endif iterations = 1; if (format == "mng" || !QImageWriter::supportedImageFormats().contains(format)) { @@ -1175,7 +1153,6 @@ void tst_QImageReader::readFromResources() QCOMPARE(QImageReader(fileName).read(), QImageReader(":/" + fileName).read()); } -#if QT_VERSION >= 0x040200 void tst_QImageReader::readCorruptImage_data() { QTest::addColumn("fileName"); @@ -1203,6 +1180,7 @@ void tst_QImageReader::readCorruptImage_data() QTest::newRow("corrupt tiff") << QString("images/corrupt-data.tif") << true << QString(""); #endif } + void tst_QImageReader::readCorruptImage() { QFETCH(QString, fileName); @@ -1214,14 +1192,12 @@ void tst_QImageReader::readCorruptImage() QVERIFY(reader.canRead()); QCOMPARE(reader.read().isNull(), shouldFail); } -#endif // QT_VERSION void tst_QImageReader::readCorruptBmp() { QCOMPARE(QImage("images/tst7.bmp").convertToFormat(QImage::Format_ARGB32_Premultiplied), QImage("images/tst7.png").convertToFormat(QImage::Format_ARGB32_Premultiplied)); } -#if QT_VERSION >= 0x040200 void tst_QImageReader::supportsOption_data() { QTest::addColumn("fileName"); @@ -1264,7 +1240,6 @@ void tst_QImageReader::supportsOption() foreach (QImageIOHandler::ImageOption option, allOptions) QVERIFY(!reader.supportsOption(option)); } -#endif #if defined QTEST_HAVE_TIFF void tst_QImageReader::tiffCompression_data() diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 6a8ff73..03a0665 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -67,9 +67,7 @@ private slots: void constructing_QFile(); void read_QByteArray(); void unget(); -#if QT_VERSION >= 0x040100 void peek(); -#endif // QT_VERSION void getch(); void putch(); @@ -310,7 +308,6 @@ void tst_QIODevice::unget() } //-------------------------------------------------------------------- -#if QT_VERSION >= 0x040100 void tst_QIODevice::peek() { QBuffer buffer; @@ -348,7 +345,6 @@ void tst_QIODevice::peek() } QFile::remove("peektestfile"); } -#endif // QT_VERSION void tst_QIODevice::getch() { @@ -441,7 +437,6 @@ void tst_QIODevice::readLine() result = buffer.readLine(line.data(), linelen + 1); QCOMPARE(result, linelen); -#if QT_VERSION >= 0x0402000 // try with a line length limit QVERIFY(buffer.seek(0)); line = buffer.readLine(linelen + 100); @@ -451,7 +446,6 @@ void tst_QIODevice::readLine() QVERIFY(buffer.seek(0)); line = buffer.readLine(); QCOMPARE(line.size(), linelen); -#endif } QTEST_MAIN(tst_QIODevice) diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp index c12c583..aa6939d 100644 --- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp +++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp @@ -61,9 +61,6 @@ void tst_QItemEditorFactory::createEditor() void tst_QItemEditorFactory::createCustomEditor() { -#if QT_VERSION < 0x040200 - QSKIP("Needs Qt >= 4.2", SkipAll); -#else QItemEditorFactory editorFactory; QItemEditorCreatorBase *creator = new QStandardItemEditorCreator(); @@ -76,7 +73,6 @@ void tst_QItemEditorFactory::createCustomEditor() QCOMPARE(w->metaObject()->userProperty().type(), QVariant::Double); delete creator; -#endif } QTEST_MAIN(tst_QItemEditorFactory) diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp index 61fc480..2cd6048 100644 --- a/tests/auto/qitemmodel/modelstotest.cpp +++ b/tests/auto/qitemmodel/modelstotest.cpp @@ -117,13 +117,8 @@ ModelsToTest::ModelsToTest() tests.append(test("QTableModel", ReadWrite, HasData)); tests.append(test("QTableModelEmpty", ReadWrite, Empty)); -#if QT_VERSION >= 0x040200 -#define TABLEFEATURE ReadWrite -#else -#define TABLEFEATURE ReadOnly -#endif - tests.append(test("QTreeModel", TABLEFEATURE, HasData)); - tests.append(test("QTreeModelEmpty", TABLEFEATURE, Empty)); + tests.append(test("QTreeModel", ReadWrite, HasData)); + tests.append(test("QTreeModelEmpty", ReadWrite, Empty)); tests.append(test("QSqlQueryModel", ReadOnly, HasData)); tests.append(test("QSqlQueryModelEmpty", ReadOnly, Empty)); diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index b248aa8..748bd50 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -230,19 +230,15 @@ void tst_QItemView::setupWithNoTestData() ViewsToTest testViews; QTest::addColumn("viewType"); QTest::addColumn("displays"); -#if QT_VERSION >= 0x040200 QTest::addColumn("vscroll"); QTest::addColumn("hscroll"); -#endif for (int i = 0; i < testViews.tests.size(); ++i) { QString view = testViews.tests.at(i).viewType; QString test = view + " ScrollPerPixel"; bool displayIndexes = (testViews.tests.at(i).display == ViewsToTest::DisplayRoot); QTest::newRow(test.toLatin1().data()) << view << displayIndexes -#if QT_VERSION >= 0x040200 << (int)QAbstractItemView::ScrollPerPixel << (int)QAbstractItemView::ScrollPerPixel -#endif ; } for (int i = 0; i < testViews.tests.size(); ++i) { @@ -250,10 +246,8 @@ void tst_QItemView::setupWithNoTestData() QString test = view + " ScrollPerItem"; bool displayIndexes = (testViews.tests.at(i).display == ViewsToTest::DisplayRoot); QTest::newRow(test.toLatin1().data()) << view << displayIndexes -#if QT_VERSION >= 0x040200 << (int)QAbstractItemView::ScrollPerItem << (int)QAbstractItemView::ScrollPerItem -#endif ; } } @@ -296,19 +290,17 @@ void tst_QItemView::nonDestructiveBasicTest() #ifdef Q_OS_IRIX QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif - + #ifdef Q_OS_WINCE QTest::qWait(400); #endif QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif // setSelectionModel() will assert //view->setSelectionModel(0); @@ -461,12 +453,10 @@ void tst_QItemView::spider() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif view->setModel(treeModel); view->show(); #if defined(Q_OS_WINCE) @@ -498,12 +488,10 @@ void tst_QItemView::resize() // doesn't really catch theproblem. QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif view->setModel(treeModel); view->show(); @@ -528,12 +516,10 @@ void tst_QItemView::visualRect() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif QCOMPARE(view->visualRect(QModelIndex()), QRect()); // Add model @@ -664,12 +650,10 @@ void tst_QItemView::indexAt() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif view->show(); view->setModel(treeModel); #if 0 @@ -700,12 +684,10 @@ void tst_QItemView::scrollTo() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); -#if QT_VERSION >= 0x040200 QFETCH(int, vscroll); QFETCH(int, hscroll); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); -#endif view->setModel(treeModel); view->show(); diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp index 33de82a..8fcee36 100644 --- a/tests/auto/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp @@ -181,9 +181,7 @@ void tst_QKeySequence::operatorQString_data() #ifndef Q_WS_MAC QTest::newRow( "Ctrl+Left" ) << int(Qt::CTRL) << int(Qt::Key_Left) << QString( "Ctrl+Left" ); -#if QT_VERSION > 0x040100 QTest::newRow( "Ctrl+," ) << int(Qt::CTRL) << int(Qt::Key_Comma) << QString( "Ctrl+," ); -#endif QTest::newRow( "Alt+Left" ) << int(Qt::ALT) << int(Qt::Key_Left) << QString( "Alt+Left" ); QTest::newRow( "Alt+Shift+Left" ) << int(Qt::ALT | Qt::SHIFT) << int(Qt::Key_Left) << QString( "Alt+Shift+Left" ); QTest::newRow( "Ctrl" ) << int(Qt::CTRL) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Ctrl+\x0c5" ); @@ -192,9 +190,7 @@ void tst_QKeySequence::operatorQString_data() QTest::newRow( "Meta" ) << int(Qt::META) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << QString( "Meta+\x0c5" ); #else QTest::newRow( "Ctrl+Left" ) << int(Qt::CTRL) << int(Qt::Key_Left) << MacCtrl + macSymbolForQtKey(Qt::Key_Left); -#if QT_VERSION > 0x040100 QTest::newRow( "Ctrl+," ) << int(Qt::CTRL) << int(Qt::Key_Comma) << MacCtrl + ","; -#endif QTest::newRow( "Alt+Left" ) << int(Qt::ALT) << int(Qt::Key_Left) << MacAlt + macSymbolForQtKey(Qt::Key_Left); QTest::newRow( "Alt+Shift+Left" ) << int(Qt::ALT | Qt::SHIFT) << int(Qt::Key_Left) << MacAlt + MacShift + macSymbolForQtKey(Qt::Key_Left); QTest::newRow( "Ctrl" ) << int(Qt::CTRL) << int(Qt::Key_Aring | Qt::UNICODE_ACCEL) << MacCtrl + "\x0c5"; @@ -385,10 +381,8 @@ void tst_QKeySequence::toString_data() QTest::newRow("Shift") << QString("Shift+\x0c5") << QString("Shift+\x0c5") << QString("Shift+\x0c5"); QTest::newRow("Meta") << QString("Meta+\x0c5") << QString("Meta+\x0c5") << QString("Meta+\x0c5"); QTest::newRow("Ctrl+Plus") << QString("Ctrl++") << QString("Ctrl++") << QString("Ctrl++"); -#if QT_VERSION > 0x040100 QTest::newRow("Ctrl+,") << QString("Ctrl+,") << QString("Ctrl+,") << QString("Ctrl+,"); QTest::newRow("Ctrl+,,Ctrl+,") << QString("Ctrl+,,Ctrl+,") << QString("Ctrl+,, Ctrl+,") << QString("Ctrl+,, Ctrl+,"); -#endif QTest::newRow("MultiKey") << QString("Alt+X, Ctrl+Y, Z") << QString("Alt+X, Ctrl+Y, Z") << QString("Alt+X, Ctrl+Y, Z"); @@ -406,10 +400,8 @@ void tst_QKeySequence::toString_data() QTest::newRow("Shift") << MacShift + "\x0c5" << QString("Shift+\x0c5") << MacShift + "\x0c5"; QTest::newRow("Meta") << MacMeta + "\x0c5" << QString("Meta+\x0c5") << MacMeta + "\x0c5"; QTest::newRow("Ctrl+Plus") << MacCtrl + "+" << QString("Ctrl++") << MacCtrl + "+"; -#if QT_VERSION > 0x040100 QTest::newRow("Ctrl+,") << MacCtrl + "," << QString("Ctrl+,") << MacCtrl + ","; QTest::newRow("Ctrl+,,Ctrl+,") << MacCtrl + ",, " + MacCtrl + "," << QString("Ctrl+,, Ctrl+,") << MacCtrl + ",, " + MacCtrl + ","; -#endif QTest::newRow("MultiKey") << MacAlt + "X, " + MacCtrl + "Y, Z" << QString("Alt+X, Ctrl+Y, Z") << MacAlt + "X, " + MacCtrl + "Y, Z"; QTest::newRow("Invalid") << QString("Ctrly") << QString("") << QString(""); diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp index 1783a3d..4580236 100644 --- a/tests/auto/qlabel/tst_qlabel.cpp +++ b/tests/auto/qlabel/tst_qlabel.cpp @@ -263,10 +263,8 @@ void tst_QLabel::setTextFormat() testWidget->setTextFormat( Qt::RichText ); QVERIFY( testWidget->textFormat() == Qt::RichText ); -#if QT_VERSION >= 0x030100 testWidget->setTextFormat( Qt::LogText ); QVERIFY( testWidget->textFormat() == Qt::LogText ); -#endif testWidget->setTextFormat( Qt::AutoText ); QVERIFY( testWidget->textFormat() == Qt::AutoText ); diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp index dea0c54e..3e7e3f3 100644 --- a/tests/auto/qlibrary/tst_qlibrary.cpp +++ b/tests/auto/qlibrary/tst_qlibrary.cpp @@ -187,7 +187,7 @@ void tst_QLibrary::version() QFETCH( int, loadversion ); QFETCH( int, resultversion ); -#if QT_VERSION >= 0x040200 && !defined(Q_OS_AIX) && !defined(Q_OS_WIN) +#if !defined(Q_OS_AIX) && !defined(Q_OS_WIN) QString currDir = QDir::currentPath(); QLibrary library( currDir + QLatin1Char('/') + lib, loadversion ); bool ok = library.load(); @@ -218,7 +218,6 @@ void tst_QLibrary::load_data() QTest::newRow("ok (libmylib ver. 1)") << currDir + "/libmylib" <<(bool)true; #endif -#if QT_VERSION >= 0x040103 # if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << (bool)true; QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << (bool)true; @@ -228,7 +227,6 @@ void tst_QLibrary::load_data() QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << (bool)true; QTest::newRow( "ok03 (with non-standard suffix)" ) << currDir + "/system.trolltech.test.mylib.so" << (bool)true; # endif // Q_OS_UNIX -#endif // QT_VERSION } void tst_QLibrary::load() @@ -438,7 +436,7 @@ void tst_QLibrary::loadHints_data() QTest::addColumn("result"); QLibrary::LoadHints lh; -#if QT_VERSION >= 0x040300 && defined(Q_OS_AIX) +#if defined(Q_OS_AIX) if (QFile::exists("/usr/lib/libGL.a") || QFile::exists("/usr/X11R6/lib/libGL.a")) { # if QT_POINTER_SIZE == 4 QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr.o)" << int(QLibrary::LoadArchiveMemberHint) << (bool)TRUE; @@ -446,9 +444,8 @@ void tst_QLibrary::loadHints_data() QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr_64.o)" << int(QLibrary::LoadArchiveMemberHint) << (bool)TRUE; #endif } -#endif // QT_VERSION +#endif -#if QT_VERSION >= 0x040103 QString currDir = QDir::currentPath(); lh |= QLibrary::ResolveAllSymbolsHint; # if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) @@ -460,8 +457,6 @@ void tst_QLibrary::loadHints_data() QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << int(lh) << (bool)TRUE; QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.so" << int(lh) << (bool)TRUE; # endif // Q_OS_UNIX -#endif // QT_VERSION - } void tst_QLibrary::loadHints() diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 87e966f..34a64c8 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -1465,14 +1465,10 @@ void tst_QLineEdit::textMask_data() void tst_QLineEdit::textMask() { -#if (QT_VERSION-0 >= 0x030303) QFETCH( QString, insertString ); testWidget->setInputMask( "#" ); testWidget->setText( insertString ); QCOMPARE( testWidget->text(), insertString ); -#else - QSKIP( "This test function tests a problem with masks that was fixed in 3.3", SkipAll); -#endif } void tst_QLineEdit::setText() diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index 4529bd5..b16a62a 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -1039,11 +1039,6 @@ void tst_QMainWindow::toolBarArea() QMainWindow mw; QToolBar tb(&mw); -#if QT_VERSION <= 0x040103 - // this would assert in previous versions - QCOMPARE(mw.toolBarArea(&tb), Qt::ToolBarArea(0)); -#endif - for (int j = 0; j < areaCount; ++j) { Qt::ToolBarArea otherArea = areas[j]; @@ -1205,11 +1200,6 @@ void tst_QMainWindow::dockWidgetArea() QMainWindow mw; QDockWidget dw(&mw); -#if QT_VERSION <= 0x040103 - // this would assert in previous versions - QCOMPARE(mw.dockWidgetArea(&dw), Qt::DockWidgetArea(0)); -#endif - for (int j = 0; j < areaCount; ++j) { Qt::DockWidgetArea otherArea = areas[i]; diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/qmake/testdata/functions/functions.pro index 5ee5f51..9ed92f96 100644 --- a/tests/auto/qmake/testdata/functions/functions.pro +++ b/tests/auto/qmake/testdata/functions/functions.pro @@ -51,15 +51,11 @@ include( infiletest.pro ) message( "FAILED: include function: $$DEFINES" ) } -lessThan(QT_VERSION, 40200) { - message( "SKIPPED: replace function only in 4.2" ) -} else { - #replace - VERSION=1.0.0 - VERSION_replaced=$$replace(VERSION,\.,_) - !isEqual(VERSION_replaced, 1_0_0) { - message( "FAILED: replace function: $$VERSION_replaced" ) - } +#replace +VERSION=1.0.0 +VERSION_replaced=$$replace(VERSION,\.,_) +!isEqual(VERSION_replaced, 1_0_0) { + message( "FAILED: replace function: $$VERSION_replaced" ) } #test functions diff --git a/tests/auto/qmap/tst_qmap.cpp b/tests/auto/qmap/tst_qmap.cpp index ce413c5..99efc80 100644 --- a/tests/auto/qmap/tst_qmap.cpp +++ b/tests/auto/qmap/tst_qmap.cpp @@ -728,37 +728,27 @@ void tst_QMap::iterators() void tst_QMap::keys_values_uniqueKeys() { QMap map; -#if QT_VERSION >= 0x040200 QVERIFY(map.uniqueKeys().isEmpty()); -#endif QVERIFY(map.keys().isEmpty()); QVERIFY(map.values().isEmpty()); map.insertMulti("alpha", 1); QVERIFY(map.keys() == (QList() << "alpha")); -#if QT_VERSION >= 0x040200 QVERIFY(map.uniqueKeys() == map.keys()); -#endif QVERIFY(map.values() == (QList() << 1)); map.insertMulti("beta", -2); QVERIFY(map.keys() == (QList() << "alpha" << "beta")); -#if QT_VERSION >= 0x040200 QVERIFY(map.keys() == map.uniqueKeys()); -#endif QVERIFY(map.values() == (QList() << 1 << -2)); map.insertMulti("alpha", 2); -#if QT_VERSION >= 0x040200 QVERIFY(map.uniqueKeys() == (QList() << "alpha" << "beta")); -#endif QVERIFY(map.keys() == (QList() << "alpha" << "alpha" << "beta")); QVERIFY(map.values() == (QList() << 2 << 1 << -2)); map.insertMulti("beta", 4); -#if QT_VERSION >= 0x040200 QVERIFY(map.uniqueKeys() == (QList() << "alpha" << "beta")); -#endif QVERIFY(map.keys() == (QList() << "alpha" << "alpha" << "beta" << "beta")); QVERIFY(map.values() == (QList() << 2 << 1 << 4 << -2)); } diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index b3b7f33..3d04a0f 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -257,11 +257,7 @@ private slots: void on_child1_destroyed() { ++invokeCount2; } }; -#if QT_VERSION >= 0x040200 #define FUNCTION(x) "QMetaObject::" x ": " -#else -#define FUNCTION(x) "QMetaObject::" x "(): " -#endif void tst_QMetaObject::connectSlotsByName() { diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp index eccf7e6..d71f470 100644 --- a/tests/auto/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/qmetatype/tst_qmetatype.cpp @@ -127,7 +127,6 @@ protected: void tst_QMetaType::threadSafety() { -#if QT_VERSION >= 0x040100 MetaTypeTorturer t1; MetaTypeTorturer t2; MetaTypeTorturer t3; @@ -139,7 +138,6 @@ void tst_QMetaType::threadSafety() QVERIFY(t1.wait()); QVERIFY(t2.wait()); QVERIFY(t3.wait()); -#endif } namespace TestSpace diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/qmovie/tst_qmovie.cpp index dd24f97..23b057b 100644 --- a/tests/auto/qmovie/tst_qmovie.cpp +++ b/tests/auto/qmovie/tst_qmovie.cpp @@ -71,9 +71,7 @@ private slots: void playMovie(); void jumpToFrame_data(); void jumpToFrame(); -#if QT_VERSION >= 0x040101 void changeMovieFile(); -#endif // QT_VERSION }; // Testing get/set functions @@ -201,7 +199,6 @@ void tst_QMovie::jumpToFrame() QVERIFY(movie.currentFrameNumber() == 0); } -#if QT_VERSION >= 0x040101 void tst_QMovie::changeMovieFile() { QMovie movie("animations/comicsecard.gif"); @@ -211,7 +208,5 @@ void tst_QMovie::changeMovieFile() QVERIFY(movie.currentFrameNumber() == -1); } -#endif // QT_VERSION - QTEST_MAIN(tst_QMovie) #include "tst_qmovie.moc" diff --git a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp index cb5112d..cc3e144 100644 --- a/tests/auto/qmutexlocker/tst_qmutexlocker.cpp +++ b/tests/auto/qmutexlocker/tst_qmutexlocker.cpp @@ -194,9 +194,6 @@ void tst_QMutexLocker::unlockAndRelockTest() void tst_QMutexLocker::lockerStateTest() { -#if QT_VERSION < 0x040200 - QSKIP("QMutexLocker doesn't keep state in Qt < 4.2", SkipAll); -#else class LockerStateThread : public tst_QMutexLockerThread { public: @@ -233,7 +230,6 @@ void tst_QMutexLocker::lockerStateTest() delete thread; thread = 0; -#endif } QTEST_MAIN(tst_QMutexLocker) diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp index a28c49a..68ec414 100644 --- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp +++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp @@ -42,8 +42,6 @@ #include -#if QT_VERSION >= 0x040100 - #ifdef Q_OS_WIN #include #endif @@ -694,7 +692,3 @@ void tst_QNativeSocketEngine::receiveUrgentData() QTEST_MAIN(tst_QNativeSocketEngine) #include "tst_qnativesocketengine.moc" - -#else // QT_VERSION -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp index 6e5afd2..a246b04 100644 --- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #include #include @@ -210,5 +206,3 @@ void tst_QNetworkInterface::copyInvalidInterface() QTEST_MAIN(tst_QNetworkInterface) #include "tst_qnetworkinterface.moc" - -#endif diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 503118a..104b788 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -2236,9 +2236,6 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket_data() void tst_QNetworkReply::ioPutToFileFromLocalSocket() { -#if defined(Q_OS_WINCE) && QT_VERSION < 0x040500 - QSKIP("No local sockets on Windows CE for Qt 4.4", SkipAll); -#else QString socketname = "networkreplytest"; QLocalServer server; if (!server.listen(socketname)) { @@ -2276,7 +2273,6 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket() QCOMPARE(file.size(), qint64(data.size())); QByteArray contents = file.readAll(); QCOMPARE(contents, data); -#endif } void tst_QNetworkReply::ioPutToFileFromProcess_data() diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 096f1c5..fb46073 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -264,13 +264,9 @@ void tst_QObject::disconnect() QCOMPARE( r1->called(1), FALSE ); r1->reset(); -#if QT_VERSION >= 0x030100 QCOMPARE( ret, TRUE ); -#endif ret = QObject::disconnect( s, SIGNAL( signal1() ), r1, SLOT( slot1() ) ); -#if QT_VERSION >= 0x030100 QCOMPARE( ret, FALSE ); -#endif // disconnect all signals from s from all slots from r1 QObject::disconnect( s, 0, r1, 0 ); @@ -702,12 +698,10 @@ void tst_QObject::connectDisconnectNotify() QCOMPARE( s->org_signal, s->nw_signal ); QCOMPARE( s->org_signal.toLatin1(), QMetaObject::normalizedSignature(a_signal.toLatin1().constData()) ); -#if QT_VERSION > 0x040101 // Reconnect connect( (SenderObject*)s, a_signal.toLatin1(), (ReceiverObject*)r, a_slot.toLatin1() ); // Test disconnectNotify for a complete disconnect ((SenderObject*)s)->disconnect((ReceiverObject*)r); -#endif delete s; delete r; diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index fb8df2e..8b43f9b 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -2573,23 +2573,6 @@ void tst_QPainter::setOpacity() p.fillRect(imageRect, QColor(127, 127, 127)); p.end(); -#if defined(Q_WS_QWS) && (QT_VERSION < 0x040500) - // embedded has an optimized implementation in 4.4 - if ((dest.format() == QImage::Format_ARGB8555_Premultiplied || - dest.format() == QImage::Format_RGB555 || - dest.format() == QImage::Format_RGB666 || - dest.format() == QImage::Format_RGB888 || - dest.format() == QImage::Format_ARGB8565_Premultiplied) && - src.format() != QImage::Format_RGB32) - { - QColor c1 = expected.pixel(1, 1); - QColor c2 = dest.pixel(1, 1); - QVERIFY(qAbs(c1.red() - c2.red()) < 2); - QVERIFY(qAbs(c1.green() - c2.green()) < 2); - QVERIFY(qAbs(c1.blue() - c2.blue()) < 2); - QVERIFY(qAbs(c1.alpha() - c2.alpha()) < 2); - } else -#endif QCOMPARE(dest, expected); } diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp index cff84e9..3d77f5e 100644 --- a/tests/auto/qpainterpath/tst_qpainterpath.cpp +++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp @@ -84,11 +84,9 @@ private slots: void testOperatorEquals_fuzzy(); void testOperatorDatastream(); -#if QT_VERSION >= 0x040200 void testArcMoveTo_data(); void testArcMoveTo(); void setElementPositionAt(); -#endif void testOnPath_data(); void testOnPath(); @@ -819,7 +817,6 @@ void tst_QPainterPath::closing() } } -#if QT_VERSION >= 0x040200 void tst_QPainterPath::testArcMoveTo_data() { QTest::addColumn("rect"); @@ -1170,8 +1167,6 @@ void tst_QPainterPath::connectPathDuplicatePoint() QCOMPARE(c, a); } -#endif - QTEST_APPLESS_MAIN(tst_QPainterPath) #include "tst_qpainterpath.moc" diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/qpicture/tst_qpicture.cpp index 43559e5..954be23 100644 --- a/tests/auto/qpicture/tst_qpicture.cpp +++ b/tests/auto/qpicture/tst_qpicture.cpp @@ -121,12 +121,10 @@ void tst_QPicture::boundingRect() // default value QVERIFY( !p1.boundingRect().isValid() ); -#if QT_VERSION >= 0x030100 QRect r1( 20, 30, 5, 15 ); p1.setBoundingRect( r1 ); QCOMPARE( p1.boundingRect(), r1 ); p1.setBoundingRect(QRect()); -#endif QPainter pt( &p1 ); pt.drawLine( 10, 20, 110, 80 ); diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 0febb87..a598bfc 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -121,9 +121,6 @@ void tst_QPrinter::getSetCheck() obj1.setCollateCopies(false); QCOMPARE(false, obj1.collateCopies()); obj1.setCollateCopies(true); -#if !defined(Q_OS_UNIX) && QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Apparently only the Unix (ps) printer supports collate at the moment", Continue); -#endif QCOMPARE(true, obj1.collateCopies()); obj1.setColorMode(QPrinter::GrayScale); @@ -185,9 +182,6 @@ void tst_QPrinter::getSetCheck() obj1.setFontEmbeddingEnabled(false); QCOMPARE(false, obj1.fontEmbeddingEnabled()); obj1.setFontEmbeddingEnabled(true); -#if !defined(Q_OS_UNIX) && QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Apparently only the Unix (ps) printer supports font embedding at the moment", Continue); -#endif QCOMPARE(true, obj1.fontEmbeddingEnabled()); // PageSize QPrinter::pageSize() @@ -255,20 +249,13 @@ void tst_QPrinter::cleanup() void tst_QPrinter::testPageSetupDialog() { -#if QT_VERSION < 0x040102 - QSKIP("QPrinter::OutputFormat doesn't exist in Qt 4.0.x and test crashes on < 4.1.2"); -#else - // Make sure this doesn't crash at least { QPrinter printer; QPageSetupDialog dialog(&printer); } -#endif } - - void tst_QPrinter::testPageSize() { #if defined (Q_WS_WIN) @@ -332,10 +319,6 @@ void tst_QPrinter::testPageRectAndPaperRect_data() void tst_QPrinter::testPageRectAndPaperRect() { -#if QT_VERSION <= 0x040100 - QEXPECT_FAIL("", "Fixed in Qt 4.1.1", Continue); -#endif - QFETCH(bool, withPainter); QFETCH(int, orientation); QFETCH(int, resolution); @@ -529,9 +512,6 @@ void tst_QPrinter::testMulitpleSets() QPrinter::PageSize printerPageSize = QPrinter::PageSize(pageSize); QPrinter printer(mode); printer.setFullPage(true); -#if QT_VERSION < 0x040103 - QEXPECT_FAIL("", "Fixed in Qt 4.1.3", SkipAll); -#endif int paperWidth, paperHeight; //const int Tolerance = 2; diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index cb2b1bf..801cce8 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -265,11 +265,9 @@ void tst_QProcess::simpleStart() //----------------------------------------------------------------------------- void tst_QProcess::startDetached() { -#if QT_VERSION >= 0x040200 QProcess proc; QVERIFY(proc.startDetached("testProcessNormal/testProcessNormal", QStringList() << "arg1" << "arg2")); -#endif QCOMPARE(QProcess::startDetached("nonexistingexe"), false); } diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp index 34dd313..27dec9d 100644 --- a/tests/auto/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp @@ -206,11 +206,7 @@ void tst_QPushButton::setAutoRepeat() QVERIFY( !testWidget->isCheckable() ); // verify autorepeat is off by default. -#if QT_VERSION < 0x040000 - QButton tmp( 0 ); -#else QPushButton tmp( 0 ); -#endif tmp.setObjectName("tmp"); QVERIFY( !tmp.autoRepeat() ); diff --git a/tests/auto/qreadlocker/tst_qreadlocker.cpp b/tests/auto/qreadlocker/tst_qreadlocker.cpp index c650ff5..a37f93c 100644 --- a/tests/auto/qreadlocker/tst_qreadlocker.cpp +++ b/tests/auto/qreadlocker/tst_qreadlocker.cpp @@ -189,9 +189,6 @@ void tst_QReadLocker::unlockAndRelockTest() void tst_QReadLocker::lockerStateTest() { -#if QT_VERSION < 0x040200 - QSKIP("QReadLocker doesn't keep state in Qt < 4.2", SkipAll); -#else class LockerStateThread : public tst_QReadLockerThread { public: @@ -228,7 +225,6 @@ void tst_QReadLocker::lockerStateTest() delete thread; thread = 0; -#endif } QTEST_MAIN(tst_QReadLocker) diff --git a/tests/auto/qrect/tst_qrect.cpp b/tests/auto/qrect/tst_qrect.cpp index ed605a3..7e8d9c3 100644 --- a/tests/auto/qrect/tst_qrect.cpp +++ b/tests/auto/qrect/tst_qrect.cpp @@ -432,14 +432,12 @@ void tst_QRect::normalized_data() QTest::newRow( "NegativePointQRect" ) << getQRectCase( NegativePointQRect ) << QRect( -10, -10, 5, 5 ); QTest::newRow( "NullQRect" ) << getQRectCase( NullQRect ) << getQRectCase( NullQRect ); QTest::newRow( "EmptyQRect" ) << getQRectCase( EmptyQRect ) << getQRectCase( EmptyQRect ); -#if QT_VERSION > 0x040001 QTest::newRow( "Task80908") << QRect(100, 200, 100, 0) << QRect(100, 200, 100, 0); // Since "NegativeSizeQRect passes, I expect both of these to pass too. // This passes, since height() returns -1 before normalization QTest::newRow( "Task85023") << QRect(QPoint(100,201), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,201)); // This, on the other hand height() returns 0 before normalization. QTest::newRow( "Task85023.1") << QRect(QPoint(100,200), QPoint(199,199)) << QRect(QPoint(100,199), QPoint(199,200)); -#endif QTest::newRow( "Task188109" ) << QRect(QPoint(263, 113), QPoint(136, 112)) << QRect(QPoint(136, 113), QPoint(263, 112)); } @@ -1733,14 +1731,12 @@ void tst_QRect::newSetTopLeft_data() void tst_QRect::newSetTopLeft() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( QPoint, topLeft ); QFETCH( QRect, nr ); r.setTopLeft( topLeft ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newSetBottomRight_data() @@ -1961,7 +1957,6 @@ void tst_QRect::newSetBottomRight_data() void tst_QRect::newSetBottomRight() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( QPoint, bottomRight ); QFETCH( QRect, nr ); @@ -1969,7 +1964,6 @@ void tst_QRect::newSetBottomRight() r.setBottomRight( bottomRight ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newSetTopRight_data() @@ -2190,7 +2184,6 @@ void tst_QRect::newSetTopRight_data() void tst_QRect::newSetTopRight() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( QPoint, topRight ); QFETCH( QRect, nr ); @@ -2198,7 +2191,6 @@ void tst_QRect::newSetTopRight() r.setTopRight( topRight ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newSetBottomLeft_data() @@ -2419,7 +2411,6 @@ void tst_QRect::newSetBottomLeft_data() void tst_QRect::newSetBottomLeft() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( QPoint, bottomLeft ); QFETCH( QRect, nr ); @@ -2427,7 +2418,6 @@ void tst_QRect::newSetBottomLeft() r.setBottomLeft( bottomLeft ); QCOMPARE( r, nr ); -#endif } void tst_QRect::topLeft_data() @@ -2787,7 +2777,6 @@ void tst_QRect::newMoveLeft_data() void tst_QRect::newMoveLeft() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( int, left ); QFETCH( QRect, nr ); @@ -2795,7 +2784,6 @@ void tst_QRect::newMoveLeft() r.moveLeft( left ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newMoveTop_data() @@ -2958,7 +2946,6 @@ void tst_QRect::newMoveTop_data() void tst_QRect::newMoveTop() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( int, top ); QFETCH( QRect, nr ); @@ -2966,7 +2953,6 @@ void tst_QRect::newMoveTop() r.moveTop( top ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newMoveRight_data() @@ -3114,7 +3100,6 @@ void tst_QRect::newMoveRight_data() void tst_QRect::newMoveRight() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( int, right ); QFETCH( QRect, nr ); @@ -3122,7 +3107,6 @@ void tst_QRect::newMoveRight() r.moveRight( right ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newMoveBottom_data() @@ -3270,7 +3254,6 @@ void tst_QRect::newMoveBottom_data() void tst_QRect::newMoveBottom() { -#if QT_VERSION >= 0x030100 QFETCH( QRect, r ); QFETCH( int, bottom ); QFETCH( QRect, nr ); @@ -3278,7 +3261,6 @@ void tst_QRect::newMoveBottom() r.moveBottom( bottom ); QCOMPARE( r, nr ); -#endif } void tst_QRect::newMoveTopLeft_data() @@ -3468,7 +3450,6 @@ void tst_QRect::newMoveTopLeft_data() void tst_QRect::newMoveTopLeft() { -#if QT_VERSION >= 0x030100 QFETCH(QRect,r); QFETCH(QPoint,topLeft); QFETCH(QRect,nr); @@ -3476,7 +3457,6 @@ void tst_QRect::newMoveTopLeft() r.moveTopLeft(topLeft); QCOMPARE(r,nr); -#endif } void tst_QRect::newMoveBottomRight_data() @@ -3666,7 +3646,6 @@ void tst_QRect::newMoveBottomRight_data() void tst_QRect::newMoveBottomRight() { -#if QT_VERSION >= 0x030100 QFETCH(QRect,r); QFETCH(QPoint,bottomRight); QFETCH(QRect,nr); @@ -3674,11 +3653,9 @@ void tst_QRect::newMoveBottomRight() r.moveBottomRight(bottomRight); QCOMPARE(r,nr); -#endif } - void tst_QRect::translate_data() { QTest::addColumn("r"); @@ -3720,10 +3697,8 @@ void tst_QRect::translate() } - void tst_QRect::moveTop() { -#if QT_VERSION >= 0x030100 { QRect r( 10, 10, 100, 100 ); r.moveTop( 3 ); @@ -3742,12 +3717,10 @@ void tst_QRect::moveTop() r.moveTop( -22 ); QCOMPARE( r, QRectF(10, -22, 100, 100) ); } -#endif } void tst_QRect::moveBottom() { -#if QT_VERSION >= 0x030100 { QRect r( 10, -22, 100, 100 ); r.moveBottom( 104 ); @@ -3758,12 +3731,10 @@ void tst_QRect::moveBottom() r.moveBottom( 104 ); QCOMPARE( r, QRectF(10, 4, 100, 100) ); } -#endif } void tst_QRect::moveLeft() { -#if QT_VERSION >= 0x030100 { QRect r( 10, 5, 100, 100 ); r.moveLeft( 11 ); @@ -3774,12 +3745,10 @@ void tst_QRect::moveLeft() r.moveLeft( 11 ); QCOMPARE( r, QRectF(11, 5, 100, 100) ); } -#endif } void tst_QRect::moveRight() { -#if QT_VERSION >= 0x030100 { QRect r( 11, 5, 100, 100 ); r.moveRight( 106 ); @@ -3790,7 +3759,6 @@ void tst_QRect::moveRight() r.moveRight( 106 ); QCOMPARE( r, QRectF(6, 5, 100, 100) ); } -#endif } void tst_QRect::moveTopLeft() @@ -3851,7 +3819,6 @@ void tst_QRect::moveBottomRight() void tst_QRect::setTopLeft() { -#if QT_VERSION >= 0x030100 { QRect r( 20, 10, 200, 100 ); r.setTopLeft( QPoint(5, 7) ); @@ -3862,12 +3829,10 @@ void tst_QRect::setTopLeft() r.setTopLeft( QPoint(5, 7) ); QCOMPARE( r, QRectF(5, 7, 215, 103) ); } -#endif } void tst_QRect::setTopRight() { -#if QT_VERSION >= 0x030100 { QRect r( 20, 10, 200, 100 ); r.setTopRight( QPoint(225, 7) ); @@ -3878,12 +3843,10 @@ void tst_QRect::setTopRight() r.setTopRight( QPoint(225, 7) ); QCOMPARE( r, QRectF(20, 7, 205, 103) ); } -#endif } void tst_QRect::setBottomLeft() { -#if QT_VERSION >= 0x030100 { QRect r( 20, 10, 200, 100 ); r.setBottomLeft( QPoint(5, 117) ); @@ -3894,12 +3857,10 @@ void tst_QRect::setBottomLeft() r.setBottomLeft( QPoint(5, 117) ); QCOMPARE( r, QRectF(5, 10, 215, 107) ); } -#endif } void tst_QRect::setBottomRight() { -#if QT_VERSION >= 0x030100 { QRect r( 20, 10, 200, 100 ); r.setBottomRight( QPoint(225, 117) ); @@ -3910,7 +3871,6 @@ void tst_QRect::setBottomRight() r.setBottomRight( QPoint(225, 117) ); QCOMPARE( r, QRectF(20, 10, 205, 107) ); } -#endif } void tst_QRect::operator_amp() diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp index 2968a8e..999166e 100644 --- a/tests/auto/qregexp/tst_qregexp.cpp +++ b/tests/auto/qregexp/tst_qregexp.cpp @@ -557,7 +557,6 @@ void tst_QRegExp::setMinimal() void tst_QRegExp::exactMatch() { -#if QT_VERSION >= 0x030100 QRegExp rx_d( "\\d" ); QRegExp rx_s( "\\s" ); QRegExp rx_w( "\\w" ); @@ -570,9 +569,7 @@ void tst_QRegExp::exactMatch() bool is_d = ( ch.category() == QChar::Number_DecimalDigit ); bool is_s = ch.isSpace(); bool is_w = ( ch.isLetterOrNumber() -#if QT_VERSION >= 0x040200 || ch.isMark() -#endif || ch == '_' ); QVERIFY( rx_d.exactMatch(QString(ch)) == is_d ); @@ -582,7 +579,6 @@ void tst_QRegExp::exactMatch() QVERIFY( rx_S.exactMatch(QString(ch)) != is_s ); QVERIFY( rx_W.exactMatch(QString(ch)) != is_w ); } -#endif } void tst_QRegExp::capturedTexts() @@ -593,13 +589,11 @@ void tst_QRegExp::capturedTexts() QCOMPARE(rx1.cap(0), QString("aaa")); QCOMPARE(rx1.cap(1), QString("aaa")); -#if QT_VERSION >= 0x040200 QRegExp rx2("a*(a*)", Qt::CaseSensitive, QRegExp::RegExp2); rx2.exactMatch("aaa"); QCOMPARE(rx2.matchedLength(), 3); QCOMPARE(rx2.cap(0), QString("aaa")); QCOMPARE(rx2.cap(1), QString("")); -#endif QRegExp rx3("(?:a|aa)(a*)", Qt::CaseSensitive, QRegExp::RegExp); rx3.exactMatch("aaa"); @@ -607,13 +601,11 @@ void tst_QRegExp::capturedTexts() QCOMPARE(rx3.cap(0), QString("aaa")); QCOMPARE(rx3.cap(1), QString("aa")); -#if QT_VERSION >= 0x040200 QRegExp rx4("(?:a|aa)(a*)", Qt::CaseSensitive, QRegExp::RegExp2); rx4.exactMatch("aaa"); QCOMPARE(rx4.matchedLength(), 3); QCOMPARE(rx4.cap(0), QString("aaa")); QCOMPARE(rx4.cap(1), QString("a")); -#endif QRegExp rx5("(a)*(a*)", Qt::CaseSensitive, QRegExp::RegExp); rx5.exactMatch("aaa"); @@ -622,14 +614,12 @@ void tst_QRegExp::capturedTexts() QCOMPARE(rx5.cap(1), QString("a")); QCOMPARE(rx5.cap(2), QString("aa")); -#if QT_VERSION >= 0x040200 QRegExp rx6("(a)*(a*)", Qt::CaseSensitive, QRegExp::RegExp2); rx6.exactMatch("aaa"); QCOMPARE(rx6.matchedLength(), 3); QCOMPARE(rx6.cap(0), QString("aaa")); QCOMPARE(rx6.cap(1), QString("a")); QCOMPARE(rx6.cap(2), QString("")); -#endif QRegExp rx7("([A-Za-z_])([A-Za-z_0-9]*)"); rx7.setCaseSensitivity(Qt::CaseSensitive); @@ -689,7 +679,6 @@ void tst_QRegExp::indexIn() } } -#if QT_VERSION >= 0x040200 // same as above, but with RegExp2 { QRegExp rx( regexpStr, Qt::CaseSensitive, QRegExp::RegExp2 ); @@ -707,7 +696,6 @@ void tst_QRegExp::indexIn() QCOMPARE( mycaps[i], caps[i] ); } } -#endif } void tst_QRegExp::lastIndexIn() @@ -746,7 +734,6 @@ void tst_QRegExp::lastIndexIn() } } -#if QT_VERSION >= 0x040200 { QRegExp rx( regexpStr, Qt::CaseSensitive, QRegExp::RegExp2 ); QVERIFY( rx.isValid() ); @@ -766,7 +753,6 @@ void tst_QRegExp::lastIndexIn() } } } -#endif } void tst_QRegExp::matchedLength() @@ -1161,10 +1147,8 @@ void tst_QRegExp::prepareEngineOptimization() QRegExp rx4("foo", Qt::CaseInsensitive, QRegExp::RegExp); QVERIFY(rx4.isValid()); -#if QT_VERSION >= 0x040200 QRegExp rx5("foo", Qt::CaseInsensitive, QRegExp::RegExp2); QVERIFY(rx5.isValid()); -#endif QRegExp rx6("foo", Qt::CaseInsensitive, QRegExp::FixedString); QVERIFY(rx6.isValid()); @@ -1175,10 +1159,8 @@ void tst_QRegExp::prepareEngineOptimization() QRegExp rx8("][", Qt::CaseInsensitive, QRegExp::RegExp); QVERIFY(!rx8.isValid()); -#if QT_VERSION >= 0x040200 QRegExp rx9("][", Qt::CaseInsensitive, QRegExp::RegExp2); QVERIFY(!rx9.isValid()); -#endif QRegExp rx10("][", Qt::CaseInsensitive, QRegExp::Wildcard); QVERIFY(!rx10.isValid()); diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp index 8ec4c28..eba07f2 100644 --- a/tests/auto/qregion/tst_qregion.cpp +++ b/tests/auto/qregion/tst_qregion.cpp @@ -145,12 +145,7 @@ void tst_QRegion::rects() { QRect rect( 10, -20, 30, 40 ); QRegion region( rect ); -#if QT_VERSION < 0x040000 - QCOMPARE( region.rects().count(), (uint)1 ); -#else QCOMPARE( region.rects().count(), 1 ); -#endif - QCOMPARE( region.rects()[0], rect ); } { @@ -200,11 +195,7 @@ void tst_QRegion::setRects() QRegion region; QRect rect( 10, -20, 30, 40 ); region.setRects( &rect, 1 ); -#if QT_VERSION < 0x040000 - QCOMPARE( region.rects().count(), (uint)1 ); -#else QCOMPARE( region.rects().count(), 1 ); -#endif QCOMPARE( region.rects()[0], rect ); } } @@ -374,9 +365,7 @@ void tst_QRegion::bitmapRegion() QVERIFY( region.contains( QPoint( 0, 10 ) ) ); // Mid-left QVERIFY( region.contains( QPoint( 10, 0 ) ) ); // Mid-top -#if ( QT_VERSION >= 0x030100 ) QVERIFY( region.contains( QPoint( 19, 10 ) ) ); // Mid-right -#endif QVERIFY( region.contains( QPoint( 10, 19 ) ) ); // Mid-bottom } } @@ -627,11 +616,9 @@ void tst_QRegion::operator_minus_data() QTest::addColumn("subtract"); QTest::addColumn("expected"); -#if !defined(Q_WS_X11) || QT_VERSION >= 0x040300 QTest::newRow("empty 0") << QRegion() << QRegion() << QRegion(); QTest::newRow("empty 1") << QRegion() << QRegion(QRect(10, 10, 10, 10)) << QRegion(); -#endif QTest::newRow("empty 2") << QRegion(QRect(10, 10, 10, 10)) << QRegion() << QRegion(QRect(10, 10, 10, 10)); diff --git a/tests/auto/qset/tst_qset.cpp b/tests/auto/qset/tst_qset.cpp index 7afcd84..5601656 100644 --- a/tests/auto/qset/tst_qset.cpp +++ b/tests/auto/qset/tst_qset.cpp @@ -619,9 +619,6 @@ void tst_QSet::stlIterator() void tst_QSet::stlMutableIterator() { -#if QT_VERSION < 0x040200 - QSKIP("Needs Qt >= 4.2", SkipAll); -#else QSet set1; for (int i = 0; i < 25000; ++i) set1.insert(QString::number(i)); @@ -679,7 +676,6 @@ void tst_QSet::stlMutableIterator() #endif QVERIFY(*i == "foo"); } -#endif } void tst_QSet::javaIterator() @@ -768,9 +764,6 @@ void tst_QSet::javaIterator() void tst_QSet::javaMutableIterator() { -#if QT_VERSION < 0x040200 - QSKIP("Needs Qt >= 4.2", SkipAll); -#else QSet set1; for (int k = 0; k < 25000; ++k) set1.insert(QString::number(k)); @@ -856,7 +849,6 @@ void tst_QSet::javaMutableIterator() QVERIFY(set2.isEmpty()); QVERIFY(set3.isEmpty()); } -#endif } void tst_QSet::makeSureTheComfortFunctionsCompile() diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 9524eb3..c478c63 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -240,7 +240,6 @@ static QString settingsPath(const char *path = "") return QDir::toNativeSeparators(tempPath + "/tst_QSettings/" + QLatin1String(path)); } -#if QT_VERSION >= 0x040100 static bool readCustom1File(QIODevice &device, QSettings::SettingsMap &map) { QDataStream in(&device); @@ -297,7 +296,6 @@ static bool writeCustom3File(QIODevice &device, const QSettings::SettingsMap &ma out << "OK"; return true; } -#endif static void populateWithFormats() { @@ -305,15 +303,12 @@ static void populateWithFormats() QTest::newRow("native") << QSettings::NativeFormat; QTest::newRow("ini") << QSettings::IniFormat; -#if QT_VERSION >= 0x040100 QTest::newRow("custom1") << QSettings::CustomFormat1; QTest::newRow("custom2") << QSettings::CustomFormat2; -#endif } tst_QSettings::tst_QSettings() { -#if QT_VERSION >= 0x040100 QSettings::Format custom1 = QSettings::registerFormat("custom1", readCustom1File, writeCustom1File); QSettings::Format custom2 = QSettings::registerFormat("custom2", readCustom2File, writeCustom2File #ifndef QT_QSETTINGS_ALWAYS_CASE_SENSITIVE_AND_FORGET_ORIGINAL_KEY_ORDER @@ -322,7 +317,6 @@ tst_QSettings::tst_QSettings() ); QVERIFY(custom1 == QSettings::CustomFormat1); QVERIFY(custom2 == QSettings::CustomFormat2); -#endif } void tst_QSettings::init() @@ -1138,9 +1132,9 @@ void tst_QSettings::testVariantTypes() l4 << QVariant(m2) << QVariant(l2) << QVariant(l3); testVal("key13", l4, QVariantList, List); - // With Qt 4.2 we store key sequences as strings instead of binary variant blob, for improved + // We store key sequences as strings instead of binary variant blob, for improved // readability in the resulting format. - if (format >= QSettings::InvalidFormat || QT_VERSION < 0x040200) { + if (format >= QSettings::InvalidFormat) { testVal("keysequence", QKeySequence(Qt::ControlModifier + Qt::Key_F1), QKeySequence, KeySequence); } else { testVal("keysequence", QKeySequence(Qt::ControlModifier + Qt::Key_F1), QString, String); @@ -2637,14 +2631,12 @@ void tst_QSettings::testCaseSensitivity() case QSettings::IniFormat: cs = false; break; -#if QT_VERSION >= 0x040100 case QSettings::CustomFormat1: cs = true; break; case QSettings::CustomFormat2: cs = false; break; -#endif default: ; } @@ -3543,7 +3535,6 @@ void tst_QSettings::allKeys() } } -#if QT_VERSION >= 0x040100 void tst_QSettings::registerFormat() { QSettings settings1(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); @@ -3641,7 +3632,6 @@ void tst_QSettings::setPath() TEST_PATH(i == 0, "custom2", CustomFormat2, SystemScope, "iota") } } -#endif void tst_QSettings::setDefaultFormat() { diff --git a/tests/auto/qsizef/tst_qsizef.cpp b/tests/auto/qsizef/tst_qsizef.cpp index 7668491..c1a827b 100644 --- a/tests/auto/qsizef/tst_qsizef.cpp +++ b/tests/auto/qsizef/tst_qsizef.cpp @@ -72,29 +72,6 @@ private slots: void transpose(); }; -#if QT_VERSION < 0x040100 -namespace QTest -{ - // Qt < 4.1 didn't do fuzzy comparisons - template<> - inline bool compare(QSizeF const &t1, QSizeF const &t2, const char *file, int line) - { - char msg[1024]; - msg[0] = '\0'; - bool isOk = true; - if ((qAbs(t1.width() - t2.width()) > 0.000000000001) || (qAbs(t1.height() - t2.height()) > 0.000000000001)) { - qt_snprintf(msg, 1024, "Compared values of type QSizeF are not the same (fuzzy compare).\n" - " Actual : w: %lf h: %lf \n" - " Expected: w: %lf h: %lf", t1.width(), t1.height(), t2.width(), t2.height()); - isOk = false; - } else { - qt_snprintf(msg, 1024, "QCOMPARE('%lf %lf', QSizeF)", t1.width(), t1.height()); - } - return compare_helper(isOk, msg, file, line); - } -} -#endif - tst_QSizeF::tst_QSizeF() { } diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index ee9daef..0509d49 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -1508,9 +1508,6 @@ void tst_QSortFilterProxyModel::insertAfterSelect() QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p); QVERIFY(view.selectionModel()->selectedIndexes().size() > 0); model.insertRows(5, 1, QModelIndex()); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Selections are not kept in versions < 4.2", Abort); -#endif QVERIFY(view.selectionModel()->selectedIndexes().size() > 0); // Should still have a selection } @@ -1532,9 +1529,6 @@ void tst_QSortFilterProxyModel::removeAfterSelect() QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p); QVERIFY(view.selectionModel()->selectedIndexes().size() > 0); model.removeRows(5, 1, QModelIndex()); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Selections are not kept in versions < 4.2", Abort); -#endif QVERIFY(view.selectionModel()->selectedIndexes().size() > 0); // Should still have a selection } diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp index a3322ab..84bda92 100644 --- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -115,7 +115,6 @@ private slots: void checkChildren(); void data(); void clear(); -#if QT_VERSION >= 0x040200 void sort_data(); void sort(); void sortRole_data(); @@ -133,10 +132,9 @@ private slots: void useCase1(); void useCase2(); void useCase3(); -#endif void rootItemFlags(); - void treeDragAndDrop(); + void treeDragAndDrop(); private: QAbstractItemModel *m_model; @@ -144,7 +142,7 @@ private: QVector rcParent; QVector rcFirst; QVector rcLast; - + //return true if models have the same structure, and all child have the same text bool compareModels(QStandardItemModel *model1, QStandardItemModel *model2); //return true if models have the same structure, and all child have the same text @@ -154,9 +152,7 @@ private: static const int defaultSize = 3; Q_DECLARE_METATYPE(QModelIndex) -#if QT_VERSION >= 0x040200 Q_DECLARE_METATYPE(QStandardItem*) -#endif Q_DECLARE_METATYPE(Qt::Orientation) Q_DECLARE_METATYPE(QVariantList) @@ -181,9 +177,7 @@ tst_QStandardItemModel::~tst_QStandardItemModel() void tst_QStandardItemModel::init() { qRegisterMetaType("QModelIndex"); -#if QT_VERSION >= 0x040200 qRegisterMetaType("QStandardItem*"); -#endif qRegisterMetaType("Qt::Orientation"); m_model = new QStandardItemModel(defaultSize, defaultSize); @@ -768,7 +762,6 @@ void tst_QStandardItemModel::clear() QCOMPARE(model.hasChildren(), false); } -#if QT_VERSION >= 0x040200 void tst_QStandardItemModel::sort_data() { QTest::addColumn("sortOrder"); @@ -1383,8 +1376,6 @@ void tst_QStandardItemModel::useCase3() delete childItem; } -#endif // QT_VERSION >= 0x040200 - void tst_QStandardItemModel::rootItemFlags() { QStandardItemModel model(6, 4); @@ -1426,7 +1417,7 @@ bool tst_QStandardItemModel::compareItems(QStandardItem *item1, QStandardItem *i } for (int row = 0; row < item1->columnCount(); row++) for (int col = 0; col < item1->columnCount(); col++) { - + if (!compareItems(item1->child(row, col), item2->child(row, col))) return false; } @@ -1438,19 +1429,19 @@ static QStandardItem *itemFromText(QStandardItem *parent, const QString &text) QStandardItem *item = 0; for(int i = 0; i < parent->columnCount(); i++) for(int j = 0; j < parent->rowCount(); j++) { - + QStandardItem *child = parent->child(j, i); - + if(!child) continue; - + if (child->text() == text) { if (item) { return 0; } item = child; } - + QStandardItem *candidate = itemFromText(child, text); if(candidate) { if (item) { @@ -1470,9 +1461,9 @@ static QModelIndex indexFromText(QStandardItemModel *model, const QString &text) } -struct FriendlyTreeView : public QTreeView +struct FriendlyTreeView : public QTreeView { - friend class tst_QStandardItemModel; + friend class tst_QStandardItemModel; Q_DECLARE_PRIVATE(QTreeView) }; @@ -1480,7 +1471,7 @@ void tst_QStandardItemModel::treeDragAndDrop() { const int nRow = 5; const int nCol = 3; - + QStandardItemModel model; QStandardItemModel checkModel; @@ -1489,13 +1480,13 @@ void tst_QStandardItemModel::treeDragAndDrop() for (int c = 0 ; c < nCol; c ++) colItems1 << new QStandardItem(QString("item %1 - %0").arg(c).arg(i)); model.appendRow(colItems1); - + for (int j = 0; j < nRow; ++j) { QList colItems2; for (int c = 0 ; c < nCol; c ++) colItems2 << new QStandardItem(QString("item %1/%2 - %0").arg(c).arg(i).arg(j)); colItems1.at(0)->appendRow(colItems2); - + for (int k = 0; k < nRow; ++k) { QList colItems3; for (int c = 0 ; c < nCol; c ++) @@ -1504,21 +1495,19 @@ void tst_QStandardItemModel::treeDragAndDrop() } } } - - - + for (int i = 0; i < nRow; ++i) { QList colItems1; for (int c = 0 ; c < nCol; c ++) colItems1 << new QStandardItem(QString("item %1 - %0").arg(c).arg(i)); checkModel.appendRow(colItems1); - + for (int j = 0; j < nRow; ++j) { QList colItems2; for (int c = 0 ; c < nCol; c ++) colItems2 << new QStandardItem(QString("item %1/%2 - %0").arg(c).arg(i).arg(j)); colItems1.at(0)->appendRow(colItems2); - + for (int k = 0; k < nRow; ++k) { QList colItems3; for (int c = 0 ; c < nCol; c ++) @@ -1527,9 +1516,9 @@ void tst_QStandardItemModel::treeDragAndDrop() } } } - + QVERIFY(compareModels(&model, &checkModel)); - + FriendlyTreeView view; view.setModel(&model); view.expandAll(); @@ -1556,7 +1545,7 @@ void tst_QStandardItemModel::treeDragAndDrop() if(model.dropMimeData(data, Qt::MoveAction, 0, 0, indexFromText(&model, "item 4 - 0"))) view.d_func()->clearOrRemove(); delete data; - + QVERIFY(!compareModels(&model, &checkModel)); //the model must be different at this point QStandardItem *item4 = itemFromText(checkModel.invisibleRootItem(), "item 4 - 0"); item4->insertRow(0, checkModel.takeRow(1)); @@ -1564,7 +1553,6 @@ void tst_QStandardItemModel::treeDragAndDrop() QVERIFY(compareModels(&model, &checkModel)); } - // // step2 drag "item 3" and "item 3/0" into "item 4" // @@ -1572,10 +1560,10 @@ void tst_QStandardItemModel::treeDragAndDrop() selection->clear(); selection->select(QItemSelection(indexFromText(&model, QString("item 3 - 0")), indexFromText(&model, QString("item 3 - %0").arg(nCol-1))), QItemSelectionModel::Select); - + selection->select(QItemSelection(indexFromText(&model, QString("item 3/0 - 0")), indexFromText(&model, QString("item 3/0 - %0").arg(nCol-1))), QItemSelectionModel::Select); - + //code based from QAbstractItemView::startDrag and QAbstractItemView::dropEvent QModelIndexList indexes = view.selectedIndexes(); QMimeData *data = model.mimeData(indexes); diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index e31e0db..cb30f83 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -70,10 +70,7 @@ #include #include - -#if QT_VERSION >= 0x040200 #include -#endif #ifdef Q_WS_MAC #include @@ -343,7 +340,7 @@ void tst_QStyle::testPlastiqueStyle() void tst_QStyle::testCleanlooksStyle() { -#if QT_VERSION >= 0x040200 && !defined(QT_NO_STYLE_CLEANLOOKS) +#if !defined(QT_NO_STYLE_CLEANLOOKS) QCleanlooksStyle cstyle; testAllFunctions(&cstyle); lineUpLayoutTest(&cstyle); @@ -365,7 +362,7 @@ void tst_QStyle::testWindowsXPStyle() QWindowsXPStyle xpstyle; testAllFunctions(&xpstyle); lineUpLayoutTest(&xpstyle); -#else +#else QSKIP("No WindowsXP style", SkipAll); #endif } diff --git a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp index 713b3fa..4f16e7e 100644 --- a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp +++ b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp @@ -332,11 +332,7 @@ void tst_QSvgDevice::playPaint( QPainter *p, const QString &type ) qDrawShadePanel(p,4000,5000,4000,2000,palette.active(),false,200,&br); qDrawShadeRect(p,2000,2000,4000,2000,palette.active(),true,100,0,&br); } - } -#if !defined (Q_WS_WIN) && (QT_VERSION < 0x030200) - // This will fail on X11 with 3.1, fixed in 3.2 -#else - else if (type=="clipRect") { + } else if (type=="clipRect") { p->setClipRect(15,25,10,10); p->drawEllipse(10,20,50,70); } else if (type=="multipleClipRects") { @@ -344,9 +340,7 @@ void tst_QSvgDevice::playPaint( QPainter *p, const QString &type ) p->drawEllipse(10,20,50,70); p->setClipRect(100,200,20,20); p->drawEllipse(110,220,50,70); - } -#endif - else if (type == "qsimplerichtext") { + } else if (type == "qsimplerichtext") { p->setPen(QColor(0,0,0)); p->setBrush(Qt::NoBrush); QRect rect1(10, 10, 100, 50); diff --git a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp index 7ce30aa..8c5da7b 100644 --- a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp +++ b/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include #include #include @@ -150,4 +146,3 @@ void tst_QSystemTrayIcon::lastWindowClosed() QTEST_MAIN(tst_QSystemTrayIcon) #include "tst_qsystemtrayicon.moc" -#endif diff --git a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp index 9364af4..f5155ae 100644 --- a/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp @@ -144,7 +144,6 @@ void tst_QTemporaryFile::fileTemplate_data() void tst_QTemporaryFile::fileTemplate() { -#if QT_VERSION >= 0x040200 QFETCH(QString, constructorTemplate); QFETCH(QString, suffix); QFETCH(QString, fileTemplate); @@ -157,7 +156,6 @@ void tst_QTemporaryFile::fileTemplate() QCOMPARE(file.fileName().right(suffix.length()), suffix); file.close(); -#endif } @@ -234,9 +232,6 @@ void tst_QTemporaryFile::write() void tst_QTemporaryFile::openCloseOpenClose() { -#if QT_VERSION < 0x040101 - QSKIP("Until Qt 4.1.1, QTemporaryFile would create a new name every time open() was called.", SkipSingle); -#endif QString fileName; { // Create a temp file @@ -248,7 +243,7 @@ void tst_QTemporaryFile::openCloseOpenClose() QVERIFY(QFile::exists(fileName)); file.close(); - // Check that it still exists after being closed + // Check that it still exists after being closed QVERIFY(QFile::exists(fileName)); QVERIFY(!file.isOpen()); QVERIFY(file.open()); diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp index 48212a4..86b253f 100644 --- a/tests/auto/qtextcursor/tst_qtextcursor.cpp +++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp @@ -124,9 +124,7 @@ private slots: void selectWordWithSeparators_data(); void selectWordWithSeparators(); void startOfWord(); -#if QT_VERSION >= 0x040100 void selectBlock(); -#endif void selectVisually(); void insertText(); @@ -1228,13 +1226,9 @@ void tst_QTextCursor::selectWord() cursor.movePosition(QTextCursor::EndOfBlock); cursor.select(QTextCursor::WordUnderCursor); -#if QT_VERSION < 0x040200 - QVERIFY(!cursor.hasSelection()); -#else QVERIFY(cursor.hasSelection()); QCOMPARE(cursor.selectionStart(), 17); QCOMPARE(cursor.selectionEnd(), 22); -#endif } void tst_QTextCursor::selectWordWithSeparators_data() @@ -1269,7 +1263,6 @@ void tst_QTextCursor::startOfWord() QCOMPARE(cursor.position(), 0); } -#if QT_VERSION >= 0x040100 void tst_QTextCursor::selectBlock() { cursor.insertText("foobar"); @@ -1295,7 +1288,6 @@ void tst_QTextCursor::selectBlock() QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter); QCOMPARE(cursor.block().text(), QString("blah")); } -#endif void tst_QTextCursor::selectVisually() { @@ -1551,7 +1543,6 @@ void tst_QTextCursor::update() void tst_QTextCursor::disallowSettingObjectIndicesOnCharFormats() { -#if QT_VERSION >= 0x040200 QTextCharFormat fmt; fmt.setObjectIndex(42); cursor.insertText("Hey", fmt); @@ -1581,7 +1572,6 @@ void tst_QTextCursor::disallowSettingObjectIndicesOnCharFormats() cursor = table->cellAt(0, 0).firstCursorPosition(); QVERIFY(!cursor.isNull()); QCOMPARE(cursor.blockCharFormat().objectIndex(), table->objectIndex()); -#endif } void tst_QTextCursor::blockAndColumnNumber() diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp index 58cc019..4ef5299 100644 --- a/tests/auto/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp @@ -193,14 +193,9 @@ void tst_QTextDocument::getSetCheck() QPointer var1 = new MyAbstractTextDocumentLayout(0); obj1.setDocumentLayout(var1); QCOMPARE(static_cast(var1), obj1.documentLayout()); -#if QT_VERSION >= 0x040200 - // QTextDocument in Qt < 4.2 crashes on this. Qt >= 4.2 should handle this gracefully obj1.setDocumentLayout((QAbstractTextDocumentLayout *)0); QVERIFY(var1.isNull()); QVERIFY(obj1.documentLayout()); -#else - delete var1; -#endif // bool QTextDocument::useDesignMetrics() // void QTextDocument::setUseDesignMetrics(bool) @@ -672,18 +667,6 @@ void tst_QTextDocument::toHtml_data() << QString("

Blah

"); } -#if QT_VERSION < 0x040200 - { - CREATE_DOC_AND_CURSOR(); - - QTextCharFormat fmt; - fmt.setProperty(QTextFormat::FontSizeIncrement, 2); - cursor.insertText("Blah", fmt); - - QTest::newRow("logical-font-size") << QTextDocumentFragment(&doc) - << QString("

Blah

"); - } -#else { CREATE_DOC_AND_CURSOR(); @@ -694,7 +677,6 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("logical-font-size") << QTextDocumentFragment(&doc) << QString("

Blah

"); } -#endif { CREATE_DOC_AND_CURSOR(); @@ -892,13 +874,8 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("simpletable") << QTextDocumentFragment(&doc) << QString("" -#if QT_VERSION >= 0x040200 "\n\n\n" "\n\n\n" -#else - "" - "" -#endif "
"); } @@ -911,11 +888,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("tablespans") << QTextDocumentFragment(&doc) << QString("" -#if QT_VERSION >= 0x040200 "\n\n\n" -#else - "" -#endif "
"); } @@ -961,7 +934,6 @@ void tst_QTextDocument::toHtml_data() ""); } -#if QT_VERSION >= 0x040200 { CREATE_DOC_AND_CURSOR(); @@ -977,7 +949,6 @@ void tst_QTextDocument::toHtml_data() "\n\n\n" ""); } -#endif { CREATE_DOC_AND_CURSOR(); @@ -988,13 +959,8 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("nestedtable") << QTextDocumentFragment(&doc) << QString("" -#if QT_VERSION >= 0x040200 "\n\n\n" "\n\n\n" -#else - "" - "" -#endif "
\n\n\n
\n

Hey

Hey

"); } @@ -1011,11 +977,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("colwidths") << QTextDocumentFragment(&doc) << QString("" -#if QT_VERSION >= 0x040200 "\n\n\n\n" -#else - "" -#endif "
"); } @@ -1032,11 +994,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("cellproperties") << QTextDocumentFragment(&doc) << QString("" -#if QT_VERSION >= 0x040200 "\n\n" -#else - "" -#endif "
"); } @@ -1111,9 +1069,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("blockmargins") << QTextDocumentFragment(&doc) << -#if QT_VERSION >= 0x040100 QString("EMPTYBLOCK") + -#endif QString("

Blah

"); } @@ -1129,11 +1085,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("lists") << QTextDocumentFragment(&doc) << QString("EMPTYBLOCK") + -#if QT_VERSION >= 0x040200 QString("
  • Blubb
  • \n
  • Blah
"); -#else - QString("
  • Blubb
  • Blah
"); -#endif } { @@ -1156,11 +1108,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("charfmt-for-list-item") << QTextDocumentFragment(&doc) << QString("EMPTYBLOCK") + -#if QT_VERSION >= 0x040200 QString("
  • Blubb
  • \n
  • Blah
"); -#else - QString("
  • Blubb
  • Blah
"); -#endif } { @@ -1174,9 +1122,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("block-indent") << QTextDocumentFragment(&doc) << -#if QT_VERSION >= 0x040100 QString("EMPTYBLOCK") + -#endif QString("

Test

"); } @@ -1192,11 +1138,7 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("list-indent") << QTextDocumentFragment(&doc) << QString("EMPTYBLOCK") + -#if QT_VERSION >= 0x040200 QString("
  • Blah
"); -#else - QString("
  • Blah
"); -#endif } { @@ -1217,11 +1159,7 @@ void tst_QTextDocument::toHtml_data() // if you press enter twice in an empty textedit and then insert 'Test' // you actually get three visible paragraphs, two empty leading ones and // a third with the actual text. the corresponding html representation - // therefore should also contain three paragraphs. that only works in >= 4.1, - // 4.0.x needs this additional block. -#if QT_VERSION < 0x040100 - cursor.insertBlock(); -#endif + // therefore should also contain three paragraphs. cursor.insertBlock(); QTextCharFormat fmt; @@ -1232,16 +1170,10 @@ void tst_QTextDocument::toHtml_data() fmt.setProperty(QTextFormat::FontSizeIncrement, 2); cursor.insertText("Test", fmt); -#if QT_VERSION < 0x040200 - QTest::newRow("blockcharfmt") << QTextDocumentFragment(&doc) - << QString("EMPTYBLOCK

Test

"); -#else QTest::newRow("blockcharfmt") << QTextDocumentFragment(&doc) << QString("EMPTYBLOCK

Test

"); -#endif } -#if QT_VERSION >= 0x040100 { CREATE_DOC_AND_CURSOR(); @@ -1254,7 +1186,6 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("blockcharfmt2") << QTextDocumentFragment(&doc) << QString("

Test

"); } -#endif { QTest::newRow("horizontal-ruler") << QTextDocumentFragment::fromHtml("
") @@ -1285,11 +1216,7 @@ void tst_QTextDocument::toHtml_data() cursor = mainFrame->lastCursorPosition(); QTest::newRow("frame") << QTextDocumentFragment(&doc) -#if QT_VERSION >= 0x040200 << QString("\n\n
\n

Hello World

"); -#else - << QString("

Hello World

"); -#endif } { @@ -1993,11 +1920,7 @@ void tst_QTextDocument::resolvedFontInEmptyFormat() void tst_QTextDocument::defaultRootFrameMargin() { -#if QT_VERSION >= 0x040200 && QT_VERSION <= 0x040400 - QCOMPARE(doc->rootFrame()->frameFormat().margin(), 2.0); -#else QCOMPARE(doc->rootFrame()->frameFormat().margin(), 4.0); -#endif } class TestDocument : public QTextDocument @@ -2415,7 +2338,6 @@ void tst_QTextDocument::documentCleanup() void tst_QTextDocument::characterAt() { -#if QT_VERSION >= 0x040500 QTextDocument doc; QTextCursor cursor(&doc); QString text("12345\n67890"); @@ -2432,7 +2354,6 @@ void tst_QTextDocument::characterAt() c = QChar(QChar::ParagraphSeparator); QCOMPARE(doc.characterAt(i), c); } -#endif } void tst_QTextDocument::revisions() diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index bace7b4..6edaee3 100644 --- a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -2217,9 +2217,6 @@ void tst_QTextDocumentFragment::defaultFont() void tst_QTextDocumentFragment::html_spanBackgroundColor() { setHtml("Foo"); -#if QT_VERSION <= 0x040100 - QEXPECT_FAIL("", "Fixed in >= 4.1.1", Continue); -#endif QVERIFY(doc->begin().begin().fragment().charFormat().background().color() == QColor(Qt::blue)); } @@ -2251,9 +2248,6 @@ void tst_QTextDocumentFragment::html_brokenTitle() void tst_QTextDocumentFragment::html_blockVsInline() { -#if QT_VERSION <= 0x040100 - QEXPECT_FAIL("", "Fixed in >= 4.1.1", Abort); -#endif { setHtml("
Foo
Bar"); QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold); @@ -2314,15 +2308,8 @@ void tst_QTextDocumentFragment::html_tbody() QTextTable *table = cursor.currentTable(); QVERIFY(table); QCOMPARE(table->columns(), 1); -#if QT_VERSION <= 0x040100 - QEXPECT_FAIL("", "Fixed in >= 4.1.1", Abort); -#endif QCOMPARE(table->rows(), 2); - -#if QT_VERISON >= 0x040200 QVERIFY(table->format().headerRowCount(), 1); -#endif - QCOMPARE(table->cellAt(0, 0).firstCursorPosition().block().text(), QString("First Cell")); QCOMPARE(table->cellAt(1, 0).firstCursorPosition().block().text(), QString("Second Cell")); } @@ -2380,7 +2367,6 @@ void tst_QTextDocumentFragment::html_nestedTables() void tst_QTextDocumentFragment::html_rowSpans() { -#if QT_VERSION > 0x040100 setHtml("" "" " " @@ -2413,7 +2399,6 @@ void tst_QTextDocumentFragment::html_rowSpans() QCOMPARE(table->cellAt(3, 0).firstCursorPosition().block().text(), QString("blubb")); QCOMPARE(table->cellAt(3, 1).firstCursorPosition().block().text(), QString("baz")); -#endif } void tst_QTextDocumentFragment::html_rowSpans2() diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp index 534c7b0..4ea3e2f 100644 --- a/tests/auto/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp @@ -182,9 +182,6 @@ void tst_QTextLayout::init() testFont.setFamily("__Qt__Box__Engine__"); testFont.setPixelSize(TESTFONT_SIZE); testFont.setWeight(QFont::Normal); -#if defined(Q_WS_MAC) && QT_VERSION < 0x040200 - QSKIP("QTestFontEngine is not supported on the mac right now", SkipAll); -#endif QCOMPARE(QFontMetrics(testFont).width('a'), testFont.pixelSize()); } diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp index f70082d..c60e0bf 100644 --- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp @@ -533,7 +533,7 @@ void tst_QScriptEngine::bengali() void tst_QScriptEngine::gurmukhi() { -#if QT_VERSION >= 0x040001 && defined(Q_WS_X11) +#if defined(Q_WS_X11) { if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) { QFont f("Lohit Punjabi"); diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 5a6cce8..358b4b6 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -100,10 +100,8 @@ private slots: void readLineFromTextDevice_data(); void readLineFromTextDevice(); void readLineUntilNull(); -#if QT_VERSION >= 0x040103 void readLineMaxlen_data(); void readLineMaxlen(); -#endif void readLinesFromBufferCRCR(); // all @@ -220,13 +218,11 @@ private slots: void utf8IncompleteAtBufferBoundary_data(); void utf8IncompleteAtBufferBoundary(); -#if QT_VERSION >= 0x040100 // status void status_real_read_data(); void status_real_read(); void status_integer_read(); void status_word_read(); -#endif // use case tests void useCase1(); diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp index 6b6197a..235d63b 100644 --- a/tests/auto/qthread/tst_qthread.cpp +++ b/tests/auto/qthread/tst_qthread.cpp @@ -326,10 +326,6 @@ void tst_QThread::isRunning() void tst_QThread::setPriority() { -#if QT_VERSION < 0x040100 - QSKIP("QThread::setPriority() was introduced in 4.1.0, you are testing " QT_VERSION_STR, - SkipAll); -#else Simple_Thread thread; // cannot change the priority, since the thread is not running @@ -401,7 +397,6 @@ void tst_QThread::setPriority() QTest::ignoreMessage(QtWarningMsg, "QThread::setPriority: Cannot set priority, thread is not running"); thread.setPriority(QThread::TimeCriticalPriority); QCOMPARE(thread.priority(), QThread::InheritPriority); -#endif } void tst_QThread::priority() diff --git a/tests/auto/qtime/tst_qtime.cpp b/tests/auto/qtime/tst_qtime.cpp index ea4700d..cc91e9d 100644 --- a/tests/auto/qtime/tst_qtime.cpp +++ b/tests/auto/qtime/tst_qtime.cpp @@ -254,11 +254,7 @@ void tst_QTime::isNull() QTime t1; QVERIFY( t1.isNull() ); QTime t2(0,0,0); -#if QT_VERSION >= 0x040100 QVERIFY( !t2.isNull() ); -#else - QVERIFY( t2.isNull() ); -#endif QTime t3(0,0,1); QVERIFY( !t3.isNull() ); QTime t4(0,0,0,1); @@ -270,11 +266,7 @@ void tst_QTime::isNull() void tst_QTime::isValid() { QTime t1; -#if QT_VERSION >= 0x040100 QVERIFY( !t1.isValid() ); -#else - QVERIFY( t1.isValid() ); -#endif QTime t2(24,0,0,0); QVERIFY( !t2.isValid() ); QTime t3(23,60,0,0); @@ -599,11 +591,7 @@ void tst_QTime::fromString_data() QTest::newRow( "data0" ) << QString("00:00:00") << QTime(0,0,0,0) << QTime(0,0,0,0); QTest::newRow( "data1" ) << QString("10:12:34") << QTime(10,12,34,0) << QTime(10,12,34,0); QTest::newRow( "data2" ) << QString("19:03:54.998601") << QTime(19, 3, 54, 999) << QTime(19, 3, 54, 999); -#if QT_VERSION >= 0x040200 QTest::newRow( "data3" ) << QString("19:03:54.999601") << QTime(19, 3, 54, 999) << QTime(19, 3, 54, 999); -#else - QTest::newRow( "data3" ) << QString("19:03:54.999601") << QTime() << QTime(); -#endif } void tst_QTime::fromString() @@ -671,9 +659,7 @@ void tst_QTime::toString_format_data() QTest::newRow( "data2" ) << QTime(10,12,34,45) << QString("hh:m:ss:z") << QString("10:12:34:45"); QTest::newRow( "data3" ) << QTime(10,12,34,45) << QString("hh:ss ap") << QString("10:34 am"); QTest::newRow( "data4" ) << QTime(22,12,34,45) << QString("hh:zzz AP") << QString("10:045 PM"); -#if (QT_VERSION-0 >= 0x030200) QTest::newRow( "data5" ) << QTime(230,230,230,230) << QString("hh:mm:ss") << QString(); -#endif } void tst_QTime::toString_format() diff --git a/tests/auto/qtimeline/tst_qtimeline.cpp b/tests/auto/qtimeline/tst_qtimeline.cpp index e35f406..9576193 100644 --- a/tests/auto/qtimeline/tst_qtimeline.cpp +++ b/tests/auto/qtimeline/tst_qtimeline.cpp @@ -42,10 +42,6 @@ #include -#if QT_VERSION < 0x040200 -QTEST_NOOP_MAIN -#else - #include //TESTED_CLASS= @@ -705,5 +701,3 @@ void tst_QTimeLine::resume() QTEST_MAIN(tst_QTimeLine) #include "tst_qtimeline.moc" - -#endif //QT_VERSION diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index dfccd9e..d9296ad 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -474,11 +474,7 @@ void tst_QTreeView::construction() QCOMPARE(view.iconSize(), QSize()); QCOMPARE(view.indexAt(QPoint()), QModelIndex()); QVERIFY(!view.indexWidget(QModelIndex())); -#if QT_VERSION >= 0x040400 QVERIFY(qobject_cast(view.itemDelegate())); -#else - QVERIFY(qobject_cast(view.itemDelegate())); -#endif QVERIFY(!view.itemDelegateForColumn(-1)); QVERIFY(!view.itemDelegateForColumn(0)); QVERIFY(!view.itemDelegateForColumn(1)); @@ -1003,11 +999,7 @@ void tst_QTreeView::itemDelegate() { QTreeView view; -#if QT_VERSION >= 0x040400 QVERIFY(qobject_cast(view.itemDelegate())); -#else - QVERIFY(qobject_cast(view.itemDelegate())); -#endif QPointer oldDelegate = view.itemDelegate(); otherItemDelegate = new QItemDelegate; @@ -1864,14 +1856,8 @@ void tst_QTreeView::indexBelow() i = view.indexBelow(i); QVERIFY(i.isValid()); QCOMPARE(i.row(), 1); -#if QT_VERSION >= 0x040100 i = view.indexBelow(i); QVERIFY(!i.isValid()); -#else - // Qt 4.0.x returns the bottom index - i = view.indexBelow(i); - QVERIFY(i.isValid()); -#endif } void tst_QTreeView::clicked() diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index b21b240..c3595c2 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -1555,9 +1555,6 @@ void tst_QTreeWidget::keyboardNavigation() void tst_QTreeWidget::scrollToItem() { -#if QT_VERSION < 0x040100 - QSKIP("This behaviour will be merged from main in 4.1.0.", SkipAll); -#else // Check if all parent nodes of the item found are expanded. // Reported in task #78761 QTreeWidgetItem *bar; @@ -1586,7 +1583,6 @@ void tst_QTreeWidget::scrollToItem() QVERIFY(testWidget->isItemExpanded(bar)); bar = bar->parent(); QVERIFY(testWidget->isItemExpanded(bar)); -#endif } // From task #85413 @@ -2087,7 +2083,6 @@ void tst_QTreeWidget::itemWidget() } } -#if QT_VERSION >= 0x040200 void tst_QTreeWidget::insertItemsWithSorting_data() { QTest::addColumn("sortOrder"); @@ -2259,8 +2254,6 @@ void tst_QTreeWidget::insertExpandedItemsWithSorting_data() << (QStringList() << "h" << "g" << "f" << "e"); } - - // From Task 134978 void tst_QTreeWidget::insertExpandedItemsWithSorting() { @@ -2421,7 +2414,6 @@ void tst_QTreeWidget::changeDataWithSorting() QCOMPARE(dataChangedSpy.count(), 1); QCOMPARE(layoutChangedSpy.count(), reorderingExpected ? 1 : 0); } -#endif // QT_VERSION void tst_QTreeWidget::itemOperatorLessThan() { @@ -2599,7 +2591,6 @@ void tst_QTreeWidget::removeSelectedItem() QCOMPARE(selModel->isSelected(w->model()->index(0,0)), false); delete w; - } class AnotherTreeWidget : public QTreeWidget diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp index 49abc6d..e4572c0 100644 --- a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp +++ b/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp @@ -42,8 +42,6 @@ #include -#if QT_VERSION >= 0x040100 - #include #include #include @@ -61,7 +59,6 @@ public: tst_QTreeWidgetItemIterator(); ~tst_QTreeWidgetItemIterator(); - public slots: void initTestCase(); void cleanupTestCase(); @@ -136,7 +133,7 @@ void tst_QTreeWidgetItemIterator::initTestCase() case 9: top->setFlags(Qt::ItemIsEnabled);break; case 10: top->setFlags(Qt::ItemIsEnabled);break; - case 11: + case 11: top->setFlags(0); break; @@ -982,7 +979,6 @@ void tst_QTreeWidgetItemIterator::postdecrement() } - void tst_QTreeWidgetItemIterator::plus_eq_data() { QTest::addColumn("start"); @@ -1146,9 +1142,9 @@ void tst_QTreeWidgetItemIterator::updateIteratorAfterDeletedItem_and_ContinueIte QTest::addColumn("grandChildItems"); // Populate the tree data // we have one iterator pointing to an item in the tree. // This iterator will be updated if we delete the item it is pointing to. - // + // QTest::addColumn("removeindex"); // The index of the node we want to remove - QTest::addColumn("iterator_initial_index"); // The new expected index of + QTest::addColumn("iterator_initial_index"); // The new expected index of QTest::addColumn("iterator_advance_after_removal"); QTest::addColumn("iterator_new_value"); // The new current item value of the iterator QTest::newRow("Remove 13, it points to 25, it-=1. We should get top0,child2,grandchild2") << 3 << 3 << 3 << 13 << 25 << -1 << QString("top0,child2,grandchild2"); @@ -1245,7 +1241,3 @@ void tst_QTreeWidgetItemIterator::initializeIterator() QTEST_MAIN(tst_QTreeWidgetItemIterator) #include "tst_qtreewidgetitemiterator.moc" - -#else -QTEST_NOOP_MAIN -#endif diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp index 57e779c..e79be38 100644 --- a/tests/auto/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp @@ -522,9 +522,6 @@ void tst_QUdpSocket::bindMode() #endif } -#if QT_VERSION < 0x040100 - QSKIP("QUdpSocket::BindMode was added in Qt 4.1.", SkipAll); -#else QUdpSocket socket; QVERIFY2(socket.bind(), socket.errorString().toLatin1().constData()); QUdpSocket socket2; @@ -550,7 +547,6 @@ void tst_QUdpSocket::bindMode() QVERIFY(!socket2.bind(socket.localPort())); QVERIFY(!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint)); #endif -#endif } void tst_QUdpSocket::writeDatagramToNonExistingPeer_data() diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 3b938f2..5a79792 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -1129,11 +1129,7 @@ void tst_QUrl::setUrl() check("host",ulong.host(),"swww.gad.de"); check("path",ulong.path(),"/servlet/CookieAccepted"); -#if QT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); -#else QTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); -#endif // UTF8 tests KURL uloc("/home/dfaure/konqtests/Matériel"); check("locale8bit",uloc.url().latin1(),"file:/home/dfaure/konqtests/Mat%E9riel"); // escaping the letter would be correct too @@ -1155,11 +1151,7 @@ void tst_QUrl::setUrl() uloc = KURL::fromPathOrURL( "" ); check("fromPathOrURL url", uloc.isValid()?"valid":"malformed", "malformed"); -#if QT_VERSION < 300 - qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); -#else QTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); -#endif baseURL = "file:/home/coolo"; KURL russian = baseURL.directory(false, true) + QString::fromLocal8Bit( "ÆÇÎ7" ); check( "russian", russian.url(), "file:/home/%C6%C7%CE7" ); diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 78d597e..d15f9c8 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -2414,13 +2414,9 @@ void tst_QVariant::url() void tst_QVariant::globalColor() { -#if QT_VERSION >= 0x040200 QVariant variant(Qt::blue); QVERIFY(variant.type() == QVariant::Color); QVERIFY(qVariantValue(variant) == QColor(Qt::blue)); -#else - QSKIP("Implemented/fixed in 4.2", SkipSingle); -#endif } void tst_QVariant::variantMap() diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp index b2305cb..1e0136f 100644 --- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp @@ -161,9 +161,6 @@ public: void tst_QWaitCondition::wait_QMutex() { -#if defined(Q_OS_WIN32) && QT_VERSION < 0x030200 - QSKIP("Known race-conditions cause sporadic failures", SkipAll); -#else int x; for (int i = 0; i < iterations; ++i) { { @@ -240,7 +237,6 @@ void tst_QWaitCondition::wait_QMutex() } } } -#endif } void tst_QWaitCondition::wait_QReadWriteLock() @@ -446,9 +442,6 @@ int wake_Thread_2::count = 0; void tst_QWaitCondition::wakeOne() { -#if defined(Q_OS_WIN32) && QT_VERSION < 0x030200 - QSKIP("Known race-conditions cause sporadic failures", SkipAll); -#else int x; // wake up threads, one at a time for (int i = 0; i < iterations; ++i) { @@ -597,7 +590,7 @@ void tst_QWaitCondition::wakeOne() // QReadWriteLock QReadWriteLock readWriteLock; - wake_Thread_2 rwthread[ThreadCount]; + wake_Thread_2 rwthread[ThreadCount]; readWriteLock.lockForWrite(); for (x = 0; x < ThreadCount; ++x) { @@ -641,14 +634,10 @@ void tst_QWaitCondition::wakeOne() QCOMPARE(wake_Thread_2::count, 0); } -#endif } void tst_QWaitCondition::wakeAll() { -#if defined(Q_OS_WIN32) && QT_VERSION < 0x030200 - QSKIP("Known race-conditions cause sporadic failures", SkipAll); -#else int x; for (int i = 0; i < iterations; ++i) { QMutex mutex; @@ -715,7 +704,6 @@ void tst_QWaitCondition::wakeAll() QCOMPARE(exited, ThreadCount); QCOMPARE(wake_Thread_2::count, 0); } -#endif } class wait_RaceConditionThread : public QThread diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 4b41bdb..a052034 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -2564,9 +2564,6 @@ void tst_QWidget::setGeometry() void tst_QWidget::windowOpacity() { -#if defined(Q_WS_X11) && QT_VERSION < 0x040200 - QSKIP("QWidget::windowOpacity is broken in Qt < 4.2 on X11", SkipAll); -#else #ifdef Q_OS_WINCE QSKIP( "Windows CE does not support windowOpacity", SkipAll); #endif @@ -2576,43 +2573,27 @@ void tst_QWidget::windowOpacity() // Initial value should be 1.0 QCOMPARE(widget.windowOpacity(), 1.0); // children should always return 1.0 -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Prior to 4.2, all children widgets returned 0.0", Continue); -#endif QCOMPARE(child.windowOpacity(), 1.0); widget.setWindowOpacity(0.0); QCOMPARE(widget.windowOpacity(), 0.0); child.setWindowOpacity(0.0); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Prior to 4.2, all children widgets returned 0.0", Continue); -#endif QCOMPARE(child.windowOpacity(), 1.0); widget.setWindowOpacity(1.0); QCOMPARE(widget.windowOpacity(), 1.0); child.setWindowOpacity(1.0); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Prior to 4.2, all children widgets returned 0.0", Continue); -#endif QCOMPARE(child.windowOpacity(), 1.0); widget.setWindowOpacity(2.0); QCOMPARE(widget.windowOpacity(), 1.0); child.setWindowOpacity(2.0); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Prior to 4.2, all children widgets returned 0.0", Continue); -#endif QCOMPARE(child.windowOpacity(), 1.0); widget.setWindowOpacity(-1.0); QCOMPARE(widget.windowOpacity(), 0.0); child.setWindowOpacity(-1.0); -#if QT_VERSION < 0x040200 - QEXPECT_FAIL("", "Prior to 4.2, all children widgets returned 0.0", Continue); -#endif QCOMPARE(child.windowOpacity(), 1.0); -#endif } class UpdateWidget : public QWidget @@ -5321,7 +5302,7 @@ void tst_QWidget::subtractOpaqueSiblings() { #ifdef QT_MAC_USE_COCOA QSKIP("Cocoa only has rect granularity.", SkipAll); -#elif defined(Q_WIDGET_USE_DIRTYLIST) || (QT_VERSION >= 0x040400) +#else QWidget w; w.setGeometry(50, 50, 300, 300); diff --git a/tests/auto/qwmatrix/tst_qwmatrix.cpp b/tests/auto/qwmatrix/tst_qwmatrix.cpp index 47fd41f..4a816a8 100644 --- a/tests/auto/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/qwmatrix/tst_qwmatrix.cpp @@ -299,16 +299,12 @@ void tst_QWMatrix::mapping_data() void tst_QWMatrix::mapRect() { -#if QT_VERSION >= 0x030100 QFETCH( QMatrix, matrix ); QFETCH( QRect, src ); // qDebug( "got src: %d/%d (%d/%d), matrix=[ %f %f %f %f %f %f ]", -// src.x(), src.y(), src.width(), src.height(), -// matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), matrix.dx(), matrix.dy() ); +// src.x(), src.y(), src.width(), src.height(), +// matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), matrix.dx(), matrix.dy() ); QTEST( QPolygon( matrix.mapRect(src) ), "res" ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -#endif } void tst_QWMatrix::operator_star_qrect() @@ -349,7 +345,6 @@ void tst_QWMatrix::operator_star_qwmatrix() void tst_QWMatrix::assignments() { -#if QT_VERSION >= 0x040000 QMatrix m; m.scale(2, 3); m.rotate(45); @@ -371,24 +366,16 @@ void tst_QWMatrix::assignments() QCOMPARE(m.m22(), c2.m22()); QCOMPARE(m.dx(), c2.dx()); QCOMPARE(m.dy(), c2.dy()); -#else - QSKIP( "Not tested with Qt versions < 4.0", SkipAll); -#endif } void tst_QWMatrix::mapToPolygon() { -#if QT_VERSION >= 0x030100 QFETCH( QMatrix, matrix ); QFETCH( QRect, src ); QFETCH( QPolygon, res ); QCOMPARE( matrix.mapToPolygon( src ), res ); -#else - QSKIP( "Not tested with Qt versions < 3.1", SkipAll); -// qDebug("passing test; transformations are broken in 3.0.x" ); -#endif } diff --git a/tests/auto/qwritelocker/tst_qwritelocker.cpp b/tests/auto/qwritelocker/tst_qwritelocker.cpp index 21bfa8a..258309d 100644 --- a/tests/auto/qwritelocker/tst_qwritelocker.cpp +++ b/tests/auto/qwritelocker/tst_qwritelocker.cpp @@ -189,9 +189,6 @@ void tst_QWriteLocker::unlockAndRelockTest() void tst_QWriteLocker::lockerStateTest() { -#if QT_VERSION < 0x040200 - QSKIP("QWriteLocker doesn't keep state in Qt < 4.2", SkipAll); -#else class LockerStateThread : public tst_QWriteLockerThread { public: @@ -228,7 +225,6 @@ void tst_QWriteLocker::lockerStateTest() delete thread; thread = 0; -#endif } QTEST_MAIN(tst_QWriteLocker) diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/rcc/tst_rcc.cpp index 3297b2b..57649b4 100644 --- a/tests/auto/rcc/tst_rcc.cpp +++ b/tests/auto/rcc/tst_rcc.cpp @@ -59,8 +59,6 @@ public: private slots: void rcc_data(); void rcc(); - -private: }; @@ -68,18 +66,9 @@ QString findExpectedFile(const QString &base) { QString expectedrccfile = base; - if (QT_VERSION >= 0x040500 && QFileInfo(expectedrccfile + QLatin1String(".450")).exists()) + // Must be updated with each minor release. + if (QFileInfo(expectedrccfile + QLatin1String(".450")).exists()) expectedrccfile += QLatin1String(".450"); - else if (QT_VERSION >= 0x040400 && QFileInfo(expectedrccfile + QLatin1String(".440")).exists()) - expectedrccfile += QLatin1String(".440"); - else if (QT_VERSION >= 0x040300 && QFileInfo(expectedrccfile + QLatin1String(".430")).exists()) - expectedrccfile += QLatin1String(".430"); - else if (QT_VERSION >= 0x040200 && QFileInfo(expectedrccfile + QLatin1String(".420")).exists()) - expectedrccfile += QLatin1String(".420"); - else if (QT_VERSION >= 0x040100 && QFileInfo(expectedrccfile + QLatin1String(".410")).exists()) - expectedrccfile += QLatin1String(".410"); - else if (QT_VERSION >= 0x040000 && QFileInfo(expectedrccfile + QLatin1String(".400")).exists()) - expectedrccfile += QLatin1String(".400"); return expectedrccfile; } diff --git a/tests/benchmarks/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/qimagereader/tst_qimagereader.cpp index ae7ecb2..1b5acb4 100644 --- a/tests/benchmarks/qimagereader/tst_qimagereader.cpp +++ b/tests/benchmarks/qimagereader/tst_qimagereader.cpp @@ -102,9 +102,7 @@ tst_QImageReader::tst_QImageReader() images << QPair(QLatin1String("4bpp-rle.bmp"), QByteArray("bmp")); images << QPair(QLatin1String("tst7.bmp"), QByteArray("bmp")); images << QPair(QLatin1String("16bpp.bmp"), QByteArray("bmp")); -#if QT_VERSION >= 0x040200 images << QPair(QLatin1String("negativeheight.bmp"), QByteArray("bmp")); -#endif images << QPair(QLatin1String("marble.xpm"), QByteArray("xpm")); images << QPair(QLatin1String("kollada.png"), QByteArray("png")); images << QPair(QLatin1String("teapot.ppm"), QByteArray("ppm")); diff --git a/tests/benchmarks/qobject/main.cpp b/tests/benchmarks/qobject/main.cpp index cd8b142..65833b8 100644 --- a/tests/benchmarks/qobject/main.cpp +++ b/tests/benchmarks/qobject/main.cpp @@ -42,12 +42,7 @@ #include #include #include "object.h" - -#if QT_VERSION >= 0x040000 -# include -#else -# include -#endif +#include #include enum { @@ -58,7 +53,7 @@ enum { class QObjectBenchmark : public QObject { Q_OBJECT -private slots: +private slots: void signal_slot_benchmark(); void signal_slot_benchmark_data(); void qproperty_benchmark_data(); @@ -82,13 +77,8 @@ void QObjectBenchmark::signal_slot_benchmark() Object singleObject; Object multiObject; -#if QT_VERSION >= 0x040000 singleObject.setObjectName("single"); multiObject.setObjectName("multi"); -#else - singleObject.setName("single"); - multiObject.setName("double"); -#endif singleObject.connect(&singleObject, SIGNAL(signal0()), SLOT(slot0())); diff --git a/tests/benchmarks/qpainter/tst_qpainter.cpp b/tests/benchmarks/qpainter/tst_qpainter.cpp index af2c412..60c099b 100644 --- a/tests/benchmarks/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/qpainter/tst_qpainter.cpp @@ -700,11 +700,7 @@ void tst_QPainter::compositionModes_data() QTest::addColumn("size"); QTest::addColumn("color"); -#if QT_VERSION >= 0x040500 const int n = QPainter::RasterOp_SourceAndNotDestination; -#else - const int n = QPainter::CompositionMode_Exclusion; -#endif for (int i = 0; i <= n; ++i) { QString title("%1:%2"); QTest::newRow(qPrintable(title.arg(i).arg("10x10:opaque"))) @@ -732,9 +728,7 @@ void tst_QPainter::compositionModes() src.fill(color); QPixmap dest(size); -#if QT_VERSION >= 0x040500 if (mode < QPainter::RasterOp_SourceOrDestination) -#endif color.setAlpha(127); // porter-duff needs an alpha channel dest.fill(color); -- cgit v0.12 From 049f9e85b6ca50ccc53596160ebe4a5fe3de3f80 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 16 Apr 2009 12:20:11 +0200 Subject: autotest fix in QtreeView reviewed-by: ogoffart --- tests/auto/qtreeview/tst_qtreeview.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index dfccd9e..a337b81 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -1682,9 +1682,16 @@ void tst_QTreeView::moveCursor() view.setColumnHidden(0, true); QVERIFY(view.isColumnHidden(0)); view.show(); + qApp->setActiveWindow(&view); - QModelIndex actual = view.moveCursor(PublicView::MoveDown, Qt::NoModifier); + //here the first visible index should be selected + //because the view got the focus QModelIndex expected = model.index(1, 1, QModelIndex()); + QCOMPARE(view.currentIndex(), expected); + + //then pressing down should go to the next line + QModelIndex actual = view.moveCursor(PublicView::MoveDown, Qt::NoModifier); + expected = model.index(2, 1, QModelIndex()); QCOMPARE(actual, expected); view.setRowHidden(0, QModelIndex(), false); -- cgit v0.12 From c2f89fd0d9d13a0da1ecc33414860795721261a7 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 16 Apr 2009 20:06:15 +1000 Subject: Remove obsolete code. Remove the last few unnecessary directives using obsolete values of QT_VERSION. There are a few references to old QT_VERSION's left, but they are legitimate and should not be removed. Reviewed-by: Trust Me --- doc/src/snippets/alphachannel.cpp | 7 +------ tools/qvfb/qvfb.cpp | 10 +--------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/doc/src/snippets/alphachannel.cpp b/doc/src/snippets/alphachannel.cpp index 7783271..ad0885a 100644 --- a/doc/src/snippets/alphachannel.cpp +++ b/doc/src/snippets/alphachannel.cpp @@ -47,11 +47,8 @@ #include #include #include - -#if (QT_VERSION) >= 0x040000 #include #include -#endif class MyClass : public QWidget { @@ -95,12 +92,10 @@ protected: //! [0] } - QPixmap channelImage, pixmap; + QPixmap channelImage, pixmap; QSize sizeHint() const { return QSize(500, 500); } }; - - int main(int argc, char **argv) { QApplication app(argc, argv); diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index b6a715c..62149a1 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -217,16 +217,10 @@ QVFb::QVFb( int display_id, int w, int h, int d, int r, const QString &skin, Dis setWindowIcon( pix ); rateDlg = 0; refreshRate = 30; -#if QT_VERSION >= 0x030000 - // When compiling with Qt 3 we need to create the menu first to - // avoid scroll bars in the main window + // Create the menu first to avoid scroll bars in the main window createMenu( menuBar() ); init( display_id, w, h, d, r, skin ); enableCursor( true ); -#else - init( display_id, w, h, d, r, skin ); - createMenu( menuBar() ); -#endif } QVFb::~QVFb() @@ -354,9 +348,7 @@ void QVFb::init( int display_id, int pw, int ph, int d, int r, const QString& sk scroller->setWidget(view); view->setContentsMargins( 0, 0, 0, 0 ); setCentralWidget(scroller); -#if QT_VERSION >= 0x030000 ph += 2; // avoid scrollbar -#endif scroller->show(); // delete defaultbuttons.conf if it was left behind... unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId())).absoluteFilePath().toLatin1().constData()); -- cgit v0.12 From f8fba0d48a1f30540ddf15f0d36f415b192d1d8b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Apr 2009 10:40:11 +0200 Subject: Fix crash in the SQLQueryModel tests Amend fd5f83e612729cebc5395c992bd98628bb9ea25f calling fetchMore in create_mapping was a bad idea bacause it may lead to infinite recurtion Make a special case for hasChildren instead Task-number: 250023 Reviewed-by: Marius Bugge Monsen BT: yes --- src/gui/itemviews/qsortfilterproxymodel.cpp | 7 ++++--- tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index b0137d2..2c9eeea 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -274,9 +274,6 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping( Mapping *m = new Mapping; - if (model->canFetchMore(source_parent)) - model->fetchMore(source_parent); - int source_rows = model->rowCount(source_parent); for (int i = 0; i < source_rows; ++i) { if (q->filterAcceptsRow(i, source_parent)) @@ -1572,6 +1569,10 @@ bool QSortFilterProxyModel::hasChildren(const QModelIndex &parent) const return false; if (!d->model->hasChildren(source_parent)) return false; + + if (d->model->canFetchMore(source_parent)) + return true; //we assume we might have children that can be fetched + QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value(); return m->source_rows.count() != 0 && m->source_columns.count() != 0; } diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 0509d49..4a749f0 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -2596,7 +2596,11 @@ class QtTestModel: public QAbstractItemModel } void fetchMore(const QModelIndex &idx) { + if (fetched.contains(idx)) + return; + beginInsertRows(idx, 0, rows-1); fetched.insert(idx); + endInsertRows(); } bool hasChildren(const QModelIndex & = QModelIndex()) const { @@ -2607,7 +2611,7 @@ class QtTestModel: public QAbstractItemModel return fetched.contains(parent) ? rows : 0; } int columnCount(const QModelIndex& parent = QModelIndex()) const { - return fetched.contains(parent) ? cols : 0; + return cols; } QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const -- cgit v0.12 From 18ec250e0bdc5ca901744b926d9a062e6920ebbc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Apr 2009 11:00:01 +0200 Subject: Condense this code into one single case. Avoid duplicating code. Just because I can. Reviewed-by: Bradley T. Hughes --- src/corelib/global/qglobal.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5fd05c0..f058b36 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -821,17 +821,12 @@ typedef quint64 qulonglong; sizeof(void *) == sizeof(quintptr) && sizeof(void *) == sizeof(qptrdiff) */ -template class QUintForSize { private: typedef void Type; }; -template <> class QUintForSize<4> { public: typedef quint32 Type; }; -template <> class QUintForSize<8> { public: typedef quint64 Type; }; -template class QUintForType : public QUintForSize { }; -typedef QUintForType::Type quintptr; - -template class QIntForSize { private: typedef void Type; }; -template <> class QIntForSize<4> { public: typedef qint32 Type; }; -template <> class QIntForSize<8> { public: typedef qint64 Type; }; -template class QIntForType : public QIntForSize { }; -typedef QIntForType::Type qptrdiff; +template struct QIntegerForSize; +template <> struct QIntegerForSize<4> { typedef quint32 Unsigned; typedef qint32 Signed; }; +template <> struct QIntegerForSize<8> { typedef quint64 Unsigned; typedef qint64 Signed; }; +template struct QIntegerForSizeof: QIntegerForSize { }; +typedef QIntegerForSizeof::Unsigned quintptr; +typedef QIntegerForSizeof::Signed qptrdiff; /* Useful type definitions for Qt -- cgit v0.12 From 4aa94a353224c14265446276277a91339f2e415d Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 16 Apr 2009 11:33:54 +0200 Subject: BT: Mac: QtDemo is really sluggish when opening menus This has to do with coalesced updates. The easy fix for now is to fix QtDemo itself, meaning: always use a steady timer for redrawing the viewport of the graphics view (as opposed to let each item on screen calling update whenever they move) Task-number: 250667 Reviewed-by: Trenton Schulz --- demos/qtdemo/colors.cpp | 3 +++ demos/qtdemo/menumanager.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index 18343cb..41bbfb3 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -278,6 +278,9 @@ void Colors::parseArgs(int argc, char *argv[]) + "[-low] [-ticker-letters] [-ticker-speed] [-no-ticker-morph] " + "[-ticker-morph-speed] [-ticker-text]"); exit(0); + } else{ + QMessageBox::warning(0, "QtDemo", QString("Unrecognized argument:\n") + s); + exit(0); } } diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index bfa2e3f..a9e9b4b 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -184,7 +184,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->tickerInAnim->startDelay = 2000; this->ticker->useGuideQt(); this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(true); } break; case MENU1: @@ -220,7 +219,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY); if (!Colors::noTicker){ this->score->queueMovie("ticker -out", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(false); } break; case UP:{ @@ -257,7 +255,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->ticker->doIntroTransitions = false; this->tickerInAnim->startDelay = 500; this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(true); } } else if (this->currentMenuCode != ROOT) itemSelected(ROOT, Colors::rootMenuName); -- cgit v0.12 From b6a50971f51618a3965605d9223c8b2b06c23f29 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 16 Apr 2009 13:05:47 +0200 Subject: Changelog Changelog --- dist/changes-4.5.1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 271f25d..776e2a3 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -383,6 +383,21 @@ Qt for Mac OS X - QDesktopWidget * [244004] Support multiple screens that have different sizes properly. +- QDialog + * [239155] QDialog(foo, Qt::Sheet) with QComboBox have none native behavior. + * [218980] Modeless dialogs should be stacked above normal windows. + * [195904] Parent dialog is displayed on top of its modal child. + +- QFileDialog + * [219844] QFileDialog::getOpenFileName() search buttons lead to crash (native version). + * [225705] QFileDialog::getSaveFileName()'s filter does not display correctly. + +- QMenu + * [228017] QMenu should close when expanding a system menu. + +- Event system + * [210912] ShowEvent not sendt when reshowing a window after it was minimized. + - macdeployqt * The binary packages now includes the macdeployqt tool. * macdeployqt now runs 'strip' on the deployed binaries. @@ -397,6 +412,8 @@ Qt for Mac OS X - Added QSysInfo::MV_10_6 as an enum to test against. - Various compile fixes for Snow Leopard (preliminary support). - The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. +- [223525] Macmainwindow Demo Application (crashfix). + - Document a bit clearer how qt_mac_set_dock_menu() works. -- cgit v0.12 From 78659fbe2d4ad8a01b41cb485f57b4a66c031fd5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 16 Apr 2009 13:09:00 +0200 Subject: change log updated for 4.5.1 --- dist/changes-4.5.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 776e2a3..dd41ef4 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -430,6 +430,7 @@ Qt for Embedded Linux Qt for Windows CE ----------------- + * [246619] Fixed tap and hold bug for QCheckbox. **************************************************************************** * Compiler Specific Changes * -- cgit v0.12 From 5c359a9b599e2024d070534c10c5a0e224eca5d8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Apr 2009 10:00:10 +0200 Subject: Add a warning for trying to connectToHost() when disconnecting. Right now, we print this warning if connectToHost() is called when we're in ConnectingState (waiting for remote to SYN,ACK) or in ConnectedState. This also means connectToHost() allows interruption of the HostLookupState cleanly (I think). But if you called connectToHost() right after disconnectFromHost() and there were data to write, the connectToHost() could discard the pending outgoing data and reconnect. Or not, depending on whether the DNS resolution ended first. In other words, race condition. Reviewed-by: Peter Hartmann --- src/network/socket/qabstractsocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index f8cf4ca..f9750f2 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1263,7 +1263,7 @@ void QAbstractSocket::connectToHostImplementation(const QString &hostName, quint (int) openMode); #endif - if (d->state == ConnectedState || d->state == ConnectingState) { + if (d->state == ConnectedState || d->state == ConnectingState || d->state == ClosingState) { qWarning("QAbstractSocket::connectToHost() called when already connecting/connected to \"%s\"", qPrintable(hostName)); return; } -- cgit v0.12 From 4df7355273916eb87eea89f39404c3a1e336766b Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Thu, 16 Apr 2009 16:03:08 +0200 Subject: Fixing the release version in FAQ.txt. --- FAQ.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.txt b/FAQ.txt index c243e5c..4660e4d 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -1,4 +1,4 @@ -This is a list of Frequently Asked Questions regarding Qt Release 4.5.0. +This is a list of Frequently Asked Questions regarding Qt Release 4.5.1. Q: I'm using a Unix system and I downloaded the Zip package. However, when I try to run the configure script, I get the following error message: -- cgit v0.12 From b43b57b251505157f32463094a9ac7c41ab69859 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Thu, 16 Apr 2009 15:14:09 +0200 Subject: fix reading problem on 64-bit machines in QProcess and socket engine QProcessPrivate and QNativeSocketEnginePrivate were reporting a wrong number of bytes available on 64-bit machines, due to use of size_t in ioctl. That was required by Irix, which we dropped support for, so we can also drop size_t Reviewed-by: Thiago Task-number: 249537 --- src/corelib/io/qfilesystemwatcher_inotify.cpp | 2 +- src/corelib/io/qprocess_unix.cpp | 8 ++++---- src/network/socket/qnativesocketengine_unix.cpp | 19 ++----------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index 4445e3c..fa44531 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -316,7 +316,7 @@ void QInotifyFileSystemWatcherEngine::readFromInotify() // qDebug() << "QInotifyFileSystemWatcherEngine::readFromInotify"; int buffSize = 0; - ioctl(inotifyFd, FIONREAD, &buffSize); + ioctl(inotifyFd, FIONREAD, (char *) &buffSize); QVarLengthArray buffer(buffSize); buffSize = read(inotifyFd, buffer.data(), buffSize); const char *at = buffer.data(); diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 37173c8..33d4a47 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -850,10 +850,10 @@ bool QProcessPrivate::processStarted() qint64 QProcessPrivate::bytesAvailableFromStdout() const { - size_t nbytes = 0; + int nbytes = 0; qint64 available = 0; if (::ioctl(stdoutChannel.pipe[0], FIONREAD, (char *) &nbytes) >= 0) - available = (qint64) *((int *) &nbytes); + available = (qint64) nbytes; #if defined (QPROCESS_DEBUG) qDebug("QProcessPrivate::bytesAvailableFromStdout() == %lld", available); #endif @@ -862,10 +862,10 @@ qint64 QProcessPrivate::bytesAvailableFromStdout() const qint64 QProcessPrivate::bytesAvailableFromStderr() const { - size_t nbytes = 0; + int nbytes = 0; qint64 available = 0; if (::ioctl(stderrChannel.pipe[0], FIONREAD, (char *) &nbytes) >= 0) - available = (qint64) *((int *) &nbytes); + available = (qint64) nbytes; #if defined (QPROCESS_DEBUG) qDebug("QProcessPrivate::bytesAvailableFromStderr() == %lld", available); #endif diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 73f6f84..cc372a6 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -506,26 +506,11 @@ int QNativeSocketEnginePrivate::nativeAccept() qint64 QNativeSocketEnginePrivate::nativeBytesAvailable() const { - /* - Apparently, there is not consistency among different operating - systems on how to use FIONREAD. - - FreeBSD, Linux and Solaris all expect the 3rd argument to - ioctl() to be an int, which is normally 32-bit even on 64-bit - machines. - - IRIX, on the other hand, expects a size_t, which is 64-bit on - 64-bit machines. - - So, the solution is to use size_t initialized to zero to make - sure all bits are set to zero, preventing underflow with the - FreeBSD/Linux/Solaris ioctls. - */ - size_t nbytes = 0; + int nbytes = 0; // gives shorter than true amounts on Unix domain sockets. qint64 available = 0; if (::ioctl(socketDescriptor, FIONREAD, (char *) &nbytes) >= 0) - available = (qint64) *((int *) &nbytes); + available = (qint64) nbytes; #if defined (QNATIVESOCKETENGINE_DEBUG) qDebug("QNativeSocketEnginePrivate::nativeBytesAvailable() == %lli", available); -- cgit v0.12 From c057ec04ce9b636e3fd0a1c0e0f3647f8a51fbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Thu, 16 Apr 2009 16:19:12 +0200 Subject: Fix QPrinter::setPrinterName()/QPrinter::printerName() on the Mac. QPrinter::printerName() used to return the CUPS printer queue name instead of the user-set printer name, which was wrong. In addition, if trying to set the printer name to a non-valid printer, the default printer was still used internally, which is not correct. As sonn as an invalid name is set, the printer now enters an invalid state, which it can only get out of by setting a valid printer name. Task-number: 199271 Reviewed-by: Gunnar --- src/gui/painting/qprintengine_mac.mm | 66 ++++++++++++++++++++--------------- src/gui/painting/qprintengine_mac_p.h | 1 + 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/painting/qprintengine_mac.mm index 7a77e47..b1216b7 100644 --- a/src/gui/painting/qprintengine_mac.mm +++ b/src/gui/painting/qprintengine_mac.mm @@ -62,6 +62,10 @@ bool QMacPrintEngine::begin(QPaintDevice *dev) { Q_D(QMacPrintEngine); + Q_ASSERT(dev && dev->devType() == QInternal::Printer); + if (!static_cast(dev)->isValid()) + return false; + if (d->state == QPrinter::Idle && !d->isPrintSessionInitialized()) // Need to reinitialize d->initialize(); @@ -121,24 +125,8 @@ bool QMacPrintEngine::end() if(d->paintEngine->type() == QPaintEngine::CoreGraphics) static_cast(d->paintEngine)->d_func()->hd = 0; d->paintEngine->end(); - if (d->state != QPrinter::Idle) { -#ifndef QT_MAC_USE_COCOA - if (d->shouldSuppressStatus()) { - PMSessionEndPageNoDialog(d->session); - PMSessionEndDocumentNoDialog(d->session); - } else { - PMSessionEndPage(d->session); - PMSessionEndDocument(d->session); - } - PMRelease(d->session); -#else - PMSessionEndPageNoDialog(d->session); - PMSessionEndDocumentNoDialog(d->session); - [d->printInfo release]; -#endif - d->printInfo = 0; - d->session = 0; - } + if (d->state != QPrinter::Idle) + d->releaseSession(); d->state = QPrinter::Idle; return true; } @@ -509,6 +497,26 @@ void QMacPrintEnginePrivate::initialize() } } +void QMacPrintEnginePrivate::releaseSession() +{ +#ifndef QT_MAC_USE_COCOA + if (shouldSuppressStatus()) { + PMSessionEndPageNoDialog(session); + PMSessionEndDocumentNoDialog(session); + } else { + PMSessionEndPage(session); + PMSessionEndDocument(session); + } + PMRelease(session); +#else + PMSessionEndPageNoDialog(session); + PMSessionEndDocumentNoDialog(session); + [printInfo release]; +#endif + printInfo = 0; + session = 0; +} + bool QMacPrintEnginePrivate::newPage_helper() { Q_Q(QMacPrintEngine); @@ -737,6 +745,7 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va d->setPaperSize(QPrinter::PaperSize(value.toInt())); break; case PPK_PrinterName: { + bool printerNameSet = false; OSStatus status = noErr; QCFType printerList; status = PMServerCreatePrinterList(kPMServerLocal, &printerList); @@ -747,12 +756,18 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va QString name = QCFString::toQString(PMPrinterGetName(printer)); if (name == value.toString()) { status = PMSessionSetCurrentPMPrinter(d->session, printer); + printerNameSet = true; break; } } } if (status != noErr) qWarning("QMacPrintEngine::setPrinterName: Error setting printer: %ld", long(status)); + if (!printerNameSet) { + qWarning("QMacPrintEngine::setPrinterName: Failed to set printer named '%s'.", qPrintable(value.toString())); + d->releaseSession(); + d->state = QPrinter::Idle; + } break; } case PPK_SuppressSystemPrintStatus: d->suppressStatus = value.toBool(); @@ -876,17 +891,12 @@ QVariant QMacPrintEngine::property(PrintEnginePropertyKey key) const ret = r; break; } case PPK_PrinterName: { - CFIndex currIndex; - PMPrinter unused; - QCFType printerList; - OSStatus status = PMSessionCreatePrinterList(d->session, &printerList, &currIndex, &unused); + PMPrinter printer; + OSStatus status = PMSessionGetCurrentPrinter(d->session, &printer); if (status != noErr) - qWarning("QMacPrintEngine::printerName: Problem getting list of printers: %ld", long(status)); - if (currIndex != -1 && printerList && currIndex < CFArrayGetCount(printerList)) { - const CFStringRef name = static_cast(CFArrayGetValueAtIndex(printerList, currIndex)); - if (name) - ret = QCFString::toQString(name); - } + qWarning("QMacPrintEngine::printerName: Failed getting current PMPrinter: %ld", long(status)); + if (printer) + ret = QCFString::toQString(PMPrinterGetName(printer)); break; } case PPK_Resolution: { ret = d->resolution.hRes; diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/painting/qprintengine_mac_p.h index 5e18845..bc917e7 100644 --- a/src/gui/painting/qprintengine_mac_p.h +++ b/src/gui/painting/qprintengine_mac_p.h @@ -143,6 +143,7 @@ public: hasCustomPaperSize(false), hasCustomPageMargins(false) {} ~QMacPrintEnginePrivate(); void initialize(); + void releaseSession(); bool newPage_helper(); void setPaperSize(QPrinter::PaperSize ps); QPrinter::PaperSize paperSize() const; -- cgit v0.12 From 08dff2935af2d71f2fe76182079da636c1bb6f5b Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:39:10 +0200 Subject: Doc - Some minor cleanups in the documentation of QInputDialog. Also marked getInt() as since Qt 4.5 and finally modified the StandardDialogs example to reflect the fact that getInteger() is deprecated. Task-number: 251288 Reviewed-by: nrc BT: Yes --- examples/dialogs/standarddialogs/dialog.cpp | 6 +- src/gui/dialogs/qinputdialog.cpp | 181 +++++++++++++++------------- 2 files changed, 99 insertions(+), 88 deletions(-) diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp index 0fe1f7e..1f7c5ef 100644 --- a/examples/dialogs/standarddialogs/dialog.cpp +++ b/examples/dialogs/standarddialogs/dialog.cpp @@ -59,7 +59,7 @@ Dialog::Dialog(QWidget *parent) integerLabel = new QLabel; integerLabel->setFrameStyle(frameStyle); QPushButton *integerButton = - new QPushButton(tr("QInputDialog::get&Integer()")); + new QPushButton(tr("QInputDialog::get&Int()")); doubleLabel = new QLabel; doubleLabel->setFrameStyle(frameStyle); @@ -198,8 +198,8 @@ void Dialog::setInteger() { //! [0] bool ok; - int i = QInputDialog::getInteger(this, tr("QInputDialog::getInteger()"), - tr("Percentage:"), 25, 0, 100, 1, &ok); + int i = QInputDialog::getInt(this, tr("QInputDialog::getInteger()"), + tr("Percentage:"), 25, 0, 100, 1, &ok); if (ok) integerLabel->setText(tr("%1%").arg(i)); //! [0] diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index b63c8ee..78d99e3 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -424,26 +424,27 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, /*! \class QInputDialog - \brief The QInputDialog class provides a simple convenience dialog to get a single value from the user. + \brief The QInputDialog class provides a simple convenience dialog to get a + single value from the user. \ingroup dialogs \mainclass - The input value can be a string, a number or an item from a list. A - label must be set to tell the user what they should enter. + The input value can be a string, a number or an item from a list. A label + must be set to tell the user what they should enter. - Four static convenience functions are provided: - getText(), getInt(), getDouble(), and getItem(). All the - functions can be used in a similar way, for example: + Four static convenience functions are provided: getText(), getInt(), + getDouble(), and getItem(). All the functions can be used in a similar way, + for example: \snippet examples/dialogs/standarddialogs/dialog.cpp 3 - The \c ok variable is set to true if the user clicks \gui OK; - otherwise it is set to false. + The \c ok variable is set to true if the user clicks \gui OK; otherwise it + is set to false. \img inputdialogs.png Input Dialogs - The \l{dialogs/standarddialogs}{Standard Dialogs} example shows - how to use QInputDialog as well as other built-in Qt dialogs. + The \l{dialogs/standarddialogs}{Standard Dialogs} example shows how to use + QInputDialog as well as other built-in Qt dialogs. \sa QMessageBox, {Standard Dialogs Example} */ @@ -452,11 +453,13 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, \enum QInputDialog::InputMode \since 4.5 - This enum describes the different modes of input that can be selected for the dialog. + This enum describes the different modes of input that can be selected for + the dialog. \value TextInput Used to input text strings. \value IntInput Used to input integers. - \value DoubleInput Used to input floating point numbers with double precision accuracy. + \value DoubleInput Used to input floating point numbers with double + precision accuracy. \sa inputMode */ @@ -487,7 +490,8 @@ QInputDialog::~QInputDialog() \brief the mode used for input - This property help determines which widget is used for entering input into the dialog. + This property help determines which widget is used for entering input into + the dialog. */ void QInputDialog::setInputMode(InputMode mode) { @@ -1104,15 +1108,18 @@ void QInputDialog::done(int result) } /*! - Static convenience function to get a string from the user. \a - title is the text which is displayed in the title bar of the - dialog. \a label is the text which is shown to the user (it should - say what should be entered). \a text is the default text which is - placed in the line edit. The \a mode is the echo mode the line - edit will use. If \a ok is nonnull \e *\a ok will be set to true - if the user pressed \gui OK and to false if the user pressed - \gui Cancel. The dialog's parent is \a parent. The dialog will be - modal and uses the specified widget \a flags. + Static convenience function to get a string from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a text is the default text which is placed in the line edit. + \a mode is the echo mode the line edit will use. + + If \a ok is nonnull \e *\a ok will be set to true if the user pressed + \gui OK and to false if the user pressed \gui Cancel. The dialog's parent + is \a parent. The dialog will be modal and uses the specified widget + \a flags. This function returns the text which has been entered in the line edit. It will not return an empty string. @@ -1121,11 +1128,11 @@ void QInputDialog::done(int result) \snippet examples/dialogs/standarddialogs/dialog.cpp 3 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getInteger(), getDouble(), getItem() + \sa getInt(), getDouble(), getItem() */ QString QInputDialog::getText(QWidget *parent, const QString &title, const QString &label, @@ -1149,30 +1156,32 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri } /*! - Static convenience function to get an integer input from the - user. \a title is the text which is displayed in the title bar - of the dialog. \a label is the text which is shown to the user - (it should say what should be entered). \a value is the default - integer which the spinbox will be set to. \a min and \a - max are the minimum and maximum values the user may choose, - and \a step is the amount by which the values change as the user - presses the arrow buttons to increment or decrement the value. - - If \a ok is nonnull *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - On success, this function returns the integer which has been - entered by the user; on failure, it returns the initial \a value. + \since 4.5 + + Static convenience function to get an integer input from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a value is the default integer which the spinbox will be set to. + \a min and \a max are the minimum and maximum values the user may choose. + \a step is the amount by which the values change as the user presses the + arrow buttons to increment or decrement the value. + + If \a ok is nonnull *\a ok will be set to true if the user pressed \gui OK + and to false if the user pressed \gui Cancel. The dialog's parent is + \a parent. The dialog will be modal and uses the widget \a flags. + + On success, this function returns the integer which has been entered by the + user; on failure, it returns the initial \a value. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 0 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. \sa getText(), getDouble(), getItem() */ @@ -1198,32 +1207,32 @@ int QInputDialog::getInt(QWidget *parent, const QString &title, const QString &l } /*! - Static convenience function to get a floating point number from - the user. \a title is the text which is displayed in the title - bar of the dialog. \a label is the text which is shown to the user - (it should say what should be entered). \a value is the default - floating point number that the line edit will be set to. \a - min and \a max are the minimum and maximum values the - user may choose, and \a decimals is the maximum number of decimal - places the number may have. - - If \a ok is nonnull, *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - This function returns the floating point number which has been - entered by the user. + Static convenience function to get a floating point number from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a value is the default floating point number that the line edit will be + set to. + \a min and \a max are the minimum and maximum values the user may choose. + \a decimals is the maximum number of decimal places the number may have. + + If \a ok is nonnull, *\a ok will be set to true if the user pressed \gui OK + and to false if the user pressed \gui Cancel. The dialog's parent is + \a parent. The dialog will be modal and uses the widget \a flags. + + This function returns the floating point number which has been entered by + the user. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 1 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getText(), getInteger(), getItem() + \sa getText(), getInt(), getItem() */ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QString &label, @@ -1248,32 +1257,34 @@ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QStr } /*! - Static convenience function to let the user select an item from a - string list. \a title is the text which is displayed in the title - bar of the dialog. \a label is the text which is shown to the user (it - should say what should be entered). \a items is the - string list which is inserted into the combobox, and \a current is the number - of the item which should be the current item. If \a editable is true - the user can enter their own text; if \a editable is false the user - may only select one of the existing items. - - If \a ok is nonnull \e *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - This function returns the text of the current item, or if \a - editable is true, the current text of the combobox. + Static convenience function to let the user select an item from a string + list. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a items is the string list which is inserted into the combobox. + \a current is the number of the item which should be the current item. + + If \a editable is true the user can enter their own text; otherwise the + user may only select one of the existing items. + + If \a ok is nonnull \e *\a ok will be set to true if the user pressed + \gui OK and to false if the user pressed \gui Cancel. The dialog's parent + is \a parent. The dialog will be modal and uses the widget \a flags. + + This function returns the text of the current item, or if \a editable is + true, the current text of the combobox. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 2 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getText(), getInteger(), getDouble() + \sa getText(), getInt(), getDouble() */ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QString &label, -- cgit v0.12 From 90ff6b0ad7397a6892185e8340d58dab4b85b032 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:40:17 +0200 Subject: Doc - Changed the link provided in the README file to one that does not have a version number, so we do not have to update it each release. Task-number: 251352 Reviewed-by: TrustMe --- examples/tutorials/addressbook/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README index 2d528b5..9b7f908 100644 --- a/examples/tutorials/addressbook/README +++ b/examples/tutorials/addressbook/README @@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser. The tutorial is also available online at -http://doc.trolltech.com/4.4/tutorial.html +http://doc.trolltech.com/tutorial.html All programs corresponding to the chapters in the tutorial should automatically be built when Qt is compiled, or will be provided as -- cgit v0.12 From fc8285ec610b02f440f692be90aed1e6925a8675 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:41:39 +0200 Subject: Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1 Task-number: 251346 Reviewed-by: TrustMe BT: Yes --- tools/qdoc3/test/qt.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 298311e..4d401a4 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.450 +qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -- cgit v0.12 From 602da82d3c9413df41eb5b17bdf7e3c1586316b5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 16 Apr 2009 16:45:45 +0200 Subject: log my changes --- dist/changes-4.5.1 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index dd41ef4..a15bfaa 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -457,12 +457,23 @@ Qt for Windows CE * [245503] Fixed redundant backslashes in string property in property browser. - Linguist + - Linguist GUI - - lupdate + * [248076] Fixed crash upon opening files for which we have no plural rules + * [249519] Fixed crash upon dropping text into non-focused lineedit + + - Entire Linguist toolchain - - lrelease + * [244035] Fixed endless loop in PO writer + * [247738] Improved handling of duplicated messages + * [248849] Fixed encoding in XLIFF writer + * [249022] Fixed TS' and QM's handling of messages which appear in multiple encodings + + - lupdate + * [248724] Fixed encoding of messages from .ui files if CODECFORTR is not utf8 + * [249633] Fixed processing of C++ backslash line continuations - rcc @@ -484,6 +495,7 @@ Qt for Windows CE * [248806] Ensure that the Xcode generator includes the right path to frameworks. * [201495] Comment processing in qmake prevented file from being moc'ed * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA + * Fixed moc and uic features to make shadow builds work even if a non-shadow build is present - configure -- cgit v0.12 From 136092f23d1d979235f7b83050c8344f6aeee3cc Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 16 Apr 2009 16:46:48 +0200 Subject: Phonon autotest - checking if the backend plugin is actually deployed In tst_mediaobject we check now explicitly if the backend plugin is deployed to the device. Since this check is done in initTestCase we also avoid a crash if the check fails. Reviewed-by: Maurice --- tests/auto/mediaobject/tst_mediaobject.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index e0275de..1b113b2 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -349,6 +349,18 @@ void tst_MediaObject::_pausePlayback() void tst_MediaObject::initTestCase() { QCoreApplication::setApplicationName("tst_MediaObject"); + m_stateChangedSignalSpy = 0; + m_media = 0; + +#ifdef Q_OS_WINCE + QString pluginsPath = QLibraryInfo::location(QLibraryInfo::PluginsPath); +#ifdef DEBUG + QVERIFY(QFile::exists(pluginsPath + "/phonon_backend/phonon_waveoutd4.dll") || QFile::exists(pluginsPath + "/phonon_backend/phonon_phonon_ds9d4.dll")); +#else + QVERIFY(QFile::exists(pluginsPath + "/phonon_backend/phonon_waveout4.dll") || QFile::exists(pluginsPath + "/phonon_backend/phonon_phonon_ds94.dll")); +#endif +#endif + m_url = qgetenv("PHONON_TESTURL"); m_media = new MediaObject(this); @@ -856,8 +868,10 @@ void tst_MediaObject::testPlayBeforeFinish() void tst_MediaObject::cleanupTestCase() { - delete m_stateChangedSignalSpy; - delete m_media; + if (m_stateChangedSignalSpy) + delete m_stateChangedSignalSpy; + if (m_media) + delete m_media; #ifdef Q_OS_WINCE QTest::qWait(200); #endif -- cgit v0.12 From 0aa3203fa13bfbc42e77488765023832934dd36b Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 17:18:15 +0200 Subject: First round of change log cleanups. Reviewed-by: TrustMe BT: Yes --- dist/changes-4.5.1 | 81 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index a15bfaa..e3aa57c 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -24,6 +24,11 @@ General Improvements -------------------- - Documentation and Examples + * Added printing feature for the Spreadsheet demo. + * [245675] Clarified the differences between QItemDelegate and + QStyledItemDelegate. + * [248752] Marked QPrintDialog::printer(), setPrinter() and addButton() + as Unix only functions, part of Qt3Support. - Embedded Dialogs demo * [246517] Fixed warnings and bugs in hover handling on Mac OS X @@ -50,90 +55,96 @@ Third party components **************************************************************************** - QAbstractItemModel - * [243195] Clrarified some warning messages printed if the model is invalid. + * [243195] Clarified some warning messages printed if the model is invalid. - QAbstractEventDispatcher - * [248805] Duplicates timerid could happen when timer are running while - the QObject is moved to another thread, and would stop timers from working. + * [248805] Duplicate timerids could occur when a timer is running while + the QObject is moved to another thread, stopping timers from working. - QAbstractSocket - * [192037] Emit disconnected only if we were connected before + * [192037] Emit the disconnected signal only if we were connected before. - QAccessible - * [241161] Fixed bug in browsing menus with the keyboard. - * [221731] Fixed bug where the accessibility plugin could crash if there - was an "&" at the end or spin forever if a label had a sequence of "&&". + * [241161] Fixed a bug in browsing menus with the keyboard. + * [221731] Fixed a bug where the accessibility plugin could crash if + there was an "&" at the end or spin forever if a label had a sequence of + "&&". - QAtomicInt - * [216492] Fix compilation on 64-bit PowerPC machines with gcc 4.3. + * [216492] Fixed compilation on 64-bit PowerPC machines with gcc 4.3. - QAuthenticator - * [237979] fix implemenation of md5-sess + * [237979] Fixed implementation of md5-sess. - QByteArray - * [246233] QByteArray::fromHex() fails with input of size 1 + * [246233] QByteArray::fromHex() fails with input of size 1. - QColorDialog - * [247349] Fixed bug causing the wrong alpha value to be returned. + * [247349] Fixed a bug causing the wrong alpha value to be returned. - QCombobox - * [248094] Fixed scrollbar appearing while not required. + * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed focus policy propagation regression. - * [246056] Fixed assertion failure in setCompletionPrefix(). + * [250064] Fixed a focus policy propagation regression. + * [246056] Fixed an assertion failure in setCompletionPrefix(). - QtConcurrent - * [244718] Reduce the number of calls to QThread::idealThreadCount(). + * [244718] Reduced the number of calls to QThread::idealThreadCount(). - QDirIterator - * [247645] Fix a bug that may loose all cached data inside the QFileInfo + * [247645] Fixed a bug that may loose all cached data inside QFileInfo. - QFile - * [244500] QFile::rename() doesn't always return false when the method fails - * [244485] Renaming a file does not change QFile::fileName() + * [244500] QFile::rename() does not always return false when the method + fails + * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo - * [205244] return valid file info also for relative UNC paths + * [205244] Return valid file info also for relative UNC paths. - QFileDialog - * [250194] QFileDialog and QSortFilterProxyModel index mapping issue - * [248332] QFileDialog is slow after visiting a large directory - * [221323] QFileDialog programatical file selection bug + * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel + index mapping. + * [248332] QFileDialog is slow after visiting a large directory. + * [221323] QFileDialog programmatical file selection bug. - QGraphicsItem - * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden + * [247890] Cached QGraphicsItems are not updated if update() is called + when they are hidden. * [250272] When an item is deleted it does not get removed from the - sceneeventfilters meaning a crash can occur - * Fixed slowdown regression in QGraphicsItem::ItemCoordinateCache + sceneeventfilters, meaning a crash can occur. + * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout - * [242472] Fix a bug where the calculation of the maximum width of a column - was not calculated correctly. + * [242472] Fixed a bug where the calculation of the maximum width of a + column was incorrect. - QGraphicsScene - * [243707] Fixed crash when adding child before parent to scene + * [243707] Fixed a crash when adding child before parent to scene. --QGraphicsView - * [245766] Rubber Band drag mode not updated correctly when scrolling +- QGraphicsView + * [245766] Rubber Band drag mode does not update correctly when + scrolling. - QGraphicsWidget * [246215] Fixed a regression where we could cache the wrong size hint because we called the virtual sizeHint() from the constructor. - QHttp - * [208445] cancel request upon receiving unknown authentication method + * [208445] Cancel request upon receiving unknown authentication method. - QHostAddress - * [247330] Fix compilation on MinGW by adding a missing QPair include. + * [247330] Fixed compilation on MinGW by adding a missing QPair include. - QLocalSocket - * Fix a bug that would cause QLocalSocket to disconnect 30 seconds + * Fixed a bug that would cause QLocalSocket to disconnect 30 seconds after a succesful delayed connection on UNIX. - QMacStyle - * [248769] Fix regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. - * Adjust the opacity value for popups. + * [248769] Fixed a regression where QMacStyle would only draw tabs when + passed a QStyleOptionTabV3. + * Adjusted the opacity value for popups. - QMainWindow * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. -- cgit v0.12 From 6fc56f2da1cb4d15e48ed3458e502eea3fed3903 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Apr 2009 17:06:16 +0200 Subject: Remove some warnings These aren't used in Carbon, so don't reference them. --- src/gui/kernel/qwidget_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 827e098..fc34f61 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2847,10 +2847,10 @@ void QWidgetPrivate::updateSystemBackground() void QWidgetPrivate::setCursor_sys(const QCursor &) { - Q_Q(QWidget); #ifndef QT_MAC_USE_COCOA qt_mac_update_cursor(); #else + Q_Q(QWidget); if (q->testAttribute(Qt::WA_WState_Created)) { [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)]; } @@ -2859,10 +2859,10 @@ void QWidgetPrivate::setCursor_sys(const QCursor &) void QWidgetPrivate::unsetCursor_sys() { - Q_Q(QWidget); #ifndef QT_MAC_USE_COCOA qt_mac_update_cursor(); #else + Q_Q(QWidget); if (q->testAttribute(Qt::WA_WState_Created)) { [qt_mac_window_for(q) invalidateCursorRectsForView:qt_mac_nativeview_for(q)]; } -- cgit v0.12 From 139265031939d676f049edd2c91918040e0659b4 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Apr 2009 17:15:16 +0200 Subject: BT:Stop widgets disappearing in unified when clicking the toolbar button The comment in the code pretty much says it all, so I'll repeat it: This is a workaround for NSToolbar. When a widget is hidden by clicking the toolbar button, Cocoa reparents the widgets to another window (but Qt doesn't know about it). When we start showing them, it reparents back, but at this point it's window is nil, but the window it's being brought into (the Qt one) is for sure created. This stops the hierarchy moving under our feet. Task-number: 251294 Reviewed-by: Prasanth Ullattil --- src/gui/kernel/qwidget_mac.mm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index fc34f61..2c3f7f1 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -465,7 +465,18 @@ Q_GUI_EXPORT OSWindowRef qt_mac_window_for(const QWidget *w) if (hiview){ OSWindowRef window = qt_mac_window_for(hiview); if (!window && qt_isGenuineQWidget(hiview)) { - w->window()->d_func()->createWindow_sys(); + QWidget *myWindow = w->window(); + // This is a workaround for NSToolbar. When a widget is hidden + // by clicking the toolbar button, Cocoa reparents the widgets + // to another window (but Qt doesn't know about it). + // When we start showing them, it reparents back, + // but at this point it's window is nil, but the window it's being brought + // into (the Qt one) is for sure created. + // This stops the hierarchy moving under our feet. + if (myWindow != w && qt_mac_window_for(qt_mac_nativeview_for(myWindow))) + return qt_mac_window_for(qt_mac_nativeview_for(myWindow)); + + myWindow->d_func()->createWindow_sys(); // Reget the hiview since the "create window could potentially move the view (I guess). hiview = qt_mac_nativeview_for(w); window = qt_mac_window_for(hiview); -- cgit v0.12 From d1221d84714a169e12192cfa073af11db61bfbcc Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Apr 2009 17:29:36 +0200 Subject: QSortFilterProxyModel: In dynamic filter model, childs of temporarly filtered items are not correctly updated. when filtering away a row, we should remove all the mapping of the children Task-number: 251296 Reviewed-by: Marius Bugge Monsen --- src/gui/itemviews/qsortfilterproxymodel.cpp | 14 +++++++- .../tst_qsortfilterproxymodel.cpp | 42 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 2c9eeea..a1d35b0 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -1032,9 +1032,21 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc } } - if (!source_rows_remove.isEmpty()) + if (!source_rows_remove.isEmpty()) { remove_source_items(m->proxy_rows, m->source_rows, source_rows_remove, source_parent, Qt::Vertical); + QSet source_rows_remove_set = source_rows_remove.toSet(); + QVector::iterator it = m->mapped_children.begin(); + while (it != m->mapped_children.end()) { + const QModelIndex source_child_index = *it; + if (source_rows_remove_set.contains(source_child_index.row())) { + it = m->mapped_children.erase(it); + remove_from_mapping(source_child_index); + } else { + ++it; + } + } + } if (!source_rows_resort.isEmpty()) { // Re-sort the rows diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 4a749f0..18aa5fc 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -132,6 +132,7 @@ private slots: void task248868_staticSorting(); void task248868_dynamicSorting(); void task250023_fetchMore(); + void task251296_hiddenChildren(); protected: void buildHierarchy(const QStringList &data, QAbstractItemModel *model); @@ -2675,6 +2676,47 @@ void tst_QSortFilterProxyModel::task250023_fetchMore() QCOMPARE(proxy.columnCount(idx), 10); } +void tst_QSortFilterProxyModel::task251296_hiddenChildren() +{ + QStandardItemModel model; + QSortFilterProxyModel proxy; + proxy.setSourceModel(&model); + proxy.setDynamicSortFilter(true); + + QStandardItem *itemA = new QStandardItem("A VISIBLE"); + model.appendRow(itemA); + QStandardItem *itemB = new QStandardItem("B VISIBLE"); + itemA->appendRow(itemB); + QStandardItem *itemC = new QStandardItem("C"); + itemA->appendRow(itemC); + proxy.setFilterRegExp("VISIBLE"); + + QCOMPARE(proxy.rowCount(QModelIndex()) , 1); + QPersistentModelIndex indexA = proxy.index(0,0); + QCOMPARE(proxy.data(indexA).toString(), QString::fromLatin1("A VISIBLE")); + + QCOMPARE(proxy.rowCount(indexA) , 1); + QPersistentModelIndex indexB = proxy.index(0, 0, indexA); + QCOMPARE(proxy.data(indexB).toString(), QString::fromLatin1("B VISIBLE")); + + itemA->setText("A"); + QCOMPARE(proxy.rowCount(QModelIndex()), 0); + QVERIFY(!indexA.isValid()); + QVERIFY(!indexB.isValid()); + + itemB->setText("B"); + itemA->setText("A VISIBLE"); + itemC->setText("C VISIBLE"); + + QCOMPARE(proxy.rowCount(QModelIndex()), 1); + indexA = proxy.index(0,0); + QCOMPARE(proxy.data(indexA).toString(), QString::fromLatin1("A VISIBLE")); + + QCOMPARE(proxy.rowCount(indexA) , 1); + QModelIndex indexC = proxy.index(0, 0, indexA); + QCOMPARE(proxy.data(indexC).toString(), QString::fromLatin1("C VISIBLE")); +} + QTEST_MAIN(tst_QSortFilterProxyModel) #include "tst_qsortfilterproxymodel.moc" -- cgit v0.12 From e1f9b0a54921397c9f6dc0e10b313814dcb908d3 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Apr 2009 18:01:32 +0200 Subject: Compile Reviewed-by: TrustMe --- src/gui/itemviews/qsortfilterproxymodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index a1d35b0..91431c4 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -1035,7 +1035,7 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc if (!source_rows_remove.isEmpty()) { remove_source_items(m->proxy_rows, m->source_rows, source_rows_remove, source_parent, Qt::Vertical); - QSet source_rows_remove_set = source_rows_remove.toSet(); + QSet source_rows_remove_set = source_rows_remove.toList().toSet(); QVector::iterator it = m->mapped_children.begin(); while (it != m->mapped_children.end()) { const QModelIndex source_child_index = *it; -- cgit v0.12 From 50adfa5d5be1e120b1d5defea3e1939f1eb7e730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Thu, 16 Apr 2009 19:04:19 +0200 Subject: Use setContentsMargins() instead of setMargin(). setMargin() is deprecated. --- examples/layouts/flowlayout/flowlayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/layouts/flowlayout/flowlayout.cpp b/examples/layouts/flowlayout/flowlayout.cpp index be6b476..c4032d0 100644 --- a/examples/layouts/flowlayout/flowlayout.cpp +++ b/examples/layouts/flowlayout/flowlayout.cpp @@ -46,13 +46,13 @@ FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing) : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing) { - setMargin(margin); + setContentsMargins(margin, margin, margin, margin); } FlowLayout::FlowLayout(int margin, int hSpacing, int vSpacing) : m_hSpace(hSpacing), m_vSpace(vSpacing) { - setMargin(margin); + setContentsMargins(margin, margin, margin, margin); } FlowLayout::~FlowLayout() -- cgit v0.12 From 90d7509e4a1543e43a49bfb25dd672d824c4fde3 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 17 Apr 2009 08:10:29 +1000 Subject: Document my changes for 4.5.1 --- dist/changes-4.5.1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index e3aa57c..0b8dae2 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -133,6 +133,8 @@ Third party components - QHttp * [208445] Cancel request upon receiving unknown authentication method. + * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in + some private headers. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -168,6 +170,8 @@ Third party components * [247505] Fix missing fills of rectangles with negative width/height in raster paint engine. * [249628] Fix crash in OpenGL paint engine when filling using Qt::NoBrush. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite + and OpenGL/ES 1.0. - QPixmap * [249175] Fix QPixmap::fromImage() of monochrome images to result in @@ -437,6 +441,8 @@ Qt for Embedded Linux --------------------- - Various improvements to the Qt DirectFB plugin. +- Fix recreation of temporary EGL surfaces in PowerVR gfxdriver. +- Document some necessary #define's for building the PowerVR gfxdriver. Qt for Windows CE ----------------- -- cgit v0.12 From 90bc01d2854f5c7024027c6419ae22feff57aa71 Mon Sep 17 00:00:00 2001 From: Bill King Date: Fri, 17 Apr 2009 08:54:31 +1000 Subject: Fixes long strings getting truncated by the ODBC Driver. This test has always been wrong/confusing. Fix it to work, and make sense. Task-number: 250026 Revby: Lincoln Ramsay --- src/sql/drivers/odbc/qsql_odbc.cpp | 2 +- tests/auto/qsqlquery/tst_qsqlquery.cpp | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index d6423ae..2a83fe6 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -355,7 +355,7 @@ static QString qGetStringData(SQLHANDLE hStmt, int column, int colSize, bool uni } else { fieldVal += QString::fromAscii(buf, rSize); } - if (fieldVal.size() + lengthIndicator >= colSize) { + if (lengthIndicator - fieldVal.size() <= 0) { // workaround for Drivermanagers that don't return SQL_NO_DATA break; } diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index 8d77589..074f16f 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -179,6 +179,10 @@ private slots: void task_217003(); #endif + void task_250026_data() { generic_data("QODBC"); } + void task_250026(); + + private: // returns all database connections void generic_data(const QString &engine=QString()); @@ -293,6 +297,7 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db ) #ifdef NOT_READY_YET tablenames << qTableName( "Planet" ); #endif + tablenames << qTableName( "task_250026" ); tst_Databases::safeDropTables( db, tablenames ); } @@ -2677,5 +2682,34 @@ void tst_QSqlQuery::task_217003() } #endif +void tst_QSqlQuery::task_250026() +{ + QString data258, data1026; + QFETCH( QString, dbName ); + QSqlDatabase db = QSqlDatabase::database( dbName ); + CHECK_DATABASE( db ); + QSqlQuery q( db ); + + QString tableName = qTableName( "task_250026" ); + + if ( !q.exec( "create table " + tableName + " (longfield varchar(1100))" ) ) { + qDebug() << "Error" << q.lastError(); + QSKIP( "Db doesn't support \"1100\" as a size for fields", SkipSingle ); + } + + data258.fill( 'A', 258 ); + data1026.fill( 'A', 1026 ); + QVERIFY_SQL( q, prepare( "insert into " + tableName + "(longfield) VALUES (:longfield)" ) ); + q.bindValue( "longfield", data258 ); + QVERIFY_SQL( q, exec() ); + q.bindValue( "longfield", data1026 ); + QVERIFY_SQL( q, exec() ); + QVERIFY_SQL( q, exec( "select * from " + tableName ) ); + QVERIFY_SQL( q, next() ); + QCOMPARE( q.value( 0 ).toString().length(), data258.length() ); + QVERIFY_SQL( q, next() ); + QCOMPARE( q.value( 0 ).toString().length(), data1026.length() ); +} + QTEST_MAIN( tst_QSqlQuery ) #include "tst_qsqlquery.moc" -- cgit v0.12 From 41a2b73a4bf5e7e8e1c0af458a120e2cf75f8035 Mon Sep 17 00:00:00 2001 From: Bill King Date: Thu, 16 Apr 2009 13:48:20 +1000 Subject: Add sql changes to 4.5.1 changelog (cherry picked from commit b01d52de1f942755c59e22d50b84dd37ffc8e3fe) --- dist/changes-4.5.1 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0b06315..8d306d9 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -218,10 +218,28 @@ Third party components * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. +- QSqlTableModel + * [189093] QSqlTableModel did not handle updates when one of the fields + had a NULL value. + * Made setTable() try and use the db's casing of the passed tablename. + **************************************************************************** * Database Drivers * **************************************************************************** + * Fixed DB2 driver returning double field as empty + * Fixed memory leak in DB2 driver + * [249059] Fixed QPSQL datetime/time fields with negative timezone offsets + not being handled correctly. + * Fixed DB2 not enquoting table/field names properly. + * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. + * Fixed sqlite2 driver not returning false on failing to exec a statement. + * PrecisionPolicy now works in the oracle driver. + * Fixed ODBC driver returning a list of tables when requested. + * Fixed Interbase retrieving scale/precision information on numeric/decimal fields. + * Stopped drivers doing quoting again when escapeIdentifier called twice. + * Fixed sqlite2 driver not quoting fields correctly. + * [232769] Fixed memory overflow issue on bound out strings in ODBC Driver **************************************************************************** * Platform Specific Changes * -- cgit v0.12 From d3005bd5eca03834a5563469ad844a1041e29317 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 16 Apr 2009 08:45:58 +0200 Subject: QX11Embed crashes on 64-bit Solaris The data passed to XChangeProperty should be long arrays, as this is what Xlib expects. Task-number: 244062 Reviewed-by: Rhys Weatherley (cherry picked from commit 1ae4c7b989b04f89a5069d5a5db78c0d8914972b) --- src/gui/kernel/qx11embed_x11.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index 22cae87..f991275 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -481,7 +481,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) | ExposureMask | StructureNotifyMask | SubstructureNotifyMask | PropertyChangeMask); - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*) data, 2); @@ -1571,7 +1571,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } @@ -1587,8 +1587,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; - + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } -- cgit v0.12 From 764a970587cf13943a608ebd8ed8bb9f2996e532 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Thu, 16 Apr 2009 10:24:56 +0200 Subject: My 4.5.1 changes. (cherry picked from commit 97ff2bde044838be0d5210a86c2fafd23c05d994) --- dist/changes-4.5.1 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 8d306d9..271f25d 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -28,6 +28,19 @@ General Improvements - Embedded Dialogs demo * [246517] Fixed warnings and bugs in hover handling on Mac OS X + +Optimizations +------------- + +- Graphics View has been optimized in several areas + * Improved the performance of QGraphicsItem::clipPath. + * Improved the performance of QGraphicsItem::setPos. + * Improved the performance of QGraphicsItem::effectiveOpacity. + * Improved the performance of QGrahicsScene::items(*). + * Improved update handling. + * Reduced the number of floating point operations. + * Reduced QVariant overhead. + Third party components ---------------------- @@ -316,6 +329,10 @@ Qt for Linux/X11 * Event posted to a thread before it is started are not processed until others events are posted. +- QWidget + * [213512] Fixed a bug that would cause wrong clipping when using the + Qt::WA_PaintOutsidePaintEvent attribute. + Qt for Windows -------------- @@ -331,6 +348,10 @@ Qt for Windows * [248036] Fixed an issue where tool buttons would incorrectly hover when disabled. +- QWidget + * [248391] Fixed a bug that made it impossible to dynamically switch + from QPainter based graphics to native graphics API and back. + - [249576] Fixed a crash when using a combobox with Qt::NoFocus. - [244875] System menu will now be shown for a fullscreen window. - [240891] Corrected the focus behavior of native file dialogs, when application has multiple toplevels. @@ -357,6 +378,7 @@ Qt for Mac OS X * Fixed a bug where the drag cursor was not updated when modifier keys are used. * [247947] Fixed a crash in drag and drop. * The command + h shortcut is now enabled. (Hides the current window.) + * [239043] Fixed a bug that would cause QGraphicsProxyWidget to shrink when moving it. - QDesktopWidget * [244004] Support multiple screens that have different sizes properly. -- cgit v0.12 From 969a54bbd298b34cd160384998ec9e1d2cf5a5fa Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Apr 2009 10:40:11 +0200 Subject: Fix crash in the SQLQueryModel tests Amend fd5f83e612729cebc5395c992bd98628bb9ea25f calling fetchMore in create_mapping was a bad idea bacause it may lead to infinite recurtion Make a special case for hasChildren instead Task-number: 250023 Reviewed-by: Marius Bugge Monsen BT: yes (cherry picked from commit f8fba0d48a1f30540ddf15f0d36f415b192d1d8b) --- src/gui/itemviews/qsortfilterproxymodel.cpp | 7 ++++--- tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index e49f40a..011e326 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -274,9 +274,6 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping( Mapping *m = new Mapping; - if (model->canFetchMore(source_parent)) - model->fetchMore(source_parent); - int source_rows = model->rowCount(source_parent); for (int i = 0; i < source_rows; ++i) { if (q->filterAcceptsRow(i, source_parent)) @@ -1572,6 +1569,10 @@ bool QSortFilterProxyModel::hasChildren(const QModelIndex &parent) const return false; if (!d->model->hasChildren(source_parent)) return false; + + if (d->model->canFetchMore(source_parent)) + return true; //we assume we might have children that can be fetched + QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value(); return m->source_rows.count() != 0 && m->source_columns.count() != 0; } diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 3a3d895..940fbbb 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -2602,7 +2602,11 @@ class QtTestModel: public QAbstractItemModel } void fetchMore(const QModelIndex &idx) { + if (fetched.contains(idx)) + return; + beginInsertRows(idx, 0, rows-1); fetched.insert(idx); + endInsertRows(); } bool hasChildren(const QModelIndex & = QModelIndex()) const { @@ -2613,7 +2617,7 @@ class QtTestModel: public QAbstractItemModel return fetched.contains(parent) ? rows : 0; } int columnCount(const QModelIndex& parent = QModelIndex()) const { - return fetched.contains(parent) ? cols : 0; + return cols; } QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const -- cgit v0.12 From dc2bc84025af766f82fb4fd5a188ee3902583e73 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 16 Apr 2009 11:33:54 +0200 Subject: BT: Mac: QtDemo is really sluggish when opening menus This has to do with coalesced updates. The easy fix for now is to fix QtDemo itself, meaning: always use a steady timer for redrawing the viewport of the graphics view (as opposed to let each item on screen calling update whenever they move) Task-number: 250667 Reviewed-by: Trenton Schulz (cherry picked from commit 4aa94a353224c14265446276277a91339f2e415d) --- demos/qtdemo/colors.cpp | 3 +++ demos/qtdemo/menumanager.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index 94e44f3..32f2ad0 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -278,6 +278,9 @@ void Colors::parseArgs(int argc, char *argv[]) + "[-low] [-ticker-letters] [-ticker-speed] [-no-ticker-morph] " + "[-ticker-morph-speed] [-ticker-text]"); exit(0); + } else{ + QMessageBox::warning(0, "QtDemo", QString("Unrecognized argument:\n") + s); + exit(0); } } diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index 8df9eca..369972e 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -184,7 +184,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->tickerInAnim->startDelay = 2000; this->ticker->useGuideQt(); this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(true); } break; case MENU1: @@ -220,7 +219,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->score->queueMovie(this->currentInfo + " -buttons", Score::NEW_ANIMATION_ONLY); if (!Colors::noTicker){ this->score->queueMovie("ticker -out", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(false); } break; case UP:{ @@ -257,7 +255,6 @@ void MenuManager::itemSelected(int userCode, const QString &menuName) this->ticker->doIntroTransitions = false; this->tickerInAnim->startDelay = 500; this->score->queueMovie("ticker", Score::NEW_ANIMATION_ONLY); - this->window->switchTimerOnOff(true); } } else if (this->currentMenuCode != ROOT) itemSelected(ROOT, Colors::rootMenuName); -- cgit v0.12 From ba33bce47493d05088b31539ededeb392dbebf8d Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 16 Apr 2009 13:05:47 +0200 Subject: Changelog Changelog (cherry picked from commit b6a50971f51618a3965605d9223c8b2b06c23f29) --- dist/changes-4.5.1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 271f25d..776e2a3 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -383,6 +383,21 @@ Qt for Mac OS X - QDesktopWidget * [244004] Support multiple screens that have different sizes properly. +- QDialog + * [239155] QDialog(foo, Qt::Sheet) with QComboBox have none native behavior. + * [218980] Modeless dialogs should be stacked above normal windows. + * [195904] Parent dialog is displayed on top of its modal child. + +- QFileDialog + * [219844] QFileDialog::getOpenFileName() search buttons lead to crash (native version). + * [225705] QFileDialog::getSaveFileName()'s filter does not display correctly. + +- QMenu + * [228017] QMenu should close when expanding a system menu. + +- Event system + * [210912] ShowEvent not sendt when reshowing a window after it was minimized. + - macdeployqt * The binary packages now includes the macdeployqt tool. * macdeployqt now runs 'strip' on the deployed binaries. @@ -397,6 +412,8 @@ Qt for Mac OS X - Added QSysInfo::MV_10_6 as an enum to test against. - Various compile fixes for Snow Leopard (preliminary support). - The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. +- [223525] Macmainwindow Demo Application (crashfix). + - Document a bit clearer how qt_mac_set_dock_menu() works. -- cgit v0.12 From c02086b100f588b725c355e94effe46a569ab80c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 16 Apr 2009 13:09:00 +0200 Subject: change log updated for 4.5.1 (cherry picked from commit 78659fbe2d4ad8a01b41cb485f57b4a66c031fd5) --- dist/changes-4.5.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 776e2a3..dd41ef4 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -430,6 +430,7 @@ Qt for Embedded Linux Qt for Windows CE ----------------- + * [246619] Fixed tap and hold bug for QCheckbox. **************************************************************************** * Compiler Specific Changes * -- cgit v0.12 From 680ee5b476ab67a49484aeb10a1e8da190367dd1 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:39:10 +0200 Subject: Doc - Some minor cleanups in the documentation of QInputDialog. Also marked getInt() as since Qt 4.5 and finally modified the StandardDialogs example to reflect the fact that getInteger() is deprecated. Task-number: 251288 Reviewed-by: nrc BT: Yes (cherry picked from commit 08dff2935af2d71f2fe76182079da636c1bb6f5b) --- examples/dialogs/standarddialogs/dialog.cpp | 6 +- src/gui/dialogs/qinputdialog.cpp | 181 +++++++++++++++------------- 2 files changed, 99 insertions(+), 88 deletions(-) diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp index d62bee2..111ef35 100644 --- a/examples/dialogs/standarddialogs/dialog.cpp +++ b/examples/dialogs/standarddialogs/dialog.cpp @@ -59,7 +59,7 @@ Dialog::Dialog(QWidget *parent) integerLabel = new QLabel; integerLabel->setFrameStyle(frameStyle); QPushButton *integerButton = - new QPushButton(tr("QInputDialog::get&Integer()")); + new QPushButton(tr("QInputDialog::get&Int()")); doubleLabel = new QLabel; doubleLabel->setFrameStyle(frameStyle); @@ -198,8 +198,8 @@ void Dialog::setInteger() { //! [0] bool ok; - int i = QInputDialog::getInteger(this, tr("QInputDialog::getInteger()"), - tr("Percentage:"), 25, 0, 100, 1, &ok); + int i = QInputDialog::getInt(this, tr("QInputDialog::getInteger()"), + tr("Percentage:"), 25, 0, 100, 1, &ok); if (ok) integerLabel->setText(tr("%1%").arg(i)); //! [0] diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index 3796e71..05f331b 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -424,26 +424,27 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, /*! \class QInputDialog - \brief The QInputDialog class provides a simple convenience dialog to get a single value from the user. + \brief The QInputDialog class provides a simple convenience dialog to get a + single value from the user. \ingroup dialogs \mainclass - The input value can be a string, a number or an item from a list. A - label must be set to tell the user what they should enter. + The input value can be a string, a number or an item from a list. A label + must be set to tell the user what they should enter. - Four static convenience functions are provided: - getText(), getInt(), getDouble(), and getItem(). All the - functions can be used in a similar way, for example: + Four static convenience functions are provided: getText(), getInt(), + getDouble(), and getItem(). All the functions can be used in a similar way, + for example: \snippet examples/dialogs/standarddialogs/dialog.cpp 3 - The \c ok variable is set to true if the user clicks \gui OK; - otherwise it is set to false. + The \c ok variable is set to true if the user clicks \gui OK; otherwise it + is set to false. \img inputdialogs.png Input Dialogs - The \l{dialogs/standarddialogs}{Standard Dialogs} example shows - how to use QInputDialog as well as other built-in Qt dialogs. + The \l{dialogs/standarddialogs}{Standard Dialogs} example shows how to use + QInputDialog as well as other built-in Qt dialogs. \sa QMessageBox, {Standard Dialogs Example} */ @@ -452,11 +453,13 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, \enum QInputDialog::InputMode \since 4.5 - This enum describes the different modes of input that can be selected for the dialog. + This enum describes the different modes of input that can be selected for + the dialog. \value TextInput Used to input text strings. \value IntInput Used to input integers. - \value DoubleInput Used to input floating point numbers with double precision accuracy. + \value DoubleInput Used to input floating point numbers with double + precision accuracy. \sa inputMode */ @@ -487,7 +490,8 @@ QInputDialog::~QInputDialog() \brief the mode used for input - This property help determines which widget is used for entering input into the dialog. + This property help determines which widget is used for entering input into + the dialog. */ void QInputDialog::setInputMode(InputMode mode) { @@ -1104,15 +1108,18 @@ void QInputDialog::done(int result) } /*! - Static convenience function to get a string from the user. \a - title is the text which is displayed in the title bar of the - dialog. \a label is the text which is shown to the user (it should - say what should be entered). \a text is the default text which is - placed in the line edit. The \a mode is the echo mode the line - edit will use. If \a ok is nonnull \e *\a ok will be set to true - if the user pressed \gui OK and to false if the user pressed - \gui Cancel. The dialog's parent is \a parent. The dialog will be - modal and uses the specified widget \a flags. + Static convenience function to get a string from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a text is the default text which is placed in the line edit. + \a mode is the echo mode the line edit will use. + + If \a ok is nonnull \e *\a ok will be set to true if the user pressed + \gui OK and to false if the user pressed \gui Cancel. The dialog's parent + is \a parent. The dialog will be modal and uses the specified widget + \a flags. This function returns the text which has been entered in the line edit. It will not return an empty string. @@ -1121,11 +1128,11 @@ void QInputDialog::done(int result) \snippet examples/dialogs/standarddialogs/dialog.cpp 3 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getInteger(), getDouble(), getItem() + \sa getInt(), getDouble(), getItem() */ QString QInputDialog::getText(QWidget *parent, const QString &title, const QString &label, @@ -1149,30 +1156,32 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri } /*! - Static convenience function to get an integer input from the - user. \a title is the text which is displayed in the title bar - of the dialog. \a label is the text which is shown to the user - (it should say what should be entered). \a value is the default - integer which the spinbox will be set to. \a min and \a - max are the minimum and maximum values the user may choose, - and \a step is the amount by which the values change as the user - presses the arrow buttons to increment or decrement the value. - - If \a ok is nonnull *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - On success, this function returns the integer which has been - entered by the user; on failure, it returns the initial \a value. + \since 4.5 + + Static convenience function to get an integer input from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a value is the default integer which the spinbox will be set to. + \a min and \a max are the minimum and maximum values the user may choose. + \a step is the amount by which the values change as the user presses the + arrow buttons to increment or decrement the value. + + If \a ok is nonnull *\a ok will be set to true if the user pressed \gui OK + and to false if the user pressed \gui Cancel. The dialog's parent is + \a parent. The dialog will be modal and uses the widget \a flags. + + On success, this function returns the integer which has been entered by the + user; on failure, it returns the initial \a value. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 0 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. \sa getText(), getDouble(), getItem() */ @@ -1198,32 +1207,32 @@ int QInputDialog::getInt(QWidget *parent, const QString &title, const QString &l } /*! - Static convenience function to get a floating point number from - the user. \a title is the text which is displayed in the title - bar of the dialog. \a label is the text which is shown to the user - (it should say what should be entered). \a value is the default - floating point number that the line edit will be set to. \a - min and \a max are the minimum and maximum values the - user may choose, and \a decimals is the maximum number of decimal - places the number may have. - - If \a ok is nonnull, *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - This function returns the floating point number which has been - entered by the user. + Static convenience function to get a floating point number from the user. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a value is the default floating point number that the line edit will be + set to. + \a min and \a max are the minimum and maximum values the user may choose. + \a decimals is the maximum number of decimal places the number may have. + + If \a ok is nonnull, *\a ok will be set to true if the user pressed \gui OK + and to false if the user pressed \gui Cancel. The dialog's parent is + \a parent. The dialog will be modal and uses the widget \a flags. + + This function returns the floating point number which has been entered by + the user. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 1 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getText(), getInteger(), getItem() + \sa getText(), getInt(), getItem() */ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QString &label, @@ -1248,32 +1257,34 @@ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QStr } /*! - Static convenience function to let the user select an item from a - string list. \a title is the text which is displayed in the title - bar of the dialog. \a label is the text which is shown to the user (it - should say what should be entered). \a items is the - string list which is inserted into the combobox, and \a current is the number - of the item which should be the current item. If \a editable is true - the user can enter their own text; if \a editable is false the user - may only select one of the existing items. - - If \a ok is nonnull \e *\a ok will be set to true if the user - pressed \gui OK and to false if the user pressed \gui Cancel. The - dialog's parent is \a parent. The dialog will be modal and uses - the widget \a flags. - - This function returns the text of the current item, or if \a - editable is true, the current text of the combobox. + Static convenience function to let the user select an item from a string + list. + + \a title is the text which is displayed in the title bar of the dialog. + \a label is the text which is shown to the user (it should say what should + be entered). + \a items is the string list which is inserted into the combobox. + \a current is the number of the item which should be the current item. + + If \a editable is true the user can enter their own text; otherwise the + user may only select one of the existing items. + + If \a ok is nonnull \e *\a ok will be set to true if the user pressed + \gui OK and to false if the user pressed \gui Cancel. The dialog's parent + is \a parent. The dialog will be modal and uses the widget \a flags. + + This function returns the text of the current item, or if \a editable is + true, the current text of the combobox. Use this static function like this: \snippet examples/dialogs/standarddialogs/dialog.cpp 2 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QInputDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QInputDialog constructors. - \sa getText(), getInteger(), getDouble() + \sa getText(), getInt(), getDouble() */ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QString &label, -- cgit v0.12 From e78d6b63ace3cbf291fc7e1270157ff7bd355b5d Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:40:17 +0200 Subject: Doc - Changed the link provided in the README file to one that does not have a version number, so we do not have to update it each release. Task-number: 251352 Reviewed-by: TrustMe (cherry picked from commit 90ff6b0ad7397a6892185e8340d58dab4b85b032) --- examples/tutorials/addressbook/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tutorials/addressbook/README b/examples/tutorials/addressbook/README index 2d528b5..9b7f908 100644 --- a/examples/tutorials/addressbook/README +++ b/examples/tutorials/addressbook/README @@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser. The tutorial is also available online at -http://doc.trolltech.com/4.4/tutorial.html +http://doc.trolltech.com/tutorial.html All programs corresponding to the chapters in the tutorial should automatically be built when Qt is compiled, or will be provided as -- cgit v0.12 From 9376ea8aeeb261fd97d43c56d3f308950aec1122 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 16:41:39 +0200 Subject: Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1 Task-number: 251346 Reviewed-by: TrustMe BT: Yes (cherry picked from commit fc8285ec610b02f440f692be90aed1e6925a8675) --- tools/qdoc3/test/qt.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 298311e..4d401a4 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.450 +qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -- cgit v0.12 From b2c40a544c7cfcd7e6195b6ade0816b54e20ba64 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 16 Apr 2009 16:45:45 +0200 Subject: log my changes (cherry picked from commit 602da82d3c9413df41eb5b17bdf7e3c1586316b5) --- dist/changes-4.5.1 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index dd41ef4..a15bfaa 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -457,12 +457,23 @@ Qt for Windows CE * [245503] Fixed redundant backslashes in string property in property browser. - Linguist + - Linguist GUI - - lupdate + * [248076] Fixed crash upon opening files for which we have no plural rules + * [249519] Fixed crash upon dropping text into non-focused lineedit + + - Entire Linguist toolchain - - lrelease + * [244035] Fixed endless loop in PO writer + * [247738] Improved handling of duplicated messages + * [248849] Fixed encoding in XLIFF writer + * [249022] Fixed TS' and QM's handling of messages which appear in multiple encodings + + - lupdate + * [248724] Fixed encoding of messages from .ui files if CODECFORTR is not utf8 + * [249633] Fixed processing of C++ backslash line continuations - rcc @@ -484,6 +495,7 @@ Qt for Windows CE * [248806] Ensure that the Xcode generator includes the right path to frameworks. * [201495] Comment processing in qmake prevented file from being moc'ed * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA + * Fixed moc and uic features to make shadow builds work even if a non-shadow build is present - configure -- cgit v0.12 From 78815e49fa25b40e437c125d73c11fb72aacd90f Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 16 Apr 2009 17:18:15 +0200 Subject: First round of change log cleanups. Reviewed-by: TrustMe BT: Yes (cherry picked from commit 0aa3203fa13bfbc42e77488765023832934dd36b) --- dist/changes-4.5.1 | 81 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index a15bfaa..e3aa57c 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -24,6 +24,11 @@ General Improvements -------------------- - Documentation and Examples + * Added printing feature for the Spreadsheet demo. + * [245675] Clarified the differences between QItemDelegate and + QStyledItemDelegate. + * [248752] Marked QPrintDialog::printer(), setPrinter() and addButton() + as Unix only functions, part of Qt3Support. - Embedded Dialogs demo * [246517] Fixed warnings and bugs in hover handling on Mac OS X @@ -50,90 +55,96 @@ Third party components **************************************************************************** - QAbstractItemModel - * [243195] Clrarified some warning messages printed if the model is invalid. + * [243195] Clarified some warning messages printed if the model is invalid. - QAbstractEventDispatcher - * [248805] Duplicates timerid could happen when timer are running while - the QObject is moved to another thread, and would stop timers from working. + * [248805] Duplicate timerids could occur when a timer is running while + the QObject is moved to another thread, stopping timers from working. - QAbstractSocket - * [192037] Emit disconnected only if we were connected before + * [192037] Emit the disconnected signal only if we were connected before. - QAccessible - * [241161] Fixed bug in browsing menus with the keyboard. - * [221731] Fixed bug where the accessibility plugin could crash if there - was an "&" at the end or spin forever if a label had a sequence of "&&". + * [241161] Fixed a bug in browsing menus with the keyboard. + * [221731] Fixed a bug where the accessibility plugin could crash if + there was an "&" at the end or spin forever if a label had a sequence of + "&&". - QAtomicInt - * [216492] Fix compilation on 64-bit PowerPC machines with gcc 4.3. + * [216492] Fixed compilation on 64-bit PowerPC machines with gcc 4.3. - QAuthenticator - * [237979] fix implemenation of md5-sess + * [237979] Fixed implementation of md5-sess. - QByteArray - * [246233] QByteArray::fromHex() fails with input of size 1 + * [246233] QByteArray::fromHex() fails with input of size 1. - QColorDialog - * [247349] Fixed bug causing the wrong alpha value to be returned. + * [247349] Fixed a bug causing the wrong alpha value to be returned. - QCombobox - * [248094] Fixed scrollbar appearing while not required. + * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed focus policy propagation regression. - * [246056] Fixed assertion failure in setCompletionPrefix(). + * [250064] Fixed a focus policy propagation regression. + * [246056] Fixed an assertion failure in setCompletionPrefix(). - QtConcurrent - * [244718] Reduce the number of calls to QThread::idealThreadCount(). + * [244718] Reduced the number of calls to QThread::idealThreadCount(). - QDirIterator - * [247645] Fix a bug that may loose all cached data inside the QFileInfo + * [247645] Fixed a bug that may loose all cached data inside QFileInfo. - QFile - * [244500] QFile::rename() doesn't always return false when the method fails - * [244485] Renaming a file does not change QFile::fileName() + * [244500] QFile::rename() does not always return false when the method + fails + * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo - * [205244] return valid file info also for relative UNC paths + * [205244] Return valid file info also for relative UNC paths. - QFileDialog - * [250194] QFileDialog and QSortFilterProxyModel index mapping issue - * [248332] QFileDialog is slow after visiting a large directory - * [221323] QFileDialog programatical file selection bug + * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel + index mapping. + * [248332] QFileDialog is slow after visiting a large directory. + * [221323] QFileDialog programmatical file selection bug. - QGraphicsItem - * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden + * [247890] Cached QGraphicsItems are not updated if update() is called + when they are hidden. * [250272] When an item is deleted it does not get removed from the - sceneeventfilters meaning a crash can occur - * Fixed slowdown regression in QGraphicsItem::ItemCoordinateCache + sceneeventfilters, meaning a crash can occur. + * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout - * [242472] Fix a bug where the calculation of the maximum width of a column - was not calculated correctly. + * [242472] Fixed a bug where the calculation of the maximum width of a + column was incorrect. - QGraphicsScene - * [243707] Fixed crash when adding child before parent to scene + * [243707] Fixed a crash when adding child before parent to scene. --QGraphicsView - * [245766] Rubber Band drag mode not updated correctly when scrolling +- QGraphicsView + * [245766] Rubber Band drag mode does not update correctly when + scrolling. - QGraphicsWidget * [246215] Fixed a regression where we could cache the wrong size hint because we called the virtual sizeHint() from the constructor. - QHttp - * [208445] cancel request upon receiving unknown authentication method + * [208445] Cancel request upon receiving unknown authentication method. - QHostAddress - * [247330] Fix compilation on MinGW by adding a missing QPair include. + * [247330] Fixed compilation on MinGW by adding a missing QPair include. - QLocalSocket - * Fix a bug that would cause QLocalSocket to disconnect 30 seconds + * Fixed a bug that would cause QLocalSocket to disconnect 30 seconds after a succesful delayed connection on UNIX. - QMacStyle - * [248769] Fix regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. - * Adjust the opacity value for popups. + * [248769] Fixed a regression where QMacStyle would only draw tabs when + passed a QStyleOptionTabV3. + * Adjusted the opacity value for popups. - QMainWindow * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. -- cgit v0.12 From 6574991f7b17f1d627e67fc5de1eed09b5c2e095 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Apr 2009 17:15:16 +0200 Subject: BT:Stop widgets disappearing in unified when clicking the toolbar button The comment in the code pretty much says it all, so I'll repeat it: This is a workaround for NSToolbar. When a widget is hidden by clicking the toolbar button, Cocoa reparents the widgets to another window (but Qt doesn't know about it). When we start showing them, it reparents back, but at this point it's window is nil, but the window it's being brought into (the Qt one) is for sure created. This stops the hierarchy moving under our feet. Task-number: 251294 Reviewed-by: Prasanth Ullattil (cherry picked from commit 139265031939d676f049edd2c91918040e0659b4) --- src/gui/kernel/qwidget_mac.mm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index aa1f736..43f6725 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -465,7 +465,18 @@ Q_GUI_EXPORT OSWindowRef qt_mac_window_for(const QWidget *w) if (hiview){ OSWindowRef window = qt_mac_window_for(hiview); if (!window && qt_isGenuineQWidget(hiview)) { - w->window()->d_func()->createWindow_sys(); + QWidget *myWindow = w->window(); + // This is a workaround for NSToolbar. When a widget is hidden + // by clicking the toolbar button, Cocoa reparents the widgets + // to another window (but Qt doesn't know about it). + // When we start showing them, it reparents back, + // but at this point it's window is nil, but the window it's being brought + // into (the Qt one) is for sure created. + // This stops the hierarchy moving under our feet. + if (myWindow != w && qt_mac_window_for(qt_mac_nativeview_for(myWindow))) + return qt_mac_window_for(qt_mac_nativeview_for(myWindow)); + + myWindow->d_func()->createWindow_sys(); // Reget the hiview since the "create window could potentially move the view (I guess). hiview = qt_mac_nativeview_for(w); window = qt_mac_window_for(hiview); -- cgit v0.12 From 822647ae6c7720f3dc76b3aece4e330eb1780aa4 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 17 Apr 2009 08:10:29 +1000 Subject: Document my changes for 4.5.1 (cherry picked from commit 90d7509e4a1543e43a49bfb25dd672d824c4fde3) --- dist/changes-4.5.1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index e3aa57c..0b8dae2 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -133,6 +133,8 @@ Third party components - QHttp * [208445] Cancel request upon receiving unknown authentication method. + * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in + some private headers. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -168,6 +170,8 @@ Third party components * [247505] Fix missing fills of rectangles with negative width/height in raster paint engine. * [249628] Fix crash in OpenGL paint engine when filling using Qt::NoBrush. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite + and OpenGL/ES 1.0. - QPixmap * [249175] Fix QPixmap::fromImage() of monochrome images to result in @@ -437,6 +441,8 @@ Qt for Embedded Linux --------------------- - Various improvements to the Qt DirectFB plugin. +- Fix recreation of temporary EGL surfaces in PowerVR gfxdriver. +- Document some necessary #define's for building the PowerVR gfxdriver. Qt for Windows CE ----------------- -- cgit v0.12 From 095c4209fe8fea6d46cc6c1486d2bc6471e8f0a5 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 17 Apr 2009 13:42:46 +1000 Subject: Document my QGLFramebufferObject change --- dist/changes-4.5.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0b8dae2..016a99d 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -109,6 +109,9 @@ Third party components * [248332] QFileDialog is slow after visiting a large directory. * [221323] QFileDialog programmatical file selection bug. +- QGLFramebufferObject + * Framebuffer object extension resolution now works with OpenGL/ES 2.0. + - QGraphicsItem * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden. -- cgit v0.12 From e389dc42a1d3d473eac34987767b94dbe623a275 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 14:22:30 +1000 Subject: BT: Whats new doc page has a link to changes-4.5.0 file instead of 4.5.1 Restore the text that is omitted for a minor release but included in patch releases. Also fixes obsolete link to changes files. Reviewed-by: Trust Me --- doc/src/qt4-intro.qdoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index cd66c10..5d83ef2 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -161,9 +161,9 @@ \o Support for OLE verbs and MIME data handling in \l{ActiveQt}. \endlist - For more information about improvements in the current release, see - the \l{http://www.qtsoftware.com/developer/changes/changes-4.1.4/} - {detailed list of changes}. + For more information about improvements in each Qt release, see + the \l{http://www.qtsoftware.com/developer/changes/} + {detailed lists of changes}. \section1 Significant Improvements @@ -447,11 +447,10 @@ \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}. A \l{Known Issues in %VERSION%}{list of known issues} for this release is also available. - \omit + Changes between this release and the previous release are provided in the \c{changes-%VERSION%} file (also \l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}). - \endomit A list of other Qt 4 features can be found on the \bold{\l{What's New in Qt 4}} page. -- cgit v0.12 From 8eb08c8c294f00763961e86cc3370b0ef78c8976 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 17 Apr 2009 15:07:45 +1000 Subject: Allow -help to be used in a non-eval package. The previous logic caused a license check when the eval license file was missing. Reviewed-by: Jason McDonald Task-number: 251339 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a3a7b2d..9f2b28d 100755 --- a/configure +++ b/configure @@ -205,10 +205,10 @@ earlyArgParse() h|help|--help|-help) if [ "$VAL" = "yes" ]; then OPT_HELP="$VAL" - COMMERCIAL_USER="yes" #doesn't matter we will display the help + COMMERCIAL_USER="no" #doesn't matter we will display the help else UNKNOWN_OPT=yes - COMMERCIAL_USER="yes" #doesn't matter we will display the help + COMMERCIAL_USER="no" #doesn't matter we will display the help fi ;; --*) -- cgit v0.12 From 08934a1647d60150d260275b4aac7d680bce3cfe Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 15:51:13 +1000 Subject: BT: Fix version number in FAQ.txt. Don't state a specific version number, or we'll keep forgetting to update it. Task-number: 251338 Reviewed-by: Trust Me --- FAQ.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.txt b/FAQ.txt index c243e5c..f20d10b 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -1,4 +1,4 @@ -This is a list of Frequently Asked Questions regarding Qt Release 4.5.0. +This is a list of Frequently Asked Questions regarding this Qt release. Q: I'm using a Unix system and I downloaded the Zip package. However, when I try to run the configure script, I get the following error message: -- cgit v0.12 From 04c01e15739d926ef653293ef1e89132085d7acd Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 17 Apr 2009 08:57:25 +0200 Subject: Fix management of svg icons Task: 251248 Revieved-by: Friedemann Kleint --- src/tools/uic/cpp/cppwriteinitialization.cpp | 16 ++++++++-------- tools/designer/src/lib/shared/qdesigner_utils.cpp | 2 +- tools/designer/src/lib/uilib/resourcebuilder.cpp | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index ed06006..3d702dd 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1648,21 +1648,21 @@ QString WriteInitialization::writeIconProperties(const DomResourceIcon *i) const QString pixmap = QLatin1String("QPixmap"); m_output << m_indent << "QIcon " << iconName << ";\n"; if (i->hasElementNormalOff()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementNormalOff()->text()) << ", QIcon::Normal, QIcon::Off);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Normal, QIcon::Off);\n"; if (i->hasElementNormalOn()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementNormalOn()->text()) << ", QIcon::Normal, QIcon::On);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Normal, QIcon::On);\n"; if (i->hasElementDisabledOff()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementDisabledOff()->text()) << ", QIcon::Disabled, QIcon::Off);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Disabled, QIcon::Off);\n"; if (i->hasElementDisabledOn()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementDisabledOn()->text()) << ", QIcon::Disabled, QIcon::On);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Disabled, QIcon::On);\n"; if (i->hasElementActiveOff()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementActiveOff()->text()) << ", QIcon::Active, QIcon::Off);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Active, QIcon::Off);\n"; if (i->hasElementActiveOn()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementActiveOn()->text()) << ", QIcon::Active, QIcon::On);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Active, QIcon::On);\n"; if (i->hasElementSelectedOff()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementSelectedOff()->text()) << ", QIcon::Selected, QIcon::Off);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Selected, QIcon::Off);\n"; if (i->hasElementSelectedOn()) - m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementSelectedOn()->text()) << ", QIcon::Selected, QIcon::On);\n"; + m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Selected, QIcon::On);\n"; } else { // pre-4.4 legacy m_output << m_indent << "const QIcon " << iconName << " = " << pixCall(QLatin1String("QIcon"), i->text())<< ";\n"; } diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp index d2f092e..75fa180 100644 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp @@ -397,7 +397,7 @@ namespace qdesigner_internal QMapIterator, PropertySheetPixmapValue> itPath(paths); while (itPath.hasNext()) { QPair pair = itPath.next().key(); - icon.addPixmap(m_pixmapCache->pixmap(itPath.value()), pair.first, pair.second); + icon.addFile(itPath.value().path(), QSize(), pair.first, pair.second); } m_cache.insert(value, icon); return icon; diff --git a/tools/designer/src/lib/uilib/resourcebuilder.cpp b/tools/designer/src/lib/uilib/resourcebuilder.cpp index 3679f92..5df10e9 100644 --- a/tools/designer/src/lib/uilib/resourcebuilder.cpp +++ b/tools/designer/src/lib/uilib/resourcebuilder.cpp @@ -98,21 +98,21 @@ QVariant QResourceBuilder::loadResource(const QDir &workingDirectory, const DomP if (const int flags = iconStateFlags(dpi)) { // new, post 4.4 format QIcon icon; if (flags & NormalOff) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementNormalOff()->text()).absoluteFilePath(), QIcon::Normal, QIcon::Off); + icon.addFile(QFileInfo(workingDirectory, dpi->elementNormalOff()->text()).absoluteFilePath(), QSize(), QIcon::Normal, QIcon::Off); if (flags & NormalOn) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementNormalOn()->text()).absoluteFilePath(), QIcon::Normal, QIcon::On); + icon.addFile(QFileInfo(workingDirectory, dpi->elementNormalOn()->text()).absoluteFilePath(), QSize(), QIcon::Normal, QIcon::On); if (flags & DisabledOff) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementDisabledOff()->text()).absoluteFilePath(), QIcon::Disabled, QIcon::Off); + icon.addFile(QFileInfo(workingDirectory, dpi->elementDisabledOff()->text()).absoluteFilePath(), QSize(), QIcon::Disabled, QIcon::Off); if (flags & DisabledOn) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementDisabledOn()->text()).absoluteFilePath(), QIcon::Disabled, QIcon::On); + icon.addFile(QFileInfo(workingDirectory, dpi->elementDisabledOn()->text()).absoluteFilePath(), QSize(), QIcon::Disabled, QIcon::On); if (flags & ActiveOff) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementActiveOff()->text()).absoluteFilePath(), QIcon::Active, QIcon::Off); + icon.addFile(QFileInfo(workingDirectory, dpi->elementActiveOff()->text()).absoluteFilePath(), QSize(), QIcon::Active, QIcon::Off); if (flags & ActiveOn) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementActiveOn()->text()).absoluteFilePath(), QIcon::Active, QIcon::On); + icon.addFile(QFileInfo(workingDirectory, dpi->elementActiveOn()->text()).absoluteFilePath(), QSize(), QIcon::Active, QIcon::On); if (flags & SelectedOff) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementSelectedOff()->text()).absoluteFilePath(), QIcon::Selected, QIcon::Off); + icon.addFile(QFileInfo(workingDirectory, dpi->elementSelectedOff()->text()).absoluteFilePath(), QSize(), QIcon::Selected, QIcon::Off); if (flags & SelectedOn) - icon.addPixmap(QFileInfo(workingDirectory, dpi->elementSelectedOn()->text()).absoluteFilePath(), QIcon::Selected, QIcon::On); + icon.addFile(QFileInfo(workingDirectory, dpi->elementSelectedOn()->text()).absoluteFilePath(), QSize(), QIcon::Selected, QIcon::On); return qVariantFromValue(icon); } else { // 4.3 legacy const QIcon icon(QFileInfo(workingDirectory, dpi->text()).absoluteFilePath()); -- cgit v0.12 From c01ce578761aefc2c1780047aa666eb7ee96159f Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Fri, 17 Apr 2009 10:20:55 +0200 Subject: Add my bugfix. --- dist/changes-4.5.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 016a99d..a78e946 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -241,6 +241,7 @@ Third party components * [248689] Q3ListView would not update under certain condition. - QtWebKit + * [248643] Fixed compiling with -pedantic. * Fix bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). * Fixed support for calling from JavaScript into NPAPI plugins on Windows. * Fixed updating state of WebActions (Erik Bunce) -- cgit v0.12 From 5ed3f621255079b3688a792c1a964d6cd6cda743 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 17 Apr 2009 10:31:10 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 450331808bfe11b1472c213a8cb311190355c2de ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-04 Simon Hausmann Unreviewed Qt build fix. Changed ASSERT(image) to ASSERT(!image.isNull()). * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::getImageData): ++ b/WebKit/qt/ChangeLog 2009-03-07 Adam Treat Reviewed by Cameron Zwarich. These methods are clearly returning the wrong values as the two were returning swapped information. * Api/qwebpage.cpp: (QWebPage::totalBytes): (QWebPage::bytesReceived): --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 9 +++++++++ .../webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp | 2 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 4 ++-- src/3rdparty/webkit/WebKit/qt/ChangeLog | 11 +++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 1762ecd..bfaefa2 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - e446518445c51c56471e41b1697e2a9e9f3adf36 + 450331808bfe11b1472c213a8cb311190355c2de diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 3774ea5..9be6e72 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2009-02-04 Simon Hausmann + + Unreviewed Qt build fix. + + Changed ASSERT(image) to ASSERT(!image.isNull()). + + * platform/graphics/qt/ImageBufferQt.cpp: + (WebCore::ImageBuffer::getImageData): + 2009-02-03 Dirk Schulze Reviewed by Sam Weinig. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp index cea255e..d1009b5 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -114,7 +114,7 @@ PassRefPtr ImageBuffer::getImageData(const IntRect& rect) const QImage image = m_data.m_pixmap.toImage(); if (image.format() != QImage::Format_ARGB32) image = image.convertToFormat(QImage::Format_ARGB32); - ASSERT(image); + ASSERT(!image.isNull()); unsigned destBytesPerRow = 4 * rect.width(); unsigned char* destRows = data + desty * destBytesPerRow + destx * 4; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index de37383..e17306d 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -2517,7 +2517,7 @@ void QWebPagePrivate::_q_onLoadProgressChanged(int) { \sa bytesReceived() */ quint64 QWebPage::totalBytes() const { - return d->m_bytesReceived; + return d->m_totalBytes; } @@ -2527,7 +2527,7 @@ quint64 QWebPage::totalBytes() const { \sa totalBytes() */ quint64 QWebPage::bytesReceived() const { - return d->m_totalBytes; + return d->m_bytesReceived; } /*! diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 41ca520..5a23200 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,14 @@ +2009-03-07 Adam Treat + + Reviewed by Cameron Zwarich. + + These methods are clearly returning the wrong values as the two were + returning swapped information. + + * Api/qwebpage.cpp: + (QWebPage::totalBytes): + (QWebPage::bytesReceived): + 2009-04-02 Takumi Asaki Reviewed by Simon Hausmann. -- cgit v0.12 From 2da87118ac000f754ca09ad2b14f1ec80a59b985 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Fri, 17 Apr 2009 11:14:51 +0200 Subject: More cleanups on the change log. Reviewed-by: TrustMe BT: Yes --- dist/changes-4.5.1 | 195 ++++++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 90 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index a78e946..ed3acd7 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -37,14 +37,14 @@ General Improvements Optimizations ------------- -- Graphics View has been optimized in several areas - * Improved the performance of QGraphicsItem::clipPath. - * Improved the performance of QGraphicsItem::setPos. - * Improved the performance of QGraphicsItem::effectiveOpacity. - * Improved the performance of QGrahicsScene::items(*). - * Improved update handling. - * Reduced the number of floating point operations. - * Reduced QVariant overhead. +- Graphics View Framework has been optimized in several areas + * Improved the performance of QGraphicsItem::clipPath(). + * Improved the performance of QGraphicsItem::setPos(). + * Improved the performance of QGraphicsItem::effectiveOpacity(). + * Improved the performance of QGrahicsScene::items(*). + * Improved handling of updates. + * Reduced the number of floating point operations. + * Reduced QVariant overhead. Third party components ---------------------- @@ -55,11 +55,11 @@ Third party components **************************************************************************** - QAbstractItemModel - * [243195] Clarified some warning messages printed if the model is invalid. + * Clarified some warning messages printed if the model is invalid. - QAbstractEventDispatcher - * [248805] Duplicate timerids could occur when a timer is running while - the QObject is moved to another thread, stopping timers from working. + * [248805] Duplicate timerids could occur if a timer is running while the + QObject is moved to another thread, stopping timers from working. - QAbstractSocket * [192037] Emit the disconnected signal only if we were connected before. @@ -86,7 +86,7 @@ Third party components * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed a focus policy propagation regression. + * [250064] Fixed a regression in focus policy propagation. * [246056] Fixed an assertion failure in setCompletionPrefix(). - QtConcurrent @@ -97,7 +97,7 @@ Third party components - QFile * [244500] QFile::rename() does not always return false when the method - fails + fails * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo @@ -105,39 +105,40 @@ Third party components - QFileDialog * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel - index mapping. + index mapping. * [248332] QFileDialog is slow after visiting a large directory. - * [221323] QFileDialog programmatical file selection bug. + * [221323] Fixed a bug in QFileDialog's programmatical file selection. - QGLFramebufferObject * Framebuffer object extension resolution now works with OpenGL/ES 2.0. - QGraphicsItem * [247890] Cached QGraphicsItems are not updated if update() is called - when they are hidden. - * [250272] When an item is deleted it does not get removed from the - sceneeventfilters, meaning a crash can occur. + when they are hidden. + * [250272] Fixed a crash that could occur when an item is deleted but + it does not get removed from the sceneeventfilters. * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout * [242472] Fixed a bug where the calculation of the maximum width of a - column was incorrect. + column was incorrect. - QGraphicsScene - * [243707] Fixed a crash when adding child before parent to scene. + * [243707] Fixed a crash when adding a child before a parent to the + scene. - QGraphicsView * [245766] Rubber Band drag mode does not update correctly when - scrolling. + scrolling. - QGraphicsWidget - * [246215] Fixed a regression where we could cache the wrong size hint + * [246215] Fixed a regression where we could cache the wrong size hint because we called the virtual sizeHint() from the constructor. - QHttp * [208445] Cancel request upon receiving unknown authentication method. - * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in - some private headers. + * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in some + private headers. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -148,130 +149,144 @@ Third party components - QMacStyle * [248769] Fixed a regression where QMacStyle would only draw tabs when - passed a QStyleOptionTabV3. + passed a QStyleOptionTabV3. * Adjusted the opacity value for popups. - QMainWindow - * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. + * [248048] Fixed a regression that would cause tooltips to disappear when + using the unified toolbar. - QMetaType - * [248890] Detailed description of QMetaType no longer contradicts - documentation of QMetaType::type() + * [248890] The detailed description of QMetaType no longer contradicts + the documentation of QMetaType::type() - QMutex - * Fix performance regression for contended mutexes as reported on - the qt4-preview-feedback list. + * Fixed a performance regression for contended mutexes as reported on the + qt4-preview-feedback list. - QPainter - * [247492] Fix rendering bug in raster paint engine causing one-pixel - offset when drawing premultiplied ARGB32 images on RGB16 images. - * [249490] Fix one-pixel offset between stroke and fills of ellipses in - X11 paint engine. - * [246573] Fix very slow stroking of paths in X11 paint engine. - * [247083] Fix scale applied to antialiased cosmetic pens in X11 paint - engine. - * [247505] Fix missing fills of rectangles with negative width/height in - raster paint engine. - * [249628] Fix crash in OpenGL paint engine when filling using Qt::NoBrush. - * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite - and OpenGL/ES 1.0. + * [247492] Fixed a rendering bug in the raster paint engine causing + one-pixel offset when drawing premultiplied ARGB32 images on RGB16 + images. + * [249490] Fixed one-pixel offset between stroke and fills of ellipses in + the X11 paint engine. + * [246573] Fixed a very slow stroking of paths in the X11 paint engine. + * [247083] Fixed the scale applied to antialiased cosmetic pens in X11 + paint engine. + * [247505] Fixed missing fills of rectangles with negative width/height + in raster paint engine. + * [249628] Fixed a crash in OpenGL paint engine when filling using + Qt::NoBrush. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and + OpenGL/ES 1.0. - QPixmap - * [249175] Fix QPixmap::fromImage() of monochrome images to result in + * [249175] Fixed QPixmap::fromImage() of monochrome images to result in black/white pixels and not transparent/white pixels. - QProcess - * [247865] Fix a crash when calling QProcess::start() and + * [247865] Fixed a crash when calling QProcess::start() and startDetached() with an empty program string. - QScrollBar - * [247985] Stylesheet: added ability to style scrollbar menus. + * [247985] Stylesheet: added the feature to style scrollbar menus. - QSharedPointer - * [246843] Fixed a crash caused by using QSharedPointer in global statics + * [246843] Fixed a crash caused by using QSharedPointer in global statics. - QSortFilterProxyModel - * [247867] Properly sort when calling appendRows() - * [248868] Resort when the model is reset if dynamicSort is enabled. - * [248868] Fixed QSortFilterProxyModel::sort while dynamicSort was disabled. + * [247867] Properly sort when calling appendRows(). + * [248868] Re-sort when the model is reset if dynamicSort is enabled. + * [248868] Fixed QSortFilterProxyModel::sort() if dynamicSort was disabled. - QSSlSocket - * [245668] set also protocol, verifyMode and verifyDepth in - setSslConfiguration() + * [245668] Set also protocol, verifyMode and verifyDepth in + setSslConfiguration(). - QString - * [249517] Fixed regression in replace(int, int, QChar) when string is empty + * [249517] Fixed a regression in replace(int, int, QChar) when the string + is empty. - QStyleSheetStyle * Improved support for setting background and foreground roles in styles - such as the text color in a combo box popup on Mac and Cleanlooks, or - the QScrollBar background. - * [188195] fix background of QAbstractScrollArea loosing its color if styled with pseudo-class. - * Fixed crash while styling the title bar of a QMdiArea. - * [246542] Fixed QToolButton::hover{ color:.... } + such as the text color in a combo box popup on Mac and Cleanlooks, or + the background of QScrollBar. + * [188195] Fixed the background of QAbstractScrollArea losing its color + if styled with pseudo-class. + * Fixed a crash that occured while styling the title bar of a QMdiArea. + * [246542] Fixed a bug in QToolButton::hover{ color:.... }. - QThread - * [249997] Add documentation indicating that the priority set by - the programmer may be ignored, for example on Linux. + * [249997] Added documentation indicating that the priority set by the + programmer may be ignored, for example on Linux. - QTreeView - * Fixed crash that may occurs when event are processed just after QSortFilterProxyModel - has been invalidated - * [246025] Fixed auto-expand that occurs while quicly collapsing an item after clicking on a child - * [248805] Calling programatically QTreeView::sortByColumn was not working if manual - sorting is disabled - * [248163] Fixed possible crash in the paintEvent when spans are used. + * Fixed a crash that may occur when events are processed immediately + after a QSortFilterProxyModel is invalidated. + * [246025] Fixed auto-expand that occured when quickly collapsing an item + after clicking on a child. + * [248805] Calling QTreeView::sortByColumn() programmatically was not + working if manual sorting was disabled. + * [248163] Fixed a possible crash in the paintEvent() when spans are used. - QWidget - * [250388] Fixed potential crash in QWidget::scroll() when using the raster - graphics system. + * [250388] Fixed a potential crash in QWidget::scroll() when using the + raster graphics system. - QWidget - * [246852] Better handling WindowMaximizeButtonHint for widget with + * [246852] Improved handling of WindowMaximizeButtonHint for widgets with layouts. -QLocale - * String-to-number conversion functions are now ignore trailing and - leading whitespaces in all locales as it is documented. + * String-to-number conversion functions will now ignore trailing and + leading whitespaces in all locales as documented. - QWizard - * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. + * [248107] Fixed a bug on Windows Vista causing the Back button to + connect to the back() signal twice. - Q3ListView - * [248689] Q3ListView would not update under certain condition. + * [248689] Fixed a bug in Q3ListView that would not update under certain + conditions. - QtWebKit - * [248643] Fixed compiling with -pedantic. - * Fix bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). - * Fixed support for calling from JavaScript into NPAPI plugins on Windows. - * Fixed updating state of WebActions (Erik Bunce) - * Fixed bug in HTML 5 Canvas clearRect() (Dirk Schulze) - * Fixed text field theming with KDE 4 Oxygen style (Zack Rusin) + * [248643] Fixed compiling with the "-pedantic" compile option. + * Fixed a bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). + * Fixed a bug in calling from JavaScript into NPAPI plugins on Windows. + * Fixed the updating state of WebActions (Erik Bunce) + * Fixed a bug in HTML 5 Canvas clearRect() (Dirk Schulze) + * Fixed the theming of text fields with KDE 4 Oxygen style (Zack Rusin) * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. - QSqlTableModel * [189093] QSqlTableModel did not handle updates when one of the fields had a NULL value. - * Made setTable() try and use the db's casing of the passed tablename. + * Made setTable() try and use the database's letter case (uppercase/ + lowercase) of the given tablename. **************************************************************************** * Database Drivers * **************************************************************************** - * Fixed DB2 driver returning double field as empty - * Fixed memory leak in DB2 driver - * [249059] Fixed QPSQL datetime/time fields with negative timezone offsets - not being handled correctly. - * Fixed DB2 not enquoting table/field names properly. + * Fixed the DB2 driver returning a double field as empty. + * Fixed a memory leak in the DB2 driver. + * [249059] Fixed a bug that handled QPSQL datetime/time fields with + negative timezone offsets incorrectly. + * Fixed the DB2 driver not quoting table/field names properly. * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. - * Fixed sqlite2 driver not returning false on failing to exec a statement. + * Fixed a bug in the sqlite2 driver not returning false on failing to + execute a statement. * PrecisionPolicy now works in the oracle driver. - * Fixed ODBC driver returning a list of tables when requested. - * Fixed Interbase retrieving scale/precision information on numeric/decimal fields. - * Stopped drivers doing quoting again when escapeIdentifier called twice. - * Fixed sqlite2 driver not quoting fields correctly. - * [232769] Fixed memory overflow issue on bound out strings in ODBC Driver + * Fixed a bug in the ODBC driver returning a list of tables when + requested. + * Fixed Interbase retrieving scale/precision information on numeric/ + decimal fields. + * Stopped drivers from quoting again when escapeIdentifier is called + twice. + * Fixed a bug in the sqlite2 driver not quoting fields correctly. + * [232769] Fixed a memory overflow issue on bound out strings in ODBC + Driver **************************************************************************** * Platform Specific Changes * -- cgit v0.12 From fd73185195633fd97228a0c832c247b761967598 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 17 Apr 2009 11:11:07 +0200 Subject: Fix two bugs in Graphics View's mouse grab logics + add autotests. Change fd4d94df4eb16e9e54f61dd8ee45914e24832ae9 introduced mouse grab and keyboard grab support to Graphics View (this was as part of 4.4). The change was missing a large set of autotests that I wrote to test the behavior of these features. As part of task 245317, which involves investigating modality in Graphics View, I figured it would be a good idea to start off but reconstructing these autotests. So this change is mainly about adding autotests for mouse grabbing. And of course, as it always is, I found two bugs while writing these tests. 1) Calling QGraphicsItem::grabMouse() while the item is holding the implicit mouse grab will now upgrade the implicit grab to an explicit grab. 2) Adding a popup to the scene will automatically grab the mouse. Before, the popup would get the grab on show(), but if it was already visible when added to the scene it would not gain the grab. Task-number: 245317 Reviewed-by: jasplin --- src/gui/graphicsview/qgraphicsscene.cpp | 13 +- src/gui/graphicsview/qgraphicswidget_p.cpp | 9 +- tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 302 +++++++++++++++++++++ 3 files changed, 317 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index c616e91..d9e0eec 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -902,11 +902,18 @@ void QGraphicsScenePrivate::grabMouse(QGraphicsItem *item, bool implicit) { // Append to list of mouse grabber items, and send a mouse grab event. if (mouseGrabberItems.contains(item)) { - if (mouseGrabberItems.last() == item) - qWarning("QGraphicsItem::grabMouse: already a mouse grabber"); - else + if (mouseGrabberItems.last() == item) { + Q_ASSERT(!implicit); + if (!lastMouseGrabberItemHasImplicitMouseGrab) { + qWarning("QGraphicsItem::grabMouse: already a mouse grabber"); + } else { + // Upgrade to an explicit mouse grab + lastMouseGrabberItemHasImplicitMouseGrab = false; + } + } else { qWarning("QGraphicsItem::grabMouse: already blocked by mouse grabber: %p", mouseGrabberItems.last()); + } return; } diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index 789f8da..06ffe73 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -66,15 +66,16 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl isWidget = 1; // QGraphicsItem::isWidget() returns true. focusNext = focusPrev = q; focusPolicy = Qt::NoFocus; + + if (!parentItem) + adjustWindowFlags(&wFlags); + windowFlags = wFlags; + q->setParentItem(parentItem); q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::DefaultType)); q->setGraphicsItem(q); resolveLayoutDirection(); - - if (!parentItem) - adjustWindowFlags(&wFlags); - windowFlags = wFlags; q->unsetWindowFrameMargins(); } qreal QGraphicsWidgetPrivate::titleBarHeight(const QStyleOptionTitleBar &options) const diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index dee3f54..a737a37 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -146,6 +146,9 @@ private slots: void setSizes(); void closePopupOnOutsideClick(); void defaultSize(); + void explicitMouseGrabber(); + void implicitMouseGrabber(); + void popupMouseGrabber(); // Task fixes void task236127_bspTreeIndexFails(); @@ -1784,6 +1787,305 @@ void tst_QGraphicsWidget::defaultSize() } +void tst_QGraphicsWidget::explicitMouseGrabber() +{ + QGraphicsWidget *widget = new QGraphicsWidget; + EventSpy widgetGrabEventSpy(widget, QEvent::GrabMouse); + EventSpy widgetUngrabEventSpy(widget, QEvent::UngrabMouse); + + // Grab without scene + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::grabMouse: cannot grab mouse without scene"); + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 0); + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::ungrabMouse: cannot ungrab mouse without scene"); + widget->ungrabMouse(); + QCOMPARE(widgetUngrabEventSpy.count(), 0); + + // Add to scene + QGraphicsScene scene; + scene.addItem(widget); + + // Ungrab while not grabber + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::ungrabMouse: not a mouse grabber"); + widget->ungrabMouse(); + + // Simple grab with scene + QVERIFY(!scene.mouseGrabberItem()); + widget->grabMouse(); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 1); + widget->ungrabMouse(); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + QCOMPARE(widgetUngrabEventSpy.count(), 1); + + // Grab while grabbing + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 2); + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::grabMouse: already a mouse grabber"); + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 2); + QCOMPARE(widgetUngrabEventSpy.count(), 1); + widget->ungrabMouse(); + QCOMPARE(widgetUngrabEventSpy.count(), 2); + + // Add two more widgets to the scene + QGraphicsWidget *widget2 = new QGraphicsWidget; + scene.addItem(widget2); + EventSpy widget2GrabEventSpy(widget2, QEvent::GrabMouse); + EventSpy widget2UngrabEventSpy(widget2, QEvent::UngrabMouse); + QGraphicsWidget *widget3 = new QGraphicsWidget; + scene.addItem(widget3); + EventSpy widget3GrabEventSpy(widget3, QEvent::GrabMouse); + EventSpy widget3UngrabEventSpy(widget3, QEvent::UngrabMouse); + + widget->setData(0, "widget"); + widget2->setData(0, "widget2"); + widget3->setData(0, "widget3"); + + // Simple nested grabbing + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 3); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + widget2->grabMouse(); + QCOMPARE(widgetUngrabEventSpy.count(), 3); + QCOMPARE(widget2GrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + widget3->grabMouse(); + QCOMPARE(widget2UngrabEventSpy.count(), 1); + QCOMPARE(widget3GrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); + widget3->ungrabMouse(); + QCOMPARE(widget3UngrabEventSpy.count(), 1); + QCOMPARE(widget2GrabEventSpy.count(), 2); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + widget2->ungrabMouse(); + QCOMPARE(widget2UngrabEventSpy.count(), 2); + QCOMPARE(widgetGrabEventSpy.count(), 4); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + widget->ungrabMouse(); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + + // Out of order ungrab + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 5); + widget2->grabMouse(); + QCOMPARE(widget2GrabEventSpy.count(), 3); + widget3->grabMouse(); + QCOMPARE(widget3GrabEventSpy.count(), 2); + widget2->ungrabMouse(); + QCOMPARE(widget3UngrabEventSpy.count(), 2); + QCOMPARE(widget2UngrabEventSpy.count(), 4); + QCOMPARE(widgetGrabEventSpy.count(), 6); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); +} + +void tst_QGraphicsWidget::implicitMouseGrabber() +{ + QGraphicsScene scene; + QGraphicsWidget *widget = new QGraphicsWidget; + widget->setFlag(QGraphicsItem::ItemIsMovable); // can grab mouse + widget->resize(200, 200); + EventSpy widgetGrabEventSpy(widget, QEvent::GrabMouse); + EventSpy widgetUngrabEventSpy(widget, QEvent::UngrabMouse); + scene.addItem(widget); + + QVERIFY(!scene.mouseGrabberItem()); + + // Click on an item, see if gain and lose implicit mouse grab. + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 1); + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseRelease); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + QCOMPARE(widgetGrabEventSpy.count(), 1); + QCOMPARE(widgetUngrabEventSpy.count(), 1); + + // Click on an item that already grabs the mouse. Shouldn't have any effect. + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 2); + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 2); + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseRelease); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 2); + QCOMPARE(widgetUngrabEventSpy.count(), 1); + widget->ungrabMouse(); + QCOMPARE(widgetUngrabEventSpy.count(), 2); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + + // Implicit mouse grabber tries to explicitly grab the mouse + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 3); + widget->grabMouse(); + QCOMPARE(widgetUngrabEventSpy.count(), 2); + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseRelease); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(50, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 3); + QCOMPARE(widgetUngrabEventSpy.count(), 2); + widget->ungrabMouse(); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + QCOMPARE(widgetGrabEventSpy.count(), 3); + QCOMPARE(widgetUngrabEventSpy.count(), 3); + + // Arrival of a new widget + QGraphicsWidget *widget2 = new QGraphicsWidget; + widget2->setFlag(QGraphicsItem::ItemIsMovable); // can grab mouse + widget2->resize(200, 200); + widget2->setPos(205, 0); + EventSpy widget2GrabEventSpy(widget2, QEvent::GrabMouse); + EventSpy widget2UngrabEventSpy(widget2, QEvent::UngrabMouse); + scene.addItem(widget2); + + // Implicit grab while there's an explicit grab is not possible. + widget->grabMouse(); + QCOMPARE(widgetGrabEventSpy.count(), 4); + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(250, 50)); + qApp->sendEvent(&scene, &event); + } + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + QCOMPARE(widgetGrabEventSpy.count(), 4); + QCOMPARE(widget2GrabEventSpy.count(), 0); + QCOMPARE(widget2UngrabEventSpy.count(), 0); + + scene.removeItem(widget); + QCOMPARE(widgetUngrabEventSpy.count(), 4); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); +} + +void tst_QGraphicsWidget::popupMouseGrabber() +{ + QGraphicsScene scene; + QGraphicsWidget *widget = new QGraphicsWidget(0, Qt::Popup); + widget->setFlag(QGraphicsItem::ItemIsMovable); // can grab mouse + widget->resize(200, 200); + EventSpy widgetGrabEventSpy(widget, QEvent::GrabMouse); + EventSpy widgetUngrabEventSpy(widget, QEvent::UngrabMouse); + + // Simply adding a visible popup to the scene immediately grabs the mouse. + scene.addItem(widget); + QCOMPARE(widgetGrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + + // Hiding it loses the grab again. + widget->hide(); + QCOMPARE(widgetUngrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0); + + // Showing it grabs the mosue again + widget->show(); + QCOMPARE(widgetGrabEventSpy.count(), 2); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget); + + // Add two popups + QGraphicsWidget *widget2 = new QGraphicsWidget(0, Qt::Popup); + widget2->setFlag(QGraphicsItem::ItemIsMovable); // can grab mouse + widget2->resize(200, 200); + EventSpy widget2GrabEventSpy(widget2, QEvent::GrabMouse); + EventSpy widget2UngrabEventSpy(widget2, QEvent::UngrabMouse); + QGraphicsWidget *widget3 = new QGraphicsWidget(0, Qt::Popup); + widget3->setFlag(QGraphicsItem::ItemIsMovable); // can grab mouse + widget3->resize(200, 200); + EventSpy widget3GrabEventSpy(widget3, QEvent::GrabMouse); + EventSpy widget3UngrabEventSpy(widget3, QEvent::UngrabMouse); + + // Adding to the scene grabs + scene.addItem(widget2); + QCOMPARE(widgetUngrabEventSpy.count(), 2); + QCOMPARE(widget2GrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + + // Adding to the scene grabs again + scene.addItem(widget3); + QCOMPARE(widget2UngrabEventSpy.count(), 1); + QCOMPARE(widget3GrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); + + // Hiding the topmost widget causes widget 2 to regain grab. + widget3->hide(); + QCOMPARE(widget2GrabEventSpy.count(), 2); + QCOMPARE(widget3UngrabEventSpy.count(), 1); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + widget3->show(); + QCOMPARE(widget2UngrabEventSpy.count(), 2); + QCOMPARE(widget3GrabEventSpy.count(), 2); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); + + // Clicking outside the popup still causes it to close (despite that it's + // an explicit mouse grabber). + { + QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress); + event.ignore(); + event.setButton(Qt::LeftButton); + event.setScenePos(QPointF(500, 500)); // outside + qApp->sendEvent(&scene, &event); + } + QVERIFY(!widget3->isVisible()); + QCOMPARE(widget3UngrabEventSpy.count(), 2); + QCOMPARE(widget2GrabEventSpy.count(), 3); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + QVERIFY(widget2->isVisible()); + QVERIFY(widget->isVisible()); + widget3->show(); + QCOMPARE(widget3GrabEventSpy.count(), 3); + QCOMPARE(widget2UngrabEventSpy.count(), 3); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); + + // This is something of a curiosity. What happens if you call + // ungrabMouse() on a popup? The answer is - it loses the grab. If you + // hide and show the popup again, it will regain the grab. + widget3->ungrabMouse(); + QCOMPARE(widget3UngrabEventSpy.count(), 3); + QCOMPARE(widget2GrabEventSpy.count(), 4); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget2); + widget3->hide(); + widget3->show(); + QCOMPARE(widget3GrabEventSpy.count(), 4); + QCOMPARE(widget2UngrabEventSpy.count(), 4); + QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); +} + class ProxyStyle : public QCommonStyle { public: -- cgit v0.12 From 5d39d424a92d89243207d8370d0fa1c6c8061668 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Fri, 17 Apr 2009 11:13:34 +0200 Subject: Line edit displays garbage when pressing up or down arrow keys (Cocoa). The unicode characters between 0xF700 & 0xF8FF are special function-key code characters used by the NSEvent. These characters have to be ignored when converting to a QString. Task-number:244486 Reviewed-by:nrc --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 9c381b4..52e76d8 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -555,12 +555,15 @@ bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widge int keyLength = [keyChars length]; if (keyLength == 0) return false; // Dead Key, nothing to do! + bool ignoreText = false; Qt::Key qtKey = Qt::Key_unknown; if (keyLength == 1) { QChar ch([keyChars characterAtIndex:0]); if (ch.isLower()) ch = ch.toUpper(); qtKey = cocoaKey2QtKey(ch); + // Do not set the text for Function-Key Unicodes characters (0xF700–0xF8FF). + ignoreText = (ch.unicode() >= 0xF700 && ch.unicode() <= 0xF8FF); } Qt::KeyboardModifiers keyMods = qt_cocoaModifiers2QtModifiers([event modifierFlags]); QString text; @@ -568,7 +571,7 @@ bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widge // To quote from the Carbon port: This is actually wrong--but it is the best that // can be done for now because of the Control/Meta mapping issues // (we always get text on the Mac) - if (!(keyMods & (Qt::ControlModifier | Qt::MetaModifier))) + if (!ignoreText && !(keyMods & (Qt::ControlModifier | Qt::MetaModifier))) text = QCFString::toQString(reinterpret_cast(keyChars)); UInt32 macScanCode = 1; -- cgit v0.12 From 8aa8997f18afb85cb17f5b2a875a004302df4c72 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:06:09 +1000 Subject: Fix incorrect year and version number in assistant docs. Task: 251421 Reviewed-by: Trust Me --- tools/assistant/tools/assistant/doc/assistant.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 50f18c0..0d2271d 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -10,8 +10,8 @@ description = "Qt Assistant" HTML.{postheader,address} = "" HTML.footer = "


\n" \ "
\n" \ - "\n" \ "\n" \ - "\n" \ + "\n" \ "
Copyright © 2008 Nokia Corporation " \ + "Copyright © 2009 Nokia Corporation " \ "and/or its subsidiary(-ies)Trademarks
Qt 4.5.0
Qt 4.5.1
" -- cgit v0.12 From c138c9e80acabcf1d9a712a7ebd2b2a7d6135d8b Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:16:35 +1000 Subject: Remove out-of-date Cocoa known issues page. This page is not linked from anywhere, and its content is horribly out-of-date. Task-number: 251420 Reviewed-by: nrc --- doc/src/qtcocoa-known-issues.qdoc | 168 -------------------------------------- 1 file changed, 168 deletions(-) delete mode 100644 doc/src/qtcocoa-known-issues.qdoc diff --git a/doc/src/qtcocoa-known-issues.qdoc b/doc/src/qtcocoa-known-issues.qdoc deleted file mode 100644 index eedbd68..0000000 --- a/doc/src/qtcocoa-known-issues.qdoc +++ /dev/null @@ -1,168 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtcocoa-known-issues.html - \title Known Issues with the Qt/Mac Cocoa Port - - This document explains the current list of features in the Qt/Mac Cocoa port - that are currently not working. Most of the issues will be addressed in - upcoming snapshots and beta releases. We hope that all the issues should be - addressed by the time the of the final 4.5.0 release. - - \tableofcontents - - \section1 What Works - - Here are the things that we can say about the current state of the Qt/Mac Cocoa port. - - \list - \i \e{64-bit Support}: - The Qt libraries currently do build and link as 64-bit frameworks and it is - possible to build and run many of the Qt examples as 64-bit. - - \i \e{HIViews are now NSViews}: - Every QWidget is now backed by an NSView pointer instead of an HIViewRef. - QWidget::winId() will return an NSView pointer that can be used in other - Cocoa technologies (e.g., Core Animation). - - \i \e{Some Native Dialogs Work}: - QFileDialog and QColorDialog have been ported to use NSOpen-/NSSavePanel and - NSColorPanel respectively. QPrintDialog and QPageSetupDialog are not in - this release, but are on their way. Currently, none of these dialogs show - up as sheets pending the creation of an asynchronous API. - - \i \e{Painting, Printing, and Styles}: - Since printing and painting used Quartz 2D and styling used HITheme, these - sub-systems work without any changes. - - \i \e {OpenGL}: - OpenGL is fully supported,including pixel buffers and framebuffer objects. - - \i \e{Clipboard}: - Using QClipboard to copy and paste data works as expected. - - \i \e{Mouse, Keyboard, and Wheel events}: - Mouse, keyboard, and wheel events are dispatched to the proper - widget. The Qt/Mac Cocoa port respects Cocoa's idea of a "First - Responder." - - \endlist - - \section1 Current Known Issues - - The following are items that don't currently work, but that we plan to have - resolved before the final release of the Qt/Mac Cocoa port. Please do not - file bugs on these. - - \list - \i \e{Carbon Support}: - The current source tree for the Qt/Mac Cocoa port contains source for - building Qt/Mac with Cocoa. It contains some of the source code that is - used for the Carbon port, but it is currently not set up to build the - Carbon Qt/Mac libraries. Please use a normal release or snapshot if you - want to use Carbon. - - \i \e{Drag and Drop Support}: - Drag and Drop is currently not implemented and needs to be ported to Cocoa, - but using the clipboard does work at this time. - - \i \e {Accessibility}: - Accessibility support is not implemented and needs to be ported to Cocoa. - - \i \e {Text}: - Most text rendering works fine for Latin-1 characters. However, rendering - non-Latin-1 characters has not been tested. - - \i \e {Input Methods}: - Input methods also need to be ported to Cocoa. - - \i \e {Shortcuts}: - Shortcuts that exist outside of the menu bar may not be dispatched. - - \i \e {Tablet Support}: - The tablet support has not been ported from Carbon yet. However, it should - still be possible to use the tablet as a mouse. - - \i \e {Phonon}: - Phonon uses the QuickTime backend that is only available on 32-bit. Using - Phonon in 64-bit requires a QTKit-based backend and has not been done. - - \i \e {Unified Toolbar}: - The QMainWindow::setUnifiedTitleAndToolBarOnMac() method currently does nothing. - - \i \e {Dialogs, Tool Windows, Sheets, and Drawers}: - At the moment, all windows are subclasses of NSWindow. This means that - window types like drawers and sheets do not work and tool windows do not - get the right decorations. Modal dialogs do show up at the correct window - level, but are not yet considered "panels." Many window flags are not - recognized. - - \endlist - - \section1 Things We Don't Expect to Support - - The following items that we do not plan on spending any resources on unless - there is monumental outcry for their inclusion. - - \list - \i \e{Qt3Support}: - At this time we have no plans for making the Qt3Support module work with - the Qt/Mac Cocoa port in 64-bit mode. Following in footsteps of Apple, we - would like to encourage you to consider the time of going Cocoa and 64-bit - as a chance to jettison Qt 3 constructs and classes. - - \i \e{Support for versions of Mac OS X below 10.5}: - We are using methods and classes that are only available in 10.5 and - higher. Most of these functions don't have any equivalent on earlier - versions. We recommend using the Carbon version for earlier versions of Mac - OS X. We anticipate keeping the Carbon port supported at least for the - lifetime of 4.5. - - \i \e{Support for -no-framework or -static}: - Cocoa requires that we load a nib in order to properly access the global - menu bar. This nib has to reside on disk somewhere. The most logical place - for it to reside is inside the QtGui framework. For this reason, building - Qt as standard "dylibs" or statically is no longer supported. - - \endlist - -*/ -- cgit v0.12 From 569394738995b6792f6e4866f0daf12897975ad4 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:28:23 +1000 Subject: Wrong version number in windows installation doc. Doc still referred to 4.4.0-rc1 - replace with %VERSION% so we don't have to keep updating this. Task-number: 251419 Reviewed-by: Trust Me --- doc/src/snippets/code/doc_src_installation.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 66bb998..e35dad9 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -44,7 +44,7 @@ PATH - to locate qmake, moc and other Qt tools //! [8] C: -cd /D C:\Qt\4.4.0-rc1 +cd /D C:\Qt\%VERSION% configure //! [8] -- cgit v0.12 From cfa04d53ff58d45d7811637c8be76099740d25c5 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:45:11 +1000 Subject: Fix obsolete version number in docs. Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me --- doc/src/platform-notes.qdoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc index 6532d1e..c8046c4 100644 --- a/doc/src/platform-notes.qdoc +++ b/doc/src/platform-notes.qdoc @@ -232,9 +232,7 @@ \section1 Windows Vista - Known issues for Qt on Vista will be listed here. - - As of Qt 4.2.0 no Vista-specific issues are known. + At the time Qt %VERSION% was released, there were no known Vista-specific issues. \target Windows NT \section1 Windows XP, Windows 2000 and Windows NT -- cgit v0.12 From 2df5b45eed7059862e9dd10a74c19310266b9d55 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:54:19 +1000 Subject: Fix obsolete version number in docs. Replace with %VERSION%, so we don't need to fix this for every release. Task-number: 251417 Reviewed-by: Trust Me --- doc/src/snippets/code/doc_src_qtestlib.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index a4ef52e..ff52b2f 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -69,7 +69,7 @@ void TestQString::toUpper() //! [10] ********* Start testing of TestQString ********* -Config: Using QTest library 4.1.0, Qt 4.1.0 +Config: Using QTest library %VERSION%, Qt %VERSION% PASS : TestQString::initTestCase() PASS : TestQString::toUpper() PASS : TestQString::cleanupTestCase() @@ -99,4 +99,4 @@ private slots: } } }; -//! [12] \ No newline at end of file +//! [12] -- cgit v0.12 From e85867003ca1741f378b1f58f4dd9d48577a5d9b Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Fri, 17 Apr 2009 13:26:59 +0200 Subject: Even more cleanups on the Change Log. Reviewed-by: TrustMe BT: Yes --- dist/changes-4.5.1 | 350 ++++++++++++++++++++++++++++------------------------- 1 file changed, 185 insertions(+), 165 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index ed3acd7..c9e689f 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -65,10 +65,10 @@ Third party components * [192037] Emit the disconnected signal only if we were connected before. - QAccessible - * [241161] Fixed a bug in browsing menus with the keyboard. * [221731] Fixed a bug where the accessibility plugin could crash if there was an "&" at the end or spin forever if a label had a sequence of "&&". + * [241161] Fixed a bug in browsing menus with the keyboard. - QAtomicInt * [216492] Fixed compilation on 64-bit PowerPC machines with gcc 4.3. @@ -86,8 +86,8 @@ Third party components * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed a regression in focus policy propagation. * [246056] Fixed an assertion failure in setCompletionPrefix(). + * [250064] Fixed a regression in focus policy propagation. - QtConcurrent * [244718] Reduced the number of calls to QThread::idealThreadCount(). @@ -96,28 +96,28 @@ Third party components * [247645] Fixed a bug that may loose all cached data inside QFileInfo. - QFile + * [244485] Renaming a file does not change QFile::fileName(). * [244500] QFile::rename() does not always return false when the method fails - * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo * [205244] Return valid file info also for relative UNC paths. - QFileDialog + * [221323] Fixed a bug in QFileDialog's programmatical file selection. + * [248332] QFileDialog is slow after visiting a large directory. * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel index mapping. - * [248332] QFileDialog is slow after visiting a large directory. - * [221323] Fixed a bug in QFileDialog's programmatical file selection. - QGLFramebufferObject * Framebuffer object extension resolution now works with OpenGL/ES 2.0. - QGraphicsItem + * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden. * [250272] Fixed a crash that could occur when an item is deleted but it does not get removed from the sceneeventfilters. - * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout * [242472] Fixed a bug where the calculation of the maximum width of a @@ -133,12 +133,12 @@ Third party components - QGraphicsWidget * [246215] Fixed a regression where we could cache the wrong size hint - because we called the virtual sizeHint() from the constructor. + because we called the virtual sizeHint() from the constructor. - QHttp - * [208445] Cancel request upon receiving unknown authentication method. * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in some private headers. + * [208445] Cancel request upon receiving unknown authentication method. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -148,9 +148,9 @@ Third party components after a succesful delayed connection on UNIX. - QMacStyle + * Adjusted the opacity value for popups. * [248769] Fixed a regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. - * Adjusted the opacity value for popups. - QMainWindow * [248048] Fixed a regression that would cause tooltips to disappear when @@ -165,20 +165,21 @@ Third party components qt4-preview-feedback list. - QPainter - * [247492] Fixed a rendering bug in the raster paint engine causing - one-pixel offset when drawing premultiplied ARGB32 images on RGB16 - images. - * [249490] Fixed one-pixel offset between stroke and fills of ellipses in - the X11 paint engine. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and + OpenGL/ES 1.0. * [246573] Fixed a very slow stroking of paths in the X11 paint engine. * [247083] Fixed the scale applied to antialiased cosmetic pens in X11 paint engine. + * [247492] Fixed a rendering bug in the raster paint engine causing * [247505] Fixed missing fills of rectangles with negative width/height in raster paint engine. + one-pixel offset when drawing premultiplied ARGB32 images on RGB16 + images. + * [249490] Fixed one-pixel offset between stroke and fills of ellipses in + the X11 paint engine. * [249628] Fixed a crash in OpenGL paint engine when filling using Qt::NoBrush. - * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and - OpenGL/ES 1.0. + - QPixmap * [249175] Fixed QPixmap::fromImage() of monochrome images to result in @@ -211,9 +212,9 @@ Third party components * Improved support for setting background and foreground roles in styles such as the text color in a combo box popup on Mac and Cleanlooks, or the background of QScrollBar. + * Fixed a crash that occured while styling the title bar of a QMdiArea. * [188195] Fixed the background of QAbstractScrollArea losing its color if styled with pseudo-class. - * Fixed a crash that occured while styling the title bar of a QMdiArea. * [246542] Fixed a bug in QToolButton::hover{ color:.... }. - QThread @@ -225,9 +226,9 @@ Third party components after a QSortFilterProxyModel is invalidated. * [246025] Fixed auto-expand that occured when quickly collapsing an item after clicking on a child. + * [248163] Fixed a possible crash in the paintEvent() when spans are used. * [248805] Calling QTreeView::sortByColumn() programmatically was not working if manual sorting was disabled. - * [248163] Fixed a possible crash in the paintEvent() when spans are used. - QWidget * [250388] Fixed a potential crash in QWidget::scroll() when using the @@ -250,7 +251,6 @@ Third party components conditions. - QtWebKit - * [248643] Fixed compiling with the "-pedantic" compile option. * Fixed a bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). * Fixed a bug in calling from JavaScript into NPAPI plugins on Windows. * Fixed the updating state of WebActions (Erik Bunce) @@ -258,12 +258,13 @@ Third party components * Fixed the theming of text fields with KDE 4 Oxygen style (Zack Rusin) * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. + * [248643] Fixed compiling with the "-pedantic" compile option. - QSqlTableModel - * [189093] QSqlTableModel did not handle updates when one of the fields - had a NULL value. * Made setTable() try and use the database's letter case (uppercase/ lowercase) of the given tablename. + * [189093] QSqlTableModel did not handle updates when one of the fields + had a NULL value. **************************************************************************** * Database Drivers * @@ -271,8 +272,6 @@ Third party components * Fixed the DB2 driver returning a double field as empty. * Fixed a memory leak in the DB2 driver. - * [249059] Fixed a bug that handled QPSQL datetime/time fields with - negative timezone offsets incorrectly. * Fixed the DB2 driver not quoting table/field names properly. * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. * Fixed a bug in the sqlite2 driver not returning false on failing to @@ -287,6 +286,8 @@ Third party components * Fixed a bug in the sqlite2 driver not quoting fields correctly. * [232769] Fixed a memory overflow issue on bound out strings in ODBC Driver + * [249059] Fixed a bug that handled QPSQL datetime/time fields with + negative timezone offsets incorrectly. **************************************************************************** * Platform Specific Changes * @@ -295,178 +296,191 @@ Third party components Qt for Linux/X11 ---------------- - * Proper resetting input contexts when switching between multiple - input context plugins. - - * [244337] Improved input method handling when the widgets native - window id is recreated. - - * Input methods preedit strings are properly reset when user - switches focus without commiting a string. - - * [244607] Current focus widget is properly set and input method is - properly initialized when showing a toplevel that accepts - keyboard input. - - * Unicode conversion functions will handle Latin-1 character set - only if they are used before QCoreApplication/QApplication is - constructed. - + * Ensured proper resetting for input contexts when switching between + multiple input context plugins. + * Input methods preedit strings are now reset properly when user switches + focus without commiting a string. + * Unicode conversion functions will handle Latin-1 character set only if + they are used before a QCoreApplication/QApplication is constructed. * Improved handling of failed unicode conversion. - - * [232632] Fixed reparenting widgets to a difference X11 screen. - - * [241888] The background of the drag-n-drop cursor is respected + * Fixed clipboard handling when the user manually creates an instance of + the QDesktopWidget. + * [226048] Ensured that the QDesktopWidget::resized() signal is emitted + properly when a new screen appears or the screen geometry is changed + without affecting the whole desktop's geometry. + * [232632] Fixed a bug in reparenting widgets to a difference X11 screen. + * [241888] The background of the drag-n-drop cursor is now respected, according to the stylesheet. - - * Fixed clipboard handling when the user manually creates an - instance of the QDesktopWidget. - - * [226048] Fixed emitting a QDesktopWidget::resized() signal when - new screen appears or screen geometry is changed without - affecting the whole desktop geometry. + * [244337] Improved input method handling when a widget's native window + id is recreated. + * [244607] Current focus widget is properly set and input method is + properly initialized when showing a toplevel widget that accepts + keyboard input. - Phonon/GStreamer - * [244259] Fixed a problem where the backend would fail to indicate an - error when streaming fails. - * [233188] Fixed a problem where the seek slider would reset to 0 while - being dragged. - * [246189] Fixed a problem where the backend would fail to correctly - escape certain file names so that playback would not start + * [233188] Fixed a problem where the seek slider reset to 0 while being + dragged. + * [244259] Fixed a problem where the backend failed to indicate an error + when the streaming failed. * [246097] Added support for the MediaController interface to allow audio - CD playback. + CD playback. + * [246189] Fixed a problem where the backend failed to correctly escape + certain file names casuing playback to not start. + - QGtkStyle - * The system palette is no longer strictly forced. Also behavior related - to system theme changes have been improved. + * The system palette is no longer strictly forced. Also improved behavior + related to system theme changes. + * Fixed palette and styling issues with the background color of combo box + popups. + * [238196] Allowed middle click to set scrollbar position, following GTK+ + behavior. + * [239829] Disabled alt-key navigation for QGtkStyle following GTK+ + behavior. + * [247653] Fixed a compilation issue on Solaris. * [249363] QFrame is now styled as a GtkScrolledWindow. - * [247653] Fixed a compilation issue on solaris. - * Fixed palette and styling issues with the background color of - combo box popups. - * [239829] Disabled alt-key navigation for QGtkStyle to follow - GTK+ behavior. - * [238196] Allow middle click to set scrollbar position to follow - GTK+ behavior. - Font rendering - * Improve performance of subpixel antialiased text rendering by using a mask - in the calls to XRender's text compositing function. - * [248387] Better respect the font config LCD filter settings for subpixel - antialiased text rendering when Freetype's native subpixel rendering is - disabled. + * Improved performance of subpixel antialiased text rendering by using a + mask in the calls to XRender's text compositing function. + * [248387] Properly respect the font config LCD filter settings for + subpixel antialiased text rendering when Freetype's native subpixel + rendering is disabled. * [248498] Fix garbled rendering of subpixel antialiased text when using Freetype's native subpixel rendering for vertical subpixel layouts. * [248644] Fall back to Qt's subpixel rendering if Freetype's subpixel - rendering is available at compile-time but not at run-time. + rendering was available at compile-time but not at run-time. - QEventDispatcherGlib * Event posted to a thread before it is started are not processed until others events are posted. - QWidget - * [213512] Fixed a bug that would cause wrong clipping when using the - Qt::WA_PaintOutsidePaintEvent attribute. + * [213512] Fixed a bug that caused wrong clipping when using the + Qt::WA_PaintOutsidePaintEvent attribute. Qt for Windows -------------- - * [243583] Improved drag-and-drop handling when switching mouse - buttons fast. + * [240891] Corrected the focus behavior of native file dialogs, when an + application has multiple toplevel widgets. + * [243583] Improved drag-and-drop handling when switching mouse buttons + quickly. + * [244875] The system menu will now be shown for a fullscreen window. + * [245330] Fixed a bug that caused mouse inputs to be ignored on modal + dialogs, when shown from an ActiveQt control. + * [249576] Fixed a crash when using a combobox with Qt::NoFocus. + - QCoreApplication - * [247401] Fixed a bug that would cause a restarted timer to fire - too early, causing Javascript in QtWebKit to consume 100% CPU on - Windows. + * [247401] Fixed a bug that caused a restarted timer to fire too early, + resulting in QtWebKit's Javascript consuming 100% CPU on Windows. - QWindowsXPStyle - * [248036] Fixed an issue where tool buttons would incorrectly - hover when disabled. + * [248036] Fixed an issue where tool buttons were hovering incorrectly + when disabled. - QWidget - * [248391] Fixed a bug that made it impossible to dynamically switch - from QPainter based graphics to native graphics API and back. + * [248391] Fixed a bug that made it impossible to dynamically switch from + QPainter-based graphics to native graphics API and back. -- [249576] Fixed a crash when using a combobox with Qt::NoFocus. -- [244875] System menu will now be shown for a fullscreen window. -- [240891] Corrected the focus behavior of native file dialogs, when application has multiple toplevels. -- [245330] Fixed a bug which causes mouse inputs to be ignored on modal dialogs, when shown from an ActieQt control. Qt for Mac OS X --------------- -- Cocoa port - * Fixed a bug where actions in the native menubar weren't properly disabled. - * Make shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard layout. - * Fixed a bug where dialogs would be positioned in the wrong place on the screen. - * [244369] Window flags on Cocoa windows should match have a similar look as the Carbon ones. - * The build-key for Cocoa was changed in the unlikely case that a plugin may make - assumptions on how Qt was built. All Cocoa plugins built against 4.5.0 WILL NOT WORK - with 4.5.1, we don't foresee changing this again. - * Fixed a bug where some windows would not get activation when they normally should. - * Key events sent to popups do not get propagated onwards. - * [249296] Fix a bug where lineedits on a second page of a stack widget would not get key events - * QFileOpenEvents are no longer sent for items passed on the command line. - * Various fixes for determining metrics of text and the ability to disable kerning. - * [248918] Fixed color matching for themed text items. - * Modify the colliding mice example to work better with coalesced updates. - * Fixed a bug where the drag cursor was not updated when modifier keys are used. - * [247947] Fixed a crash in drag and drop. - * The command + h shortcut is now enabled. (Hides the current window.) - * [239043] Fixed a bug that would cause QGraphicsProxyWidget to shrink when moving it. + * Fixed a crash when showing a widget that is a modal window but has no + parent. + * Added QSysInfo::MV_10_6 as an enum to test against. + * Various compile fixes for the preliminary supported Snow Leopard. + * The uninstall-qt.py script included in the binary package no longer + complains about removing itself multiple times. +- * Improved the documentation for how qt_mac_set_dock_menu() works. + * Fixed an issue with the focus frame's transparency as it was difficult + to use the QWidget with stylesheets. + * [223525] Fixed a crash in the MacMainWindow Demo. + * [248803] Ensured that two dialogs shown at the same time will both not + have visible default buttons. - QDesktopWidget - * [244004] Support multiple screens that have different sizes properly. + * [244004] Properly support multiple screens with different sizes. - QDialog - * [239155] QDialog(foo, Qt::Sheet) with QComboBox have none native behavior. - * [218980] Modeless dialogs should be stacked above normal windows. - * [195904] Parent dialog is displayed on top of its modal child. + * [195904] Parent dialog is displayed on top of its modal child. + * [218980] Modeless dialogs should be stacked above normal windows. + * [239155] QDialog(foo, Qt::Sheet) with QComboBox has non-native + behavior. - QFileDialog - * [219844] QFileDialog::getOpenFileName() search buttons lead to crash (native version). - * [225705] QFileDialog::getSaveFileName()'s filter does not display correctly. + * [219844] Fixed a crash caused by QFileDialog::getOpenFileName()'s + search buttons (native version). + * [225705] QFileDialog::getSaveFileName()'s filter does not display + correctly. - QMenu - * [228017] QMenu should close when expanding a system menu. + * [228017] Ensured that QMenu closes when expanding a system menu. + +- QTestLib + * Activate the test application when launched from the command line. - Event system - * [210912] ShowEvent not sendt when reshowing a window after it was minimized. + * [210912] Fixed a bug where ShowEvent not sent when reshowing a window + after it was minimized. - macdeployqt - * The binary packages now includes the macdeployqt tool. - * macdeployqt now runs 'strip' on the deployed binaries. - * Fixed issue preventing the QtSvg from being deployed. + * The binary packages now include this tool. + * macdeployqt now runs 'strip' on the deployed binaries. + * Fixed an issue that prevented the QtSvg module from being deployed. - configure script - * Now supports "-arch i386" as an alias for "-arch x86". - * Detects invalid arch arguemnts and exits. - -- Fix a crash when showing a widget that is window modal but has no parent. -- [248803] Showing two dialogs at the same time don't get shared activation. -- Added QSysInfo::MV_10_6 as an enum to test against. -- Various compile fixes for Snow Leopard (preliminary support). -- The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. -- [223525] Macmainwindow Demo Application (crashfix). - - -- Document a bit clearer how qt_mac_set_dock_menu() works. + * Now supports "-arch i386" as an alias for "-arch x86". + * Detects invalid arch arguemnts and exits. -- QTestLib - * Activate the test application when launched from the command line. - -- Fixed the focus frame transparency that would make widget difficult to use with widget stylesheet. +- Cocoa port + * Fixed a bug where actions in the native menubar were not disabled + properly. + * Made shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard + layout. + * Fixed a bug where dialogs were positioned in the wrong place on the + screen. + * The build-key for Cocoa was changed in the unlikely case that a plugin + may make assumptions on how Qt was built. All Cocoa plugins built + against Qt 4.5.0 will NOT work with Qt 4.5.1; we do not foresee + changing this again. + * Fixed a bug where some windows did not get activation when they + normally should. + * Fixed a bug where key events sent to popups were not propagated + onwards. + * QFileOpenEvents will no longer be sent for items passed via command + line. + * Various fixes for determining the metrics of text and the ability to + disable kerning. + * Modified the Colliding Mice Example to work better with coalesced + updates. + * Fixed a bug where the drag cursor was not updated when modifier keys + were used. + * [239043] Fixed a bug that caused QGraphicsProxyWidget to shrink when + moved. + * [244369] Window flags on Cocoa windows should look similar to the + Carbon ones. + * [247947] Fixed a crash in drag and drop. + * [248918] Fixed color matching for themed text items. + * The command + h shortcut is now enabled. (Hides the current window.) + * [249296] Fixed a bug where line edits on a second page of a stack + widget were not getting key events. Qt for Embedded Linux --------------------- -- Various improvements to the Qt DirectFB plugin. -- Fix recreation of temporary EGL surfaces in PowerVR gfxdriver. -- Document some necessary #define's for building the PowerVR gfxdriver. +- * Various improvements to the Qt DirectFB plugin. + * Fixed recreation of temporary EGL surfaces in the PowerVR QScreen + driver. +- * Document some necessary #define's for building the PowerVR QScreen + driver. Qt for Windows CE ----------------- - * [246619] Fixed tap and hold bug for QCheckbox. + * [246619] Fixed a tap and hold bug for QCheckbox. **************************************************************************** * Compiler Specific Changes * @@ -483,56 +497,62 @@ Qt for Windows CE - Designer - * [249097] Fixed a crash related to undoing a QGridLayout re-layouting - operation. - * [247995] Fixed a crash occurring after layout operations that cause - an instance of QGridLayout or QFormLayout to shrink. - * [248000] Fixed a crash ocurring when re-layouting empty grid layouts. - * [245961] Restricted objectname-validation to known object name - properties only. - * [245503] Fixed redundant backslashes in string property in property browser. + * [245503] Fixed redundant backslashes in string property in the property + browser. + * [245961] Restricted objectname-validation to known object name + properties only. + * [247995] Fixed a crash occurring after layout operations that caused + an instance of QGridLayout or QFormLayout to shrink. + * [248000] Fixed a crash ocurring when re-layouting empty grid layouts. + * [249097] Fixed a crash related to undoing a QGridLayout re-layout + operation. - Linguist - Linguist GUI - * [248076] Fixed crash upon opening files for which we have no plural rules - * [249519] Fixed crash upon dropping text into non-focused lineedit + * [248076] Fixed a crash caused by opening files for which we have no + plural rules. + * [249519] Fixed a crash upon dropping text into a non-focused line + edit. - Entire Linguist toolchain - * [244035] Fixed endless loop in PO writer - * [247738] Improved handling of duplicated messages - * [248849] Fixed encoding in XLIFF writer - * [249022] Fixed TS' and QM's handling of messages which appear in multiple encodings + * [244035] Fixed an infinite loop in PO writer. + * [247738] Improved handling of duplicated messages. + * [248849] Fixed the encoding in XLIFF writer. + * [249022] Fixed TS' and QM's handling of messages which appear in + multiple encodings. - lupdate - * [248724] Fixed encoding of messages from .ui files if CODECFORTR is not utf8 - * [249633] Fixed processing of C++ backslash line continuations + * [248724] Fixed the encoding of messages from .ui files if CODECFORTR + is not utf8. + * [249633] Fixed the processing of C++ backslash line continuations. - rcc - moc - * [240368] moc parsing issue with "unsigned" subphrase + * [240368] moc parsing issue with "unsigned" subphrase - uic - * [244998] Fixed include file generation for phonon widgets. - * [248070] Fixed code generation for QStringList-type properties to use - encoding properly. - * [242447] Made uic generate class-specific code correctly in the case - of multiple levels of inheritance. + * [244998] Fixed include file generation for phonon widgets. + * [248070] Fixed code generation for QStringList-type properties to use + encoding properly. + * [242447] Made uic generate class-specific code correctly in the case of + multiple levels of inheritance. - uic3 - qmake - * [248806] Ensure that the Xcode generator includes the right path to frameworks. - * [201495] Comment processing in qmake prevented file from being moc'ed - * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA - * Fixed moc and uic features to make shadow builds work even if a non-shadow build is present - + * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA. + * Fixed moc and uic features to make shadow builds work even if a + non-shadow build is present + * [201495] Comment processing in qmake prevented file from being moc'ed + * [248806] Ensured that the Xcode generator includes the right path to + frameworks. - configure -- cgit v0.12 From b173f1671fd35c6ae674f5368f7a8b66a0f15322 Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Fri, 17 Apr 2009 13:41:49 +0200 Subject: Changing version from 4.5.0 to 4.5.1 in What's new section. --- doc/src/qt4-intro.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 5442c00..d8fd6cf 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -443,7 +443,7 @@ release, separated by category. A comprehensive list of changes between Qt 4.4 and Qt 4.5 is included - in the \c changes-4.5.0 file + in the \c changes-4.5.1 file \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}. A \l{Known Issues in %VERSION%}{list of known issues} for this release is also available. -- cgit v0.12 From 4527bb90539f36dc5f0613f402049876f5089087 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 17 Apr 2009 14:01:59 +0200 Subject: Fix QGraphicsView::mapToScene(QRect) to avoid extra adjustments. The QGraphicsView::mapToScene(QRect) function assumes that QRect and QRectF share semantics for ::bottomRight(). However, since QRect follows Qt 3 semantics (the rect is based on viewport pixels and (0,0,1,1) is equivalent to one pixel, topleft = bottomright), this function gives unexpected behavior: map(0,0,1,1) gives you an empty polygon! To work around this, users of the function need to adjust their rectangles with (0,0,1,1) to get the correct behavior, matching what QRectF does. QRectF(0,0,1,1).bottomRight() == QPointF(1,1) QRect(0,0,1,1).bottomRight() == QPoint(0,0) Reviewed-by: TrustMe --- src/gui/graphicsview/qgraphicsview.cpp | 15 ++++---- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 52 ++++++++++++++++++++------ 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index bffbf4d..a9d585c 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1075,7 +1075,7 @@ QList QGraphicsViewPrivate::findItems(const QRegion &exposedReg // Step 1) If all items are contained within the expose region, then // return a list of all visible items. - const QRectF exposedRegionSceneBounds = q->mapToScene(exposedRegion.boundingRect().adjusted(-1, -1, 2, 2)) + const QRectF exposedRegionSceneBounds = q->mapToScene(exposedRegion.boundingRect().adjusted(-1, -1, 1, 1)) .boundingRect(); if (exposedRegionSceneBounds.contains(scene->d_func()->growingItemsBoundingRect)) { Q_ASSERT(allItems); @@ -2313,7 +2313,7 @@ QList QGraphicsView::items(const QPoint &pos) const QTransform xinv = viewportTransform().inverted(); return d->scene->items(xinv.mapRect(QRectF(pos.x(), pos.y(), 1, 1))); } - return d->scene->items(mapToScene(pos.x(), pos.y(), 2, 2)); + return d->scene->items(mapToScene(pos.x(), pos.y(), 1, 1)); } QPainterPath path; @@ -2475,10 +2475,11 @@ QPolygonF QGraphicsView::mapToScene(const QRect &rect) const return QPolygonF(); QPointF scrollOffset(d->horizontalScroll(), d->verticalScroll()); - QPointF tl = scrollOffset + rect.topLeft(); - QPointF tr = scrollOffset + rect.topRight(); - QPointF br = scrollOffset + rect.bottomRight(); - QPointF bl = scrollOffset + rect.bottomLeft(); + QRect r = rect.adjusted(0, 0, 1, 1); + QPointF tl = scrollOffset + r.topLeft(); + QPointF tr = scrollOffset + r.topRight(); + QPointF br = scrollOffset + r.bottomRight(); + QPointF bl = scrollOffset + r.bottomLeft(); QPolygonF poly; poly.resize(4); @@ -3471,7 +3472,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event) exposedRegion = viewport()->rect(); else if (d->viewportUpdateMode == BoundingRectViewportUpdate) exposedRegion = event->rect(); - QRectF exposedSceneRect = mapToScene(exposedRegion.boundingRect().adjusted(0, 0, 1, 1)).boundingRect(); + QRectF exposedSceneRect = mapToScene(exposedRegion.boundingRect()).boundingRect(); // Set up the painter QPainter painter(viewport()); diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 9368630..ca88afc 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -72,6 +72,7 @@ Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QMatrix) Q_DECLARE_METATYPE(QPainterPath) Q_DECLARE_METATYPE(QPointF) +Q_DECLARE_METATYPE(QPolygonF) Q_DECLARE_METATYPE(QRectF) Q_DECLARE_METATYPE(Qt::ScrollBarPolicy) @@ -159,6 +160,7 @@ private slots: void itemAt2(); void mapToScene(); void mapToScenePoint(); + void mapToSceneRect_data(); void mapToSceneRect(); void mapToScenePoly(); void mapToScenePath(); @@ -1612,23 +1614,51 @@ void tst_QGraphicsView::mapToScenePoint() view.mapToScene(center) + QPointF(0, -10)); } +void tst_QGraphicsView::mapToSceneRect_data() +{ + QTest::addColumn("viewRect"); + QTest::addColumn("scenePoly"); + QTest::addColumn("rotation"); + + QTest::newRow("nil") << QRect() << QPolygonF() << qreal(0); + QTest::newRow("0, 0, 1, 1") << QRect(0, 0, 1, 1) << QPolygonF(QRectF(0, 0, 1, 1)) << qreal(0); + QTest::newRow("0, 0, 10, 10") << QRect(0, 0, 10, 10) << QPolygonF(QRectF(0, 0, 10, 10)) << qreal(0); + QTest::newRow("nil") << QRect() << QPolygonF() << qreal(90); + QPolygonF p; + p << QPointF(0, 0) << QPointF(0, -1) << QPointF(1, -1) << QPointF(1, 0) << QPointF(0, 0); + QTest::newRow("0, 0, 1, 1") << QRect(0, 0, 1, 1) + << p + << qreal(90); + p.clear(); + p << QPointF(0, 0) << QPointF(0, -10) << QPointF(10, -10) << QPointF(10, 0) << QPointF(0, 0); + QTest::newRow("0, 0, 10, 10") << QRect(0, 0, 10, 10) + << p + << qreal(90); +} + void tst_QGraphicsView::mapToSceneRect() { - QGraphicsScene scene; + QFETCH(QRect, viewRect); + QFETCH(QPolygonF, scenePoly); + QFETCH(qreal, rotation); + + QGraphicsScene scene(-1000, -1000, 2000, 2000); + scene.addRect(25, -25, 50, 50); QGraphicsView view(&scene); - view.rotate(90); - view.setFixedSize(117, 117); + view.setFrameStyle(0); + view.setAlignment(Qt::AlignTop | Qt::AlignLeft); + view.setFixedSize(200, 200); + view.setTransformationAnchor(QGraphicsView::NoAnchor); + view.setResizeAnchor(QGraphicsView::NoAnchor); view.show(); - QPoint center = view.viewport()->rect().center(); - QRect rect(center + QPoint(10, 0), QSize(10, 10)); - QPolygonF poly; - poly << view.mapToScene(rect.topLeft()); - poly << view.mapToScene(rect.topRight()); - poly << view.mapToScene(rect.bottomRight()); - poly << view.mapToScene(rect.bottomLeft()); + view.rotate(rotation); + + QPolygonF poly = view.mapToScene(viewRect); + if (!poly.isEmpty()) + poly << poly[0]; - QCOMPARE(view.mapToScene(rect), poly); + QCOMPARE(poly, scenePoly); } void tst_QGraphicsView::mapToScenePoly() -- cgit v0.12 From a46f54e0ad78ccb4ffaeee6befc7429f93740375 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 22:09:14 +1000 Subject: Fix a couple more unmaintained version numbers. I have now inspected all 4.x.y version numbers appearing in the depot. All remaining instances appear to be acceptable. Reviewed-by: Trust Me --- FAQ.txt | 2 +- doc/src/deployment.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FAQ.txt b/FAQ.txt index f20d10b..1d2266d 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -8,7 +8,7 @@ to Unix style line endings (LF). To avoid this problem, uncompress the file again and give the option "-a" to unzip, which will then add the correct line endings. -Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe +Q: I'm running Windows XP and I downloaded the qt-win-eval-%VERSION%-vs2008.exe version of Qt. However, when I try to run the examples I get an error saying: "The application failed to start because the application configuration is incorrect. Reinstalling the application may fix this problem.". I reinstalled diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc index d9f7c1a..bcfa93d 100644 --- a/doc/src/deployment.qdoc +++ b/doc/src/deployment.qdoc @@ -911,7 +911,7 @@ Then qApp->libraryPaths() would return something like this: "C:/customPath/plugins " - "C:/Qt/4.5.0/plugins" + "C:/Qt/%VERSION%/plugins" "E:/myApplication/directory/" The executable will look for the plugins in these directories and -- cgit v0.12 From cd8ff7d5879c3f2a9738c6416aced6d2efb7d9d9 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 17 Apr 2009 14:33:00 +0200 Subject: Display error with QTableView with custom default row height QHeaderView can sometimes display holes when using default row height Task-number: 248050 Reviewed-by: ogoffart --- src/gui/itemviews/qheaderview.cpp | 31 ++++++++++++++++++++++++------ src/gui/itemviews/qheaderview_p.h | 3 +-- tests/auto/qheaderview/tst_qheaderview.cpp | 24 +++++++++++++++++++++++ 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp index 5bd82d4..dc63b25 100644 --- a/src/gui/itemviews/qheaderview.cpp +++ b/src/gui/itemviews/qheaderview.cpp @@ -1388,8 +1388,7 @@ int QHeaderView::defaultSectionSize() const void QHeaderView::setDefaultSectionSize(int size) { Q_D(QHeaderView); - d->defaultSectionSize = size; - d->forceInitializing = true; + d->setDefaultSectionSize(size); } /*! @@ -1894,9 +1893,6 @@ void QHeaderView::initializeSections() //make sure we update the hidden sections if (newCount < oldCount) d->updateHiddenSections(0, newCount-1); - } else if (d->forceInitializing) { - initializeSections(0, newCount - 1); - d->forceInitializing = false; } } @@ -1952,7 +1948,7 @@ void QHeaderView::initializeSections(int start, int end) if (!d->sectionHidden.isEmpty()) d->sectionHidden.resize(d->sectionCount); - if (d->sectionCount > oldCount || d->forceInitializing) + if (d->sectionCount > oldCount) d->createSectionSpan(start, end, (end - start + 1) * d->defaultSectionSize, d->globalResizeMode); //Q_ASSERT(d->headerLength() == d->length); @@ -3364,6 +3360,29 @@ void QHeaderViewPrivate::cascadingResize(int visual, int newSize) viewport->update(); } +void QHeaderViewPrivate::setDefaultSectionSize(int size) +{ + Q_Q(QHeaderView); + defaultSectionSize = size; + int currentVisualIndex = 0; + for (int i = 0; i < sectionSpans.count(); ++i) { + QHeaderViewPrivate::SectionSpan &span = sectionSpans[i]; + if (span.size > 0) { + //we resize it if it is not hidden (ie size > 0) + const int newSize = span.count * size; + if (newSize != span.size) { + length += newSize - span.size; //the whole length is changed + const int oldSectionSize = span.sectionSize(); + span.size = span.count * size; + for (int i = currentVisualIndex; i < currentVisualIndex + span.count; ++i) { + emit q->sectionResized(logicalIndex(i), oldSectionSize, size); + } + } + } + currentVisualIndex += span.count; + } +} + void QHeaderViewPrivate::resizeSectionSpan(int visualIndex, int oldSize, int newSize) { Q_Q(QHeaderView); diff --git a/src/gui/itemviews/qheaderview_p.h b/src/gui/itemviews/qheaderview_p.h index fbba69a..2889f08 100644 --- a/src/gui/itemviews/qheaderview_p.h +++ b/src/gui/itemviews/qheaderview_p.h @@ -90,7 +90,6 @@ public: highlightSelected(false), stretchLastSection(false), cascadingResizing(false), - forceInitializing(false), stretchSections(0), contentsSections(0), minimumSectionSize(-1), @@ -275,7 +274,6 @@ public: bool highlightSelected; bool stretchLastSection; bool cascadingResizing; - bool forceInitializing; int stretchSections; int contentsSections; int defaultSectionSize; @@ -310,6 +308,7 @@ public: void createSectionSpan(int start, int end, int size, QHeaderView::ResizeMode mode); void removeSectionsFromSpans(int start, int end); void resizeSectionSpan(int visualIndex, int oldSize, int newSize); + void setDefaultSectionSize(int size); inline int headerSectionCount() const { // for debugging int count = 0; diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 0867e48..6478854 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -187,6 +187,7 @@ private slots: void emptySectionSpan(); void task236450_hidden_data(); void task236450_hidden(); + void task248050_hideRow(); protected: QHeaderView *view; @@ -1919,5 +1920,28 @@ void tst_QHeaderView::task236450_hidden() } +void tst_QHeaderView::task248050_hideRow() +{ + //this is the sequence of events that make the task fail + protected_QHeaderView header(Qt::Vertical); + QStandardItemModel model(0, 1); + header.setStretchLastSection(false); + header.setDefaultSectionSize(17); + header.setModel(&model); + header.doItemsLayout(); + + model.setRowCount(3); + + QCOMPARE(header.sectionPosition(2), 17*2); + + header.hideSection(1); + QCOMPARE(header.sectionPosition(2), 17); + + QTest::qWait(100); + //the size of the section shouldn't have changed + QCOMPARE(header.sectionPosition(2), 17); +} + + QTEST_MAIN(tst_QHeaderView) #include "tst_qheaderview.moc" -- cgit v0.12 From 7c815bc2d4ea922d75f49f7dc29c81362ce5210e Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 17 Apr 2009 14:55:12 +0200 Subject: BT: Make native QFontDialog work when using show and changing windows Cocoa's font manager uses "first responder" which is a great idea, but breaks as soon as we change windows. Thankfully we can just set the target and we are OK. An upshot is that we don't need the delegate, but I'm not going to push my luck on that. Reviewed-by: Richard Moe Gustavsen --- src/gui/dialogs/qfontdialog_mac.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index d6ddfa3..42be3be 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -190,7 +190,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin newFont.setStrikeOut(mQtFont->strikeOut()); } - [self setQtFont:newFont]; + [self setQtFont:newFont]; if (mPriv) mPriv->updateSampleFont(*mQtFont); } @@ -357,8 +357,8 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)setQtFont:(const QFont &)newFont { - delete mQtFont; - mQtFont = new QFont(newFont); + delete mQtFont; + mQtFont = new QFont(newFont); } - (QFont)qtFont @@ -404,6 +404,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin } [mFontPanel setDelegate:nil]; [[NSFontManager sharedFontManager] setDelegate:nil]; + [[NSFontManager sharedFontManager] setTarget:nil]; } @end @@ -527,6 +528,7 @@ void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial, extraHeight:dialogExtraHeight]; [ourPanel setDelegate:delegate]; [[NSFontManager sharedFontManager] setDelegate:delegate]; + [[NSFontManager sharedFontManager] setTarget:delegate]; setFont(delegate, initial); // hack to get correct initial layout -- cgit v0.12 From e60b104a78e508341d2449f74b692d1ea0124eed Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 23:13:35 +1000 Subject: Revert "Changing version from 4.5.0 to 4.5.1 in What's new section." This reverts commit b173f1671fd35c6ae674f5368f7a8b66a0f15322. --- doc/src/qt4-intro.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index d8fd6cf..5442c00 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -443,7 +443,7 @@ release, separated by category. A comprehensive list of changes between Qt 4.4 and Qt 4.5 is included - in the \c changes-4.5.1 file + in the \c changes-4.5.0 file \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}. A \l{Known Issues in %VERSION%}{list of known issues} for this release is also available. -- cgit v0.12 From 19a9aa8e8156ca9d2110b1768c18dd4afc678597 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 17 Apr 2009 13:42:46 +1000 Subject: Document my QGLFramebufferObject change (cherry picked from commit 095c4209fe8fea6d46cc6c1486d2bc6471e8f0a5) --- dist/changes-4.5.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 0b8dae2..016a99d 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -109,6 +109,9 @@ Third party components * [248332] QFileDialog is slow after visiting a large directory. * [221323] QFileDialog programmatical file selection bug. +- QGLFramebufferObject + * Framebuffer object extension resolution now works with OpenGL/ES 2.0. + - QGraphicsItem * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden. -- cgit v0.12 From c326a1db6bcfa2cd26f1225e7ca0e62396c26dd8 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 14:22:30 +1000 Subject: BT: Whats new doc page has a link to changes-4.5.0 file instead of 4.5.1 Restore the text that is omitted for a minor release but included in patch releases. Also fixes obsolete link to changes files. Reviewed-by: Trust Me (cherry picked from commit e389dc42a1d3d473eac34987767b94dbe623a275) --- doc/src/qt4-intro.qdoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 5442c00..d541dd1 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -161,9 +161,9 @@ \o Support for OLE verbs and MIME data handling in \l{ActiveQt}. \endlist - For more information about improvements in the current release, see - the \l{http://www.qtsoftware.com/developer/changes/changes-4.1.4/} - {detailed list of changes}. + For more information about improvements in each Qt release, see + the \l{http://www.qtsoftware.com/developer/changes/} + {detailed lists of changes}. \section1 Significant Improvements @@ -447,11 +447,10 @@ \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}. A \l{Known Issues in %VERSION%}{list of known issues} for this release is also available. - \omit + Changes between this release and the previous release are provided in the \c{changes-%VERSION%} file (also \l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}). - \endomit A list of other Qt 4 features can be found on the \bold{\l{What's New in Qt 4}} page. -- cgit v0.12 From c2c3f009f32d9cff675ec87001939344bf48a84c Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 17 Apr 2009 15:07:45 +1000 Subject: Allow -help to be used in a non-eval package. The previous logic caused a license check when the eval license file was missing. Reviewed-by: Jason McDonald Task-number: 251339 (cherry picked from commit 8eb08c8c294f00763961e86cc3370b0ef78c8976) --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 83d4078..2c108ad 100755 --- a/configure +++ b/configure @@ -205,10 +205,10 @@ earlyArgParse() h|help|--help|-help) if [ "$VAL" = "yes" ]; then OPT_HELP="$VAL" - COMMERCIAL_USER="yes" #doesn't matter we will display the help + COMMERCIAL_USER="no" #doesn't matter we will display the help else UNKNOWN_OPT=yes - COMMERCIAL_USER="yes" #doesn't matter we will display the help + COMMERCIAL_USER="no" #doesn't matter we will display the help fi ;; --*) -- cgit v0.12 From fc7dc18faacb69f6237f9e7a1350d341e2b638b6 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 23:24:49 +1000 Subject: BT: Fix version number in FAQ.txt. Don't state a specific version number, or we'll keep forgetting to update it. Task-number: 251338 Reviewed-by: Trust Me (cherry picked from commit 08934a1647d60150d260275b4aac7d680bce3cfe) Conflicts: FAQ.txt --- FAQ.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.txt b/FAQ.txt index 4660e4d..f20d10b 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -1,4 +1,4 @@ -This is a list of Frequently Asked Questions regarding Qt Release 4.5.1. +This is a list of Frequently Asked Questions regarding this Qt release. Q: I'm using a Unix system and I downloaded the Zip package. However, when I try to run the configure script, I get the following error message: -- cgit v0.12 From 73117a5f3ec66bec4d073f79ce127eca8bce20c3 Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Fri, 17 Apr 2009 10:20:55 +0200 Subject: Add my bugfix. (cherry picked from commit c01ce578761aefc2c1780047aa666eb7ee96159f) --- dist/changes-4.5.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 016a99d..a78e946 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -241,6 +241,7 @@ Third party components * [248689] Q3ListView would not update under certain condition. - QtWebKit + * [248643] Fixed compiling with -pedantic. * Fix bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). * Fixed support for calling from JavaScript into NPAPI plugins on Windows. * Fixed updating state of WebActions (Erik Bunce) -- cgit v0.12 From 891cff5a6971a54fee32ca5b22d2eddf76667886 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Fri, 17 Apr 2009 11:14:51 +0200 Subject: More cleanups on the change log. Reviewed-by: TrustMe BT: Yes (cherry picked from commit 2da87118ac000f754ca09ad2b14f1ec80a59b985) --- dist/changes-4.5.1 | 195 ++++++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 90 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index a78e946..ed3acd7 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -37,14 +37,14 @@ General Improvements Optimizations ------------- -- Graphics View has been optimized in several areas - * Improved the performance of QGraphicsItem::clipPath. - * Improved the performance of QGraphicsItem::setPos. - * Improved the performance of QGraphicsItem::effectiveOpacity. - * Improved the performance of QGrahicsScene::items(*). - * Improved update handling. - * Reduced the number of floating point operations. - * Reduced QVariant overhead. +- Graphics View Framework has been optimized in several areas + * Improved the performance of QGraphicsItem::clipPath(). + * Improved the performance of QGraphicsItem::setPos(). + * Improved the performance of QGraphicsItem::effectiveOpacity(). + * Improved the performance of QGrahicsScene::items(*). + * Improved handling of updates. + * Reduced the number of floating point operations. + * Reduced QVariant overhead. Third party components ---------------------- @@ -55,11 +55,11 @@ Third party components **************************************************************************** - QAbstractItemModel - * [243195] Clarified some warning messages printed if the model is invalid. + * Clarified some warning messages printed if the model is invalid. - QAbstractEventDispatcher - * [248805] Duplicate timerids could occur when a timer is running while - the QObject is moved to another thread, stopping timers from working. + * [248805] Duplicate timerids could occur if a timer is running while the + QObject is moved to another thread, stopping timers from working. - QAbstractSocket * [192037] Emit the disconnected signal only if we were connected before. @@ -86,7 +86,7 @@ Third party components * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed a focus policy propagation regression. + * [250064] Fixed a regression in focus policy propagation. * [246056] Fixed an assertion failure in setCompletionPrefix(). - QtConcurrent @@ -97,7 +97,7 @@ Third party components - QFile * [244500] QFile::rename() does not always return false when the method - fails + fails * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo @@ -105,39 +105,40 @@ Third party components - QFileDialog * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel - index mapping. + index mapping. * [248332] QFileDialog is slow after visiting a large directory. - * [221323] QFileDialog programmatical file selection bug. + * [221323] Fixed a bug in QFileDialog's programmatical file selection. - QGLFramebufferObject * Framebuffer object extension resolution now works with OpenGL/ES 2.0. - QGraphicsItem * [247890] Cached QGraphicsItems are not updated if update() is called - when they are hidden. - * [250272] When an item is deleted it does not get removed from the - sceneeventfilters, meaning a crash can occur. + when they are hidden. + * [250272] Fixed a crash that could occur when an item is deleted but + it does not get removed from the sceneeventfilters. * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout * [242472] Fixed a bug where the calculation of the maximum width of a - column was incorrect. + column was incorrect. - QGraphicsScene - * [243707] Fixed a crash when adding child before parent to scene. + * [243707] Fixed a crash when adding a child before a parent to the + scene. - QGraphicsView * [245766] Rubber Band drag mode does not update correctly when - scrolling. + scrolling. - QGraphicsWidget - * [246215] Fixed a regression where we could cache the wrong size hint + * [246215] Fixed a regression where we could cache the wrong size hint because we called the virtual sizeHint() from the constructor. - QHttp * [208445] Cancel request upon receiving unknown authentication method. - * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in - some private headers. + * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in some + private headers. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -148,130 +149,144 @@ Third party components - QMacStyle * [248769] Fixed a regression where QMacStyle would only draw tabs when - passed a QStyleOptionTabV3. + passed a QStyleOptionTabV3. * Adjusted the opacity value for popups. - QMainWindow - * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. + * [248048] Fixed a regression that would cause tooltips to disappear when + using the unified toolbar. - QMetaType - * [248890] Detailed description of QMetaType no longer contradicts - documentation of QMetaType::type() + * [248890] The detailed description of QMetaType no longer contradicts + the documentation of QMetaType::type() - QMutex - * Fix performance regression for contended mutexes as reported on - the qt4-preview-feedback list. + * Fixed a performance regression for contended mutexes as reported on the + qt4-preview-feedback list. - QPainter - * [247492] Fix rendering bug in raster paint engine causing one-pixel - offset when drawing premultiplied ARGB32 images on RGB16 images. - * [249490] Fix one-pixel offset between stroke and fills of ellipses in - X11 paint engine. - * [246573] Fix very slow stroking of paths in X11 paint engine. - * [247083] Fix scale applied to antialiased cosmetic pens in X11 paint - engine. - * [247505] Fix missing fills of rectangles with negative width/height in - raster paint engine. - * [249628] Fix crash in OpenGL paint engine when filling using Qt::NoBrush. - * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite - and OpenGL/ES 1.0. + * [247492] Fixed a rendering bug in the raster paint engine causing + one-pixel offset when drawing premultiplied ARGB32 images on RGB16 + images. + * [249490] Fixed one-pixel offset between stroke and fills of ellipses in + the X11 paint engine. + * [246573] Fixed a very slow stroking of paths in the X11 paint engine. + * [247083] Fixed the scale applied to antialiased cosmetic pens in X11 + paint engine. + * [247505] Fixed missing fills of rectangles with negative width/height + in raster paint engine. + * [249628] Fixed a crash in OpenGL paint engine when filling using + Qt::NoBrush. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and + OpenGL/ES 1.0. - QPixmap - * [249175] Fix QPixmap::fromImage() of monochrome images to result in + * [249175] Fixed QPixmap::fromImage() of monochrome images to result in black/white pixels and not transparent/white pixels. - QProcess - * [247865] Fix a crash when calling QProcess::start() and + * [247865] Fixed a crash when calling QProcess::start() and startDetached() with an empty program string. - QScrollBar - * [247985] Stylesheet: added ability to style scrollbar menus. + * [247985] Stylesheet: added the feature to style scrollbar menus. - QSharedPointer - * [246843] Fixed a crash caused by using QSharedPointer in global statics + * [246843] Fixed a crash caused by using QSharedPointer in global statics. - QSortFilterProxyModel - * [247867] Properly sort when calling appendRows() - * [248868] Resort when the model is reset if dynamicSort is enabled. - * [248868] Fixed QSortFilterProxyModel::sort while dynamicSort was disabled. + * [247867] Properly sort when calling appendRows(). + * [248868] Re-sort when the model is reset if dynamicSort is enabled. + * [248868] Fixed QSortFilterProxyModel::sort() if dynamicSort was disabled. - QSSlSocket - * [245668] set also protocol, verifyMode and verifyDepth in - setSslConfiguration() + * [245668] Set also protocol, verifyMode and verifyDepth in + setSslConfiguration(). - QString - * [249517] Fixed regression in replace(int, int, QChar) when string is empty + * [249517] Fixed a regression in replace(int, int, QChar) when the string + is empty. - QStyleSheetStyle * Improved support for setting background and foreground roles in styles - such as the text color in a combo box popup on Mac and Cleanlooks, or - the QScrollBar background. - * [188195] fix background of QAbstractScrollArea loosing its color if styled with pseudo-class. - * Fixed crash while styling the title bar of a QMdiArea. - * [246542] Fixed QToolButton::hover{ color:.... } + such as the text color in a combo box popup on Mac and Cleanlooks, or + the background of QScrollBar. + * [188195] Fixed the background of QAbstractScrollArea losing its color + if styled with pseudo-class. + * Fixed a crash that occured while styling the title bar of a QMdiArea. + * [246542] Fixed a bug in QToolButton::hover{ color:.... }. - QThread - * [249997] Add documentation indicating that the priority set by - the programmer may be ignored, for example on Linux. + * [249997] Added documentation indicating that the priority set by the + programmer may be ignored, for example on Linux. - QTreeView - * Fixed crash that may occurs when event are processed just after QSortFilterProxyModel - has been invalidated - * [246025] Fixed auto-expand that occurs while quicly collapsing an item after clicking on a child - * [248805] Calling programatically QTreeView::sortByColumn was not working if manual - sorting is disabled - * [248163] Fixed possible crash in the paintEvent when spans are used. + * Fixed a crash that may occur when events are processed immediately + after a QSortFilterProxyModel is invalidated. + * [246025] Fixed auto-expand that occured when quickly collapsing an item + after clicking on a child. + * [248805] Calling QTreeView::sortByColumn() programmatically was not + working if manual sorting was disabled. + * [248163] Fixed a possible crash in the paintEvent() when spans are used. - QWidget - * [250388] Fixed potential crash in QWidget::scroll() when using the raster - graphics system. + * [250388] Fixed a potential crash in QWidget::scroll() when using the + raster graphics system. - QWidget - * [246852] Better handling WindowMaximizeButtonHint for widget with + * [246852] Improved handling of WindowMaximizeButtonHint for widgets with layouts. -QLocale - * String-to-number conversion functions are now ignore trailing and - leading whitespaces in all locales as it is documented. + * String-to-number conversion functions will now ignore trailing and + leading whitespaces in all locales as documented. - QWizard - * [248107] Fixed bug on Vista causing Back button to connect twice to the back() signal. + * [248107] Fixed a bug on Windows Vista causing the Back button to + connect to the back() signal twice. - Q3ListView - * [248689] Q3ListView would not update under certain condition. + * [248689] Fixed a bug in Q3ListView that would not update under certain + conditions. - QtWebKit - * [248643] Fixed compiling with -pedantic. - * Fix bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). - * Fixed support for calling from JavaScript into NPAPI plugins on Windows. - * Fixed updating state of WebActions (Erik Bunce) - * Fixed bug in HTML 5 Canvas clearRect() (Dirk Schulze) - * Fixed text field theming with KDE 4 Oxygen style (Zack Rusin) + * [248643] Fixed compiling with the "-pedantic" compile option. + * Fixed a bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). + * Fixed a bug in calling from JavaScript into NPAPI plugins on Windows. + * Fixed the updating state of WebActions (Erik Bunce) + * Fixed a bug in HTML 5 Canvas clearRect() (Dirk Schulze) + * Fixed the theming of text fields with KDE 4 Oxygen style (Zack Rusin) * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. - QSqlTableModel * [189093] QSqlTableModel did not handle updates when one of the fields had a NULL value. - * Made setTable() try and use the db's casing of the passed tablename. + * Made setTable() try and use the database's letter case (uppercase/ + lowercase) of the given tablename. **************************************************************************** * Database Drivers * **************************************************************************** - * Fixed DB2 driver returning double field as empty - * Fixed memory leak in DB2 driver - * [249059] Fixed QPSQL datetime/time fields with negative timezone offsets - not being handled correctly. - * Fixed DB2 not enquoting table/field names properly. + * Fixed the DB2 driver returning a double field as empty. + * Fixed a memory leak in the DB2 driver. + * [249059] Fixed a bug that handled QPSQL datetime/time fields with + negative timezone offsets incorrectly. + * Fixed the DB2 driver not quoting table/field names properly. * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. - * Fixed sqlite2 driver not returning false on failing to exec a statement. + * Fixed a bug in the sqlite2 driver not returning false on failing to + execute a statement. * PrecisionPolicy now works in the oracle driver. - * Fixed ODBC driver returning a list of tables when requested. - * Fixed Interbase retrieving scale/precision information on numeric/decimal fields. - * Stopped drivers doing quoting again when escapeIdentifier called twice. - * Fixed sqlite2 driver not quoting fields correctly. - * [232769] Fixed memory overflow issue on bound out strings in ODBC Driver + * Fixed a bug in the ODBC driver returning a list of tables when + requested. + * Fixed Interbase retrieving scale/precision information on numeric/ + decimal fields. + * Stopped drivers from quoting again when escapeIdentifier is called + twice. + * Fixed a bug in the sqlite2 driver not quoting fields correctly. + * [232769] Fixed a memory overflow issue on bound out strings in ODBC + Driver **************************************************************************** * Platform Specific Changes * -- cgit v0.12 From 9de17b04a82127f0a0ae941d490d5183fcac13b2 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Fri, 17 Apr 2009 11:13:34 +0200 Subject: Line edit displays garbage when pressing up or down arrow keys (Cocoa). The unicode characters between 0xF700 & 0xF8FF are special function-key code characters used by the NSEvent. These characters have to be ignored when converting to a QString. Task-number:244486 Reviewed-by:nrc (cherry picked from commit 5d39d424a92d89243207d8370d0fa1c6c8061668) --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 423898d..c874cf1 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -555,12 +555,15 @@ bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widge int keyLength = [keyChars length]; if (keyLength == 0) return false; // Dead Key, nothing to do! + bool ignoreText = false; Qt::Key qtKey = Qt::Key_unknown; if (keyLength == 1) { QChar ch([keyChars characterAtIndex:0]); if (ch.isLower()) ch = ch.toUpper(); qtKey = cocoaKey2QtKey(ch); + // Do not set the text for Function-Key Unicodes characters (0xF700–0xF8FF). + ignoreText = (ch.unicode() >= 0xF700 && ch.unicode() <= 0xF8FF); } Qt::KeyboardModifiers keyMods = qt_cocoaModifiers2QtModifiers([event modifierFlags]); QString text; @@ -568,7 +571,7 @@ bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widge // To quote from the Carbon port: This is actually wrong--but it is the best that // can be done for now because of the Control/Meta mapping issues // (we always get text on the Mac) - if (!(keyMods & (Qt::ControlModifier | Qt::MetaModifier))) + if (!ignoreText && !(keyMods & (Qt::ControlModifier | Qt::MetaModifier))) text = QCFString::toQString(reinterpret_cast(keyChars)); UInt32 macScanCode = 1; -- cgit v0.12 From ebdeffe8ff2d3a7d629ffdca11843c895d04cbdb Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:06:09 +1000 Subject: Fix incorrect year and version number in assistant docs. Task: 251421 Reviewed-by: Trust Me (cherry picked from commit 8aa8997f18afb85cb17f5b2a875a004302df4c72) --- tools/assistant/tools/assistant/doc/assistant.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 50f18c0..0d2271d 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -10,8 +10,8 @@ description = "Qt Assistant" HTML.{postheader,address} = "" HTML.footer = "


\n" \ "\n" \ - "\n" \ "\n" \ - "\n" \ + "\n" \ "
Copyright © 2008 Nokia Corporation " \ + "Copyright © 2009 Nokia Corporation " \ "and/or its subsidiary(-ies)Trademarks
Qt 4.5.0
Qt 4.5.1
" -- cgit v0.12 From 1e255d19fab4008b5fafe090618122b8acff17f0 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 23:28:08 +1000 Subject: Remove out-of-date Cocoa known issues page. This page is not linked from anywhere, and its content is horribly out-of-date. Task-number: 251420 Reviewed-by: nrc (cherry picked from commit c138c9e80acabcf1d9a712a7ebd2b2a7d6135d8b) Conflicts: doc/src/qtcocoa-known-issues.qdoc --- doc/src/qtcocoa-known-issues.qdoc | 168 -------------------------------------- 1 file changed, 168 deletions(-) delete mode 100644 doc/src/qtcocoa-known-issues.qdoc diff --git a/doc/src/qtcocoa-known-issues.qdoc b/doc/src/qtcocoa-known-issues.qdoc deleted file mode 100644 index 95a1d8b..0000000 --- a/doc/src/qtcocoa-known-issues.qdoc +++ /dev/null @@ -1,168 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtcocoa-known-issues.html - \title Known Issues with the Qt/Mac Cocoa Port - - This document explains the current list of features in the Qt/Mac Cocoa port - that are currently not working. Most of the issues will be addressed in - upcoming snapshots and beta releases. We hope that all the issues should be - addressed by the time the of the final 4.5.0 release. - - \tableofcontents - - \section1 What Works - - Here are the things that we can say about the current state of the Qt/Mac Cocoa port. - - \list - \i \e{64-bit Support}: - The Qt libraries currently do build and link as 64-bit frameworks and it is - possible to build and run many of the Qt examples as 64-bit. - - \i \e{HIViews are now NSViews}: - Every QWidget is now backed by an NSView pointer instead of an HIViewRef. - QWidget::winId() will return an NSView pointer that can be used in other - Cocoa technologies (e.g., Core Animation). - - \i \e{Some Native Dialogs Work}: - QFileDialog and QColorDialog have been ported to use NSOpen-/NSSavePanel and - NSColorPanel respectively. QPrintDialog and QPageSetupDialog are not in - this release, but are on their way. Currently, none of these dialogs show - up as sheets pending the creation of an asynchronous API. - - \i \e{Painting, Printing, and Styles}: - Since printing and painting used Quartz 2D and styling used HITheme, these - sub-systems work without any changes. - - \i \e {OpenGL}: - OpenGL is fully supported,including pixel buffers and framebuffer objects. - - \i \e{Clipboard}: - Using QClipboard to copy and paste data works as expected. - - \i \e{Mouse, Keyboard, and Wheel events}: - Mouse, keyboard, and wheel events are dispatched to the proper - widget. The Qt/Mac Cocoa port respects Cocoa's idea of a "First - Responder." - - \endlist - - \section1 Current Known Issues - - The following are items that don't currently work, but that we plan to have - resolved before the final release of the Qt/Mac Cocoa port. Please do not - file bugs on these. - - \list - \i \e{Carbon Support}: - The current source tree for the Qt/Mac Cocoa port contains source for - building Qt/Mac with Cocoa. It contains some of the source code that is - used for the Carbon port, but it is currently not set up to build the - Carbon Qt/Mac libraries. Please use a normal release or snapshot if you - want to use Carbon. - - \i \e{Drag and Drop Support}: - Drag and Drop is currently not implemented and needs to be ported to Cocoa, - but using the clipboard does work at this time. - - \i \e {Accessibility}: - Accessibility support is not implemented and needs to be ported to Cocoa. - - \i \e {Text}: - Most text rendering works fine for Latin-1 characters. However, rendering - non-Latin-1 characters has not been tested. - - \i \e {Input Methods}: - Input methods also need to be ported to Cocoa. - - \i \e {Shortcuts}: - Shortcuts that exist outside of the menu bar may not be dispatched. - - \i \e {Tablet Support}: - The tablet support has not been ported from Carbon yet. However, it should - still be possible to use the tablet as a mouse. - - \i \e {Phonon}: - Phonon uses the QuickTime backend that is only available on 32-bit. Using - Phonon in 64-bit requires a QTKit-based backend and has not been done. - - \i \e {Unified Toolbar}: - The QMainWindow::setUnifiedTitleAndToolBarOnMac() method currently does nothing. - - \i \e {Dialogs, Tool Windows, Sheets, and Drawers}: - At the moment, all windows are subclasses of NSWindow. This means that - window types like drawers and sheets do not work and tool windows do not - get the right decorations. Modal dialogs do show up at the correct window - level, but are not yet considered "panels." Many window flags are not - recognized. - - \endlist - - \section1 Things We Don't Expect to Support - - The following items that we do not plan on spending any resources on unless - there is monumental outcry for their inclusion. - - \list - \i \e{Qt3Support}: - At this time we have no plans for making the Qt3Support module work with - the Qt/Mac Cocoa port in 64-bit mode. Following in footsteps of Apple, we - would like to encourage you to consider the time of going Cocoa and 64-bit - as a chance to jettison Qt 3 constructs and classes. - - \i \e{Support for versions of Mac OS X below 10.5}: - We are using methods and classes that are only available in 10.5 and - higher. Most of these functions don't have any equivalent on earlier - versions. We recommend using the Carbon version for earlier versions of Mac - OS X. We anticipate keeping the Carbon port supported at least for the - lifetime of 4.5. - - \i \e{Support for -no-framework or -static}: - Cocoa requires that we load a nib in order to properly access the global - menu bar. This nib has to reside on disk somewhere. The most logical place - for it to reside is inside the QtGui framework. For this reason, building - Qt as standard "dylibs" or statically is no longer supported. - - \endlist - -*/ -- cgit v0.12 From 5fc494f6581821463b55b2ffdfbc3543215baba5 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:28:23 +1000 Subject: Wrong version number in windows installation doc. Doc still referred to 4.4.0-rc1 - replace with %VERSION% so we don't have to keep updating this. Task-number: 251419 Reviewed-by: Trust Me (cherry picked from commit 569394738995b6792f6e4866f0daf12897975ad4) --- doc/src/snippets/code/doc_src_installation.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 66bb998..e35dad9 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -44,7 +44,7 @@ PATH - to locate qmake, moc and other Qt tools //! [8] C: -cd /D C:\Qt\4.4.0-rc1 +cd /D C:\Qt\%VERSION% configure //! [8] -- cgit v0.12 From 495fc59bc1381693779b10a454035e5d454555e5 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:45:11 +1000 Subject: Fix obsolete version number in docs. Use %VERSION% so that we don't have to fix this for every release. Task-number: 251418 Reviewed-by: Trust Me (cherry picked from commit cfa04d53ff58d45d7811637c8be76099740d25c5) --- doc/src/platform-notes.qdoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc index 04d5dd3..f340a50 100644 --- a/doc/src/platform-notes.qdoc +++ b/doc/src/platform-notes.qdoc @@ -232,9 +232,7 @@ \section1 Windows Vista - Known issues for Qt on Vista will be listed here. - - As of Qt 4.2.0 no Vista-specific issues are known. + At the time Qt %VERSION% was released, there were no known Vista-specific issues. \target Windows NT \section1 Windows XP, Windows 2000 and Windows NT -- cgit v0.12 From 00a538d235b843ad3389d68a7419aec080a0a06e Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 20:54:19 +1000 Subject: Fix obsolete version number in docs. Replace with %VERSION%, so we don't need to fix this for every release. Task-number: 251417 Reviewed-by: Trust Me (cherry picked from commit 2df5b45eed7059862e9dd10a74c19310266b9d55) --- doc/src/snippets/code/doc_src_qtestlib.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index a4ef52e..ff52b2f 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -69,7 +69,7 @@ void TestQString::toUpper() //! [10] ********* Start testing of TestQString ********* -Config: Using QTest library 4.1.0, Qt 4.1.0 +Config: Using QTest library %VERSION%, Qt %VERSION% PASS : TestQString::initTestCase() PASS : TestQString::toUpper() PASS : TestQString::cleanupTestCase() @@ -99,4 +99,4 @@ private slots: } } }; -//! [12] \ No newline at end of file +//! [12] -- cgit v0.12 From 0dd4bef3cf108a57ff6bea2ae1bf7b18b48b90f5 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Fri, 17 Apr 2009 13:26:59 +0200 Subject: Even more cleanups on the Change Log. Reviewed-by: TrustMe BT: Yes (cherry picked from commit e85867003ca1741f378b1f58f4dd9d48577a5d9b) --- dist/changes-4.5.1 | 350 ++++++++++++++++++++++++++++------------------------- 1 file changed, 185 insertions(+), 165 deletions(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index ed3acd7..c9e689f 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -65,10 +65,10 @@ Third party components * [192037] Emit the disconnected signal only if we were connected before. - QAccessible - * [241161] Fixed a bug in browsing menus with the keyboard. * [221731] Fixed a bug where the accessibility plugin could crash if there was an "&" at the end or spin forever if a label had a sequence of "&&". + * [241161] Fixed a bug in browsing menus with the keyboard. - QAtomicInt * [216492] Fixed compilation on 64-bit PowerPC machines with gcc 4.3. @@ -86,8 +86,8 @@ Third party components * [248094] Fixed scrollbar from appearing when not required. - QCompleter - * [250064] Fixed a regression in focus policy propagation. * [246056] Fixed an assertion failure in setCompletionPrefix(). + * [250064] Fixed a regression in focus policy propagation. - QtConcurrent * [244718] Reduced the number of calls to QThread::idealThreadCount(). @@ -96,28 +96,28 @@ Third party components * [247645] Fixed a bug that may loose all cached data inside QFileInfo. - QFile + * [244485] Renaming a file does not change QFile::fileName(). * [244500] QFile::rename() does not always return false when the method fails - * [244485] Renaming a file does not change QFile::fileName(). - QFileInfo * [205244] Return valid file info also for relative UNC paths. - QFileDialog + * [221323] Fixed a bug in QFileDialog's programmatical file selection. + * [248332] QFileDialog is slow after visiting a large directory. * [250194] Fixed an issue with QFileDialog and QSortFilterProxyModel index mapping. - * [248332] QFileDialog is slow after visiting a large directory. - * [221323] Fixed a bug in QFileDialog's programmatical file selection. - QGLFramebufferObject * Framebuffer object extension resolution now works with OpenGL/ES 2.0. - QGraphicsItem + * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. * [247890] Cached QGraphicsItems are not updated if update() is called when they are hidden. * [250272] Fixed a crash that could occur when an item is deleted but it does not get removed from the sceneeventfilters. - * Fixed a slow down regression in QGraphicsItem::ItemCoordinateCache. - QGraphicsGridLayout * [242472] Fixed a bug where the calculation of the maximum width of a @@ -133,12 +133,12 @@ Third party components - QGraphicsWidget * [246215] Fixed a regression where we could cache the wrong size hint - because we called the virtual sizeHint() from the constructor. + because we called the virtual sizeHint() from the constructor. - QHttp - * [208445] Cancel request upon receiving unknown authentication method. * Compile fixes for QT_BEGIN_NAMESPACE being in the wrong place in some private headers. + * [208445] Cancel request upon receiving unknown authentication method. - QHostAddress * [247330] Fixed compilation on MinGW by adding a missing QPair include. @@ -148,9 +148,9 @@ Third party components after a succesful delayed connection on UNIX. - QMacStyle + * Adjusted the opacity value for popups. * [248769] Fixed a regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. - * Adjusted the opacity value for popups. - QMainWindow * [248048] Fixed a regression that would cause tooltips to disappear when @@ -165,20 +165,21 @@ Third party components qt4-preview-feedback list. - QPainter - * [247492] Fixed a rendering bug in the raster paint engine causing - one-pixel offset when drawing premultiplied ARGB32 images on RGB16 - images. - * [249490] Fixed one-pixel offset between stroke and fills of ellipses in - the X11 paint engine. + * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and + OpenGL/ES 1.0. * [246573] Fixed a very slow stroking of paths in the X11 paint engine. * [247083] Fixed the scale applied to antialiased cosmetic pens in X11 paint engine. + * [247492] Fixed a rendering bug in the raster paint engine causing * [247505] Fixed missing fills of rectangles with negative width/height in raster paint engine. + one-pixel offset when drawing premultiplied ARGB32 images on RGB16 + images. + * [249490] Fixed one-pixel offset between stroke and fills of ellipses in + the X11 paint engine. * [249628] Fixed a crash in OpenGL paint engine when filling using Qt::NoBrush. - * Compile fixes for OpenGL paint engine on OpenGL/ES 1.1 CommonLite and - OpenGL/ES 1.0. + - QPixmap * [249175] Fixed QPixmap::fromImage() of monochrome images to result in @@ -211,9 +212,9 @@ Third party components * Improved support for setting background and foreground roles in styles such as the text color in a combo box popup on Mac and Cleanlooks, or the background of QScrollBar. + * Fixed a crash that occured while styling the title bar of a QMdiArea. * [188195] Fixed the background of QAbstractScrollArea losing its color if styled with pseudo-class. - * Fixed a crash that occured while styling the title bar of a QMdiArea. * [246542] Fixed a bug in QToolButton::hover{ color:.... }. - QThread @@ -225,9 +226,9 @@ Third party components after a QSortFilterProxyModel is invalidated. * [246025] Fixed auto-expand that occured when quickly collapsing an item after clicking on a child. + * [248163] Fixed a possible crash in the paintEvent() when spans are used. * [248805] Calling QTreeView::sortByColumn() programmatically was not working if manual sorting was disabled. - * [248163] Fixed a possible crash in the paintEvent() when spans are used. - QWidget * [250388] Fixed a potential crash in QWidget::scroll() when using the @@ -250,7 +251,6 @@ Third party components conditions. - QtWebKit - * [248643] Fixed compiling with the "-pedantic" compile option. * Fixed a bug in cookie handling (WebKit Bugzilla 24062, Benjamin Meyer). * Fixed a bug in calling from JavaScript into NPAPI plugins on Windows. * Fixed the updating state of WebActions (Erik Bunce) @@ -258,12 +258,13 @@ Third party components * Fixed the theming of text fields with KDE 4 Oxygen style (Zack Rusin) * Fixed path fill styles (Zack Rusin) * Fixed pre-edit text handling with input methods. + * [248643] Fixed compiling with the "-pedantic" compile option. - QSqlTableModel - * [189093] QSqlTableModel did not handle updates when one of the fields - had a NULL value. * Made setTable() try and use the database's letter case (uppercase/ lowercase) of the given tablename. + * [189093] QSqlTableModel did not handle updates when one of the fields + had a NULL value. **************************************************************************** * Database Drivers * @@ -271,8 +272,6 @@ Third party components * Fixed the DB2 driver returning a double field as empty. * Fixed a memory leak in the DB2 driver. - * [249059] Fixed a bug that handled QPSQL datetime/time fields with - negative timezone offsets incorrectly. * Fixed the DB2 driver not quoting table/field names properly. * Fixed an issue with ODBC & FreeTDS not accepting quotes in statements. * Fixed a bug in the sqlite2 driver not returning false on failing to @@ -287,6 +286,8 @@ Third party components * Fixed a bug in the sqlite2 driver not quoting fields correctly. * [232769] Fixed a memory overflow issue on bound out strings in ODBC Driver + * [249059] Fixed a bug that handled QPSQL datetime/time fields with + negative timezone offsets incorrectly. **************************************************************************** * Platform Specific Changes * @@ -295,178 +296,191 @@ Third party components Qt for Linux/X11 ---------------- - * Proper resetting input contexts when switching between multiple - input context plugins. - - * [244337] Improved input method handling when the widgets native - window id is recreated. - - * Input methods preedit strings are properly reset when user - switches focus without commiting a string. - - * [244607] Current focus widget is properly set and input method is - properly initialized when showing a toplevel that accepts - keyboard input. - - * Unicode conversion functions will handle Latin-1 character set - only if they are used before QCoreApplication/QApplication is - constructed. - + * Ensured proper resetting for input contexts when switching between + multiple input context plugins. + * Input methods preedit strings are now reset properly when user switches + focus without commiting a string. + * Unicode conversion functions will handle Latin-1 character set only if + they are used before a QCoreApplication/QApplication is constructed. * Improved handling of failed unicode conversion. - - * [232632] Fixed reparenting widgets to a difference X11 screen. - - * [241888] The background of the drag-n-drop cursor is respected + * Fixed clipboard handling when the user manually creates an instance of + the QDesktopWidget. + * [226048] Ensured that the QDesktopWidget::resized() signal is emitted + properly when a new screen appears or the screen geometry is changed + without affecting the whole desktop's geometry. + * [232632] Fixed a bug in reparenting widgets to a difference X11 screen. + * [241888] The background of the drag-n-drop cursor is now respected, according to the stylesheet. - - * Fixed clipboard handling when the user manually creates an - instance of the QDesktopWidget. - - * [226048] Fixed emitting a QDesktopWidget::resized() signal when - new screen appears or screen geometry is changed without - affecting the whole desktop geometry. + * [244337] Improved input method handling when a widget's native window + id is recreated. + * [244607] Current focus widget is properly set and input method is + properly initialized when showing a toplevel widget that accepts + keyboard input. - Phonon/GStreamer - * [244259] Fixed a problem where the backend would fail to indicate an - error when streaming fails. - * [233188] Fixed a problem where the seek slider would reset to 0 while - being dragged. - * [246189] Fixed a problem where the backend would fail to correctly - escape certain file names so that playback would not start + * [233188] Fixed a problem where the seek slider reset to 0 while being + dragged. + * [244259] Fixed a problem where the backend failed to indicate an error + when the streaming failed. * [246097] Added support for the MediaController interface to allow audio - CD playback. + CD playback. + * [246189] Fixed a problem where the backend failed to correctly escape + certain file names casuing playback to not start. + - QGtkStyle - * The system palette is no longer strictly forced. Also behavior related - to system theme changes have been improved. + * The system palette is no longer strictly forced. Also improved behavior + related to system theme changes. + * Fixed palette and styling issues with the background color of combo box + popups. + * [238196] Allowed middle click to set scrollbar position, following GTK+ + behavior. + * [239829] Disabled alt-key navigation for QGtkStyle following GTK+ + behavior. + * [247653] Fixed a compilation issue on Solaris. * [249363] QFrame is now styled as a GtkScrolledWindow. - * [247653] Fixed a compilation issue on solaris. - * Fixed palette and styling issues with the background color of - combo box popups. - * [239829] Disabled alt-key navigation for QGtkStyle to follow - GTK+ behavior. - * [238196] Allow middle click to set scrollbar position to follow - GTK+ behavior. - Font rendering - * Improve performance of subpixel antialiased text rendering by using a mask - in the calls to XRender's text compositing function. - * [248387] Better respect the font config LCD filter settings for subpixel - antialiased text rendering when Freetype's native subpixel rendering is - disabled. + * Improved performance of subpixel antialiased text rendering by using a + mask in the calls to XRender's text compositing function. + * [248387] Properly respect the font config LCD filter settings for + subpixel antialiased text rendering when Freetype's native subpixel + rendering is disabled. * [248498] Fix garbled rendering of subpixel antialiased text when using Freetype's native subpixel rendering for vertical subpixel layouts. * [248644] Fall back to Qt's subpixel rendering if Freetype's subpixel - rendering is available at compile-time but not at run-time. + rendering was available at compile-time but not at run-time. - QEventDispatcherGlib * Event posted to a thread before it is started are not processed until others events are posted. - QWidget - * [213512] Fixed a bug that would cause wrong clipping when using the - Qt::WA_PaintOutsidePaintEvent attribute. + * [213512] Fixed a bug that caused wrong clipping when using the + Qt::WA_PaintOutsidePaintEvent attribute. Qt for Windows -------------- - * [243583] Improved drag-and-drop handling when switching mouse - buttons fast. + * [240891] Corrected the focus behavior of native file dialogs, when an + application has multiple toplevel widgets. + * [243583] Improved drag-and-drop handling when switching mouse buttons + quickly. + * [244875] The system menu will now be shown for a fullscreen window. + * [245330] Fixed a bug that caused mouse inputs to be ignored on modal + dialogs, when shown from an ActiveQt control. + * [249576] Fixed a crash when using a combobox with Qt::NoFocus. + - QCoreApplication - * [247401] Fixed a bug that would cause a restarted timer to fire - too early, causing Javascript in QtWebKit to consume 100% CPU on - Windows. + * [247401] Fixed a bug that caused a restarted timer to fire too early, + resulting in QtWebKit's Javascript consuming 100% CPU on Windows. - QWindowsXPStyle - * [248036] Fixed an issue where tool buttons would incorrectly - hover when disabled. + * [248036] Fixed an issue where tool buttons were hovering incorrectly + when disabled. - QWidget - * [248391] Fixed a bug that made it impossible to dynamically switch - from QPainter based graphics to native graphics API and back. + * [248391] Fixed a bug that made it impossible to dynamically switch from + QPainter-based graphics to native graphics API and back. -- [249576] Fixed a crash when using a combobox with Qt::NoFocus. -- [244875] System menu will now be shown for a fullscreen window. -- [240891] Corrected the focus behavior of native file dialogs, when application has multiple toplevels. -- [245330] Fixed a bug which causes mouse inputs to be ignored on modal dialogs, when shown from an ActieQt control. Qt for Mac OS X --------------- -- Cocoa port - * Fixed a bug where actions in the native menubar weren't properly disabled. - * Make shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard layout. - * Fixed a bug where dialogs would be positioned in the wrong place on the screen. - * [244369] Window flags on Cocoa windows should match have a similar look as the Carbon ones. - * The build-key for Cocoa was changed in the unlikely case that a plugin may make - assumptions on how Qt was built. All Cocoa plugins built against 4.5.0 WILL NOT WORK - with 4.5.1, we don't foresee changing this again. - * Fixed a bug where some windows would not get activation when they normally should. - * Key events sent to popups do not get propagated onwards. - * [249296] Fix a bug where lineedits on a second page of a stack widget would not get key events - * QFileOpenEvents are no longer sent for items passed on the command line. - * Various fixes for determining metrics of text and the ability to disable kerning. - * [248918] Fixed color matching for themed text items. - * Modify the colliding mice example to work better with coalesced updates. - * Fixed a bug where the drag cursor was not updated when modifier keys are used. - * [247947] Fixed a crash in drag and drop. - * The command + h shortcut is now enabled. (Hides the current window.) - * [239043] Fixed a bug that would cause QGraphicsProxyWidget to shrink when moving it. + * Fixed a crash when showing a widget that is a modal window but has no + parent. + * Added QSysInfo::MV_10_6 as an enum to test against. + * Various compile fixes for the preliminary supported Snow Leopard. + * The uninstall-qt.py script included in the binary package no longer + complains about removing itself multiple times. +- * Improved the documentation for how qt_mac_set_dock_menu() works. + * Fixed an issue with the focus frame's transparency as it was difficult + to use the QWidget with stylesheets. + * [223525] Fixed a crash in the MacMainWindow Demo. + * [248803] Ensured that two dialogs shown at the same time will both not + have visible default buttons. - QDesktopWidget - * [244004] Support multiple screens that have different sizes properly. + * [244004] Properly support multiple screens with different sizes. - QDialog - * [239155] QDialog(foo, Qt::Sheet) with QComboBox have none native behavior. - * [218980] Modeless dialogs should be stacked above normal windows. - * [195904] Parent dialog is displayed on top of its modal child. + * [195904] Parent dialog is displayed on top of its modal child. + * [218980] Modeless dialogs should be stacked above normal windows. + * [239155] QDialog(foo, Qt::Sheet) with QComboBox has non-native + behavior. - QFileDialog - * [219844] QFileDialog::getOpenFileName() search buttons lead to crash (native version). - * [225705] QFileDialog::getSaveFileName()'s filter does not display correctly. + * [219844] Fixed a crash caused by QFileDialog::getOpenFileName()'s + search buttons (native version). + * [225705] QFileDialog::getSaveFileName()'s filter does not display + correctly. - QMenu - * [228017] QMenu should close when expanding a system menu. + * [228017] Ensured that QMenu closes when expanding a system menu. + +- QTestLib + * Activate the test application when launched from the command line. - Event system - * [210912] ShowEvent not sendt when reshowing a window after it was minimized. + * [210912] Fixed a bug where ShowEvent not sent when reshowing a window + after it was minimized. - macdeployqt - * The binary packages now includes the macdeployqt tool. - * macdeployqt now runs 'strip' on the deployed binaries. - * Fixed issue preventing the QtSvg from being deployed. + * The binary packages now include this tool. + * macdeployqt now runs 'strip' on the deployed binaries. + * Fixed an issue that prevented the QtSvg module from being deployed. - configure script - * Now supports "-arch i386" as an alias for "-arch x86". - * Detects invalid arch arguemnts and exits. - -- Fix a crash when showing a widget that is window modal but has no parent. -- [248803] Showing two dialogs at the same time don't get shared activation. -- Added QSysInfo::MV_10_6 as an enum to test against. -- Various compile fixes for Snow Leopard (preliminary support). -- The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. -- [223525] Macmainwindow Demo Application (crashfix). - - -- Document a bit clearer how qt_mac_set_dock_menu() works. + * Now supports "-arch i386" as an alias for "-arch x86". + * Detects invalid arch arguemnts and exits. -- QTestLib - * Activate the test application when launched from the command line. - -- Fixed the focus frame transparency that would make widget difficult to use with widget stylesheet. +- Cocoa port + * Fixed a bug where actions in the native menubar were not disabled + properly. + * Made shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard + layout. + * Fixed a bug where dialogs were positioned in the wrong place on the + screen. + * The build-key for Cocoa was changed in the unlikely case that a plugin + may make assumptions on how Qt was built. All Cocoa plugins built + against Qt 4.5.0 will NOT work with Qt 4.5.1; we do not foresee + changing this again. + * Fixed a bug where some windows did not get activation when they + normally should. + * Fixed a bug where key events sent to popups were not propagated + onwards. + * QFileOpenEvents will no longer be sent for items passed via command + line. + * Various fixes for determining the metrics of text and the ability to + disable kerning. + * Modified the Colliding Mice Example to work better with coalesced + updates. + * Fixed a bug where the drag cursor was not updated when modifier keys + were used. + * [239043] Fixed a bug that caused QGraphicsProxyWidget to shrink when + moved. + * [244369] Window flags on Cocoa windows should look similar to the + Carbon ones. + * [247947] Fixed a crash in drag and drop. + * [248918] Fixed color matching for themed text items. + * The command + h shortcut is now enabled. (Hides the current window.) + * [249296] Fixed a bug where line edits on a second page of a stack + widget were not getting key events. Qt for Embedded Linux --------------------- -- Various improvements to the Qt DirectFB plugin. -- Fix recreation of temporary EGL surfaces in PowerVR gfxdriver. -- Document some necessary #define's for building the PowerVR gfxdriver. +- * Various improvements to the Qt DirectFB plugin. + * Fixed recreation of temporary EGL surfaces in the PowerVR QScreen + driver. +- * Document some necessary #define's for building the PowerVR QScreen + driver. Qt for Windows CE ----------------- - * [246619] Fixed tap and hold bug for QCheckbox. + * [246619] Fixed a tap and hold bug for QCheckbox. **************************************************************************** * Compiler Specific Changes * @@ -483,56 +497,62 @@ Qt for Windows CE - Designer - * [249097] Fixed a crash related to undoing a QGridLayout re-layouting - operation. - * [247995] Fixed a crash occurring after layout operations that cause - an instance of QGridLayout or QFormLayout to shrink. - * [248000] Fixed a crash ocurring when re-layouting empty grid layouts. - * [245961] Restricted objectname-validation to known object name - properties only. - * [245503] Fixed redundant backslashes in string property in property browser. + * [245503] Fixed redundant backslashes in string property in the property + browser. + * [245961] Restricted objectname-validation to known object name + properties only. + * [247995] Fixed a crash occurring after layout operations that caused + an instance of QGridLayout or QFormLayout to shrink. + * [248000] Fixed a crash ocurring when re-layouting empty grid layouts. + * [249097] Fixed a crash related to undoing a QGridLayout re-layout + operation. - Linguist - Linguist GUI - * [248076] Fixed crash upon opening files for which we have no plural rules - * [249519] Fixed crash upon dropping text into non-focused lineedit + * [248076] Fixed a crash caused by opening files for which we have no + plural rules. + * [249519] Fixed a crash upon dropping text into a non-focused line + edit. - Entire Linguist toolchain - * [244035] Fixed endless loop in PO writer - * [247738] Improved handling of duplicated messages - * [248849] Fixed encoding in XLIFF writer - * [249022] Fixed TS' and QM's handling of messages which appear in multiple encodings + * [244035] Fixed an infinite loop in PO writer. + * [247738] Improved handling of duplicated messages. + * [248849] Fixed the encoding in XLIFF writer. + * [249022] Fixed TS' and QM's handling of messages which appear in + multiple encodings. - lupdate - * [248724] Fixed encoding of messages from .ui files if CODECFORTR is not utf8 - * [249633] Fixed processing of C++ backslash line continuations + * [248724] Fixed the encoding of messages from .ui files if CODECFORTR + is not utf8. + * [249633] Fixed the processing of C++ backslash line continuations. - rcc - moc - * [240368] moc parsing issue with "unsigned" subphrase + * [240368] moc parsing issue with "unsigned" subphrase - uic - * [244998] Fixed include file generation for phonon widgets. - * [248070] Fixed code generation for QStringList-type properties to use - encoding properly. - * [242447] Made uic generate class-specific code correctly in the case - of multiple levels of inheritance. + * [244998] Fixed include file generation for phonon widgets. + * [248070] Fixed code generation for QStringList-type properties to use + encoding properly. + * [242447] Made uic generate class-specific code correctly in the case of + multiple levels of inheritance. - uic3 - qmake - * [248806] Ensure that the Xcode generator includes the right path to frameworks. - * [201495] Comment processing in qmake prevented file from being moc'ed - * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA - * Fixed moc and uic features to make shadow builds work even if a non-shadow build is present - + * On Mac OS, properly escape file names in QMAKE_BUNDLE_DATA. + * Fixed moc and uic features to make shadow builds work even if a + non-shadow build is present + * [201495] Comment processing in qmake prevented file from being moc'ed + * [248806] Ensured that the Xcode generator includes the right path to + frameworks. - configure -- cgit v0.12 From 8b166186c1446ebd13b2a7d0ab019c828915f4c2 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 17 Apr 2009 22:09:14 +1000 Subject: Fix a couple more unmaintained version numbers. I have now inspected all 4.x.y version numbers appearing in the depot. All remaining instances appear to be acceptable. Reviewed-by: Trust Me (cherry picked from commit a46f54e0ad78ccb4ffaeee6befc7429f93740375) --- FAQ.txt | 2 +- doc/src/deployment.qdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FAQ.txt b/FAQ.txt index f20d10b..1d2266d 100644 --- a/FAQ.txt +++ b/FAQ.txt @@ -8,7 +8,7 @@ to Unix style line endings (LF). To avoid this problem, uncompress the file again and give the option "-a" to unzip, which will then add the correct line endings. -Q: I'm running Windows XP and I downloaded the qt-win-eval-4.5.0-vs2008.exe +Q: I'm running Windows XP and I downloaded the qt-win-eval-%VERSION%-vs2008.exe version of Qt. However, when I try to run the examples I get an error saying: "The application failed to start because the application configuration is incorrect. Reinstalling the application may fix this problem.". I reinstalled diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc index f2f76a9..1f0b3ca 100644 --- a/doc/src/deployment.qdoc +++ b/doc/src/deployment.qdoc @@ -911,7 +911,7 @@ Then qApp->libraryPaths() would return something like this: "C:/customPath/plugins " - "C:/Qt/4.5.0/plugins" + "C:/Qt/%VERSION%/plugins" "E:/myApplication/directory/" The executable will look for the plugins in these directories and -- cgit v0.12 From aa29f55547ce72ef6a87c34543face5657206be8 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 17 Apr 2009 14:55:12 +0200 Subject: BT: Make native QFontDialog work when using show and changing windows Cocoa's font manager uses "first responder" which is a great idea, but breaks as soon as we change windows. Thankfully we can just set the target and we are OK. An upshot is that we don't need the delegate, but I'm not going to push my luck on that. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 7c815bc2d4ea922d75f49f7dc29c81362ce5210e) --- src/gui/dialogs/qfontdialog_mac.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index a8e9de6..dc0c83b 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -190,7 +190,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin newFont.setStrikeOut(mQtFont->strikeOut()); } - [self setQtFont:newFont]; + [self setQtFont:newFont]; if (mPriv) mPriv->updateSampleFont(*mQtFont); } @@ -357,8 +357,8 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)setQtFont:(const QFont &)newFont { - delete mQtFont; - mQtFont = new QFont(newFont); + delete mQtFont; + mQtFont = new QFont(newFont); } - (QFont)qtFont @@ -404,6 +404,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin } [mFontPanel setDelegate:nil]; [[NSFontManager sharedFontManager] setDelegate:nil]; + [[NSFontManager sharedFontManager] setTarget:nil]; } @end @@ -527,6 +528,7 @@ void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial, extraHeight:dialogExtraHeight]; [ourPanel setDelegate:delegate]; [[NSFontManager sharedFontManager] setDelegate:delegate]; + [[NSFontManager sharedFontManager] setTarget:delegate]; setFont(delegate, initial); // hack to get correct initial layout -- cgit v0.12 From cd5d8313583e002742b9b00988c2011e8eaa923c Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 17 Apr 2009 15:27:49 +0200 Subject: Possible assert when hiding tabbed QDockWidget The problem is in QTabBar which emits the currentChanged signal before accessing its own internal data. As we react to that signal by possibly removing/adding tabs, it can cause a assertion failure. Task-number: 251184 Reviewed-by: ogoffart --- src/gui/widgets/qtabbar.cpp | 6 +++--- tests/auto/qtabbar/tst_qtabbar.cpp | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index b6e6b6d..b562b1f 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1167,13 +1167,13 @@ void QTabBar::setCurrentIndex(int index) d->currentIndex = index; update(); d->makeVisible(index); + d->tabList[index].lastTab = oldIndex; + d->layoutWidgets(oldIndex); + d->layoutWidgets(index); #ifdef QT3_SUPPORT emit selected(index); #endif emit currentChanged(index); - d->tabList[index].lastTab = oldIndex; - d->layoutWidgets(oldIndex); - d->layoutWidgets(index); } } diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp index 433eb86..31722de 100644 --- a/tests/auto/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/qtabbar/tst_qtabbar.cpp @@ -92,6 +92,8 @@ private slots: void moveTab_data(); void moveTab(); + + void task251184_removeTab(); }; // Testing get/set functions @@ -503,5 +505,35 @@ void tst_QTabBar::moveTab() bar.callMoveTab(from, to); } + +class MyTabBar : public QTabBar +{ + Q_OBJECT +public slots: + void onCurrentChanged() + { + //we just want this to be done once + disconnect(this, SIGNAL(currentChanged(int)), this, SLOT(onCurrentChanged())); + removeTab(0); + } +}; + +void tst_QTabBar::task251184_removeTab() +{ + MyTabBar bar; + bar.addTab("bar1"); + bar.addTab("bar2"); + QCOMPARE(bar.count(), 2); + QCOMPARE(bar.currentIndex(), 0); + + bar.connect(&bar, SIGNAL(currentChanged(int)), SLOT(onCurrentChanged())); + bar.setCurrentIndex(1); + + QCOMPARE(bar.count(), 1); + QCOMPARE(bar.currentIndex(), 0); + QCOMPARE(bar.tabText(bar.currentIndex()), QString("bar2")); +} + + QTEST_MAIN(tst_QTabBar) #include "tst_qtabbar.moc" -- cgit v0.12 From a1749882051801d95ca562292c0bd1e43a70cdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Fri, 17 Apr 2009 15:59:19 +0200 Subject: Compile. --- tests/auto/qaccessibility/tst_qaccessibility.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index dc52416..df770b3 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -4046,7 +4046,7 @@ void tst_QAccessibility::accelerators() window->show(); QAccessibleInterface *accLineEdit = QAccessible::queryAccessibleInterface(le); - QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("L"))); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString() + QLatin1String("L")); label->setText(tr("Q &")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); label->setText(tr("Q &&")); @@ -4054,11 +4054,11 @@ void tst_QAccessibility::accelerators() label->setText(tr("Q && A")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); label->setText(tr("Q &&&A")); - QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("A"))); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString() + QLatin1String("A")); label->setText(tr("Q &&A")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); label->setText(tr("Q &A&B")); - QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString(QKeySequence(Qt::ALT) + QLatin1String("A"))); + QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString() + QLatin1String("A")); #if defined(Q_WS_X11) qt_x11_wait_for_window_manager(window); -- cgit v0.12 From 81c7a8b453726bb4aff11f2382284fc144eeda78 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Sat, 18 Apr 2009 00:23:51 +1000 Subject: BT: Obsolete license text In the docs, index.html had a statement about licensing that is no longer true, plus the file it linked to longer exists. This change removes the offending paragraph from the docs. Task-number: 251348 Reviewed-by: Carlos Duclos --- doc/src/index.qdoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 49dfafd..4ead9e4 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -85,12 +85,6 @@ \endif \endif - \if defined(opensourceedition) - \bold{Note:} This edition is for the development of \l{Qt - Open Source Edition}{Free and Open Source} software only; see - \l{Qt Commercial Editions}. - \endif - \raw HTML -- cgit v0.12 From 3e4a8153da6c05e11d8bb26f15b7ab4806e0902b Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 17 Apr 2009 17:33:50 +0200 Subject: autotest didn't compile with gcc --- tests/auto/qmenu/tst_qmenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index a86b754..5b6e54c 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -684,7 +684,7 @@ void tst_QMenu::task250673_activeMutliColumnSubMenuPosition() class MyMenu : public QMenu { public: - friend class tst_QMenu; + int columnCount() const { return QMenu::columnCount(); } }; QMenu sub; -- cgit v0.12 From c3ba378b961a7296985d607c96a3b68a6de52a43 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Sat, 18 Apr 2009 00:23:51 +1000 Subject: BT: Obsolete license text In the docs, index.html had a statement about licensing that is no longer true, plus the file it linked to longer exists. This change removes the offending paragraph from the docs. Task-number: 251348 Reviewed-by: Carlos Duclos (cherry picked from commit 81c7a8b453726bb4aff11f2382284fc144eeda78) --- doc/src/index.qdoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index e697c95..b73ad34 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -85,12 +85,6 @@ \endif \endif - \if defined(opensourceedition) - \bold{Note:} This edition is for the development of \l{Qt - Open Source Edition}{Free and Open Source} software only; see - \l{Qt Commercial Editions}. - \endif - \raw HTML
-- cgit v0.12 From 7a02f249edc179426159e66680ca4421c3c44309 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 17 Apr 2009 16:52:47 +0200 Subject: compile heh, it was perfectly safe to remove the QT_VERSION ifdefs, but QT_VERISON was another matter... --- tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 6edaee3..46f5f0c 100644 --- a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -2309,7 +2309,7 @@ void tst_QTextDocumentFragment::html_tbody() QVERIFY(table); QCOMPARE(table->columns(), 1); QCOMPARE(table->rows(), 2); - QVERIFY(table->format().headerRowCount(), 1); + QCOMPARE(table->format().headerRowCount(), 1); QCOMPARE(table->cellAt(0, 0).firstCursorPosition().block().text(), QString("First Cell")); QCOMPARE(table->cellAt(1, 0).firstCursorPosition().block().text(), QString("Second Cell")); } -- cgit v0.12 From e018b82432055d9a5f13be7c17e31502830b9fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Fri, 17 Apr 2009 16:59:26 +0200 Subject: Fix an endianess issue with 32 bit pixmaps on big endian systems. On big endian systems with Xrender, the QPixmap::toImage() function did an unnecessary byte swap for 32 bit pixmaps. Task-number: 196152 Reviewed-by: Samuel --- src/gui/image/qpixmap_x11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index ff7c1b6..38916c7 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -1437,7 +1437,7 @@ QImage QX11PixmapData::toImage() const // we may have to swap the byte order if ((QSysInfo::ByteOrder == QSysInfo::LittleEndian && xi->byte_order == MSBFirst) - || (QSysInfo::ByteOrder == QSysInfo::BigEndian)) + || (QSysInfo::ByteOrder == QSysInfo::BigEndian && xi->byte_order == LSBFirst)) { for (int i=0; i < image.height(); i++) { uint *p = (uint*)image.scanLine(i); -- cgit v0.12 From 2c762f3b8b284a7c6dc0c499b7052013bad5b707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Fri, 17 Apr 2009 18:59:17 +0200 Subject: Make sure tooltips are shown properly in popups. The problem was that if you had child widgets of a popup, only child widgets that had hasMouseTracking() == true received the ToolTip event. This was because in order for a widget to receive a ToolTip, it relied on the MouseMove event. It still relies on the MouseMove event, but the problem with the previous code was that it did not even *try* to deliver the MouseMove event to the widget that did not have mousetracking. And it was the code that "tried" to deliver (QApplication::notify()) the event that also was responsible of finding which widget it should get the tooltip from. Unfortunately the previous code did not even enter QApplication::notify() because of that early cut-off. The result was that the event was propagated up to the parent widget (which was the popup) and consumed by the popup. (Nothing would happen unless the popup itself had a tooltip). This is also how translateMouseEvent() is implemented in qapplication_x11.cpp. --- src/gui/kernel/qapplication_win.cpp | 5 +---- tests/auto/qwidget/tst_qwidget.cpp | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index fae0335..2f2fc2c 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -3164,10 +3164,7 @@ bool QETWidget::translateMouseEvent(const MSG &msg) if (popupButtonFocus) { target = popupButtonFocus; } else if (popupChild) { - // forward mouse events to the popup child. mouse move events - // are only forwarded to popup children that enable mouse tracking. - if (type != QEvent::MouseMove || popupChild->hasMouseTracking()) - target = popupChild; + target = popupChild; } pos = target->mapFromGlobal(globalPos); diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index a557563..9547c8f 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -5787,6 +5787,35 @@ void tst_QWidget::setToolTip() widget.setToolTip(QString()); QCOMPARE(widget.toolTip(), QString()); QCOMPARE(spy.count(), 2); + + + + for (int pass = 0; pass < 2; ++pass) { + QWidget *popup = new QWidget(0, Qt::Popup); + popup->resize(150, 50); + QFrame *frame = new QFrame(popup); + frame->setGeometry(0, 0, 50, 50); + frame->setFrameStyle(QFrame::Box | QFrame::Plain); + EventSpy spy1(frame, QEvent::ToolTip); + EventSpy spy2(popup, QEvent::ToolTip); + frame->setMouseTracking(pass == 0 ? false : true); + frame->setToolTip(QLatin1String("TOOLTIP FRAME")); + popup->setToolTip(QLatin1String("TOOLTIP POPUP")); + popup->show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(popup); +#endif + QTest::qWait(100); + QTest::mouseMove(frame); + QTest::qWait(900); // delay is 700 + + QCOMPARE(spy1.count(), 1); + QCOMPARE(spy2.count(), 0); + if (pass == 0) + QTest::qWait(2200); // delay is 2000 + QTest::mouseMove(popup); + delete popup; + } } void tst_QWidget::testWindowIconChangeEventPropagation() -- cgit v0.12 From 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Sat, 18 Apr 2009 18:55:12 +1000 Subject: Fix the About Qt dialog text to be truthful, post-LGPL Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission. --- src/gui/dialogs/qmessagebox.cpp | 53 +- tools/assistant/compat/mainwindow.cpp | 24 +- tools/assistant/tools/assistant/mainwindow.cpp | 19 +- tools/designer/src/designer/versiondialog.cpp | 24 +- tools/linguist/linguist/mainwindow.cpp | 24 +- tools/qdbus/qdbusviewer/qdbusviewer.cpp | 17 +- tools/qtconfig/mainwindow.cpp | 14 - translations/assistant_adp_de.ts | 59 +- translations/assistant_adp_ja.ts | 56 +- translations/assistant_adp_pl.ts | 50 +- translations/assistant_adp_tr_TR.ts | 967 ++++ translations/assistant_adp_untranslated.ts | 60 +- translations/assistant_adp_zh_CN.ts | 43 +- translations/assistant_adp_zh_TW.ts | 223 +- translations/assistant_de.ts | 226 +- translations/assistant_ja.ts | 259 +- translations/assistant_pl.ts | 231 +- translations/assistant_tr_TR.ts | 1059 ++++ translations/assistant_untranslated.ts | 259 +- translations/assistant_zh_CN.ts | 219 +- translations/assistant_zh_TW.ts | 293 +- translations/designer_de.ts | 571 +- translations/designer_ja.ts | 729 +-- translations/designer_pl.ts | 727 +-- translations/designer_tr_TR.ts | 6950 ++++++++++++++++++++++++ translations/designer_untranslated.ts | 556 +- translations/designer_zh_CN.ts | 704 +-- translations/designer_zh_TW.ts | 1664 +++++- translations/linguist_de.ts | 147 +- translations/linguist_fr.ts | 152 +- translations/linguist_ja.ts | 140 +- translations/linguist_pl.ts | 145 +- translations/linguist_tr_TR.ts | 1955 +++++++ translations/linguist_untranslated.ts | 150 +- translations/linguist_zh_CN.ts | 142 +- translations/linguist_zh_TW.ts | 477 +- translations/qt_ar.ts | 584 +- translations/qt_de.ts | 583 +- translations/qt_es.ts | 572 +- translations/qt_fr.ts | 581 +- translations/qt_help_de.ts | 28 +- translations/qt_help_ja.ts | 27 +- translations/qt_help_pl.ts | 28 +- translations/qt_help_tr_TR.ts | 355 ++ translations/qt_help_untranslated.ts | 27 +- translations/qt_help_zh_CN.ts | 27 +- translations/qt_help_zh_TW.ts | 78 +- translations/qt_iw.ts | 586 +- translations/qt_ja_JP.ts | 570 +- translations/qt_pl.ts | 618 ++- translations/qt_pt.ts | 572 +- translations/qt_ru.ts | 584 +- translations/qt_sk.ts | 578 +- translations/qt_sv.ts | 574 +- translations/qt_uk.ts | 572 +- translations/qt_untranslated.ts | 576 +- translations/qt_zh_CN.ts | 577 +- translations/qt_zh_TW.ts | 1892 ++++++- translations/qtconfig_pl.ts | 40 +- translations/qtconfig_untranslated.ts | 33 +- translations/qtconfig_zh_CN.ts | 43 +- translations/qtconfig_zh_TW.ts | 203 +- translations/qvfb_pl.ts | 8 +- translations/qvfb_untranslated.ts | 7 +- translations/qvfb_zh_CN.ts | 4 +- translations/qvfb_zh_TW.ts | 70 +- 66 files changed, 22935 insertions(+), 7450 deletions(-) create mode 100644 translations/assistant_adp_tr_TR.ts create mode 100644 translations/assistant_tr_TR.ts create mode 100644 translations/designer_tr_TR.ts create mode 100644 translations/linguist_tr_TR.ts create mode 100644 translations/qt_help_tr_TR.ts diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 1967837..1ddb8f4 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1680,7 +1680,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) { #ifdef Q_WS_MAC static QPointer oldMsgBox; - + if (oldMsgBox) { oldMsgBox->show(); oldMsgBox->raise(); @@ -1692,29 +1692,34 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) QString translatedTextAboutQt; translatedTextAboutQt = QMessageBox::tr( "

About Qt

" - "%1

Qt is a C++ toolkit for cross-platform " - "application development.

" - "

Qt provides single-source " - "portability across MS Windows, Mac OS X, " - "Linux, and all major commercial Unix variants. Qt is also" - " available for embedded devices as Qt for Embedded Linux" - " and Qt for Windows CE.

" - "

Qt is a Nokia product. See " - "qtsoftware.com/qt/ for more information.

" - ) -#if QT_EDITION != QT_EDITION_OPENSOURCE - .arg(QMessageBox::tr("

This program uses Qt version %1.

")) -#else - .arg(QMessageBox::tr("

This program uses Qt Open Source Edition version %1.

" - "

Qt Open Source Edition is intended for the development " - "of Open Source applications. You need a commercial Qt " - "license for development of proprietary (closed source) " - "applications.

" - "

Please see qtsoftware.com/company/model/ " - "for an overview of Qt licensing.

")) -#endif - - .arg(QLatin1String(QT_VERSION_STR)); + "

This program uses Qt version %1.

" + "

Qt is a C++ toolkit for cross-platform application " + "development.

" + "

Qt provides single-source portability across MS Windows, " + "Mac OS X, Linux, and all major commercial Unix variants. " + "Qt is also available for embedded devices as Qt for Embedded Linux " + "and Qt for Windows CE.

" + "

Qt is available under three different licensing options designed " + "to accommodate the needs of our various users.

" + "Qt licensed under our commercial license agreement is appropriate " + "for development of proprietary/commercial software where you do not " + "want to share any source code with third parties or otherwise cannot " + "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version " + "3.0.

" + "

Qt licensed under the GNU LGPL version 2.1 is appropriate for the " + "development of Qt applications (proprietary or open source) provided " + "you can comply with the terms and conditions of the GNU LGPL version " + "2.1.

" + "

Qt licensed under the GNU General Public License version 3.0 is " + "appropriate for the development of Qt applications where you wish to " + "use such applications in combination with software subject to the " + "terms of the GNU GPL version 3.0 or where you are otherwise willing " + "to comply with the terms of the GNU GPL version 3.0.

" + "

Please see www.qtsoftware.com/products/licensing " + "for an overview of Qt licensing.

" + "

Qt is a Nokia product. See www.qtsoftware.com/qt " + "for more information.

" + ).arg(QLatin1String(QT_VERSION_STR)); QMessageBox *msgBox = new QMessageBox(parent); msgBox->setAttribute(Qt::WA_DeleteOnClose); diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp index 65759ad..9f91f9b 100644 --- a/tools/assistant/compat/mainwindow.cpp +++ b/tools/assistant/compat/mainwindow.cpp @@ -311,29 +311,11 @@ void MainWindow::closeEvent(QCloseEvent *e) void MainWindow::about() { QMessageBox box(this); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt Assistant is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see qtsoftware.com/company/model for an overview of Qt licensing."); -#elif defined(QT_PRODUCT_LICENSE) - QString edition; - QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE))); -#else + + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); - -#endif + QString moreInfo; box.setText(QString::fromLatin1("
" "

%1

" diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index df39650..bcafacc 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -787,26 +787,11 @@ void MainWindow::showAboutDialog() aboutDia.setPixmap(pix); aboutDia.setWindowTitle(aboutDia.documentTitle()); } else { -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt Assistant is part of the Qt Open " - "Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development " - "of proprietary (closed source) applications. Please see " - "http://qtsoftware.com/company/about/businessmodel for an " - "overview of Qt licensing."); -#else + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); + QString moreInfo; -#endif QByteArray resources; aboutDia.setText(QString::fromLatin1("
" "

%1

" diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp index a129a4d..c21912b 100644 --- a/tools/designer/src/designer/versiondialog.cpp +++ b/tools/designer/src/designer/versiondialog.cpp @@ -169,31 +169,11 @@ VersionDialog::VersionDialog(QWidget *parent) VersionLabel *label = new VersionLabel; QLabel *lbl = new QLabel; QString version = tr("

%1



Version %2"); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString open = tr(" Open Source Edition"); - version.append(open); -#endif version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR)); version.append(tr("
Qt Designer is a graphical user interface designer for Qt applications.
")); - QString edition = -#if QT_EDITION == QT_EDITION_OPENSOURCE - tr("This version of Qt Designer is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/about/businessmodel" - ".html for an overview of Qt licensing.
"); -#elif defined(QT_PRODUCT_LICENSE) - tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.
").arg(QT_PRODUCT_LICENSE); -#else - tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.
"); -#endif + // TODO: Remove this variable for 4.6.0. Must keep this way for 4.5.x due to string freeze + QString edition; lbl->setText(tr("%1" "
%2" diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp index 84200d4..5157fbe 100644 --- a/tools/linguist/linguist/mainwindow.cpp +++ b/tools/linguist/linguist/mainwindow.cpp @@ -1340,30 +1340,10 @@ void MainWindow::about() QMessageBox box(this); box.setTextFormat(Qt::RichText); QString version = tr("Version %1"); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString open = tr(" Open Source Edition"); - version.append(open); -#endif version = version.arg(QLatin1String(QT_VERSION_STR)); - QString edition = -#if QT_EDITION == QT_EDITION_OPENSOURCE - tr("This version of Qt Linguist is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/model" - ".html for an overview of Qt licensing."); -#elif defined(QT_PRODUCT_LICENSE) - tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE)); -#else - tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution."); -#endif + // TODO: Remove this variable for 4.6.0. Must keep this way for 4.5.x due to string freeze. + QString edition; box.setText(tr("

%1

" "

Qt Linguist is a tool for adding translations to Qt " diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp index e8ac3a6..9c25a89 100644 --- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp @@ -440,22 +440,11 @@ void QDBusViewer::refreshChildren() void QDBusViewer::about() { QMessageBox box(this); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt's D-Bus Viewer is part of the Qt Open Source Edition. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see qtsoftware.com/company/model.html for an overview of Qt licensing."); -#else + + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); - -#endif + QString moreInfo; box.setText(QString::fromLatin1("

" "

%1

" diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 498a6b6..47b1417 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -999,20 +999,6 @@ void MainWindow::helpAbout() QMessageBox box(this); box.setText(tr("

%1

" "
Version %2" -#if QT_EDITION == QT_EDITION_OPENSOURCE - " Open Source Edition

" - "This version of Qt Configuration is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/model" - ".html for an overview of Qt licensing." -#else - "

This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution." -#endif "

Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)." "

The program is provided AS IS with NO WARRANTY OF ANY KIND," " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A" diff --git a/translations/assistant_adp_de.ts b/translations/assistant_adp_de.ts index c92d6f9..db2005a 100644 --- a/translations/assistant_adp_de.ts +++ b/translations/assistant_adp_de.ts @@ -1,6 +1,6 @@ - - + + Assistant @@ -15,7 +15,7 @@ AssistantServer - + Qt Assistant Qt Assistant @@ -103,7 +103,7 @@ FontPanel - + Font Schrift @@ -131,7 +131,7 @@ FontSettingsDialog - + Font Settings Schriftart @@ -188,9 +188,9 @@ Qt Assistant Handbuch - + - + Qt Assistant Qt Assistant @@ -199,7 +199,7 @@ Öffne Link im aktuellen Fenster - + Open Link in New Window Öffne Link in neuem Fenster @@ -245,7 +245,7 @@ Skipping file. - + Done Fertig @@ -284,7 +284,7 @@ Skipping file. - + Open Link in Current Tab Link im Aktuellen Tab öffnen @@ -307,7 +307,7 @@ Skipping file. Dokumentation %1 ist nicht kompatibel! Datei wird übersprungen. - + Failed to save fulltext search index Assistant will not work! Der Index für die Volltextsuche konnte nicht gespeichert werden. @@ -630,7 +630,7 @@ Assistent ist nicht einsatzbereit! Qt Assistant von Trolltech - %1 - + Help Hilfe @@ -717,7 +717,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert. Index - + Untitled Unbenannt @@ -853,7 +853,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.A&nsicht - + Ctrl+T Strg+T @@ -869,17 +869,15 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Strg+E - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. + Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des Qt %1 Lizenzvertrages. Einzelheiten können sie der mitgelieferten Lizenz-Datei entnehmen. + Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des Qt %1 Lizenzvertrages. Einzelheiten können sie der mitgelieferten Lizenz-Datei entnehmen. - + Qt Assistant Qt Assistant @@ -1082,7 +1080,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Umschalt+F1 - + Ctrl+S Strg+S @@ -1170,7 +1168,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert. - + Failed to open about application contents in file: '%1' Fehler beim öffnen des Inhalts in Datei: '%1' @@ -1179,7 +1177,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Fehler ... - + Sidebar Sidebar @@ -1229,22 +1227,19 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Zeigt die Hauptseite eines Dokumentensets an. - Open Source Edition - Open Source Edition + Open Source Edition - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Diese Version von Qt Assistant ist Teil der Qt Open Source Edition und darf für die Entwicklung von Open Source Anwendungen genutzt werden. Qt ist ein umfangreiches C++ Framework für die Entwicklung von Cross-Platform-Anwendungen. + Diese Version von Qt Assistant ist Teil der Qt Open Source Edition und darf für die Entwicklung von Open Source Anwendungen genutzt werden. Qt ist ein umfangreiches C++ Framework für die Entwicklung von Cross-Platform-Anwendungen. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des kommerziellen Qt Lizenzvertrages. Einzelheiten können Sie der mitgelieferten LICENSE-Datei entnehmen. + Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des kommerziellen Qt Lizenzvertrages. Einzelheiten können Sie der mitgelieferten LICENSE-Datei entnehmen. - + ... ... @@ -1292,7 +1287,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Qt Assistant von Trolltech - + Qt Assistant by Nokia @@ -1470,7 +1465,7 @@ Es müssen zuerst alle Inhalte gelöscht werden. Unbenannt - + Add page Seite einfügen @@ -1528,7 +1523,7 @@ Es müssen zuerst alle Inhalte gelöscht werden. TopicChooser - + Choose a topic for <b>%1</b> Wählen Sie ein Thema für <b>%1</b> diff --git a/translations/assistant_adp_ja.ts b/translations/assistant_adp_ja.ts index 0a4b209..312f00f 100644 --- a/translations/assistant_adp_ja.ts +++ b/translations/assistant_adp_ja.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings @@ -72,7 +73,7 @@ HelpDialog - + Open Link in Current Tab リンクをç¾åœ¨ã®ã‚¿ãƒ–ã«é–‹ã @@ -95,12 +96,12 @@ - + Qt Assistant Qt Assistant - + Failed to load keyword index file Assistant will not work! キーワードインデックスファイルã®ãƒ­ãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—㟠@@ -140,7 +141,7 @@ Skipping file. スキップã—ã¾ã™ã€‚ - + %n document(s) found. @@ -163,8 +164,8 @@ Skipping file. 検索 - - + + Done 完了 @@ -360,7 +361,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! HelpWindow - + Help ヘルプ @@ -414,7 +415,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Index - + Untitled タイトルãªã— @@ -422,7 +423,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! MainWindow - + Sidebar サイドãƒãƒ¼ @@ -482,17 +483,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! 指定ã•ã‚ŒãŸãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚»ãƒƒãƒˆã®ãƒ¡ã‚¤ãƒ³ãƒšãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - + Qt Assistant Qt Assistant @@ -853,7 +844,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! åå‰ã‚’ã¤ã‘ã¦ãƒšãƒ¼ã‚¸ã‚’ä¿å­˜... - + &Window ウィンドウ(&W) @@ -868,23 +859,20 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Ctrl+M - Open Source Edition - オープンソース版 + オープンソース版 - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - ã“ã® Qt Assistant 㯠Qt オープンソース版ã®ä¸€éƒ¨ã§ã‚ã‚Šã€ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºã‚’目的ã¨ã—ãŸã‚‚ã®ã§ã™ã€‚Qt ã¯ã€è¤‡æ•°ã®ãƒ—ラットフォームã«å¯¾å¿œã™ã‚‹ã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã® C++ ã®ã‚ã‹ã‚Šã‚„ã™ã„フレームワークã§ã™ã€‚ + ã“ã® Qt Assistant 㯠Qt オープンソース版ã®ä¸€éƒ¨ã§ã‚ã‚Šã€ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºã‚’目的ã¨ã—ãŸã‚‚ã®ã§ã™ã€‚Qt ã¯ã€è¤‡æ•°ã®ãƒ—ラットフォームã«å¯¾å¿œã™ã‚‹ã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã® C++ ã®ã‚ã‹ã‚Šã‚„ã™ã„フレームワークã§ã™ã€‚ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. 著作権ã®ã‚る(ソースを公開ã—ãªã„)アプリケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> ã‚’ã”覧ãã ã•ã„。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - ã“ã®ãƒ—ログラム㯠Qt 商用版ライセンスè¦ç´„ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã€ã‚ãªãŸã«ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚詳細ã¯ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ã¨ã‚‚ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをã”覧ãã ã•ã„。 + ã“ã®ãƒ—ログラム㯠Qt 商用版ライセンスè¦ç´„ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã€ã‚ãªãŸã«ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚詳細ã¯ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ã¨ã‚‚ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをã”覧ãã ã•ã„。 @@ -935,7 +923,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Trolltech ã® Qt Assistant - + Qt Assistant by Nokia @@ -943,7 +931,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! TabbedBrowser - + ... ... @@ -1011,7 +999,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! TopicChooser - + Choose a topic for <b>%1</b> <b>%1</b> ã®ãƒˆãƒ”ックをé¸æŠž diff --git a/translations/assistant_adp_pl.ts b/translations/assistant_adp_pl.ts index 3a80244..de0c71c 100644 --- a/translations/assistant_adp_pl.ts +++ b/translations/assistant_adp_pl.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font Czcionka @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings Ustawienia czcionki @@ -72,7 +73,7 @@ HelpDialog - + Open Link in Current Tab Otwórz odsyÅ‚acz w bieżącej karcie @@ -95,12 +96,12 @@ - + Qt Assistant Qt Assistant - + Failed to load keyword index file Assistant will not work! Nie można wczytać indeksu słów kluczowych @@ -141,7 +142,7 @@ Plik zostaje pominiÄ™ty. - + Done Zrobione @@ -346,7 +347,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! HelpWindow - + Help Pomoc @@ -396,7 +397,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Index - + Untitled Nienazwany @@ -404,7 +405,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! MainWindow - + Sidebar Panel @@ -479,22 +480,15 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Pokazuje głównÄ… stronÄ™ wybranego zestawu dokumentacji. - Open Source Edition - Wydanie Open Source + Wydanie Open Source - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - + Qt Assistant Qt Assistant @@ -865,14 +859,8 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Ustawienia czcionki... - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - + Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. @@ -882,7 +870,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Qt Assistant Trolltech'a - + Qt Assistant by Nokia @@ -890,7 +878,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! TabbedBrowser - + ... ... @@ -958,7 +946,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! TopicChooser - + Choose a topic for <b>%1</b> Wybierz temat dla <b>%1</b> diff --git a/translations/assistant_adp_tr_TR.ts b/translations/assistant_adp_tr_TR.ts new file mode 100644 index 0000000..bb86689 --- /dev/null +++ b/translations/assistant_adp_tr_TR.ts @@ -0,0 +1,967 @@ + + + + + AssistantServer + + + Qt Assistant + + + + + Failed to bind to port %1 + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + FontSettingsDialog + + + Font Settings + + + + + Font settings for: + + + + + Browser + + + + + Application + + + + + Use custom settings + + + + + HelpDialog + + + Open Link in Current Tab + + + + + Open Link in New Window + + + + + Open Link in New Tab + + + + + + Prepare... + + + + + + + Qt Assistant + + + + + Failed to load keyword index file +Assistant will not work! + + + + + Cannot open the index file %1 + + + + + + + Warning + + + + + + Documentation file %1 does not exist! +Skipping file. + + + + + + Parse Error + + + + + Documentation file %1 is not compatible! +Skipping file. + + + + + + Done + + + + + Failed to save fulltext search index +Assistant will not work! + + + + + Indexing files... + + + + + Reading dictionary... + + + + + + Full Text Search + + + + + Using a wildcard within phrases is not allowed. + + + + + The closing quotation mark is missing. + + + + + %n document(s) found. + + + + + + + Help + + + + + <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> + + + + + Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. + + + + + Con&tents + + + + + <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> + + + + + column 1 + + + + + &Index + + + + + &Look For: + + + + + Enter keyword + + + + + <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> + + + + + <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> + + + + + &Bookmarks + + + + + Displays the list of bookmarks. + + + + + Add new bookmark + + + + + Add the currently displayed page as a new bookmark. + + + + + &New + + + + + Delete bookmark + + + + + Delete the selected bookmark. + + + + + &Delete + + + + + &Search + + + + + Searching f&or: + + + + + Enter searchword(s). + + + + + <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> + + + + + <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> + + + + + Found &Documents: + + + + + Display the help page. + + + + + Display the help page for the full text search. + + + + + He&lp + + + + + Start searching. + + + + + Pressing this button starts the search. + + + + + Preparing... + + + + + HelpWindow + + + Help + + + + + Unable to launch web browser. + + + + + + OK + + + + + Failed to open link: '%1' + + + + + <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + + + + + Error... + + + + + Copy &Link Location + + + + + Open Link in New Tab + + + + + Open Link in New Window Shift+LMB + + + + + Index + + + Untitled + + + + + MainWindow + + + Sidebar + + + + + &Window + + + + + Minimize + + + + + Ctrl+M + + + + + Initializing Qt Assistant... + + + + + SHIFT+CTRL+= + + + + + Ctrl+T + + + + + Ctrl+I + + + + + Ctrl+B + + + + + Ctrl+S + + + + + Ctrl+] + + + + + Ctrl+[ + + + + + Views + + + + + Displays the main page of a specific documentation set. + + + + + + Qt Assistant + + + + + Failed to open about application contents in file: '%1' + + + + + ... + + + + + + Save Page + + + + + Cannot open file for writing! + + + + + Qt Assistant by Nokia + + + + + Toolbar + + + + + Go + + + + + &Help + + + + + &File + + + + + Boo&kmarks + + + + + &Go + + + + + &View + + + + + &Edit + + + + + &Print... + + + + + Print the currently displayed page. + + + + + Ctrl+P + + + + + E&xit + + + + + Quit Qt Assistant. + + + + + Ctrl+Q + + + + + &Copy + + + + + Copy the selected text to the clipboard. + + + + + Ctrl+C + + + + + &Find in Text... + + + + + Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. + + + + + Ctrl+F + + + + + Find &Next + + + + + F3 + + + + + Find &Previous + + + + + Shift+F3 + + + + + &Home + + + + + Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. + + + + + Ctrl+Home + + + + + &Previous + + + + + Go to the previous page. + + + + + Alt+Left + + + + + &Next + + + + + Go to the next page. + + + + + Alt+Right + + + + + About Qt Assistant + + + + + Display further information about Qt Assistant. + + + + + About Qt + + + + + Zoom &in + + + + + Zoom in on the document, i.e. increase the font size. + + + + + Ctrl++ + + + + + Zoom &out + + + + + Zoom out on the document, i.e. decrease the font size. + + + + + Ctrl+- + + + + + New Window + + + + + Open a new window. + + + + + Ctrl+N + + + + + &Close + + + + + Close the current window. + + + + + Ctrl+W + + + + + &Add Bookmark + + + + + Add the currently displayed page as a new bookmark. + + + + + What's This? + + + + + "What's This?" context sensitive help. + + + + + Shift+F1 + + + + + Add Tab + + + + + Ctrl+Alt+N + + + + + Next Tab + + + + + Ctrl+Alt+Right + + + + + Previous Tab + + + + + Ctrl+Alt+Left + + + + + Close Tab + + + + + Ctrl+Alt+Q + + + + + Qt Assistant Manual + + + + + F1 + + + + + Save Page As... + + + + + Ctrl+Alt+S + + + + + Sync with Table of Contents + + + + + Select the page in contents tab. + + + + + Font Settings... + + + + + QObject + + + Qt Assistant by Nokia + + + + + TabbedBrowser + + + ... + + + + + Add page + + + + + Close page + + + + + New Tab + + + + + Close Tab + + + + + Close Other Tabs + + + + + TabbedBrowser + + + + + Untitled + + + + + Previous + + + + + Next + + + + + Case Sensitive + + + + + Whole words + + + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + + + + + TopicChooser + + + Choose a topic for <b>%1</b> + + + + + Choose Topic + + + + + Select a topic from the list and click the <b>Display</b>-button to open the online help. + + + + + &Topics + + + + + Displays a list of available help topics for the keyword. + + + + + Open the topic selected in the list. + + + + + &Display + + + + + Close the Dialog. + + + + + &Close + + + + diff --git a/translations/assistant_adp_untranslated.ts b/translations/assistant_adp_untranslated.ts index 52cc26c..e6c927a 100644 --- a/translations/assistant_adp_untranslated.ts +++ b/translations/assistant_adp_untranslated.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings @@ -77,14 +78,14 @@ - + - + Qt Assistant - + Open Link in Current Tab @@ -143,7 +144,7 @@ Skipping file. - + Done @@ -340,7 +341,7 @@ Assistant will not work! HelpWindow - + Help @@ -389,7 +390,7 @@ Assistant will not work! Index - + Untitled @@ -457,7 +458,7 @@ Assistant will not work! - + Ctrl+T @@ -472,17 +473,7 @@ Assistant will not work! - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - + Qt Assistant @@ -493,7 +484,7 @@ Assistant will not work! - + Sidebar @@ -553,22 +544,7 @@ Assistant will not work! - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + Failed to open about application contents in file: '%1' @@ -867,7 +843,7 @@ Assistant will not work! QObject - + Qt Assistant by Nokia @@ -875,7 +851,7 @@ Assistant will not work! TabbedBrowser - + ... @@ -943,7 +919,7 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> diff --git a/translations/assistant_adp_zh_CN.ts b/translations/assistant_adp_zh_CN.ts index 656a598..62354b3 100644 --- a/translations/assistant_adp_zh_CN.ts +++ b/translations/assistant_adp_zh_CN.ts @@ -4,7 +4,7 @@ AssistantServer - + Qt Assistant Qt 助手 @@ -17,7 +17,7 @@ FontPanel - + Font 字体 @@ -45,7 +45,7 @@ FontSettingsDialog - + Font Settings 字体设置 @@ -73,7 +73,7 @@ HelpDialog - + Open Link in Current Tab 在当å‰æ ‡ç­¾é¡µæ‰“开链接 @@ -96,12 +96,12 @@ - + Qt Assistant Qt 助手 - + Failed to load keyword index file Assistant will not work! 加载关键è¯ç´¢å¼•æ–‡ä»¶å¤±è´¥ @@ -142,7 +142,7 @@ Skipping file. - + Done å®Œæˆ @@ -344,7 +344,7 @@ Assistant will not work! HelpWindow - + Help 帮助 @@ -394,7 +394,7 @@ Assistant will not work! Index - + Untitled 未命åçš„ @@ -402,7 +402,7 @@ Assistant will not work! MainWindow - + Sidebar ä¾§æ  @@ -477,22 +477,19 @@ Assistant will not work! 显示一个指定文档集的主页é¢ã€‚ - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 + 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + Qt Assistant Qt 助手 @@ -863,14 +860,12 @@ Assistant will not work! 字体设置... - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 + å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 @@ -880,7 +875,7 @@ Assistant will not work! Trolltech çš„ Qt 助手 - + Qt Assistant by Nokia Qt助手 - Nokia @@ -888,7 +883,7 @@ Assistant will not work! TabbedBrowser - + ... ... @@ -956,7 +951,7 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> 为<b>%1</b>选择一个主题 diff --git a/translations/assistant_adp_zh_TW.ts b/translations/assistant_adp_zh_TW.ts index ced339e..7fd1738 100644 --- a/translations/assistant_adp_zh_TW.ts +++ b/translations/assistant_adp_zh_TW.ts @@ -1,14 +1,15 @@ - - + + AssistantServer - + Qt Assistant Qt å°å¹«æ‰‹ + Failed to bind to port %1 無法çµåˆé€£æŽ¥åŸ  %1 @@ -16,23 +17,27 @@ FontPanel - + Font å­—åž‹ + &Writing system 寫入系統(&W) + &Family 家æ—(&F) + &Style 風格(&S) + &Point size 點大å°(&P) @@ -40,23 +45,27 @@ FontSettingsDialog - + Font Settings 字型設定 + Font settings for: 字型設定用於: + Browser ç€è¦½å™¨ + Application æ‡‰ç”¨ç¨‹å¼ + Use custom settings 使用者自訂設定 @@ -64,211 +73,269 @@ HelpDialog + Con&tents 內容(&T) + + + Qt Assistant Qt å°å¹«æ‰‹ + Open Link in Current Tab 在目å‰çš„分é é–‹å•Ÿé€£çµ + Open Link in New Window åœ¨æ–°è¦–çª—é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + + Prepare... 準備中... + Failed to load keyword index file Assistant will not work! 無法載入關éµå­—索引檔 å°å¹«æ‰‹å°‡ç„¡æ³•é‹ä½œ! + Cannot open the index file %1 無法開啟索引檔 %1 + + + Warning 警告 + + Documentation file %1 does not exist! Skipping file. 文件檔 %1 ä¸å­˜åœ¨ 將跳éŽæ­¤æª”案。 + + Parse Error 剖æžéŒ¯èª¤ + Documentation file %1 is not compatible! Skipping file. 文件檔 %1 ä¸ç›¸å®¹ 將跳éŽæ­¤æª”案。 + + Done å®Œæˆ + Failed to save fulltext search index Assistant will not work! 無法儲存全文檢索æœå°‹ç´¢å¼•ã€‚ å°å¹«æ‰‹å°‡ç„¡æ³•é‹ä½œ! + Indexing files... 建立檔案索引中... + Reading dictionary... 讀å–字典中... + + Full Text Search 全文檢索 + Using a wildcard within phrases is not allowed. 在片語中ä¸èƒ½ä½¿ç”¨è¬ç”¨å­—元。 + The closing quotation mark is missing. 沒有關閉引號。 + Help 說明 + <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> <b>說明</b><p>請從內容清單中é¸æ“‡æ‚¨éœ€è¦èªªæ˜Žçš„主題,或是在索引中æœå°‹é—œéµå­—。</p> + Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. ä¾åˆ†é¡žã€ç´¢å¼•æˆ–書籤來顯示說明主題。å¦ä¸€å€‹åˆ†é æœƒç¹¼æ‰¿æ­¤å…¨æ–‡æª¢ç´¢ã€‚ + <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> <b>ä¾é¡žåˆ¥çµ„織說明主題。</b><p>雙擊å¯ä»¥æŸ¥çœ‹è©²é¡žåˆ¥ä¸­æœ‰å“ªäº›ä¸»é¡Œã€‚雙擊該主題å¯ä»¥æŸ¥çœ‹å…§å®¹ã€‚</p> + column 1 欄 1 + &Index 索引(&I) + &Look For: æœå°‹(&L): + Enter keyword 輸入關éµå­— + <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> <b>輸入關éµå­—。</b><p>此清單å¯ä»¥é¸æ“‡æœ€èƒ½ç¬¦åˆè¼¸å…¥å­—串的項目。</p> + <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> <b>å¯ç”¨èªªæ˜Žä¸»é¡Œæ¸…單。</b><p>雙擊å¯ä»¥é–‹å•Ÿè©²èªªæ˜Žé é¢ã€‚如果找到一個以上,您必須指定您è¦çœ‹å“ªä¸€å€‹é é¢ã€‚</p> + &Bookmarks 書籤(&B) + Displays the list of bookmarks. 顯示書籤的清單。 + Add new bookmark 新增書籤 + Add the currently displayed page as a new bookmark. 將目å‰é¡¯ç¤ºçš„é é¢æ–°å¢žåˆ°æ›¸ç±¤ä¸­ã€‚ + &New 新增(&N) + Delete bookmark 刪除書籤 + Delete the selected bookmark. 刪除é¸å–的書籤。 + &Delete 刪除(&D) + &Search æœå°‹(&S) + Searching f&or: æœå°‹å…§å®¹(&O): + Enter searchword(s). 請輸入æœå°‹é—œéµå­—詞。 + <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> <b>輸入æœå°‹é—œéµå­—詞。</b><p>在此輸入您è¦æœå°‹çš„é—œéµå­—詞。å¯ä»¥ä½¿ç”¨è¬ç”¨å­—å…ƒ (*)。如果是一個片語,請用引號括起來。</p> + <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> <b>找到的文件</b><p>這放清單包å«äº†æ‰€æœ‰ä¸Šæ¬¡æœå°‹æ‰¾åˆ°çš„文件。文件會ä¾ç¬¦åˆç¨‹åº¦æŽ’åºã€‚</p> + Found &Documents: 找到的文件(&D): + Display the help page. 顯示說明é é¢ã€‚ + Display the help page for the full text search. 顯示全文檢索的說明é é¢ã€‚ + He&lp 說明(&L) + Start searching. 開始æœå°‹ã€‚ + Pressing this button starts the search. 按下此按éµé–‹å§‹æœå°‹ã€‚ + Preparing... 準備中... - + %n document(s) found. 找到 %n 個文件。 @@ -278,41 +345,49 @@ Assistant will not work! HelpWindow - + Help 說明 - Open Link in New WindowShift+LMB - 在新視窗開啟連çµShift+æ»‘é¼ å·¦éµ + + Open Link in New Window Shift+LMB + åœ¨æ–°è¦–çª—é–‹å•Ÿé€£çµ Shift+æ»‘é¼ å·¦éµ + Unable to launch web browser. 無法啟動ç€è¦½å™¨ã€‚ + OK 確定 + Failed to open link: '%1' 無法開啟連çµï¼š%1 + <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <div align="center"><h1>找ä¸åˆ°è©²é é¢</h1><br><h3>%1</h3></div> + Error... 錯誤... + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Copy &Link Location 複製連çµä½ç½®(&L) @@ -320,7 +395,7 @@ Assistant will not work! Index - + Untitled 未命å @@ -332,378 +407,466 @@ Assistant will not work! Qt å°å¹«æ‰‹ï¼ŒTrolltech å…¬å¸æä¾› + Toolbar 工具列 + &Print... 列å°(&P)... + E&xit 離開(&X) + &Copy 複製(&C) + &Find in Text... 在文字中尋找(&F)... + &Home 首é (&H) + &Previous å‰ä¸€å€‹(&P) + &Next 下一個(&N) + About Qt 關於 Qt + Zoom &in 放大(&I) + Zoom &out 縮å°(&O) + New Window 新視窗 - + Ctrl+T Ctrl+T + Ctrl+I Ctrl+I + Ctrl+B Ctrl+B + + Qt Assistant Qt å°å¹«æ‰‹ + &Add Bookmark 新增書籤(&A) + Sidebar 邊列 + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Initializing Qt Assistant... åˆå§‹åŒ– Qt å°å¹«æ‰‹ä¸­... + SHIFT+CTRL+= SHIFT+CTRL+= + Ctrl+S Ctrl+S + Ctrl+W Ctrl+W - + Ctrl+] Ctrl+] + Ctrl+[ Ctrl+[ + Views 檢視 + Displays the main page of a specific documentation set. 顯示指定文件集的主é é¢ã€‚ Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ + 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + Failed to open about application contents in file: '%1' 無法開啟檔案中應用程å¼çš„「關於ã€å…§å®¹ï¼š%1 + ... ... + + Save Page 儲存é é¢ + Cannot open file for writing! 無法開啟檔案以寫入! + Qt Assistant by Nokia Nokia æ供的 Qt å°å¹«æ‰‹ + Go èµ° + &Help 說明(&H) + &File 檔案(&F) + Boo&kmarks 書籤(&K) + &Go èµ°(&G) + &View 檢視(&V) + &Edit 編輯(&E) + Print the currently displayed page. 列å°ç›®å‰é¡¯ç¤ºçš„é é¢ã€‚ + Ctrl+P Ctrl+P + Quit Qt Assistant. 離開 Qt å°å¹«æ‰‹ã€‚ + Ctrl+Q Ctrl+Q + Copy the selected text to the clipboard. 複製é¸å–的文字到剪貼簿中。 + Ctrl+C Ctrl+C + Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. 開啟「尋找ã€å°è©±æ¡†ã€‚Qt å°å¹«æ‰‹æœƒåœ¨ç›®å‰é¡¯ç¤ºçš„é é¢ä¸­æœå°‹æ‚¨æ‰€è¼¸å…¥çš„文字。 + Ctrl+F Ctrl+F + Find &Next 尋找下一筆(&N) + F3 F3 + Find &Previous 尋找上一筆(&P) + Shift+F3 Shift+F3 + Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. 回到首é ã€‚Qt å°å¹«æ‰‹çš„首é ç‚º Qt åƒè€ƒæ–‡ä»¶ã€‚ + Ctrl+Home Ctrl+Home + Go to the previous page. 跳到上一é ã€‚ + Alt+Left Alt+Left + Go to the next page. 跳到下一é ã€‚ + Alt+Right Alt+Right + About Qt Assistant 關於 Qt å°å¹«æ‰‹ + Display further information about Qt Assistant. 顯示關於 Qt å°å¹«æ‰‹çš„詳情。 + Zoom in on the document, i.e. increase the font size. 放大文件,也就是加大字型。 + Ctrl++ Ctrl++ + Zoom out on the document, i.e. decrease the font size. 縮å°æ–‡ä»¶ï¼Œä¹Ÿå°±æ˜¯ç¸®å°å­—型。 + Ctrl+- Ctrl+- + Open a new window. 開啟新視窗。 + Ctrl+N Ctrl+N + &Close 關閉(&C) + Close the current window. 關閉目å‰çš„視窗。 + Add the currently displayed page as a new bookmark. 將目å‰é¡¯ç¤ºçš„é é¢æ–°å¢žåˆ°æ›¸ç±¤ä¸­ã€‚ + What's This? 這是什麼? + "What's This?" context sensitive help. 「這是什麼?ã€å…§æ–‡èªªæ˜Žã€‚ + Shift+F1 Shift+F1 + Add Tab æ–°å¢žåˆ†é  + Ctrl+Alt+N Ctrl+Alt+N + Next Tab ä¸‹ä¸€å€‹åˆ†é  + Ctrl+Alt+Right Ctrl+Alt+Right + Previous Tab å‰ä¸€å€‹åˆ†é  + Ctrl+Alt+Left Ctrl+Alt+Left + Close Tab é—œé–‰åˆ†é  + Ctrl+Alt+Q Ctrl+Alt+Q + Qt Assistant Manual Qt å°å¹«æ‰‹æ‰‹å†Š + F1 F1 + Save Page As... å¦å­˜é é¢ç‚º... + Ctrl+Alt+S Ctrl+Alt+S + Sync with Table of Contents 與目錄åŒæ­¥ + Select the page in contents tab. é¸æ“‡åœ¨å…§å®¹åˆ†é ä¸­çš„é é¢ã€‚ + Font Settings... 字型設定... You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 + 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§å¥—件中的授權檔。 + 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§å¥—件中的授權檔。 @@ -713,7 +876,7 @@ Assistant will not work! Qt å°å¹«æ‰‹ï¼ŒTrolltech å…¬å¸æä¾› - + Qt Assistant by Nokia Nokia æ供的 Qt å°å¹«æ‰‹ @@ -721,55 +884,67 @@ Assistant will not work! TabbedBrowser - + ... ... + Add page 新增é é¢ + Close page 關閉é é¢ + New Tab æ–°å¢žåˆ†é  + Close Tab é—œé–‰åˆ†é  + Close Other Tabs é—œé–‰å…¶ä»–åˆ†é  + TabbedBrowser 分é å¼ç€è¦½å™¨ + Untitled 未命å + Previous å‰ä¸€å€‹ + Next 下一個 + Case Sensitive å€åˆ†å¤§å°å¯« + Whole words 整個字詞 + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;æœå°‹å·²æŠ˜å›ž @@ -777,39 +952,47 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> 請為 <b>%1</b> é¸æ“‡ä¸€å€‹ä¸»é¡Œ + Choose Topic é¸æ“‡ä¸»é¡Œ + Select a topic from the list and click the <b>Display</b>-button to open the online help. 請從清單中é¸å–一個主題,並按下「顯示ã€éµé–‹å•Ÿç·šä¸Šèªªæ˜Žã€‚ + &Topics 主題(&T) + Displays a list of available help topics for the keyword. 顯示此關éµå­—å¯ç”¨çš„說明主題。 + &Display 顯示(&D) + Open the topic selected in the list. 開啟在清單中é¸å–的主題。 + &Close 關閉(&C) + Close the Dialog. 關閉å°è©±æ¡†ã€‚ diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 0bb0e66..0411ef1 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -1,10 +1,10 @@ - - + + AboutDialog - + &Close &Schließen @@ -52,7 +52,7 @@ Neuer Ordner - + @@ -163,7 +163,7 @@ CentralWidget - + Add new page Neue Seite hinzufügen @@ -173,12 +173,12 @@ Aktuelle Seite schließen - + Print Document Drucken - + unknown unbekannt @@ -204,7 +204,7 @@ Lesezeichen für diese Seite hinzufügen... - + Search Suchen @@ -212,7 +212,7 @@ ContentWindow - + Open Link Link öffnen @@ -242,7 +242,7 @@ FindWidget - + Previous Vorherige @@ -270,7 +270,7 @@ FontPanel - + Font Schriftart @@ -298,7 +298,7 @@ HelpViewer - + Help Hilfe @@ -314,12 +314,12 @@ OK - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Fehler 404...</title><div align="center"><br><br><h1>Die Seite konnte nicht gefunden werden!</h1><br><h3>'%1'</h3></div> - + Copy &Link Location &Link Adresse kopieren @@ -329,12 +329,12 @@ Link in neuem Tab öffnen - + Open Link in New Tab Link in neuem Tab öffnen - + Unable to launch external application. Fehler beim Starten der externen Anwendung. @@ -344,12 +344,12 @@ IndexWindow - + &Look for: Suche &nach: - + Open Link Link öffnen @@ -362,7 +362,7 @@ InstallDialog - + Install Documentation Dokumentation installieren @@ -462,38 +462,38 @@ MainWindow - - + + Index Index - - + + Contents Inhalt - - + + Bookmarks Lesezeichen - - + + Search Suchen - - - + + + Qt Assistant Qt Assistant - + Unfiltered Ohne Filter @@ -503,47 +503,44 @@ Datei - + Page Set&up... S&eite einrichten... - + Print Preview... Druckvorschau... - + &Print... &Drucken... - CTRL+P - CTRL+P + CTRL+P - + New &Tab Neue &Seite - CTRL+T - CTRL+T + CTRL+T - + &Close Tab &Seite schließen - CTRL+W - CTRL+W + CTRL+W - + &Quit &Beenden @@ -562,42 +559,38 @@ &Kopieren - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... &Textsuche... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next &Weitersuchen - F3 - F3 + F3 - + Find &Previous &Vorheriges suchen - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... Einstellungen... @@ -611,27 +604,25 @@ &Vergrößern - Ctrl++ - Ctrl++ + Ctrl++ - + Zoom &out Ver&kleinern - Ctrl+- - Ctrl+- + Ctrl+- - + Normal &Size Standard&größe - + Ctrl+0 Ctrl+0 @@ -664,27 +655,27 @@ &Startseite - + Ctrl+Home Strg+Pos1 - + &Back &Rückwärts - + &Forward &Vorwärts - + Sync with Table of Contents Seite mit Inhalt Tab syncronisieren - + Next Page Nächste Seite @@ -699,7 +690,7 @@ Vorherige Seite - + Ctrl+Alt+Left Ctrl+Alt+Left @@ -727,7 +718,7 @@ Navigationsleiste - + Toolbars Werkzeugleisten @@ -742,7 +733,7 @@ Filter: - + Address Toolbar Adressleiste @@ -752,31 +743,28 @@ Adresse: - + Could not find the associated content item. Der zugehörige Inhaltseintrag konnte nicht gefunden werden. - Open Source Edition - Open Source Edition + Open Source Edition - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. + This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. + This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + About %1 Ãœber %1 @@ -786,17 +774,17 @@ Suchindex wird aufgebaut - + Looking for Qt Documentation... Suche nach Qt Dokumentationen... - + &Window &Fenster - + Minimize Minimieren @@ -806,7 +794,7 @@ CTRL+M - + Zoom Zoom @@ -819,27 +807,27 @@ Entfernen - + &File &Datei - + &Edit &Bearbeiten - + &View &Ansicht - + &Go &Gehe - + &Bookmarks &Lesezeichen @@ -849,17 +837,16 @@ &Hilfe - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. + Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. - + ALT+O ALT+O - + CTRL+D CTRL+D @@ -875,7 +862,7 @@ Von Helpserver herunterladen... - + Add Documentation @@ -897,7 +884,27 @@ Der Namespace %1 ist bereits registriert! - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + Abbrechen + + + + OK + OK + + + Use custom settings Benutze erweiterte Einstellungen @@ -975,24 +982,20 @@ Hinzufügen... - Network - Netzwerk + Netzwerk - Use Http Proxy - Http Proxy + Http Proxy - Http Proxy: - Http Proxy: + Http Proxy: - Port: - Port: + Port: @@ -1022,7 +1025,7 @@ Neuer Ordner - + The specified collection file does not exist! Die angegeben Katalogdatei (collection file) konnte nicht gefunden werden! @@ -1068,6 +1071,11 @@ Fehlende Hilfedatei! + + Missing filter argument! + + + Unknown option: %1 Unbekannte Option: %1 @@ -1079,7 +1087,7 @@ Qt Assistant - + Could not register documentation file %1 @@ -1093,7 +1101,7 @@ Reason: Dokumentation erfolgreich registriert. - + Could not unregister documentation file %1 @@ -1102,12 +1110,12 @@ Reason: Could not unregister documentation file%1Reason:%2 - + Documentation successfully unregistered. Dokumentation erfolgreich entfernt. - + Cannot load sqlite database driver! @@ -1126,7 +1134,7 @@ Reason: RemoteControl - + Debugging Remote Control Debugging Remote Control @@ -1139,7 +1147,7 @@ Reason: SearchWidget - + &Copy &Kopieren @@ -1168,7 +1176,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts index 5552272..1853155 100644 --- a/translations/assistant_ja.ts +++ b/translations/assistant_ja.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -149,7 +150,7 @@ CentralWidget - + Add new page @@ -159,12 +160,12 @@ - + Print Document - + unknown @@ -190,7 +191,7 @@ - + Search @@ -198,7 +199,7 @@ ContentWindow - + Open Link @@ -224,7 +225,7 @@ FindWidget - + Previous @@ -252,7 +253,7 @@ FontPanel - + Font @@ -280,7 +281,7 @@ HelpViewer - + Help @@ -290,12 +291,12 @@ - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - + Copy &Link Location @@ -305,12 +306,12 @@ - + Open Link in New Tab - + Unable to launch external application. @@ -319,12 +320,12 @@ IndexWindow - + &Look for: - + Open Link @@ -337,7 +338,7 @@ InstallDialog - + Install Documentation @@ -436,84 +437,69 @@ MainWindow - - + + Index - - + + Contents - - + + Bookmarks - - + + Search - - - + + + Qt Assistant - + Unfiltered - + Page Set&up... - + Print Preview... - - &Print... - - - - CTRL+P + &Print... - + New &Tab - - CTRL+T - - - - + &Close Tab - - CTRL+W - - - - + &Quit @@ -528,42 +514,22 @@ - - Ctrl+C - - - - + &Find in Text... - - Ctrl+F - - - - + Find &Next - - F3 - - - - + Find &Previous - - Shift+F3 - - - - + Preferences... @@ -573,27 +539,17 @@ - - Ctrl++ - - - - + Zoom &out - - Ctrl+- - - - - + Normal &Size - + Ctrl+0 @@ -618,27 +574,27 @@ - + Ctrl+Home - + &Back - + &Forward - + Sync with Table of Contents - + Next Page @@ -653,7 +609,7 @@ - + Ctrl+Alt+Left @@ -673,7 +629,7 @@ - + Toolbars @@ -688,7 +644,7 @@ - + Address Toolbar @@ -698,27 +654,12 @@ - + Could not find the associated content item. - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 @@ -728,17 +669,17 @@ - + Looking for Qt Documentation... - + &Window - + Minimize @@ -748,32 +689,32 @@ - + Zoom - + &File - + &Edit - + &View - + &Go - + &Bookmarks @@ -783,17 +724,12 @@ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - - - - + ALT+O - + CTRL+D @@ -801,7 +737,7 @@ PreferencesDialog - + Add Documentation @@ -823,7 +759,27 @@ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + Use custom settings @@ -902,26 +858,6 @@ - Network - - - - - Use Http Proxy - - - - - Http Proxy: - - - - - Port: - - - - Options @@ -944,7 +880,7 @@ QObject - + The specified collection file does not exist! @@ -990,6 +926,11 @@ + + Missing filter argument! + + + Unknown option: %1 @@ -1001,7 +942,7 @@ - + Could not register documentation file %1 @@ -1015,7 +956,7 @@ Reason: - + Could not unregister documentation file %1 @@ -1024,12 +965,12 @@ Reason: - + Documentation successfully unregistered. - + Cannot load sqlite database driver! @@ -1048,7 +989,7 @@ Reason: RemoteControl - + Debugging Remote Control @@ -1061,7 +1002,7 @@ Reason: SearchWidget - + &Copy @@ -1090,7 +1031,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: diff --git a/translations/assistant_pl.ts b/translations/assistant_pl.ts index 4985b72..f84bad2 100644 --- a/translations/assistant_pl.ts +++ b/translations/assistant_pl.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close Za&mknij @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -157,7 +158,7 @@ CentralWidget - + Add new page Dodaj nowÄ… stronÄ™ @@ -167,12 +168,12 @@ Zamknij bieżącÄ… stronÄ™ - + Print Document Wydrukuj dokument - + unknown nieznany @@ -198,7 +199,7 @@ Dodaj zakÅ‚adkÄ™ dla tej strony... - + Search Wyszukaj @@ -206,7 +207,7 @@ ContentWindow - + Open Link Otwórz odsyÅ‚acz @@ -236,7 +237,7 @@ FindWidget - + Previous Poprzedni @@ -264,7 +265,7 @@ FontPanel - + Font Czcionka @@ -292,7 +293,7 @@ HelpViewer - + Help Pomoc @@ -308,12 +309,12 @@ OK - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>BÅ‚Ä…d 404...</title><div align="center"><br><br><h1>Strona nie może być znaleziona</h1><br><h3>'%1'</h3></div> - + Copy &Link Location Skopiuj &odsyÅ‚acz @@ -323,12 +324,12 @@ Otwórz odsyÅ‚acz w nowej karcie Ctrl+LMB - + Open Link in New Tab Otwórz odsyÅ‚acz w nowej karcie - + Unable to launch external application. Nie można uruchomić zewnÄ™trznej aplikacji. @@ -338,12 +339,12 @@ IndexWindow - + &Look for: Wy&szukaj: - + Open Link Otwórz odsyÅ‚acz @@ -356,7 +357,7 @@ InstallDialog - + Install Documentation Zainstaluj dokumentacjÄ™ @@ -456,38 +457,38 @@ MainWindow - - + + Index Indeks - - + + Contents Spis treÅ›ci - - + + Bookmarks ZakÅ‚adki - - + + Search Wyszukaj - - - + + + Qt Assistant Qt Assistant - + Unfiltered Nieprzefiltrowany @@ -497,47 +498,44 @@ Plik - + Page Set&up... &Ustawienia strony... - + Print Preview... PodglÄ…d wydruku... - + &Print... Wy&drukuj... - CTRL+P - CTRL+P + CTRL+P - + New &Tab Nowa kar&ta - CTRL+T - CTRL+T + CTRL+T - + &Close Tab &Zamknij kartÄ™ - CTRL+W - CTRL+W + CTRL+W - + &Quit Za&koÅ„cz @@ -556,42 +554,38 @@ S&kopiuj zaznaczony tekst - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... Znajdź w &tekÅ›cie... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next Znajdź &nastÄ™pny - F3 - F3 + F3 - + Find &Previous Znajdź &poprzedni - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... Ustawienia... @@ -605,27 +599,17 @@ Po&wiÄ™ksz - - Ctrl++ - - - - + Zoom &out Po&mniejsz - - Ctrl+- - - - - + Normal &Size Normalny &rozmiar - + Ctrl+0 Ctrl+0 @@ -658,27 +642,27 @@ Strona &startowa - + Ctrl+Home - + &Back &Wstecz - + &Forward W &przód - + Sync with Table of Contents Znajdź bieżącÄ… stronÄ™ w spisie treÅ›ci - + Next Page NastÄ™pna strona @@ -693,7 +677,7 @@ Poprzednia strona - + Ctrl+Alt+Left @@ -717,7 +701,7 @@ Pasek do nawigacji - + Toolbars Paski narzÄ™dzi @@ -732,7 +716,7 @@ Przefiltrowane przez: - + Address Toolbar Pasek adresu @@ -742,27 +726,20 @@ Adres: - + Could not find the associated content item. Nie można znaleźć skojarzonego elementu zawartoÅ›ci. - Open Source Edition - Edycja Open Source + Edycja Open Source - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. + Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 Informacje o %1 @@ -772,17 +749,17 @@ Uaktualnianie indeksu wyszukiwawczego - + Looking for Qt Documentation... Szukanie dokumentacji Qt... - + &Window &Okno - + Minimize Zminimalizuj @@ -792,7 +769,7 @@ - + Zoom PowiÄ™kszenie @@ -805,32 +782,31 @@ UsuÅ„ - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. + Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - + &File &Plik - + &Edit &Edycja - + &View &Widok - + &Go &Nawigacja - + &Bookmarks &ZakÅ‚adki @@ -840,12 +816,12 @@ &Pomoc - + ALT+O ALT+O - + CTRL+D CTRL+D @@ -853,7 +829,7 @@ PreferencesDialog - + Add Documentation @@ -875,7 +851,27 @@ PrzestrzeÅ„ nazw %1 jest już zarejestrowana! - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + Anuluj + + + + OK + OK + + + Use custom settings Użyj wÅ‚asnych ustawieÅ„ @@ -953,24 +949,20 @@ Dodaj... - Network - Sieć + Sieć - Use Http Proxy - Użyj poÅ›rednika http + Użyj poÅ›rednika http - Http Proxy: - PoÅ›rednik http: + PoÅ›rednik http: - Port: - Port: + Port: @@ -1000,7 +992,7 @@ Nowy katalog - + The specified collection file does not exist! Podany plik z kolekcjÄ… nie istnieje! @@ -1046,6 +1038,11 @@ Brak pliku pomocy! + + Missing filter argument! + + + Unknown option: %1 Nieznana opcja: %1 @@ -1057,7 +1054,7 @@ Qt Assistant - + Could not register documentation file %1 @@ -1075,7 +1072,7 @@ Powód: Dokumentacja poprawnie zarejestrowana. - + Could not unregister documentation file %1 @@ -1088,12 +1085,12 @@ Powód: %2 - + Documentation successfully unregistered. Dokumentacja poprawnie wyrejestrowana. - + Cannot load sqlite database driver! Nie można odczytać sterownika bazy danych sqlite! @@ -1112,7 +1109,7 @@ Powód: RemoteControl - + Debugging Remote Control Zdalne debugowanie @@ -1125,7 +1122,7 @@ Powód: SearchWidget - + &Copy S&kopiuj @@ -1154,7 +1151,7 @@ Powód: TopicChooser - + Choose a topic for <b>%1</b>: Wybierz temat dla <b>%1</b>: diff --git a/translations/assistant_tr_TR.ts b/translations/assistant_tr_TR.ts new file mode 100644 index 0000000..0ca29df --- /dev/null +++ b/translations/assistant_tr_TR.ts @@ -0,0 +1,1059 @@ + + + + + AboutDialog + + + &Close + + + + + AboutLabel + + + Warning + + + + + Unable to launch external application. + + + + + + OK + + + + + BookmarkDialog + + + Add Bookmark + + + + + Bookmark: + + + + + Add in Folder: + + + + + + + + + + + New Folder + + + + + + + + + Bookmarks + + + + + Delete Folder + + + + + Rename Folder + + + + + BookmarkManager + + + Bookmarks + + + + + Remove + + + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + + + + + + New Folder + + + + + BookmarkWidget + + + Delete Folder + + + + + Rename Folder + + + + + Show Bookmark + + + + + Show Bookmark in New Tab + + + + + Delete Bookmark + + + + + Rename Bookmark + + + + + Filter: + + + + + Add + + + + + Remove + + + + + CentralWidget + + + Add new page + + + + + Close current page + + + + + Print Document + + + + + + unknown + + + + + Add New Page + + + + + Close This Page + + + + + Close Other Pages + + + + + Add Bookmark for this Page... + + + + + Search + + + + + ContentWindow + + + Open Link + + + + + Open Link in New Tab + + + + + FilterNameDialogClass + + + Add Filter Name + + + + + Filter Name: + + + + + FindWidget + + + Previous + + + + + Next + + + + + Case Sensitive + + + + + Whole words + + + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + HelpViewer + + + Open Link in New Tab + + + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + + + + + Help + + + + + Unable to launch external application. + + + + + + OK + + + + + Copy &Link Location + + + + + Open Link in New Tab Ctrl+LMB + + + + + IndexWindow + + + &Look for: + + + + + Open Link + + + + + Open Link in New Tab + + + + + InstallDialog + + + + Install Documentation + + + + + Downloading documentation info... + + + + + Download canceled. + + + + + + + Done. + + + + + The file %1 already exists. Do you want to overwrite it? + + + + + Unable to save the file %1: %2. + + + + + Downloading %1... + + + + + + + Download failed: %1. + + + + + Documentation info file is corrupt! + + + + + Download failed: Downloaded file is corrupted. + + + + + Installing documentation %1... + + + + + Error while installing documentation: +%1 + + + + + Available Documentation: + + + + + Install + + + + + Cancel + + + + + Close + + + + + Installation Path: + + + + + ... + + + + + MainWindow + + + + Index + + + + + + Contents + + + + + + Bookmarks + + + + + + Search + + + + + + + Qt Assistant + + + + + + Unfiltered + + + + + Looking for Qt Documentation... + + + + + &File + + + + + Page Set&up... + + + + + Print Preview... + + + + + &Print... + + + + + New &Tab + + + + + &Close Tab + + + + + &Quit + + + + + CTRL+Q + + + + + &Edit + + + + + &Copy selected Text + + + + + &Find in Text... + + + + + Find &Next + + + + + Find &Previous + + + + + Preferences... + + + + + &View + + + + + Zoom &in + + + + + Zoom &out + + + + + Normal &Size + + + + + Ctrl+0 + + + + + ALT+C + + + + + ALT+I + + + + + ALT+O + + + + + ALT+S + + + + + &Go + + + + + &Home + + + + + Ctrl+Home + + + + + &Back + + + + + &Forward + + + + + Sync with Table of Contents + + + + + Next Page + + + + + Ctrl+Alt+Right + + + + + Previous Page + + + + + Ctrl+Alt+Left + + + + + &Bookmarks + + + + + Add Bookmark... + + + + + CTRL+D + + + + + &Help + + + + + About... + + + + + Navigation Toolbar + + + + + &Window + + + + + Zoom + + + + + Minimize + + + + + Ctrl+M + + + + + Toolbars + + + + + Filter Toolbar + + + + + Filtered by: + + + + + Address Toolbar + + + + + Address: + + + + + Could not find the associated content item. + + + + + About %1 + + + + + Updating search index + + + + + PreferencesDialog + + + + + Add Documentation + + + + + Qt Compressed Help Files (*.qch) + + + + + The specified file is not a valid Qt Help File! + + + + + The namespace %1 is already registered! + + + + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + + Use custom settings + + + + + PreferencesDialogClass + + + Preferences + + + + + Fonts + + + + + Font settings: + + + + + Browser + + + + + Application + + + + + Filters + + + + + Filter: + + + + + Attributes: + + + + + 1 + + + + + Add + + + + + Remove + + + + + Documentation + + + + + Registered Documentation: + + + + + Add... + + + + + Options + + + + + Homepage + + + + + Current Page + + + + + Restore to default + + + + + QObject + + + + Bookmark + + + + + The specified collection file does not exist! + + + + + Missing collection file! + + + + + Invalid URL! + + + + + Missing URL! + + + + + + + Unknown widget: %1 + + + + + + + Missing widget! + + + + + + The specified Qt help file does not exist! + + + + + + Missing help file! + + + + + Missing filter argument! + + + + + Unknown option: %1 + + + + + + Qt Assistant + + + + + Could not register documentation file +%1 + +Reason: +%2 + + + + + Documentation successfully registered. + + + + + Documentation successfully unregistered. + + + + + Could not unregister documentation file +%1 + +Reason: +%2 + + + + + Cannot load sqlite database driver! + + + + + The specified collection file could not be read! + + + + + RemoteControl + + + Debugging Remote Control + + + + + Received Command: %1 %2 + + + + + SearchWidget + + + &Copy + + + + + Copy &Link Location + + + + + + Open Link in New Tab + + + + + Select All + + + + + Open Link + + + + + TopicChooser + + + Choose a topic for <b>%1</b>: + + + + + Choose Topic + + + + + &Topics + + + + + &Display + + + + + &Close + + + + diff --git a/translations/assistant_untranslated.ts b/translations/assistant_untranslated.ts index 5552272..1853155 100644 --- a/translations/assistant_untranslated.ts +++ b/translations/assistant_untranslated.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -149,7 +150,7 @@ CentralWidget - + Add new page @@ -159,12 +160,12 @@ - + Print Document - + unknown @@ -190,7 +191,7 @@ - + Search @@ -198,7 +199,7 @@ ContentWindow - + Open Link @@ -224,7 +225,7 @@ FindWidget - + Previous @@ -252,7 +253,7 @@ FontPanel - + Font @@ -280,7 +281,7 @@ HelpViewer - + Help @@ -290,12 +291,12 @@ - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - + Copy &Link Location @@ -305,12 +306,12 @@ - + Open Link in New Tab - + Unable to launch external application. @@ -319,12 +320,12 @@ IndexWindow - + &Look for: - + Open Link @@ -337,7 +338,7 @@ InstallDialog - + Install Documentation @@ -436,84 +437,69 @@ MainWindow - - + + Index - - + + Contents - - + + Bookmarks - - + + Search - - - + + + Qt Assistant - + Unfiltered - + Page Set&up... - + Print Preview... - - &Print... - - - - CTRL+P + &Print... - + New &Tab - - CTRL+T - - - - + &Close Tab - - CTRL+W - - - - + &Quit @@ -528,42 +514,22 @@ - - Ctrl+C - - - - + &Find in Text... - - Ctrl+F - - - - + Find &Next - - F3 - - - - + Find &Previous - - Shift+F3 - - - - + Preferences... @@ -573,27 +539,17 @@ - - Ctrl++ - - - - + Zoom &out - - Ctrl+- - - - - + Normal &Size - + Ctrl+0 @@ -618,27 +574,27 @@ - + Ctrl+Home - + &Back - + &Forward - + Sync with Table of Contents - + Next Page @@ -653,7 +609,7 @@ - + Ctrl+Alt+Left @@ -673,7 +629,7 @@ - + Toolbars @@ -688,7 +644,7 @@ - + Address Toolbar @@ -698,27 +654,12 @@ - + Could not find the associated content item. - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 @@ -728,17 +669,17 @@ - + Looking for Qt Documentation... - + &Window - + Minimize @@ -748,32 +689,32 @@ - + Zoom - + &File - + &Edit - + &View - + &Go - + &Bookmarks @@ -783,17 +724,12 @@ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - - - - + ALT+O - + CTRL+D @@ -801,7 +737,7 @@ PreferencesDialog - + Add Documentation @@ -823,7 +759,27 @@ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + Use custom settings @@ -902,26 +858,6 @@ - Network - - - - - Use Http Proxy - - - - - Http Proxy: - - - - - Port: - - - - Options @@ -944,7 +880,7 @@ QObject - + The specified collection file does not exist! @@ -990,6 +926,11 @@ + + Missing filter argument! + + + Unknown option: %1 @@ -1001,7 +942,7 @@ - + Could not register documentation file %1 @@ -1015,7 +956,7 @@ Reason: - + Could not unregister documentation file %1 @@ -1024,12 +965,12 @@ Reason: - + Documentation successfully unregistered. - + Cannot load sqlite database driver! @@ -1048,7 +989,7 @@ Reason: RemoteControl - + Debugging Remote Control @@ -1061,7 +1002,7 @@ Reason: SearchWidget - + &Copy @@ -1090,7 +1031,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: diff --git a/translations/assistant_zh_CN.ts b/translations/assistant_zh_CN.ts index 0384c47..a1f763f 100644 --- a/translations/assistant_zh_CN.ts +++ b/translations/assistant_zh_CN.ts @@ -1,11 +1,10 @@ - AboutDialog - + &Close 关闭(&C) @@ -33,7 +32,7 @@ BookmarkDialog - + @@ -164,7 +163,7 @@ CentralWidget - + Add new page æ·»åŠ æ–°é¡µé¢ @@ -174,12 +173,12 @@ 关闭当å‰é¡µé¢ - + Print Document 打å°æ–‡æ¡£ - + unknown 未知的 @@ -205,7 +204,7 @@ 把这个页é¢æ·»åŠ ä¸ºä¹¦ç­¾... - + Search æœç´¢ @@ -213,7 +212,7 @@ ContentWindow - + Open Link 打开链接 @@ -243,7 +242,7 @@ FindWidget - + Previous 上一个 @@ -271,7 +270,7 @@ FontPanel - + Font 字体 @@ -299,7 +298,7 @@ HelpViewer - + Help 帮助 @@ -315,12 +314,12 @@ 确定 - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>404 错误...</title><div align="center"><br><br><h1>ä¸èƒ½æ‰¾åˆ°è¯¥é¡µé¢</h1><br><h3>'%1'</h3></div> - + Copy &Link Location å¤åˆ¶é“¾æŽ¥åœ°å€(&L) @@ -330,12 +329,12 @@ 在新标签页中打开链接 Ctrl+LMB - + Open Link in New Tab 在新标签页中打开链接 - + Unable to launch external application. ä¸èƒ½å¯åŠ¨å¤–部应用程åºã€‚ @@ -345,12 +344,12 @@ IndexWindow - + &Look for: 查找(&L): - + Open Link 打开链接 @@ -363,7 +362,7 @@ InstallDialog - + Install Documentation 安装文档 @@ -463,38 +462,38 @@ MainWindow - - + + Index 索引 - - + + Contents 内容 - - + + Bookmarks 书签 - - + + Search æœç´¢ - - - + + + Qt Assistant Qt 助手 - + Unfiltered 未过滤的 @@ -504,47 +503,44 @@ 文件 - + Page Set&up... 页é¢è®¾ç½®(&U)... - + Print Preview... 打å°é¢„览... - + &Print... 打å°(&P)... - CTRL+P - CTRL+P + CTRL+P - + New &Tab 新建标签页(&T) - CTRL+T - CTRL+T + CTRL+T - + &Close Tab 关闭标签页(&C) - CTRL+W - CTRL+W + CTRL+W - + &Quit 退出(&Q) @@ -563,42 +559,38 @@ å¤åˆ¶é€‰ä¸­çš„文本(&C) - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... 在文本中查找(&F)... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next 查找下一个(&N) - F3 - F3 + F3 - + Find &Previous 查找上一个(&P) - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... 首选项... @@ -612,27 +604,25 @@ 放大(&I) - Ctrl++ - Ctrl++ + Ctrl++ - + Zoom &out 缩å°(&O) - Ctrl+- - Ctrl+- + Ctrl+- - + Normal &Size 正常大å°(&S) - + Ctrl+0 Ctrl+0 @@ -665,27 +655,27 @@ 主页(&H) - + Ctrl+Home Ctrl+Home - + &Back åŽé€€(&B) - + &Forward å‰è¿›(&F) - + Sync with Table of Contents åŒæ­¥ç›®å½• - + Next Page 下一页 @@ -700,7 +690,7 @@ 上一页 - + Ctrl+Alt+Left Ctrl+Alt+Left @@ -728,7 +718,7 @@ å¯¼èˆªå·¥å…·æ  - + Toolbars å·¥å…·æ  @@ -743,7 +733,7 @@ 过滤器为: - + Address Toolbar 地å€å·¥å…·æ  @@ -753,27 +743,24 @@ 地å€ï¼š - + Could not find the associated content item. ä¸èƒ½æ‰¾åˆ°ç›¸å…³å†…容项目。 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 + 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + About %1 关于 %1 @@ -783,17 +770,17 @@ 正在更新æœç´¢ç´¢å¼• - + Looking for Qt Documentation... 正在查找 Qt 文档... - + &Window 窗å£(&W) - + Minimize 最å°åŒ– @@ -803,7 +790,7 @@ Ctrl+M - + Zoom 缩放 @@ -816,27 +803,26 @@ 移除 - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/about/businessmodel">qtsoftware.com/company/about/businessmodel</a>。 + å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/about/businessmodel">qtsoftware.com/company/about/businessmodel</a>。 - + &File 文件(&F) - + &Edit 编辑(&E) - + &View 查看(&V) - + ALT+O ALT+O @@ -846,7 +832,7 @@ å‰å¾€(&G) - + &Bookmarks 书签(&B) @@ -864,7 +850,7 @@ PreferencesDialog - + Add Documentation @@ -886,7 +872,27 @@ 命å空间 %1 å·²ç»è¢«æ³¨å†Œï¼ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + å–消 + + + + OK + 确定 + + + Use custom settings 使用自定义设定 @@ -964,24 +970,20 @@ 添加... - Network - 网络 + 网络 - Use Http Proxy - 使用 HTTP ä»£ç† + 使用 HTTP ä»£ç† - Http Proxy: - HTTP 代ç†ï¼š + HTTP 代ç†ï¼š - Port: - 端å£ï¼š + 端å£ï¼š @@ -1011,7 +1013,7 @@ 新建文件夹 - + The specified collection file does not exist! 指定的收è—文件并ä¸å­˜åœ¨ï¼ @@ -1057,6 +1059,11 @@ ç¼ºå°‘å¸®åŠ©æ–‡ä»¶ï¼ + + Missing filter argument! + + + Unknown option: %1 未知的选项:%1 @@ -1068,7 +1075,7 @@ Qt 助手 - + Could not register documentation file %1 @@ -1086,7 +1093,7 @@ Reason: 文档已ç»æˆåŠŸæ³¨å†Œã€‚ - + Could not unregister documentation file %1 @@ -1099,12 +1106,12 @@ Reason: %2 - + Documentation successfully unregistered. 文档已ç»æˆåŠŸå–消注册。 - + Cannot load sqlite database driver! 无法加载sqliteæ•°æ®åº“é©±åŠ¨ï¼ @@ -1123,7 +1130,7 @@ Reason: RemoteControl - + Debugging Remote Control 正在调试é¥æŽ§å™¨ @@ -1136,7 +1143,7 @@ Reason: SearchWidget - + &Copy å¤åˆ¶(&C) @@ -1165,7 +1172,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: 为<b>%1</b>选择一个主题 diff --git a/translations/assistant_zh_TW.ts b/translations/assistant_zh_TW.ts index 179b69c..df6b827 100644 --- a/translations/assistant_zh_TW.ts +++ b/translations/assistant_zh_TW.ts @@ -1,10 +1,10 @@ - - + + AboutDialog - + &Close 關閉(&C) @@ -12,16 +12,19 @@ AboutLabel + Warning 警告 + Unable to launch external application. 無法啟動外部應用程å¼ã€‚ + OK 確定 @@ -29,34 +32,46 @@ BookmarkDialog + Add Bookmark 新增書籤 + Bookmark: 書籤: + Add in Folder: 新增到資料夾: + New Folder 新增資料夾 + + + + + Bookmarks 書籤 + + + + Delete Folder 刪除資料夾 + Rename Folder é‡å‘½å資料夾 @@ -64,18 +79,23 @@ BookmarkManager + Bookmarks 書籤 + Remove 移除 + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? 您打算刪除資料夾,這會將裡é¢çš„內容<br>一併移除。您確定è¦ç¹¼çºŒå—Žï¼Ÿ + + New Folder 新資料夾 @@ -83,6 +103,7 @@ BookmarkWidget + Filter: éŽæ¿¾ï¼š @@ -91,6 +112,7 @@ 書籤 + Remove 移除 @@ -99,26 +121,32 @@ 您打算刪除資料夾,這會將裡é¢çš„內容一併移除。您確定è¦ç¹¼çºŒå—Žï¼Ÿ + Delete Folder 刪除資料夾 + Rename Folder é‡å‘½å資料夾 + Show Bookmark 顯示書籤 + Show Bookmark in New Tab 於新分é é¡¯ç¤ºæ›¸ç±¤ + Delete Bookmark 刪除書籤 + Rename Bookmark é‡å‘½å書籤 @@ -127,6 +155,7 @@ æœå°‹å­—串: + Add 新增 @@ -134,39 +163,48 @@ CentralWidget - + Add new page 新增é é¢ + Close current page 關閉目å‰çš„é é¢ + Print Document 列å°æ–‡ä»¶ + + unknown 未知 + Add New Page 新增é é¢ + Close This Page 關閉此é é¢ + Close Other Pages 關閉其他é é¢ + Add Bookmark for this Page... 將此é é¢æ–°å¢žåˆ°æ›¸ç±¤... + Search æœå°‹ @@ -174,11 +212,12 @@ ContentWindow - + Open Link é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ @@ -190,10 +229,12 @@ éŽæ¿¾å™¨å稱å°è©±æ¡† + Filter Name: éŽæ¿¾å™¨å稱: + Add Filter Name 新增éŽæ¿¾å™¨å稱 @@ -201,22 +242,27 @@ FindWidget + Previous å‰ä¸€å€‹ + Next 下一個 + Case Sensitive å€åˆ†å¤§å°å¯« + Whole words 整個單字 + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;æœå°‹å·²éŽç›¡é ­ @@ -224,23 +270,27 @@ FontPanel - + Font å­—åž‹ + &Writing system 手寫系統(&W) + &Family 家æ—(&W) + &Style 樣å¼(&S) + &Point size 點大å°(&P) @@ -248,7 +298,7 @@ HelpViewer - + Help 說明 @@ -259,26 +309,32 @@ + OK 確定 + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>錯誤 404...</title><div align="center"><br><br><h1>找ä¸åˆ°é é¢</h1><br><h3>'%1'</h3></div> + Copy &Link Location 複製連çµä½ç½®(&L) - Open Link in New TabCtrl+LMB - 在新分é é–‹å•Ÿé€£çµCtrl+æ»‘é¼ å·¦éµ + + Open Link in New Tab Ctrl+LMB + 在新分é é–‹å•Ÿé€£çµ Ctrl+æ»‘é¼ å·¦éµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Unable to launch external application. 無法啟動外部應用程å¼ã€‚ @@ -288,15 +344,17 @@ IndexWindow - + &Look for: æœå°‹(&L): + Open Link é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ @@ -304,76 +362,99 @@ InstallDialog + + Install Documentation 安è£æ–‡ä»¶ + Downloading documentation info... 下載文件資訊中... + Download canceled. 下載已å–消。 + + + Done. 完æˆã€‚ + The file %1 already exists. Do you want to overwrite it? 檔案 %1 已存在。您è¦è¦†å¯«å®ƒå—Žï¼Ÿ + Unable to save the file %1: %2. 無法儲存檔案 %1:%2。 + Downloading %1... 下載 %1 中... + + + Download failed: %1. 下載失敗:%1。 + Documentation info file is corrupt! 文件資訊檔已ææ¯€ï¼ + Download failed: Downloaded file is corrupted. 下載失敗:下載的檔案已æ毀。 + Installing documentation %1... 安è£æ–‡ä»¶ %1 中... + Error while installing documentation: %1 安è£æ–‡ä»¶æ™‚發生錯誤: %1 + Available Documentation: å¯ç”¨çš„文件: + Install å®‰è£ + Cancel å–消 + Close 關閉 + Installation Path: 安è£è·¯å¾‘: + ... ... @@ -381,26 +462,39 @@ MainWindow + + Index 索引 + + Contents 內容 + + Bookmarks 書籤 + + Search æœå°‹ + + + Qt Assistant Qt å°å¹«æ‰‹ + + Unfiltered 未éŽæ¿¾ @@ -409,42 +503,49 @@ 檔案 + Page Set&up... é é¢è¨­å®š(&U)... + Print Preview... 列å°é è¦½... + &Print... 列å°(&P)... CTRL+P - CTRL+P + CTRL+P + New &Tab 新增分é (&T) CTRL+T - CTRL+T + CTRL+T + &Close Tab 關閉分é (&C) CTRL+W - CTRL+W + CTRL+W + &Quit 離開(&Q) + CTRL+Q CTRL+Q @@ -453,38 +554,43 @@ 編輯 + &Copy selected Text 複製é¸å–的文字(&C) Ctrl+C - Ctrl+C + Ctrl+C + &Find in Text... 在文字中尋找(&F)... Ctrl+F - Ctrl+F + Ctrl+F + Find &Next 尋找下一筆(&N) F3 - F3 + F3 + Find &Previous 尋找å‰ä¸€ç­†(&P) Shift+F3 - Shift+F3 + Shift+F3 + Preferences... 喜好設定... @@ -493,34 +599,40 @@ 檢視 + Zoom &in 放大(&I) Ctrl++ - Ctrl++ + Ctrl++ + Zoom &out 縮å°(&O) Ctrl+- - Ctrl+- + Ctrl+- + Normal &Size 一般大å°(&S) + Ctrl+0 Ctrl+0 + ALT+C ALT+C + ALT+I ALT+I @@ -529,6 +641,7 @@ ALT+B + ALT+S ALT+S @@ -537,42 +650,52 @@ å‰å¾€ + &Home 首é (&H) + Ctrl+Home Ctrl+Home + &Back 返回(&B) + &Forward å¾€å‰(&F) + Sync with Table of Contents 與目錄åŒæ­¥ + Next Page ä¸‹ä¸€é  + Ctrl+Alt+Right Ctrl+Alt+Right + Previous Page å‰ä¸€é  + Ctrl+Alt+Left Ctrl+Alt+Left + Add Bookmark... 新增書籤... @@ -585,44 +708,52 @@ 說明 + About... 關於... + Navigation Toolbar 導覽工具列 + Toolbars 工具列 + Filter Toolbar éŽæ¿¾å™¨å·¥å…·åˆ— + Filtered by: å·²éŽæ¿¾ï¼š + Address Toolbar ä½å€å·¥å…·åˆ— + Address: ä½å€ï¼š + Could not find the associated content item. 找ä¸åˆ°ç›¸é—œçš„內容項目。 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ + 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. @@ -630,33 +761,40 @@ This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + About %1 關於 %1 + Updating search index æ›´æ–°æœå°‹ç´¢å¼• + Looking for Qt Documentation... æœå°‹ Qt 文件中... + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Zoom 縮放 @@ -670,37 +808,45 @@ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a>。 + 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a>。 + &File 檔案(&F) + &Edit 編輯(&E) + &View 檢視(&V) + ALT+O ALT+O + &Go å‰å¾€(&G) + &Bookmarks 書籤(&B) + CTRL+D CTRL+D + &Help 說明(&H) @@ -716,22 +862,49 @@ 從說明伺æœå™¨ä¸‹è¼‰... + + + Add Documentation 新增文件 + Qt Compressed Help Files (*.qch) Qt 壓縮說明檔(*.qch) + The specified file is not a valid Qt Help File! 指定的檔案ä¸æ˜¯åˆæ³•çš„ Qt èªªæ˜Žæª”ï¼ + The namespace %1 is already registered! 命å空間 %1 å·²è¨»å†Šï¼ + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + å–消 + + + + OK + 確定 + + + Use custom settings 使用自訂設定 @@ -739,90 +912,108 @@ PreferencesDialogClass + Preferences 喜好設定 + Fonts å­—åž‹ + Font settings: 字型設定: + Browser ç€è¦½å™¨ + Application æ‡‰ç”¨ç¨‹å¼ + Filters éŽæ¿¾å™¨ + Filter: éŽæ¿¾ï¼š + Attributes: 屬性: + 1 1 + Add 新增 + Remove 移除 + Documentation 文件 + Registered Documentation: 已註冊文件: + Add... 新增... Network - 網路 + 網路 Use Http Proxy - 使用 Http 代ç†ä¼ºæœå™¨ + 使用 Http 代ç†ä¼ºæœå™¨ Http Proxy: - Http 代ç†ä¼ºæœå™¨ï¼š + Http 代ç†ä¼ºæœå™¨ï¼š Port: - 連接埠: + 連接埠: + Options é¸é … + Current Page ç›®å‰é é¢ + Restore to default 回復為é è¨­å€¼ + Homepage é¦–é  @@ -834,48 +1025,69 @@ 新資料夾 - + The specified collection file does not exist! 指定的收集檔ä¸å­˜åœ¨ï¼ + Missing collection file! éºå¤±æ”¶é›†æª”ï¼ + Invalid URL! ä¸åˆæ³•çš„網å€ï¼ + Missing URL! éºå¤±ç¶²å€ï¼ + + + Unknown widget: %1 未知的元件:%1 + + + Missing widget! éºå¤±å…ƒä»¶ï¼ + + The specified Qt help file does not exist! 指定的 Qt 說明檔ä¸å­˜åœ¨ï¼ + + Missing help file! éºå¤±èªªæ˜Žæª”ï¼ + + Missing filter argument! + + + + Unknown option: %1 未知的é¸é …:%1 + + Qt Assistant Qt å°å¹«æ‰‹ - + Could not register documentation file %1 @@ -888,10 +1100,12 @@ Reason: %2 + Documentation successfully registered. 文件已註冊æˆåŠŸã€‚ + Could not unregister documentation file %1 @@ -904,18 +1118,23 @@ Reason: %2 + Documentation successfully unregistered. 文件已æˆåŠŸè§£é™¤è¨»å†Šã€‚ + Cannot load sqlite database driver! 無法載入 sqlite 資料庫驅動程å¼ï¼ + The specified collection file could not be read! 指定的收集檔無法讀å–。 + + Bookmark 書籤 @@ -923,11 +1142,12 @@ Reason: RemoteControl - + Debugging Remote Control é ç«¯é™¤éŒ¯æŽ§åˆ¶ + Received Command: %1 %2 已接收指令:%1 %2 @@ -935,23 +1155,28 @@ Reason: SearchWidget - + &Copy 複製(&C) + Copy &Link Location 複製連çµä½ç½®(&L) + + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Select All 全部é¸å– + Open Link é–‹å•Ÿé€£çµ @@ -959,23 +1184,27 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: é¸æ“‡ %1 的標題: + Choose Topic é¸æ“‡æ¨™é¡Œ + &Topics 標題(&T) + &Display 顯示(&D) + &Close 關閉(&C) diff --git a/translations/designer_de.ts b/translations/designer_de.ts index cac8afb..4cd9914 100644 --- a/translations/designer_de.ts +++ b/translations/designer_de.ts @@ -1,11 +1,10 @@ - - + <object> <Objekt> @@ -20,7 +19,7 @@ <Slot> - + The moose in the noose ate the goose who was loose. @@ -29,7 +28,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous &Vorige @@ -75,7 +74,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts Zusätzliche Schriftarten @@ -187,7 +186,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. Fehler beim Senden einer Anforderung: Das Programm Assistant antwortet nicht. @@ -205,7 +204,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. Bei dem Element fehlt das erforderliche Attribut '%2'. @@ -233,7 +232,7 @@ ate the goose who was loose. BrushPropertyManager - + Style Stil @@ -326,19 +325,24 @@ ate the goose who was loose. Command - - + + Change signal Signal ändern - - + + Change slot Slot ändern - + + Change signal-slot connection + + + + Change sender Sender ändern @@ -348,7 +352,7 @@ ate the goose who was loose. Empfänger ändern - + Add connection Verbindung hinzufügen @@ -373,7 +377,7 @@ ate the goose who was loose. Endpunkt ändern - + Insert '%1' '%1' einfügen @@ -398,7 +402,7 @@ ate the goose who was loose. '%1' einem anderen Widget zuordnen - + Promote to custom widget Platzhalter für benutzerdefinierte Klasse erzeugen @@ -428,48 +432,48 @@ ate the goose who was loose. Layout auflösen - - - + + + Move Page Seite verschieben - - - - + + + + Delete Page Seite löschen - - + + Page Seite - - - + + + page Seite - - - - + + + + Insert Page Seite einfügen - + tab Seite - + Change Tab order Seite ändern @@ -514,12 +518,12 @@ ate the goose who was loose. Ändern des Formularlayout-Elements - + Change Layout Item Geometry Geometrie des Layoutelements ändern - + Change Table Contents Tabelleninhalt ändern @@ -561,7 +565,7 @@ ate the goose who was loose. Werkzeugleiste löschen - + Set action text Text der Aktion setzen @@ -572,7 +576,7 @@ ate the goose who was loose. - + Move action Aktion verschieben @@ -587,7 +591,7 @@ ate the goose who was loose. Menü einfügen - + Change signals/slots Signale/Slots ändern @@ -612,17 +616,17 @@ ate the goose who was loose. Subwindow - + Change Z-order of '%1' Z-Reihenfolge von '%1' ändern - + Simplify Grid Layout Tabellarisches Layout vereinfachen - + Create button group Buttons gruppieren @@ -647,19 +651,19 @@ ate the goose who was loose. Buttons aus Gruppierung entfernen - + Morph %1/'%2' into %3 MorphWidgetCommand description %1/'%2' in %3 umwandeln - + Change layout of '%1' from %2 to %3 Layout von '%1' von %2 in %3 umwandeln - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup '%1' zu '%2' hinzufügen @@ -671,12 +675,12 @@ ate the goose who was loose. '%1' aus '%2' entfernen - + Change script Skript ändern - + Changed '%1' of '%2' '%1' von '%2' geändert @@ -757,7 +761,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution Standardauflösung (96 x 96) @@ -778,12 +782,12 @@ ate the goose who was loose. Designer - + Qt Designer Qt Designer - + Unable to launch %1. %1 konnte nicht gestartet werden. @@ -855,7 +859,7 @@ ate the goose who was loose. Bitte wandeln Sie sie mit dem Befehl <b>uic3&nbsp;-convert</b> zum Format von Qt 4. - + Custom Widgets Benutzerdefinierte Widgets @@ -868,7 +872,7 @@ ate the goose who was loose. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 ist kein gültiger Wert der Aufzählung '%2'. @@ -889,7 +893,7 @@ ate the goose who was loose. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1' ist keine gültige Zahl. @@ -931,7 +935,7 @@ ate the goose who was loose. DeviceSkin - + The image file '%1' could not be loaded. Die Pixmap-Datei '%1' konnte nicht geladen werden. @@ -989,7 +993,7 @@ ate the goose who was loose. EmbeddedOptionsControl - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Stil</b></td><td>%3</td></tr><tr><td><b>Auflösung</b></td><td>%4 x %5</td></tr></table></html> @@ -1013,7 +1017,7 @@ ate the goose who was loose. FontPanel - + Font Schriftart @@ -1041,7 +1045,7 @@ ate the goose who was loose. FontPropertyManager - + PreferDefault Voreinstellung bevorzugt @@ -1064,7 +1068,7 @@ ate the goose who was loose. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values Ungültiger Stretch-Wert für '%1': '%2' @@ -1079,7 +1083,7 @@ ate the goose who was loose. FormEditorOptionsPage - + %1 % %1 % @@ -1146,7 +1150,7 @@ ate the goose who was loose. FormWindow - + Unexpected element <%1> Ungültiges Element <%1> @@ -1222,7 +1226,7 @@ ate the goose who was loose. IconSelector - + All Pixmaps ( Alle Pixmap-Dateien ( @@ -1230,7 +1234,7 @@ ate the goose who was loose. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser Ausgewähltes Icon, aus @@ -1239,7 +1243,7 @@ ate the goose who was loose. LanguageResourceDialog - + Choose Resource Ressource auswählen @@ -1247,7 +1251,7 @@ ate the goose who was loose. MainWindowBase - + Main Not currently used (main tool bar) Haupt-Werkzeugleiste @@ -1281,7 +1285,7 @@ ate the goose who was loose. NewForm - + C&reate &Neu von Vorlage @@ -1334,7 +1338,7 @@ ate the goose who was loose. NewFormWidget - + Unable to open the form template file '%1': %2 Die Formularvorlage %1 konnte nicht geöffnet werden: %2 @@ -1342,7 +1346,7 @@ ate the goose who was loose. ObjectInspectorModel - + Object Objekt @@ -1365,7 +1369,7 @@ ate the goose who was loose. ObjectNameDialog - + Change Object Name Objektnamen bearbeiten @@ -1376,52 +1380,16 @@ ate the goose who was loose. - qdesigner_internal::PluginDialog - - - Components - Komponenten - + PluginDialog - - + Plugin Information - Plugins - - - - Refresh - Neu laden - - - - Scan for newly installed custom widget plugins. - Sucht nach neuinstallierten Plugins mit benutzerdefinierten Widgets. - - - - Qt Designer couldn't find any plugins - Qt Designer konnte keine plugins finden - - - - Qt Designer found the following plugins - Qt Designer hat die folgenden Plugins gefunden - - - - New custom widget plugins have been found. - Es wurden neuinstallierten Plugins mit benutzerdefinierten Widgets gefunden. - - - - TextLabel - + Plugins 1 - 1 + 1 @@ -1435,7 +1403,7 @@ ate the goose who was loose. PreviewConfigurationWidget - + Default Vorgabe @@ -1483,7 +1451,7 @@ ate the goose who was loose. PromotionModel - + Not used Usage of promoted widgets Nicht verwendet @@ -1492,7 +1460,7 @@ ate the goose who was loose. Q3WizardContainer - + Page Seite @@ -1501,7 +1469,7 @@ ate the goose who was loose. QAbstractFormBuilder - + Unexpected element <%1> Ungültiges Element <%1> @@ -1547,7 +1515,7 @@ This indicates an inconsistency in the ui-file. Fehler beim Setzen der Tabulatorreihenfolge: Es konnte kein Widget mit dem Namen '%1' gefunden werden. - + Invalid QButtonGroup reference '%1' referenced by '%2'. Ungültige Referenz der Buttongruppe '%1', referenziert von '%2'. @@ -1560,7 +1528,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX-Steuerelement @@ -1573,7 +1541,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control Steuerelement setzen @@ -1596,7 +1564,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ist kein Platzhalter für eine benutzerdefinierte Klasse. @@ -1646,7 +1614,7 @@ This indicates an inconsistency in the ui-file. Der Name der Include-Datei darf nicht leer sein. - + Exception at line %1: %2 Ausnahmefehler bei Zeile %1: %2 @@ -1665,7 +1633,7 @@ Script: %3 QDesigner - + %1 - warning %1 - Warnung @@ -1683,7 +1651,7 @@ Script: %3 QDesignerActions - + Edit Widgets Widgets bearbeiten @@ -1837,7 +1805,7 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Die Datei konnte nicht geöffnet werden - + The backup file %1 could not be written. Hintergrundsicherung: Die Datei %1 konnte nicht geschrieben werden. @@ -1858,7 +1826,7 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Bitte schließen Sie alle Formulare, um zusätzliche Schriftarten zu laden. - + Select New File Andere Datei @@ -1868,12 +1836,12 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Die Datei konnte nicht geschrieben werden - + &Close Preview Vorschau &schließen - + Save &Image... &Vorschaubild speichern... @@ -1906,7 +1874,7 @@ Would you like to retry? Möchten Sie es noch einmal versuchen? - + Image files (*.%1) Bilddateien (*.%1) @@ -1922,7 +1890,7 @@ Möchten Sie es noch einmal versuchen? Die Datei %1 konnte nicht geschrieben werden. - + &New... &Neu... @@ -1953,12 +1921,12 @@ Möchten Sie es noch einmal versuchen? - + &Close &Schließen - + View &Code... &Code anzeigen... @@ -1969,23 +1937,23 @@ Möchten Sie es noch einmal versuchen? Formular unter einem anderen Namen speichern - + Preview failed Es konnte keine Vorschau erzeugt werden - + Code generation failed Es konnte kein Code generiert werden - + Assistant Assistant - + Saved image %1. Das Vorschaubild wurde unter %1 gespeichert. @@ -1995,7 +1963,7 @@ Möchten Sie es noch einmal versuchen? %1 wurde gedruckt. - + ALT+CTRL+S ALT+CTRL+S @@ -2003,7 +1971,7 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog Ansicht @@ -2040,7 +2008,7 @@ Möchten Sie es noch einmal versuchen? Steuerelement setzen - + Control loaded Steuerelement geladen @@ -2053,7 +2021,7 @@ Möchten Sie es noch einmal versuchen? QDesignerFormBuilder - + Script errors occurred: Es sind Skriptfehler aufgetreten: @@ -2071,7 +2039,7 @@ Möchten Sie es noch einmal versuchen? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2156,7 +2124,7 @@ Möchten Sie es noch einmal versuchen? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 Fehler beim Auswerten des XML des benutzerdefinierten Widgets %1: %2 @@ -2179,7 +2147,7 @@ Möchten Sie es noch einmal versuchen? QDesignerPropertySheet - + Dynamic Properties Dynamische Eigenschaften @@ -2187,19 +2155,19 @@ Möchten Sie es noch einmal versuchen? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. Der Layout-Typ '%1' wird nicht unterstützt; es wurde ein Grid-Layout erzeugt. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Die Container-Extension des Widgets '%1' (%2) gab für Seite %5 ein Widget '%3' (%4) zurück, was nicht von Designer verwaltet wird. Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifiziert werden. - + Unexpected element <%1> Parsing clipboard contents Ungültiges Element <%1> @@ -2220,7 +2188,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerSharedSettings - + The template path %1 could not be created. Das Vorlagenverzeichnis %1 konnte nicht angelegt werden. @@ -2233,7 +2201,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerToolWindow - + Property Editor Eigenschaften @@ -2266,7 +2234,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 Fehler bei Zeile %1 von %2: %3 @@ -2289,7 +2257,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWorkbench - + &File &Datei @@ -2364,7 +2332,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Designer wurde offenbar nicht ordnungsgemäß beendet; es existieren noch Dateien von der Hintergrundsicherung. Möchten Sie sie laden? - + The file <b>%1</b> could not be opened. Die Datei <b>%1</b> konnte nicht geöffnet werden. @@ -2374,7 +2342,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Die Datei <b>%1</b> ist keine gültige Designer-Datei. - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Das Formular wurde geändert. Möchten Sie sich die Änderungen ansehen, bevor Sie das Programm beenden? @@ -2385,7 +2353,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method Der Methode %1 wurde ein leerer Klassennamen übergeben (Name '%2'). @@ -2406,7 +2374,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Layouts des Typs `%1' werden nicht unterstützt. - + The set-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Menge). @@ -2426,7 +2394,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird. - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Der Aufzählungswert '%1' ist ungültig. Der Vorgabewert '%2' wird verwendet. @@ -2439,7 +2407,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetEventFilter - + Previous Page Vorige Seite @@ -2500,7 +2468,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QTabWidgetEventFilter - + Delete Löschen @@ -2528,7 +2496,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QToolBoxHelper - + Delete Page Seite löschen @@ -2566,7 +2534,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolEdit - + True @@ -2582,7 +2550,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolPropertyManager - + True Wahr @@ -2595,7 +2563,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCharEdit - + Clear Char Zeichen löschen @@ -2611,7 +2579,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorPropertyManager - + Red Rot @@ -2791,7 +2759,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientEditor - + Start X Anfangswert X @@ -3066,7 +3034,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientStopsWidget - + New Stop Neuer Bezugspunkt @@ -3104,7 +3072,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientView - + Grad Grad @@ -3151,7 +3119,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientViewDialog - + Select Gradient Gradienten auswählen @@ -3168,7 +3136,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3235,22 +3203,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Breite @@ -3263,22 +3231,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Breite @@ -3291,7 +3259,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtResourceEditorDialog - + Edit Resources Ressourcen bearbeiten @@ -3454,7 +3422,7 @@ zu: Datei oder Ressource löschen - + %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. @@ -3466,7 +3434,7 @@ Wollen Sie sie überschreiben? Die Datei ist offenbar keine Ressourcendatei; an Stelle des erwarteten Elements '%2' wurde das Element '%1' gefunden. - + %1 [read-only] %1 [schreibgeschützt] @@ -3577,7 +3545,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceView - + Size: %1 x %2 %3 Größe: %1 x %2 @@ -3610,7 +3578,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -3628,7 +3596,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePolicyPropertyManager - + <Invalid> <Ungültig> @@ -3662,7 +3630,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -3680,7 +3648,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtToolBarDialog - + < S E P A R A T O R > < T R E N N E R > @@ -3788,7 +3756,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtTreePropertyBrowser - + Property Eigenschaft @@ -3801,7 +3769,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. SaveFormAsTemplate - + Add path... Verzeichnis anlegen... @@ -3866,7 +3834,7 @@ Möchten Sie sie überschreiben? ScriptErrorDialog - + An error occurred while running the scripts for "%1": Bei der Ausführung der Skripte für "%1" sind Fehler aufgetreten: @@ -3899,7 +3867,7 @@ Möchten Sie sie überschreiben? SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), EMPFÄNGER(%3), SLOT(%4) @@ -3940,7 +3908,7 @@ Möchten Sie sie überschreiben? Spacer - + Horizontal Spacer '%1', %2 x %3 Horizontales Füllelement '%1', %2 x %3 @@ -3953,7 +3921,7 @@ Möchten Sie sie überschreiben? TemplateOptionsPage - + Template Paths Tab in preferences dialog Verzeichnisse für Vorlagen @@ -3995,17 +3963,12 @@ Möchten Sie sie überschreiben? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - - Open Source Edition - - - - + Qt Designer Qt Designer @@ -4015,30 +3978,15 @@ Möchten Sie sie überschreiben? - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Die Datei enthält ein benutzerdefiniertes Widget '%1' dessen Basisklasse (%2) nicht mit dem Eintrag in der Widget-Datenbank übereinstimmt. Die Widget-Datenbank wird nicht geändert. @@ -4046,22 +3994,22 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionEditor - + Actions Aktionen - + New... Neu... - + Delete Löschen - + New action Neue Aktion @@ -4071,12 +4019,17 @@ Möchten Sie sie überschreiben? Aktion ändern - + Edit... Ändern... + Go to slot... + Slot anzeigen... + + + Copy Kopieren @@ -4096,7 +4049,7 @@ Möchten Sie sie überschreiben? Alles auswählen - + Icon View Icon-Ansicht @@ -4106,7 +4059,7 @@ Möchten Sie sie überschreiben? Detaillierte Ansicht - + Remove actions Aktionen löschen @@ -4116,12 +4069,12 @@ Möchten Sie sie überschreiben? Aktion '%1' löschen - + Used In Verwendet in - + Configure Action Editor Aktionseditor konfigurieren @@ -4129,7 +4082,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionModel - + Name Name @@ -4162,7 +4115,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditor - + Add buddy Buddy hinzufügen @@ -4196,7 +4149,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies Buddies bearbeiten @@ -4204,7 +4157,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorTool - + Edit Buddies Buddies bearbeiten @@ -4258,7 +4211,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::CodeDialog - + Save... Speichern... @@ -4316,7 +4269,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ColorAction - + Text Color Schriftfarbe @@ -4324,7 +4277,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... Einträge ändern... @@ -4416,7 +4369,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page Seite davor einfügen @@ -4479,7 +4432,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::DesignerPropertyManager - + AlignLeft Linksbündig ausrichten @@ -4605,7 +4558,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) Profile @@ -4765,7 +4718,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FilterWidget - + <Filter> <FIlter> @@ -4773,7 +4726,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormEditor - + Resource File Changed Änderung einer Ressourcendatei @@ -4794,7 +4747,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindow - + Edit contents Ändern @@ -4804,7 +4757,7 @@ Möchten Sie sie überschreiben? F2 - + Resize Größe ändern @@ -4890,7 +4843,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowBase - + Delete Löschen @@ -4903,7 +4856,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowManager - + Cu&t &Ausschneiden @@ -4985,7 +4938,7 @@ Möchten Sie sie überschreiben? Berechnet die Größe des ausgewählten Widgets aus dem Layout und passt das Widget an - + Lay Out &Horizontally Objekte &waagrecht anordnen @@ -5035,7 +4988,7 @@ Möchten Sie sie überschreiben? Ordnet die ausgewählten Objekte um einen Splitter senkecht an - + &Break Layout La&yout auflösen @@ -5060,7 +5013,7 @@ Möchten Sie sie überschreiben? Formular&einstellungen... - + Break Layout Layout auflösen @@ -5076,17 +5029,17 @@ Möchten Sie sie überschreiben? Es konnte keine Vorschau erzeugt werden - + Form Settings - %1 Formulareinstellungen - %1 - + Removes empty columns and rows Entfernt unbesetzte Zeilen und Spalten - + Lay Out in a &Form Layout Objekte in &Formularlayout anordnen @@ -5096,7 +5049,7 @@ Möchten Sie sie überschreiben? Ordnet die ausgewählten Objekte in einem zweispaltigen Formularlayout an - + Si&mplify Grid Layout Tabellarisches Layout &vereinfachen @@ -5104,7 +5057,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowSettings - + None Kein @@ -5155,7 +5108,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::GroupBoxTaskMenu - + Change title... Titel ändern... @@ -5171,7 +5124,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. Die Pixmap-Datei '%1' kann nicht gelesen werden. @@ -5323,7 +5276,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::LabelTaskMenu - + Change rich text... Formatierbaren Text ändern... @@ -5336,7 +5289,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::LineEditTaskMenu - + Change text... Text ändern... @@ -5344,7 +5297,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetEditor - + Edit List Widget List-Widget ändern @@ -5362,7 +5315,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -5398,7 +5351,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::MenuTaskMenu - + Remove Löschen @@ -5457,7 +5410,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name Namen der Eigenschaft setzen @@ -5577,7 +5530,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add Hinzufügen @@ -5615,7 +5568,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... &Suchen... @@ -5631,7 +5584,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) Position %1 (%2) @@ -5712,7 +5665,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette Palette ändern @@ -5720,7 +5673,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role Farbrolle @@ -5772,15 +5725,57 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text Text bearbeiten + qdesigner_internal::PluginDialog + + + Components + Komponenten + + + + Plugin Information + Plugins + + + + Refresh + Neu laden + + + + Scan for newly installed custom widget plugins. + Sucht nach neuinstallierten Plugins mit benutzerdefinierten Widgets. + + + + Qt Designer couldn't find any plugins + Qt Designer konnte keine plugins finden + + + + Qt Designer found the following plugins + Qt Designer hat die folgenden Plugins gefunden + + + + New custom widget plugins have been found. + Es wurden neuinstallierten Plugins mit benutzerdefinierten Widgets gefunden. + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1-Stil @@ -5823,7 +5818,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close &Schließen @@ -5920,7 +5915,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... Benutzerdefinierte Klassen... @@ -5948,7 +5943,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... Dynamische Eigenschaft hinzufügen... @@ -6008,7 +6003,7 @@ Klasse: %2 qdesigner_internal::PropertyLineEdit - + Insert line break Zeilenumbruch einfügen @@ -6122,12 +6117,12 @@ Klasse: %2 Slot anzeigen... - + no signals available Es sind keine Signale vorhanden - + Set size constraint on %n widget(s) Größenbeschränkung eines Widgets festlegen @@ -6135,7 +6130,7 @@ Klasse: %2 - + Size Constraints Größe @@ -6170,7 +6165,7 @@ Klasse: %2 Maximalgröße festlegen - + Edit ToolTip ToolTip bearbeiten @@ -6183,7 +6178,7 @@ Klasse: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> Ungültiges Element <%1> @@ -6238,7 +6233,7 @@ Klasse: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -6413,7 +6408,7 @@ Klasse: %2 qdesigner_internal::ScriptDialog - + Edit script Skript bearbeiten @@ -6463,7 +6458,7 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots Signale und Slots bearbeiten @@ -6476,7 +6471,7 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots Signale und Slots bearbeiten @@ -6484,7 +6479,7 @@ Klasse: %2 qdesigner_internal::StatusBarTaskMenu - + Remove Löschen @@ -6492,7 +6487,7 @@ Klasse: %2 qdesigner_internal::StringListEditorButton - + Change String List Zeichenkettenliste ändern @@ -6500,7 +6495,7 @@ Klasse: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet Stylesheet bearbeiten @@ -6539,7 +6534,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditor - + Start from Here Hier neu beginnen @@ -6567,7 +6562,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6575,7 +6570,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6583,7 +6578,7 @@ Klasse: %2 qdesigner_internal::TableWidgetEditor - + New Column Neue Spalte @@ -6632,7 +6627,7 @@ Klasse: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -6663,7 +6658,7 @@ Klasse: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... HTML ändern... @@ -6709,7 +6704,7 @@ Klasse: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator Trenner einfügen @@ -6737,7 +6732,7 @@ Klasse: %2 qdesigner_internal::TreeWidgetEditor - + &Columns &Spalten @@ -6863,7 +6858,7 @@ Klasse: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -6871,7 +6866,7 @@ Klasse: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Warnung: Die Erzeugung des Widgets in der Widget-Box schlug fehl. Das könnte durch fehlerhaften XML-Code benutzerdefinierter Widgets verursacht worden sein. @@ -6879,17 +6874,17 @@ Klasse: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad Ablage - + Custom Widgets Benutzerdefinierte Widgets - + Expand all Alles aufklappen @@ -6930,7 +6925,7 @@ Klasse: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets Widgets bearbeiten @@ -6938,12 +6933,12 @@ Klasse: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. Die Factory für benutzerdefinierte Widgets der Klasse %1 gab einen 0-Zeiger zurück. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Bei der Erzeugung von Widgets wurden widersprüchliche Klassennamen festgestellt: Die Factory für benutzerdefinierte Widgets der Klasse %1 gab ein Widget der Klasse %2 zurück. @@ -6985,7 +6980,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_ja.ts b/translations/designer_ja.ts index a403b8d..1bcb801 100644 --- a/translations/designer_ja.ts +++ b/translations/designer_ja.ts @@ -1,20 +1,21 @@ - + + - + The moose in the noose ate the goose who was loose. åŠä¸»ãŒå±é¢¨ã«ä¸Šæ‰‹ã«åŠä¸»ã®çµµã‚’æã„ãŸã€‚ - + <object> <オブジェクト> - + <signal> <シグナル> @@ -95,7 +96,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous @@ -141,7 +142,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts @@ -253,7 +254,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. @@ -271,7 +272,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. @@ -299,7 +300,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush @@ -396,19 +397,24 @@ ate the goose who was loose. Command - - + + Change signal シグナルを変更 - - + + Change slot スロットを変更 - + + Change signal-slot connection + + + + Change sender 発信者を変更 @@ -418,7 +424,7 @@ ate the goose who was loose. å—信者を変更 - + Add connection シグナル/スロット接続を追加 @@ -443,7 +449,7 @@ ate the goose who was loose. ターゲットを変更 - + Insert '%1' '%1' を挿入 @@ -473,7 +479,7 @@ ate the goose who was loose. '%1' ã®è¦ªã‚’ã¤ã‘ã‹ãˆ - + Promote to custom widget カスタムウィジェットã«æ ¼ä¸Šã’ @@ -508,48 +514,48 @@ ate the goose who was loose. - - - + + + Move Page ページを移動 - - - - + + + + Delete Page ページを削除 - - + + Page ページ - - - + + + page ページ - - - - + + + + Insert Page ページを挿入 - + tab タブ - + Change Tab order タブ順を変更 @@ -598,7 +604,7 @@ ate the goose who was loose. - + Change Layout Item Geometry レイアウトアイテムã®åº§æ¨™ã‚’変更 @@ -607,7 +613,7 @@ ate the goose who was loose. 行を挿入 - + Change Table Contents テーブルã®å†…容を変更 @@ -649,7 +655,7 @@ ate the goose who was loose. ツールãƒãƒ¼ã‚’削除 - + Set action text アクションã®ãƒ†ã‚­ã‚¹ãƒˆã‚’設定 @@ -660,7 +666,7 @@ ate the goose who was loose. - + Move action アクションを移動 @@ -725,12 +731,12 @@ ate the goose who was loose. - + Change signals/slots - + Delete Subwindow @@ -750,7 +756,7 @@ ate the goose who was loose. - + Create button group @@ -771,7 +777,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup @@ -788,23 +794,23 @@ ate the goose who was loose. - + Morph %1/'%2' into %3 MorphWidgetCommand description - + Change layout of '%1' from %2 to %3 - + Change script スクリプトを変更 - + Changed '%1' of '%2' @@ -878,7 +884,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution @@ -899,7 +905,7 @@ ate the goose who was loose. Designer - + Qt Designer Qt Designer @@ -979,7 +985,7 @@ The old form has been untouched, but you will have to save this form under a new ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ Qt-%1 ã® Designer ã§ä½œæˆã•ã‚ŒãŸã‚‚ã®ã§ã™ãŒã€èª­ã‚ã¾ã›ã‚“ã§ã—ãŸ:<br>%2<br><b>uic3 -convert</b> を実行ã—ã¦ã€Qt 4 ã® UI フォーマットã«å¤‰æ›ã—ã¦ãã ã•ã„。 - + Custom Widgets カスタムウィジェット @@ -989,7 +995,7 @@ The old form has been untouched, but you will have to save this form under a new 格上ã’ã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ - + Unable to launch %1. %1 ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -1023,7 +1029,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. @@ -1044,7 +1050,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile @@ -1086,7 +1092,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. @@ -1144,66 +1150,16 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - - None - - - - - Add a profile - - - - - Edit the selected profile - - - - - Delete the selected profile - - - - - Add Profile - - - - - New profile - - - - - Edit Profile - - - - - Delete Profile - - - - - Would you like to delete the profile '%1'? - - - - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description - - - Default - - EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog @@ -1218,7 +1174,7 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font フォント @@ -1246,7 +1202,7 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault @@ -1269,7 +1225,7 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values @@ -1284,7 +1240,7 @@ The old form has been untouched, but you will have to save this form under a new FormEditorOptionsPage - + %1 % @@ -1351,7 +1307,7 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> @@ -1427,7 +1383,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( å…¨ã¦ã®ãƒ”ックスマップ ( @@ -1435,7 +1391,7 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser @@ -1444,7 +1400,7 @@ The old form has been untouched, but you will have to save this form under a new LanguageResourceDialog - + Choose Resource @@ -1459,7 +1415,7 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main Not currently used (main tool bar) @@ -1493,7 +1449,7 @@ The old form has been untouched, but you will have to save this form under a new NewForm - + C&reate 作æˆ(&R) @@ -1562,7 +1518,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 @@ -1570,7 +1526,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object オブジェクト @@ -1580,7 +1536,7 @@ The old form has been untouched, but you will have to save this form under a new クラス - + separator セパレータ @@ -1593,7 +1549,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name オブジェクトåを変更 @@ -1651,47 +1607,11 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog + PluginDialog - - Components - コンãƒãƒ¼ãƒãƒ³ãƒˆ - - - - + Plugin Information - プラグイン情報 - - - - Refresh - リフレッシュ - - - - Scan for newly installed custom widget plugins. - æ–°ã—ãインストールã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ—ラグインをスキャンã—ã¾ã™ã€‚ - - - - Qt Designer couldn't find any plugins - プラグインã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠- - - - Qt Designer found the following plugins - 以下ã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—㟠- - - - New custom widget plugins have been found. - æ–°ã—ã„カスタムウィジェットã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ - - - - TextLabel - テキストラベル + プラグイン情報 @@ -1742,7 +1662,7 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default @@ -1790,7 +1710,7 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used Usage of promoted widgets 使用ã•ã‚Œã¾ã›ã‚“ @@ -1799,7 +1719,7 @@ There's nothing more here. You should get back to work. Q3WizardContainer - + Page ページ @@ -1808,7 +1728,7 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> @@ -1854,7 +1774,7 @@ This indicates an inconsistency in the ui-file. タブストップã®é©ç”¨ä¸­: ウィジェット '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 - + Invalid QButtonGroup reference '%1' referenced by '%2'. @@ -1900,7 +1820,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX コントロール @@ -1913,7 +1833,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control コントロールを設定 @@ -1936,7 +1856,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ã¯æ ¼ä¸Šã’ã•ã‚ŒãŸã‚¯ãƒ©ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 @@ -1986,7 +1906,7 @@ This indicates an inconsistency in the ui-file. 空ã®ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã§ãã¾ã›ã‚“。 - + Exception at line %1: %2 %1 行目ã§ä¾‹å¤–ãŒç™ºç”Ÿ: %2 @@ -2006,7 +1926,7 @@ Script: %3 QDesigner - + %1 - warning %1 - 警告 @@ -2031,7 +1951,7 @@ Script: %3 QDesignerActions - + Edit Widgets ウィジェットを編集 @@ -2100,7 +2020,7 @@ Script: %3 CTRL+O - + Clear &Menu メニューをクリア(&M) @@ -2109,7 +2029,7 @@ Script: %3 CTRL+S - + CTRL+SHIFT+S CTRL+SHIFT+S @@ -2166,17 +2086,17 @@ Script: %3 - + About Qt Designer Qt Designer ã«ã¤ã„㦠- + About Qt Qt ã«ã¤ã„㦠- + Open Form フォームを開ã @@ -2197,7 +2117,7 @@ Script: %3 ä¿å­˜ - + %1 already exists. Do you want to replace it? %1 ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹? @@ -2218,7 +2138,7 @@ Do you want to replace it? - + &Recent Forms 最近使用ã—ãŸãƒ•ã‚©ãƒ¼ãƒ (&R) @@ -2266,7 +2186,7 @@ Do you want to update the file location or generate a new form? ファイルをオープンã§ãã¾ã›ã‚“ã§ã—㟠- + Saved image %1. @@ -2276,7 +2196,7 @@ Do you want to update the file location or generate a new form? - + Printed %1. @@ -2289,7 +2209,7 @@ Would you like to retry or change your file? リトライã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ファイルを変更ã—ã¾ã™ã‹? - + Select New File æ–°ã—ã„ファイルをé¸æŠž @@ -2307,7 +2227,7 @@ Would you like to retry? リトライã—ã¾ã™ã‹? - + &Close Preview プレビューを閉ã˜ã‚‹(&C) @@ -2316,7 +2236,7 @@ Would you like to retry? フォーム設定 - %1 - + &New... @@ -2347,12 +2267,12 @@ Would you like to retry? - + &Close é–‰ã˜ã‚‹(&C) - + Save &Image... @@ -2367,7 +2287,7 @@ Would you like to retry? - + Save Form As @@ -2387,7 +2307,7 @@ Would you like to retry? - + The backup file %1 could not be written. ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイル %1 ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -2408,12 +2328,12 @@ Would you like to retry? - + Code generation failed - + Image files (*.%1) @@ -2429,8 +2349,8 @@ Would you like to retry? - - + + Assistant @@ -2438,7 +2358,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog @@ -2447,7 +2367,7 @@ Would you like to retry? QDesignerAppearanceOptionsWidget - + Docked Window ドックウィンドウ @@ -2457,7 +2377,7 @@ Would you like to retry? 複数ã®ãƒˆãƒƒãƒ—レベルウィンドウ - + Toolwindow Font ツールウィンドウフォント @@ -2475,7 +2395,7 @@ Would you like to retry? - + Control loaded コントロールãŒãƒ­ãƒ¼ãƒ‰ã•ã‚Œã¾ã—㟠@@ -2488,7 +2408,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: スクリプトエラーãŒç™ºç”Ÿã—ã¾ã—ãŸ: @@ -2506,7 +2426,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2529,7 +2449,7 @@ Would you like to retry? QDesignerMenu - + Type Here ã“ã“ã«å…¥åŠ› @@ -2539,7 +2459,7 @@ Would you like to retry? セパレータを追加 - + Insert separator セパレータを挿入 @@ -2598,7 +2518,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 @@ -2636,7 +2556,7 @@ Would you like to retry? レイアウト - + Dynamic Properties ダイナミックプロパティ @@ -2644,18 +2564,18 @@ Would you like to retry? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents @@ -2683,7 +2603,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. テンプレートã®ãƒ‘ス %1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -2835,7 +2755,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor プロパティエディタ @@ -2872,7 +2792,7 @@ Container pages should only be added by specifying them in XML returned by the d ウィジェットボックス - + An error has been encountered at line %1 of %2: %3 @@ -2895,7 +2815,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File ファイル(&F) @@ -3014,7 +2934,7 @@ Container pages should only be added by specifying them in XML returned by the d å‰å›žä½¿ç”¨ã—ãŸã¨ãã« Designer ã¯æ­£ã—ã終了ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイルãŒå­˜åœ¨ã—ã¾ã™ã€‚ロードã—ã¾ã™ã‹? - + The file <b>%1</b> could not be opened. ファイル <b>%1</b> ã¯ã‚ªãƒ¼ãƒ—ンã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -3024,7 +2944,7 @@ Container pages should only be added by specifying them in XML returned by the d ファイル <b>%1</b> ã¯ã€æœ‰åŠ¹ãª Designer ã® UI ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“。 - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? @@ -3034,7 +2954,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method @@ -3055,7 +2975,7 @@ Container pages should only be added by specifying them in XML returned by the d レイアウトタイプ '%1' ã¯ã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 - + The set-type property %1 could not be read. Setåž‹ã®ãƒ—ロパティ %1 を読ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -3075,7 +2995,7 @@ Container pages should only be added by specifying them in XML returned by the d プロパティ %1 を書ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚%2 ã¨ã„ã†åž‹ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. @@ -3325,7 +3245,7 @@ Script: %3 QStackedWidgetEventFilter - + Previous Page å‰ã®ãƒšãƒ¼ã‚¸ @@ -3386,7 +3306,7 @@ Script: %3 QTabWidgetEventFilter - + Delete 削除 @@ -3414,7 +3334,7 @@ Script: %3 QToolBoxHelper - + Delete Page ページを削除 @@ -3452,7 +3372,7 @@ Script: %3 QtBoolEdit - + True @@ -3468,7 +3388,7 @@ Script: %3 QtBoolPropertyManager - + True @@ -3481,7 +3401,7 @@ Script: %3 QtCharEdit - + Clear Char @@ -3497,7 +3417,7 @@ Script: %3 QtColorPropertyManager - + Red 赤 @@ -3677,7 +3597,7 @@ Script: %3 QtGradientEditor - + Start X 始点㮠X 座標 @@ -3956,7 +3876,7 @@ Script: %3 QtGradientStopsWidget - + New Stop æ–°ã—ã„終点 @@ -3998,7 +3918,7 @@ Script: %3 QtGradientView - + Grad @@ -4049,7 +3969,7 @@ Script: %3 グラデーションを編集 - + Select Gradient @@ -4066,7 +3986,7 @@ Script: %3 QtLocalePropertyManager - + %1, %2 @@ -4133,22 +4053,22 @@ Script: %3 QtRectFPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -4161,22 +4081,22 @@ Script: %3 QtRectPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -4189,7 +4109,7 @@ Script: %3 QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹? @@ -4200,7 +4120,7 @@ Do you want to replace it? - + %1 [read-only] @@ -4469,7 +4389,7 @@ to QtResourceView - + Size: %1 x %2 %3 @@ -4501,7 +4421,7 @@ to QtSizeFPropertyManager - + %1 x %2 @@ -4519,12 +4439,18 @@ to QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] - + Horizontal Policy @@ -4547,7 +4473,7 @@ to QtSizePropertyManager - + %1 x %2 @@ -4565,7 +4491,7 @@ to QtToolBarDialog - + < S E P A R A T O R > @@ -4673,7 +4599,7 @@ to QtTreePropertyBrowser - + Property プロパティ @@ -4686,7 +4612,7 @@ to SaveFormAsTemplate - + Add path... パスを追加... @@ -4751,7 +4677,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": "%1" ã®ãŸã‚ã«ã‚¹ã‚¯ãƒªãƒ—トを実行ã—ã¦ã„ã¦ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: @@ -4770,11 +4696,21 @@ Do you want overwrite the template? Select signal + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -4815,7 +4751,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 @@ -4828,7 +4764,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog @@ -4870,17 +4806,16 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %2 - Open Source Edition - オープンソース版 + オープンソース版 - + Qt Designer Qt Designer @@ -4890,34 +4825,23 @@ Do you want overwrite the template? <br/>Qt Designer ã¯ã€Qt アプリケーションをデザインã™ã‚‹ãŸã‚ã® GUI ツールã§ã™ã€‚<br/> - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">http://qtsoftware.com/company/model.html</a> for an overview of Qt licensing.<br/> ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Designer ã¯ã€ã‚ªãƒ¼ãƒ—ンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <a href="http://qtsoftware.com/company/model.html">http://qtsoftware.com/company/model.html</a> ã‚’ã”覧ãã ã•ã„。<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。<br/> + ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). å…¨ã¦ã®æ¨©åˆ©ã¯ä¿è­·ã•ã‚Œã¦ã„ã¾ã™ã€‚<br/><br/>プログラムã¯ã€Œè¨­è¨ˆã€ã€ã€Œå¸‚場性ã€ãŠã‚ˆã³ã€Œç‰¹å®šã®ç›®çš„ã¸ã®é©åˆæ€§ã€ã‚‚å«ã‚€ã€ã‚らゆる種類ã®ã€Œä¿è¨¼ãŒãªãã€ã€ã€Œãã®ã¾ã¾ã§ã€æä¾›ã•ã‚Œã¾ã™ã€‚<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. @@ -4925,22 +4849,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions アクション - + New... æ–°è¦... - + Delete 削除 - + New action æ–°ã—ã„アクション @@ -4958,12 +4882,17 @@ Do you want overwrite the template? ãã®æ©Ÿèƒ½ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“! - + Edit... 編集... + Go to slot... + + + + Copy @@ -4983,7 +4912,7 @@ Do you want overwrite the template? - + Configure Action Editor @@ -4998,7 +4927,7 @@ Do you want overwrite the template? - + Remove actions @@ -5008,7 +4937,7 @@ Do you want overwrite the template? アクション '%1' を消去 - + Used In @@ -5023,7 +4952,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name åå‰ @@ -5056,7 +4985,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy buddy を追加 @@ -5088,7 +5017,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies buddy を編集 @@ -5096,7 +5025,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies buddy を編集 @@ -5150,7 +5079,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... @@ -5208,7 +5137,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color @@ -5216,7 +5145,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... アイテムを編集... @@ -5270,7 +5199,7 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel - + Sender 発信者 @@ -5290,7 +5219,7 @@ Do you want overwrite the template? スロット - + <sender> <発信者> @@ -5331,7 +5260,7 @@ Do you want overwrite the template? ページを削除 - + Insert Page Before Current Page ã“ã®ãƒšãƒ¼ã‚¸ã®å‰ã«ãƒšãƒ¼ã‚¸ã‚’挿入 @@ -5394,7 +5323,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft @@ -5519,7 +5448,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) @@ -5662,9 +5591,62 @@ Do you want overwrite the template? + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + + + + + Edit the selected profile + + + + + Delete the selected profile + + + + + Add Profile + + + + + New profile + + + + + Edit Profile + + + + + Delete Profile + + + + + Would you like to delete the profile '%1'? + + + + + Default + + + + qdesigner_internal::FilterWidget - + <Filter> @@ -5691,7 +5673,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed @@ -5712,7 +5694,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents 内容を編集 @@ -5726,7 +5708,7 @@ Do you want overwrite the template? ウィジェット '%1 を挿入 - + Resize サイズ変更 @@ -5762,13 +5744,13 @@ and then paste again. レイアウト - + Drop widget ウィジェットã®è²¼ã‚Šä»˜ã‘ - + Paste %n action(s) @@ -5817,7 +5799,7 @@ and then paste again. - + A QMainWindow-based form does not contain a central widget. @@ -5825,7 +5807,7 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 削除 @@ -5838,7 +5820,7 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 切りå–ã‚Š(&T) @@ -5920,7 +5902,7 @@ and then paste again. é¸æŠžã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚£ãƒˆã®ã‚µã‚¤ã‚ºã‚’調整 - + Lay Out &Horizontally æ°´å¹³ã«ä¸¦ã¹ã‚‹(&H) @@ -5980,7 +5962,7 @@ and then paste again. é¸æŠžã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’スプリッタã®ä¸­ã§åž‚ç›´æ–¹å‘ã«é…ç½® - + &Break Layout レイアウトを破棄(&B) @@ -6010,7 +5992,7 @@ and then paste again. フォームã®è¨­å®š(&S)... - + Break Layout レイアウトを破棄ã™ã‚‹ @@ -6026,12 +6008,12 @@ and then paste again. - + Form Settings - %1 フォーム設定 - %1 - + Removes empty columns and rows @@ -6039,7 +6021,7 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None @@ -6105,7 +6087,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... タイトルを変更... @@ -6121,7 +6103,7 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. @@ -6214,7 +6196,7 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< @@ -6273,7 +6255,7 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... リッãƒãƒ†ã‚­ã‚¹ãƒˆã‚’変更... @@ -6286,7 +6268,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... テキストを変更... @@ -6294,7 +6276,7 @@ and then paste again. qdesigner_internal::ListWidgetEditor - + Edit List Widget リストウィジェットを編集 @@ -6372,7 +6354,7 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -6408,7 +6390,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 消去 @@ -6467,7 +6449,7 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name プロパティåを設定 @@ -6593,7 +6575,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 追加 @@ -6647,7 +6629,7 @@ Please select another name. セパレータ - + &Find in Text... @@ -6663,7 +6645,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) インデックス %1 (%2) @@ -6752,7 +6734,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette パレットを変更 @@ -6760,7 +6742,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role 色役割 @@ -6812,15 +6794,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text テキストを編集 + qdesigner_internal::PluginDialog + + + Components + コンãƒãƒ¼ãƒãƒ³ãƒˆ + + + + Plugin Information + プラグイン情報 + + + + Refresh + リフレッシュ + + + + Scan for newly installed custom widget plugins. + æ–°ã—ãインストールã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ—ラグインをスキャンã—ã¾ã™ã€‚ + + + + Qt Designer couldn't find any plugins + プラグインã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠+ + + + Qt Designer found the following plugins + 以下ã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—㟠+ + + + New custom widget plugins have been found. + æ–°ã—ã„カスタムウィジェットã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ + + + TextLabel + テキストラベル + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 スタイル @@ -6862,7 +6890,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close é–‰ã˜ã‚‹(&C) @@ -6963,7 +6991,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... 格上ã’ã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ... @@ -6991,7 +7019,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... ダイナミックプロパティを追加... @@ -7026,13 +7054,13 @@ Please select another name. - + Object: %1 Class: %2 - + String... @@ -7050,7 +7078,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break 改行を挿入 @@ -7198,7 +7226,7 @@ Class: %2 - + Edit ToolTip @@ -7207,15 +7235,20 @@ Class: %2 Edit WhatsThis + + + no signals available + + - + Set size constraint on %n widget(s) - + Change signals/slots... @@ -7258,7 +7291,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> @@ -7650,7 +7683,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H @@ -8002,7 +8035,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script スクリプトを編集 @@ -8059,7 +8092,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots シグナル/スロットを編集 @@ -8072,7 +8105,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots シグナル/スロットを編集 @@ -8080,7 +8113,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 消去 @@ -8092,7 +8125,7 @@ Class: %2 文字列リストを変更 - + Change String List @@ -8100,7 +8133,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet スタイルシートを変更 @@ -8159,7 +8192,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here @@ -8187,7 +8220,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order タブ順を編集 @@ -8195,7 +8228,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order タブ順を編集 @@ -8203,7 +8236,7 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column æ–°ã—ã„列 @@ -8364,7 +8397,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -8395,7 +8428,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Edit HTML @@ -8441,7 +8474,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator セパレータを挿入 @@ -8476,7 +8509,7 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns @@ -8686,7 +8719,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -8694,7 +8727,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. @@ -8729,17 +8762,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad スクラッãƒãƒ‘ッド - + Custom Widgets カスタムウィジェット - + Expand all ã™ã¹ã¦å±•é–‹ã™ã‚‹ @@ -8780,7 +8813,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets ウィジェットを編集 @@ -8788,12 +8821,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. %1 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ãŸã‚ã«ç™»éŒ²ã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ•ã‚¡ã‚¯ãƒˆãƒªãƒ¼ãŒ 0 ã‚’è¿”ã—ã¾ã—ãŸã€‚ - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. %1 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ãŸã‚ã«ç™»éŒ²ã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ•ã‚¡ã‚¯ãƒˆãƒªãƒ¼ã‚’使ã£ã¦ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’作æˆã—ã¦ã„ã‚‹ã¨ãã«ã€ã‚¯ãƒ©ã‚¹åã®ãƒŸã‚¹ãƒžãƒƒãƒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚%2 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’è¿”ã—ã¾ã—ãŸã€‚ @@ -8835,7 +8868,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor diff --git a/translations/designer_pl.ts b/translations/designer_pl.ts index 6ae369f..5b63f66 100644 --- a/translations/designer_pl.ts +++ b/translations/designer_pl.ts @@ -1,14 +1,15 @@ - + + - + <object> <obiekt> - + <signal> <sygnaÅ‚> @@ -18,7 +19,7 @@ <slot> - + The moose in the noose ate the goose who was loose. W Szczebrzeszynie @@ -28,7 +29,7 @@ chrzÄ…szcz brzmi w trzcinie. AbstractFindWidget - + &Previous &Poprzednie @@ -74,7 +75,7 @@ chrzÄ…szcz brzmi w trzcinie. AppFontDialog - + Additional Fonts Dodatkowe czcionki @@ -186,7 +187,7 @@ chrzÄ…szcz brzmi w trzcinie. AssistantClient - + Unable to send request: Assistant is not responding. Nie można wysÅ‚ac komendy. Asystent nie odpowiada. @@ -204,7 +205,7 @@ chrzÄ…szcz brzmi w trzcinie. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. Brak atrybutu '%2' w elemencie '%1'. @@ -232,7 +233,7 @@ chrzÄ…szcz brzmi w trzcinie. BrushPropertyManager - + No brush Brak szczotki @@ -325,19 +326,24 @@ chrzÄ…szcz brzmi w trzcinie. Command - - + + Change signal ZmieÅ„ sygnaÅ‚ - - + + Change slot ZmieÅ„ slot - + + Change signal-slot connection + + + + Change sender ZmieÅ„ nadawcÄ™ @@ -347,7 +353,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ odbiorcÄ™ - + Add connection Dodaj poÅ‚Ä…czenie @@ -372,7 +378,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ przeznaczenie - + Insert '%1' Wstaw '%1' @@ -397,7 +403,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ rodzica '%1' - + Promote to custom widget ZastÄ…p widżet @@ -427,48 +433,48 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ rozmieszczenie - - - + + + Move Page PrzenieÅ› stronÄ™ - - - - + + + + Delete Page UsuÅ„ stronÄ™ - - + + Page Strona - - - + + + page strona - - - - + + + + Insert Page Wstaw stronÄ™ - + tab tab - + Change Tab order ZmieÅ„ kolejność tabulacji @@ -513,12 +519,12 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ geometriÄ™ elementu w formularzu - + Change Layout Item Geometry ZmieÅ„ geometriÄ™ elementu w rozmieszczeniu - + Change Table Contents ZmieÅ„ zawartość tabeli @@ -560,7 +566,7 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ pasek narzÄ™dzi - + Set action text Ustaw tekst akcji @@ -571,7 +577,7 @@ chrzÄ…szcz brzmi w trzcinie. - + Move action PrzenieÅ› akcjÄ™ @@ -586,12 +592,12 @@ chrzÄ…szcz brzmi w trzcinie. Wstaw menu - + Change signals/slots ZmieÅ„ sygnaÅ‚y/sloty - + Delete Subwindow UsuÅ„ podokno @@ -611,17 +617,17 @@ chrzÄ…szcz brzmi w trzcinie. Podokno - + Change Z-order of '%1' ZmieÅ„ porzÄ…dek gÅ‚Ä™bokoÅ›ci (Z-order) dla '%1' - + Simplify Grid Layout Uprość rozmieszczenie w siatce - + Create button group Utwórz grupÄ™ przycisków @@ -642,7 +648,7 @@ chrzÄ…szcz brzmi w trzcinie. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Dodaj '%1' do '%2' @@ -659,23 +665,23 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ '%1' z '%2' - + Morph %1/'%2' into %3 MorphWidgetCommand description Przekształć %1/%2 w %3 - + Change layout of '%1' from %2 to %3 ZmieÅ„ rozmieszczenie widżetu '%1' z %2 na %3 - + Change script ZmieÅ„ skrypt - + Changed '%1' of '%2' ZmieÅ„ '%1' w '%2' @@ -757,7 +763,7 @@ chrzÄ…szcz brzmi w trzcinie. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution Standardowa (96 x 96) @@ -778,12 +784,12 @@ chrzÄ…szcz brzmi w trzcinie. Designer - + Qt Designer Qt Designer - + Custom Widgets WÅ‚asne widżety @@ -793,7 +799,7 @@ chrzÄ…szcz brzmi w trzcinie. ZastÄ™pcze widżety - + Unable to launch %1. Nie można uruchomić %1. @@ -803,7 +809,7 @@ chrzÄ…szcz brzmi w trzcinie. %1 przekroczony czas operacji. - + This file cannot be read because it was created using %1. Nie można odczytać pliku ponieważ zostaÅ‚ utworzony przy użyciu %1. @@ -868,7 +874,7 @@ chrzÄ…szcz brzmi w trzcinie. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 nie jest poprawnÄ… wartoÅ›ciÄ… typu wyliczeniowego '%2'. @@ -889,7 +895,7 @@ chrzÄ…szcz brzmi w trzcinie. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1' nie jest liczbÄ…. @@ -931,7 +937,7 @@ chrzÄ…szcz brzmi w trzcinie. DeviceSkin - + The image file '%1' could not be loaded. Nie można wczytać pliku z obrazkiem %1. @@ -989,66 +995,56 @@ chrzÄ…szcz brzmi w trzcinie. EmbeddedOptionsControl - None - Å»adne + Å»adne - Add a profile - Dodaj profil + Dodaj profil - Edit the selected profile - Edytuj zaznaczony profil + Edytuj zaznaczony profil - Delete the selected profile - UsuÅ„ zaznaczony profil + UsuÅ„ zaznaczony profil - Add Profile - Dodaj profil + Dodaj profil - New profile - Nowy profil + Nowy profil - Edit Profile - Edytuj profil + Edytuj profil - Delete Profile - UsuÅ„ profil + UsuÅ„ profil - Would you like to delete the profile '%1'? - Czy chcesz usunać profil '%1'? + Czy chcesz usunać profil '%1'? - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Styl</b></td><td>%3</td></tr><tr><td><b>Rozdzielczość</b></td><td>%4 x %5</td></tr></table></html> - Default - DomyÅ›lny + DomyÅ›lny EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog Projekt dla urzÄ…dzeÅ„ specjalizowanych @@ -1063,7 +1059,7 @@ chrzÄ…szcz brzmi w trzcinie. FontPanel - + Font Czcionka @@ -1091,7 +1087,7 @@ chrzÄ…szcz brzmi w trzcinie. FontPropertyManager - + PreferDefault Preferuj domyÅ›lny @@ -1114,7 +1110,7 @@ chrzÄ…szcz brzmi w trzcinie. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values Niepoprawna wartość rozciÄ…gniecia dla '%1': '%2' @@ -1129,7 +1125,7 @@ chrzÄ…szcz brzmi w trzcinie. FormEditorOptionsPage - + %1 % %1 % @@ -1196,7 +1192,7 @@ chrzÄ…szcz brzmi w trzcinie. FormWindow - + Unexpected element <%1> Niespodziewany element <%1> @@ -1272,7 +1268,7 @@ chrzÄ…szcz brzmi w trzcinie. IconSelector - + All Pixmaps ( Wszystkie pixmapy ( @@ -1280,7 +1276,7 @@ chrzÄ…szcz brzmi w trzcinie. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX ikona wybrana wyÅ‚Ä…czona @@ -1289,7 +1285,7 @@ chrzÄ…szcz brzmi w trzcinie. LanguageResourceDialog - + Choose Resource Wybierz zasób @@ -1297,7 +1293,7 @@ chrzÄ…szcz brzmi w trzcinie. MainWindowBase - + Main Not currently used (main tool bar) Główny @@ -1331,7 +1327,7 @@ chrzÄ…szcz brzmi w trzcinie. NewForm - + New Form Nowy formularz @@ -1384,7 +1380,7 @@ chrzÄ…szcz brzmi w trzcinie. NewFormWidget - + Unable to open the form template file '%1': %2 Nie można otworzyć pliku '%1' z szablonem formularza: %2 @@ -1392,7 +1388,7 @@ chrzÄ…szcz brzmi w trzcinie. ObjectInspectorModel - + Object Obiekt @@ -1402,7 +1398,7 @@ chrzÄ…szcz brzmi w trzcinie. Klasa - + separator separator @@ -1415,7 +1411,7 @@ chrzÄ…szcz brzmi w trzcinie. ObjectNameDialog - + Change Object Name ZmieÅ„ nazwÄ™ obiektu @@ -1483,52 +1479,16 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. - qdesigner_internal::PluginDialog - - - Components - Komponenty - + PluginDialog - - + Plugin Information - Informacje o wtyczkach - - - - Qt Designer couldn't find any plugins - Qt Designer nie mógÅ‚ znaleźć żadnej wtyczki - - - - Qt Designer found the following plugins - Qt Designer znalazÅ‚ nastÄ™pujÄ…ce wtyczki: - - - - TextLabel - Etykieta - - - - Refresh - OdÅ›wież + Informacje o wtyczkach - - Scan for newly installed custom widget plugins. - Szukaj nowo zainstalowanych wtyczek z widżetami. - - - - New custom widget plugins have been found. - Znaleziono nowÄ… wtyczkÄ™ z widżetami. - - - + 1 - 1 + 1 @@ -1542,7 +1502,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. PreviewConfigurationWidget - + Default DomyÅ›lny @@ -1590,7 +1550,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. PromotionModel - + Not used Usage of promoted widgets Nie używana @@ -1599,7 +1559,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. Q3WizardContainer - + Page Strona @@ -1608,7 +1568,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. QAbstractFormBuilder - + Unexpected element <%1> Niespodziewany element <%1> @@ -1655,7 +1615,7 @@ To wskazuje na niespójność w pliku ui. Podczas przypisywania kolejnoÅ›ci tabulacji: widżet '%1' nie zostaÅ‚ znaleziony. - + Invalid QButtonGroup reference '%1' referenced by '%2'. Niepoprawny odnoÅ›nik QButtonGroup '%1', użyty w '%2'. @@ -1668,7 +1628,7 @@ To wskazuje na niespójność w pliku ui. QAxWidgetPlugin - + ActiveX control Kontrolka ActiveX @@ -1681,7 +1641,7 @@ To wskazuje na niespójność w pliku ui. QAxWidgetTaskMenu - + Set Control Ustaw kontrolkÄ™ @@ -1704,7 +1664,7 @@ To wskazuje na niespójność w pliku ui. QCoreApplication - + %1 is not a promoted class. %1 nie jest klasÄ… zastÄ™pczÄ…. @@ -1754,7 +1714,7 @@ To wskazuje na niespójność w pliku ui. Nie można ustawić pustego pliku nagłówkowego. - + Exception at line %1: %2 WyjÄ…tek w linii %1: %2 @@ -1774,7 +1734,7 @@ Skrypt: %3 QDesigner - + %1 - warning %1 - ostrzeżenie @@ -1792,12 +1752,12 @@ Skrypt: %3 QDesignerActions - + Clear &Menu Wyczyść &menu - + &Quit Za&koÅ„cz @@ -1858,17 +1818,17 @@ Skrypt: %3 - + About Qt Designer Informacje o Qt Designer - + About Qt Informacje o Qt - + &Recent Forms Os&tatnio edytowane formularze @@ -1909,19 +1869,19 @@ Czy chcesz spróbować ponownie lub zmienić nazwÄ™ pliku? Wybierz nowy plik - + %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz go zastÄ…pić? - + &Close Preview Za&mknij podglÄ…d - + Preferences... Ustawienia... @@ -1931,19 +1891,19 @@ Czy chcesz go zastÄ…pić? CTRL+SHIFT+S - + Designer UI files (*.%1);;All Files (*) Pliki Designer UI (*.%1);;Wszystkie pliki (*) - + Saved %1. Formularz %1 zachowany pomyÅ›lnie. - + Read error BÅ‚Ä…d odczytu @@ -1975,7 +1935,7 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz?

Nie można zapisać pliku - + &New... &Nowy... @@ -2006,12 +1966,12 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz? - + &Close Za&mknij - + Save &Image... Zachowaj o&brazek... @@ -2026,18 +1986,18 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz?Pokaż &kod... - + Save Form As Zachowaj formularz jako - + Preview failed Nie można utworzyć podglÄ…du - + Code generation failed Nie można wygenerować kodu @@ -2051,7 +2011,7 @@ Powód:%2 Czy chcesz spróbować ponownie? - + The backup file %1 could not be written. Nie można zapisać pliku zapasowego %1. @@ -2083,13 +2043,13 @@ Czy chcesz spróbować ponownie? Nie można zapisać pliku %1. - - + + Assistant Assistant - + Saved image %1. Zachowano obrazek %1. @@ -2099,12 +2059,12 @@ Czy chcesz spróbować ponownie?Zamknij wszystkie formularze aby umożliwić wczytanie dodatkowych czcionek. - + Printed %1. Wydrukowano %1. - + ALT+CTRL+S ALT+CTRL+S @@ -2112,7 +2072,7 @@ Czy chcesz spróbować ponownie? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog WyglÄ…d @@ -2121,7 +2081,7 @@ Czy chcesz spróbować ponownie? QDesignerAppearanceOptionsWidget - + Docked Window Okna dokowalne @@ -2131,7 +2091,7 @@ Czy chcesz spróbować ponownie? Wiele okien głównych - + Toolwindow Font Czcionka okna narzÄ™dzi @@ -2149,7 +2109,7 @@ Czy chcesz spróbować ponownie? Ustaw kontrolkÄ™ - + Control loaded Kontrolka wczytana @@ -2162,7 +2122,7 @@ Czy chcesz spróbować ponownie? QDesignerFormBuilder - + Script errors occurred: WystÄ…piÅ‚y bÅ‚Ä™dy w skrypcie: @@ -2180,7 +2140,7 @@ Czy chcesz spróbować ponownie? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2203,7 +2163,7 @@ Czy chcesz spróbować ponownie? QDesignerMenu - + Type Here Wpisz tutaj @@ -2213,7 +2173,7 @@ Czy chcesz spróbować ponownie? Dodaj separator - + Remove action '%1' UsuÅ„ akcjÄ™ '%1' @@ -2265,7 +2225,7 @@ Czy chcesz spróbować ponownie? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 WystÄ…piÅ‚ bÅ‚Ä…d XML podczas przetwarzania kodu XML dla wÅ‚asnego widżetu %1: %2 @@ -2288,7 +2248,7 @@ Czy chcesz spróbować ponownie? QDesignerPropertySheet - + Dynamic Properties Dynamiczne wÅ‚aÅ›ciwoÅ›ci @@ -2301,13 +2261,13 @@ Czy chcesz spróbować ponownie? Rozmieszczenie typu '%1' nie jest obsÅ‚ugiwane. BÄ™dzie ono zastÄ…pione siatkÄ…. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents Niespodziewany element <%1> @@ -2328,7 +2288,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. Nie można utworzyć Å›cieżki %1 dla szablonów. @@ -2341,7 +2301,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor Edytor wÅ‚aÅ›ciwoÅ›ci @@ -2374,7 +2334,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 WystÄ…piÅ‚ bÅ‚Ä…d w linii %1 w %2: %3 @@ -2397,7 +2357,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File &Plik @@ -2472,7 +2432,7 @@ Container pages should only be added by specifying them in XML returned by the d Informacja o kopiach zapasowych - + The file <b>%1</b> could not be opened. Nie można otworzyć pliku <b>%1</b>. @@ -2482,7 +2442,7 @@ Container pages should only be added by specifying them in XML returned by the d Plik <b>%1</b> nie jest poprawnym plikiem Designer'a. - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Jest %n formularz z niezachowanymi zmianami. Czy chcesz przejrzeć zmiany przed wyjÅ›ciem z programu? @@ -2494,7 +2454,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method Pusta nazwa klasy zostaÅ‚a przekazana do %1 (nazwa obiektu: '%2'). @@ -2515,7 +2475,7 @@ Container pages should only be added by specifying them in XML returned by the d Typ rozmieszczenia '%1' nie jest obsÅ‚ugiwany. - + The set-type property %1 could not be read. Nie można odczytać wÅ‚aÅ›ciwoÅ›ci %1 typu zbiór. @@ -2535,7 +2495,7 @@ Container pages should only be added by specifying them in XML returned by the d Nie można zapisać wÅ‚aÅ›ciwoÅ›ci %1. Typ %2 nie jest jeszcze obsÅ‚ugiwany. - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Niepoprawna wartość "%1" typu wyliczeniowego. Użyta bÄ™dzie domyÅ›lna wartość "%2". @@ -2548,7 +2508,7 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetEventFilter - + Previous Page Poprzednia strona @@ -2609,7 +2569,7 @@ Container pages should only be added by specifying them in XML returned by the d QTabWidgetEventFilter - + Delete UsuÅ„ @@ -2637,7 +2597,7 @@ Container pages should only be added by specifying them in XML returned by the d QToolBoxHelper - + Delete Page UsuÅ„ stronÄ™ @@ -2675,7 +2635,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolEdit - + True @@ -2691,7 +2651,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolPropertyManager - + True Prawda @@ -2704,7 +2664,7 @@ Container pages should only be added by specifying them in XML returned by the d QtCharEdit - + Clear Char Wyczyść znak @@ -2720,7 +2680,7 @@ Container pages should only be added by specifying them in XML returned by the d QtColorPropertyManager - + Red CzerwieÅ„ @@ -2900,7 +2860,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientEditor - + Start X PoczÄ…tek X @@ -3175,7 +3135,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientStopsWidget - + New Stop Nowy punkt @@ -3213,7 +3173,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientView - + Grad Grad @@ -3260,7 +3220,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientViewDialog - + Select Gradient Wybierz gradient @@ -3277,7 +3237,7 @@ Container pages should only be added by specifying them in XML returned by the d QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3344,22 +3304,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Szerokość @@ -3372,22 +3332,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Szerokość @@ -3400,7 +3360,7 @@ Container pages should only be added by specifying them in XML returned by the d QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 już istnieje. @@ -3412,7 +3372,7 @@ Czy chcesz go zastÄ…pić? Plik nie wyglÄ…da na plik z zasobami; znaleziono element '%1' podczas gdy oczekiwano elementu '%2'. - + %1 [read-only] %1 - [tylko do odczytu] @@ -3686,7 +3646,7 @@ jako: QtResourceView - + Size: %1 x %2 %3 Rozmiar: %1 x %2 @@ -3719,7 +3679,7 @@ jako: QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -3737,12 +3697,18 @@ jako: QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] - + Horizontal Policy Strategia pozioma @@ -3765,7 +3731,7 @@ jako: QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -3783,7 +3749,7 @@ jako: QtToolBarDialog - + < S E P A R A T O R > < S E P A R A T O R > @@ -3891,7 +3857,7 @@ jako: QtTreePropertyBrowser - + Property WÅ‚aÅ›ciwość @@ -3904,7 +3870,7 @@ jako: SaveFormAsTemplate - + Add path... Dodaj Å›cieżkÄ™... @@ -3969,7 +3935,7 @@ Czy chcesz nadpisać szablon? ScriptErrorDialog - + An error occurred while running the scripts for "%1": WystÄ…piÅ‚ bÅ‚Ä…d podczas uruchamiana skryptu dla "%1": @@ -3988,11 +3954,21 @@ Czy chcesz nadpisać szablon? Select signal Wybierz sygnaÅ‚ + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) NADAJNIK(%1), SYGNAÅ(%2), ODBIORNIK(%3), SLOT(%4) @@ -4033,7 +4009,7 @@ Czy chcesz nadpisać szablon? Spacer - + Horizontal Spacer '%1', %2 x %3 Poziomy dystans '%1', %2 x %3 @@ -4046,7 +4022,7 @@ Czy chcesz nadpisać szablon? TemplateOptionsPage - + Template Paths Tab in preferences dialog Åšcieżki z szablonami @@ -4088,29 +4064,27 @@ Czy chcesz nadpisać szablon? VersionDialog - + Qt Designer Qt Designer - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Wersja %2 - Open Source Edition - Wydanie Open Source + Wydanie Open Source - + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer jest aplikacjÄ… umożliwiajÄ…cÄ… projektowanie interfejsów graficznych użytkownika w aplikacjach korzystajÄ…cych z Qt.<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - Ten program wydany jest na licencji Qt Commercial. Aby zapoznać siÄ™ ze szczegółami licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czony jest do pakietu Qt.<br/> + Ten program wydany jest na licencji Qt Commercial. Aby zapoznać siÄ™ ze szczegółami licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czony jest do pakietu Qt.<br/> @@ -4118,20 +4092,14 @@ Czy chcesz nadpisać szablon? %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). Wszystkie prawa zastrzeżone.<br/><br/>Program dostarczony jest BEZ Å»ADNYCH GWARANCJI.<br/> - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - Ta wersja Qt Designer jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>.<br/> + Ta wersja Qt Designer jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>.<br/> WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Plik zawiera wÅ‚asny widżet '%1' którego klasa bazowa (%2) różni siÄ™ od bieżącego elementu w bazie danych z widżetami (%3). Baza danych z widżetami zostaÅ‚a niezmieniona. @@ -4139,22 +4107,22 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ActionEditor - + Actions Akcje - + New... Nowa... - + Delete UsuÅ„ - + New action Nowa akcja @@ -4164,12 +4132,17 @@ Czy chcesz nadpisać szablon? Edytuj akcjÄ™ - + Edit... Edytuj... + Go to slot... + Przejdź do slotu... + + + Copy Skopiuj @@ -4189,7 +4162,7 @@ Czy chcesz nadpisać szablon? Zaznacz wszystko - + Configure Action Editor Skonfiguruj edytor akcji @@ -4204,7 +4177,7 @@ Czy chcesz nadpisać szablon? Szczegółowy widok - + Remove actions UsuÅ„ akcje @@ -4214,7 +4187,7 @@ Czy chcesz nadpisać szablon? UsuÅ„ akcjÄ™ '%1' - + Used In Użyta w @@ -4222,7 +4195,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ActionModel - + Name Nazwa @@ -4255,7 +4228,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditor - + Add buddy Dodaj skojarzonÄ… etykietÄ™ @@ -4291,7 +4264,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies Edytuj skojarzone etykiety @@ -4299,7 +4272,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditorTool - + Edit Buddies Edytuj skojarzone etykiety @@ -4353,7 +4326,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::CodeDialog - + Save... Zachowaj... @@ -4411,7 +4384,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ColorAction - + Text Color Color tekstu @@ -4419,7 +4392,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... Edytuj elementy... @@ -4458,7 +4431,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ConnectionModel - + Sender Nadajnik @@ -4478,7 +4451,7 @@ Czy chcesz nadpisać szablon? Slot - + <sender> <nadajnik> @@ -4511,7 +4484,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page Wstaw stronÄ™ przed bieżącÄ… stronÄ… @@ -4574,7 +4547,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::DesignerPropertyManager - + AlignLeft Wyrównanie do lewej @@ -4701,7 +4674,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) Profile urzÄ…dzeÅ„ (*.%1) @@ -4806,9 +4779,62 @@ Czy chcesz nadpisać szablon? + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + Dodaj profil + + + + Edit the selected profile + Edytuj zaznaczony profil + + + + Delete the selected profile + UsuÅ„ zaznaczony profil + + + + Add Profile + Dodaj profil + + + + New profile + Nowy profil + + + + Edit Profile + Edytuj profil + + + + Delete Profile + UsuÅ„ profil + + + + Would you like to delete the profile '%1'? + Czy chcesz usunać profil '%1'? + + + + Default + DomyÅ›lny + + + qdesigner_internal::FilterWidget - + <Filter> <Filtr> @@ -4816,7 +4842,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormEditor - + Resource File Changed Zmieniony plik z zasobami @@ -4837,7 +4863,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindow - + Edit contents Edytuj zawartość @@ -4847,7 +4873,7 @@ Czy chcesz nadpisać szablon? F2 - + Resize ZmieÅ„ rozmiar @@ -4878,13 +4904,13 @@ Czy chcesz nadpisać szablon? Rozmieść - + Drop widget Upuść widżet - + Paste %n action(s) Wklej %n akcjÄ™ @@ -4917,12 +4943,12 @@ Czy chcesz nadpisać szablon? Wybierz przodka - + A QMainWindow-based form does not contain a central widget. Formularz bazujÄ…cy na QMainWindow nie zawiera centralnego widżetu. - + Raise widgets PrzenieÅ› widżety na wierzch @@ -4935,7 +4961,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowBase - + Delete UsuÅ„ @@ -4948,7 +4974,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowManager - + Cu&t Wy&tnij @@ -5030,7 +5056,7 @@ Czy chcesz nadpisać szablon? Dopasuj wielkość zaznaczonego widżetu - + Lay Out &Horizontally Rozmieść w po&ziomie @@ -5080,7 +5106,7 @@ Czy chcesz nadpisać szablon? Rozmieszcza zaznaczone widżety pionowo w splitterze - + &Break Layout &UsuÅ„ rozmieszczenie @@ -5105,7 +5131,7 @@ Czy chcesz nadpisać szablon? Us&tawienia formularza... - + Break Layout UsuÅ„ rozmieszczenie @@ -5121,17 +5147,17 @@ Czy chcesz nadpisać szablon? Nie można utworzyć podglÄ…du formularza - + Form Settings - %1 Ustawienia formularza - %1 - + Removes empty columns and rows UsuÅ„ puste kolumny i wiersze - + Lay Out in a &Form Layout Rozmieść w &formularzu @@ -5141,7 +5167,7 @@ Czy chcesz nadpisać szablon? Rozmieszcza zaznaczone widżety w formularzu - + Si&mplify Grid Layout Up&rość rozmieszczenie w siatce @@ -5149,7 +5175,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowSettings - + None Å»aden @@ -5200,7 +5226,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::GroupBoxTaskMenu - + Change title... ZmieÅ„ tytuÅ‚... @@ -5216,7 +5242,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. Nie można odczytać pliku z pixmapÄ… %1. @@ -5309,7 +5335,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ItemListEditor - + Properties &<< WÅ‚asciwoÅ›ci &<< @@ -5368,7 +5394,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::LabelTaskMenu - + Change rich text... ZmieÅ„ tekst sformatowany... @@ -5381,7 +5407,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::LineEditTaskMenu - + Change text... ZmieÅ„ tekst... @@ -5389,7 +5415,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ListWidgetEditor - + New Item Nowy element @@ -5407,7 +5433,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -5443,7 +5469,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::MenuTaskMenu - + Remove UsuÅ„ @@ -5502,7 +5528,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name Ustaw nazwÄ™ wÅ‚aÅ›ciwoÅ›ci @@ -5623,7 +5649,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::NewPromotedClassPanel - + Add Dodaj @@ -5661,7 +5687,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::ObjectInspector - + &Find in Text... Z&najdź w tekÅ›cie... @@ -5677,7 +5703,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::OrderDialog - + Index %1 (%2) Indeks %1 (%2) @@ -5758,7 +5784,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PaletteEditorButton - + Change Palette ZmieÅ„ paletÄ™ @@ -5766,7 +5792,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PaletteModel - + Color Role Rola koloru @@ -5818,15 +5844,61 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PlainTextEditorDialog - + Edit text Edytuj tekst + qdesigner_internal::PluginDialog + + + Components + Komponenty + + + + Plugin Information + Informacje o wtyczkach + + + + Qt Designer couldn't find any plugins + Qt Designer nie mógÅ‚ znaleźć żadnej wtyczki + + + + Qt Designer found the following plugins + Qt Designer znalazÅ‚ nastÄ™pujÄ…ce wtyczki: + + + TextLabel + Etykieta + + + + Refresh + OdÅ›wież + + + + Scan for newly installed custom widget plugins. + Szukaj nowo zainstalowanych wtyczek z widżetami. + + + + New custom widget plugins have been found. + Znaleziono nowÄ… wtyczkÄ™ z widżetami. + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style Styl %1 @@ -5869,7 +5941,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PreviewDeviceSkin - + &Close Za&mknij @@ -5966,7 +6038,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... ZastÄ™pcze widżety... @@ -5994,7 +6066,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PropertyEditor - + Add Dynamic Property... Dodaj dynamicznÄ… wÅ‚aÅ›ciwość ... @@ -6029,14 +6101,14 @@ Wybierz innÄ… nazwÄ™. Skonfiguruj edytor wÅ‚aÅ›ciwoÅ›ci - + Object: %1 Class: %2 Obiekt: %1 Klasa: %2 - + String... String... @@ -6054,7 +6126,7 @@ Klasa: %2 qdesigner_internal::PropertyLineEdit - + Insert line break Wstaw znak koÅ„ca linii @@ -6157,8 +6229,13 @@ Klasa: %2 Change script... ZmieÅ„ skrypt... + + + no signals available + + - + Set size constraint on %n widget(s) Ustaw ograniczenie rozmiaru w %n obiekcie @@ -6167,7 +6244,7 @@ Klasa: %2 - + Change signals/slots... ZmieÅ„ sygnaÅ‚y/sloty... @@ -6212,7 +6289,7 @@ Klasa: %2 Ustaw maksymalny rozmiar - + Edit ToolTip Edytuj podpowiedź @@ -6225,7 +6302,7 @@ Klasa: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> Niespodziewany element <%1> @@ -6281,7 +6358,7 @@ Klasa: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -6456,7 +6533,7 @@ Klasa: %2 qdesigner_internal::ScriptDialog - + Edit script Edytuj skrypt @@ -6506,7 +6583,7 @@ Klasa: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots Edytuj sygnaÅ‚y/sloty @@ -6519,7 +6596,7 @@ Klasa: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots Edytuj sygnaÅ‚y/sloty @@ -6527,7 +6604,7 @@ Klasa: %2 qdesigner_internal::StatusBarTaskMenu - + Remove UsuÅ„ @@ -6535,7 +6612,7 @@ Klasa: %2 qdesigner_internal::StringListEditorButton - + Change String List ZmieÅ„ listÄ™ tekstów @@ -6543,7 +6620,7 @@ Klasa: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet Edytuj arkusz stylu @@ -6582,7 +6659,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditor - + Start from Here Rozpocznij stÄ…d @@ -6610,7 +6687,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order Edytuj kolejność tabulacji @@ -6618,7 +6695,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order Edytuj kolejność tabulacji @@ -6636,7 +6713,7 @@ Klasa: %2 &Elementy - + New Row Nowy wiersz @@ -6675,7 +6752,7 @@ Klasa: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -6706,7 +6783,7 @@ Klasa: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... ZmieÅ„ HTML... @@ -6752,7 +6829,7 @@ Klasa: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator Wstaw separator @@ -6795,7 +6872,7 @@ Klasa: %2 Drzewo elementów - + &Columns &Kolumny @@ -6906,7 +6983,7 @@ Klasa: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -6914,7 +6991,7 @@ Klasa: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Ostrzeżenie: BÅ‚Ä…d tworzenia widżetu w panelu widżetów. MogÅ‚o to być spowodowane niepoprawnym kodem XML widżetu. @@ -6922,17 +6999,17 @@ Klasa: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad Notatnik - + Custom Widgets WÅ‚asne widżety - + Expand all Rozszerz wszystkie @@ -6973,7 +7050,7 @@ Klasa: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets Edytuj widżety @@ -6981,12 +7058,12 @@ Klasa: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. Fabryka widżetów użytkownika zarejestrowana dla widżetów klasy %1 zwróciÅ‚a 0. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. WystÄ…piÅ‚a niezgodność nazwy klasy podczas tworzenia widżetu przy pomocy fabryki widżetów użytkownika zarejestrowanej dla klasy %1. Zwrócony zostaÅ‚ widżet klasy %2. @@ -7029,7 +7106,7 @@ To wskazuje na niespójność w pliku "ui". qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_tr_TR.ts b/translations/designer_tr_TR.ts new file mode 100644 index 0000000..73ea53e --- /dev/null +++ b/translations/designer_tr_TR.ts @@ -0,0 +1,6950 @@ + + + + + + + + The moose in the noose +ate the goose who was loose. + + + + + <object> + + + + + <signal> + + + + + <slot> + + + + + AbstractFindWidget + + + &Previous + + + + + &Next + + + + + &Case sensitive + + + + + Whole &words + + + + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped + + + + + AddLinkDialog + + + Insert Link + + + + + Title: + + + + + URL: + + + + + AppFontDialog + + + Additional Fonts + + + + + AppFontManager + + + '%1' is not a file. + + + + + The font file '%1' does not have read permissions. + + + + + The font file '%1' is already loaded. + + + + + The font file '%1' could not be loaded. + + + + + '%1' is not a valid font id. + + + + + There is no loaded font matching the id '%1'. + + + + + The font '%1' (%2) could not be unloaded. + + + + + AppFontWidget + + + Fonts + + + + + Add font files + + + + + Remove current font file + + + + + Remove all font files + + + + + Add Font Files + + + + + Font files (*.ttf) + + + + + Error Adding Fonts + + + + + Error Removing Fonts + + + + + Remove Fonts + + + + + Would you like to remove all fonts? + + + + + AppearanceOptionsWidget + + + Form + + + + + User Interface Mode + + + + + AssistantClient + + + Unable to send request: Assistant is not responding. + + + + + The binary '%1' does not exist. + + + + + Unable to launch assistant (%1). + + + + + BrushManagerProxy + + + The element '%1' is missing the required attribute '%2'. + + + + + Empty brush name encountered. + + + + + An unexpected element '%1' was encountered. + + + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + + + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + + + + + BrushPropertyManager + + + No brush + + + + + Solid + + + + + Dense 1 + + + + + Dense 2 + + + + + Dense 3 + + + + + Dense 4 + + + + + Dense 5 + + + + + Dense 6 + + + + + Dense 7 + + + + + Horizontal + + + + + Vertical + + + + + Cross + + + + + Backward diagonal + + + + + Forward diagonal + + + + + Crossing diagonal + + + + + Style + + + + + Color + + + + + [%1, %2] + + + + + Command + + + + Change signal + + + + + + Change slot + + + + + Change signal-slot connection + + + + + Change sender + + + + + Change receiver + + + + + Create button group + + + + + Break button group + + + + + Break button group '%1' + + + + + Add buttons to group + + + + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + + + + + Remove buttons from group + + + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + + + + + Add connection + + + + + Adjust connection + + + + + Delete connections + + + + + Change source + + + + + Change target + + + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + + + + + Insert '%1' + + + + + Change Z-order of '%1' + + + + + Raise '%1' + + + + + Lower '%1' + + + + + Delete '%1' + + + + + Reparent '%1' + + + + + Promote to custom widget + + + + + Demote from custom widget + + + + + Lay out using grid + + + + + Lay out vertically + + + + + Lay out horizontally + + + + + Break layout + + + + + Simplify Grid Layout + + + + + + + Move Page + + + + + + + + Delete Page + + + + + + Page + + + + + + + page + + + + + + + + Insert Page + + + + + tab + + + + + Change Tab order + + + + + Create Menu Bar + + + + + Delete Menu Bar + + + + + Create Status Bar + + + + + Delete Status Bar + + + + + Add Tool Bar + + + + + Add Dock Window + + + + + Adjust Size of '%1' + + + + + Change Form Layout Item Geometry + + + + + Change Layout Item Geometry + + + + + Delete Subwindow + + + + + Insert Subwindow + + + + + subwindow + + + + + Subwindow + + + + + Change Table Contents + + + + + Change Tree Contents + + + + + + Add action + + + + + + Remove action + + + + + Add menu + + + + + Remove menu + + + + + Create submenu + + + + + Delete Tool Bar + + + + + Change layout of '%1' from %2 to %3 + + + + + Set action text + + + + + Insert action + + + + + + Move action + + + + + Change Title + + + + + Insert Menu + + + + + Changed '%1' of '%2' + + + + + Changed '%1' of %n objects + + + + + + + Reset '%1' of '%2' + + + + + Reset '%1' of %n objects + + + + + + + Add dynamic property '%1' to '%2' + + + + + Add dynamic property '%1' to %n objects + + + + + + + Remove dynamic property '%1' from '%2' + + + + + Remove dynamic property '%1' from %n objects + + + + + + + Change script + + + + + Change signals/slots + + + + + ConnectDialog + + + Configure Connection + + + + + GroupBox + + + + + Edit... + + + + + Show signals and slots inherited from QWidget + + + + + DPI_Chooser + + + Standard (96 x 96) + Embedded device standard screen resolution + + + + + Greenphone (179 x 185) + Embedded device screen resolution + + + + + High (192 x 192) + Embedded device high definition screen resolution + + + + + Designer + + + Qt Designer + + + + + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. + + + + + Perhaps you forgot to create a layout? + + + + + Invalid ui file: The root element <ui> is missing. + + + + + An error has occurred while reading the ui file at line %1, column %2: %3 + + + + + This file cannot be read because it was created using %1. + + + + + This file was created using Designer from Qt-%1 and cannot be read. + + + + + The converted file could not be read. + + + + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. + + + + + The old form has not been touched, but you will have to save the form under a new name. + + + + + This file was created using Designer from Qt-%1 and could not be read: +%2 + + + + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. + + + + + This file cannot be read because the extra info extension failed to load. + + + + + Custom Widgets + + + + + Promoted Widgets + + + + + Unable to launch %1. + + + + + %1 timed out. + + + + + DesignerMetaEnum + + + %1 is not a valid enumeration value of '%2'. + + + + + '%1' could not be converted to an enumeration value of type '%2'. + + + + + DesignerMetaFlags + + + '%1' could not be converted to a flag value of type '%2'. + + + + + DeviceProfile + + + '%1' is not a number. + Reading a number for an embedded device profile + + + + + An invalid tag <%1> was encountered. + + + + + DeviceProfileDialog + + + &Family + + + + + &Point Size + + + + + Style + + + + + Device DPI + + + + + Name + + + + + DeviceSkin + + + The image file '%1' could not be loaded. + + + + + The skin directory '%1' does not contain a configuration file. + + + + + The skin configuration file '%1' could not be opened. + + + + + The skin configuration file '%1' could not be read: %2 + + + + + Syntax error: %1 + + + + + The skin "up" image file '%1' does not exist. + + + + + The skin "down" image file '%1' does not exist. + + + + + The skin "closed" image file '%1' does not exist. + + + + + The skin cursor image file '%1' does not exist. + + + + + Syntax error in area definition: %1 + + + + + Mismatch in number of areas, expected %1, got %2. + + + + + EmbeddedOptionsControl + + + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description + + + + + EmbeddedOptionsPage + + + Embedded Design + Tab in preferences dialog + + + + + Device Profiles + EmbeddedOptionsControl group box" + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + FontPropertyManager + + + PreferDefault + + + + + NoAntialias + + + + + PreferAntialias + + + + + Antialiasing + + + + + FormBuilder + + + Invalid stretch value for '%1': '%2' + Parsing layout stretch values + + + + + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values + + + + + FormEditorOptionsPage + + + %1 % + + + + + Preview Zoom + + + + + Default Zoom + + + + + Forms + Tab in preferences dialog + + + + + Default Grid + + + + + FormLayoutRowDialog + + + Add Form Layout Row + + + + + &Label text: + + + + + Field &type: + + + + + &Field name: + + + + + &Buddy: + + + + + &Row: + + + + + Label &name: + + + + + FormWindow + + + Unexpected element <%1> + + + + + Error while pasting clipboard contents at line %1, column %2: %3 + + + + + FormWindowSettings + + + Form Settings + + + + + Layout &Default + + + + + &Spacing: + + + + + &Margin: + + + + + &Layout Function + + + + + Ma&rgin: + + + + + Spa&cing: + + + + + &Pixmap Function + + + + + &Include Hints + + + + + Grid + + + + + Embedded Design + + + + + &Author + + + + + IconSelector + + + All Pixmaps ( + + + + + ItemPropertyBrowser + + + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser + + + + + LanguageResourceDialog + + + Choose Resource + + + + + MainWindowBase + + + Main + Not currently used (main tool bar) + + + + + File + + + + + Edit + + + + + Tools + + + + + Form + + + + + Qt Designer + + + + + NewForm + + + Show this Dialog on Startup + + + + + C&reate + + + + + Recent + + + + + New Form + + + + + &Close + + + + + &Open... + + + + + &Recent Forms + + + + + Read error + + + + + A temporary form file could not be created in %1. + + + + + The temporary form file %1 could not be written. + + + + + NewFormWidget + + + Unable to open the form template file '%1': %2 + + + + + ObjectInspectorModel + + + Object + + + + + Class + + + + + separator + + + + + <noname> + + + + + ObjectNameDialog + + + Change Object Name + + + + + Object Name + + + + + PluginDialog + + + Plugin Information + + + + + 1 + + + + + PreferencesDialog + + + Preferences + + + + + PreviewConfigurationWidget + + + Default + + + + + None + + + + + Browse... + + + + + Form + + + + + Print/Preview Configuration + + + + + Style + + + + + Style sheet + + + + + ... + + + + + Device skin + + + + + PromotionModel + + + Not used + Usage of promoted widgets + + + + + Q3WizardContainer + + + + Page + + + + + QAbstractFormBuilder + + + Unexpected element <%1> + + + + + An error has occurred while reading the ui file at line %1, column %2: %3 + + + + + Invalid ui file: The root element <ui> is missing. + + + + + The creation of a widget of the class '%1' failed. + + + + + Attempt to add child that is not of class QWizardPage to QWizard. + + + + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. +This indicates an inconsistency in the ui-file. + + + + + Empty widget item in %1 '%2'. + + + + + Flags property are not supported yet. + + + + + While applying tab stops: The widget '%1' could not be found. + + + + + Invalid QButtonGroup reference '%1' referenced by '%2'. + + + + + This version of the uitools library is linked without script support. + + + + + QAxWidgetPlugin + + + ActiveX control + + + + + ActiveX control widget + + + + + QAxWidgetTaskMenu + + + Set Control + + + + + Reset Control + + + + + Licensed Control + + + + + The control requires a design-time license + + + + + QCoreApplication + + + %1 is not a promoted class. + + + + + The base class %1 is invalid. + + + + + The class %1 already exists. + + + + + Promoted Widgets + + + + + The class %1 cannot be removed + + + + + The class %1 cannot be removed because it is still referenced. + + + + + The class %1 cannot be renamed + + + + + The class %1 cannot be renamed to an empty name. + + + + + There is already a class named %1. + + + + + Cannot set an empty include file. + + + + + Exception at line %1: %2 + + + + + Unknown error + + + + + An error occurred while running the script for %1: %2 +Script: %3 + + + + + QDesigner + + + %1 - warning + + + + + Qt Designer + + + + + This application cannot be used for the Console edition of Qt + + + + + QDesignerActions + + + Saved %1. + + + + + %1 already exists. +Do you want to replace it? + + + + + Edit Widgets + + + + + &New... + + + + + &Open... + + + + + &Save + + + + + Save &As... + + + + + Save A&ll + + + + + Save As &Template... + + + + + + &Close + + + + + Save &Image... + + + + + &Print... + + + + + &Quit + + + + + View &Code... + + + + + &Minimize + + + + + Bring All to Front + + + + + Preferences... + + + + + Additional Fonts... + + + + + ALT+CTRL+S + + + + + CTRL+SHIFT+S + + + + + CTRL+Q + + + + + CTRL+R + + + + + CTRL+M + + + + + Qt Designer &Help + + + + + Current Widget Help + + + + + What's New in Qt Designer? + + + + + About Plugins + + + + + + About Qt Designer + + + + + About Qt + + + + + Clear &Menu + + + + + &Recent Forms + + + + + + Open Form + + + + + + + Designer UI files (*.%1);;All Files (*) + + + + + + Save Form As + + + + + Designer + + + + + Feature not implemented yet! + + + + + Code generation failed + + + + + Read error + + + + + %1 +Do you want to update the file location or generate a new form? + + + + + &Update + + + + + &New Form + + + + + + Save Form? + + + + + Could not open file + + + + + The file %1 could not be opened. +Reason: %2 +Would you like to retry or select a different file? + + + + + Select New File + + + + + Could not write file + + + + + It was not possible to write the entire file %1 to disk. +Reason:%2 +Would you like to retry? + + + + + + Assistant + + + + + &Close Preview + + + + + + The backup file %1 could not be written. + + + + + The backup directory %1 could not be created. + + + + + The temporary backup directory %1 could not be created. + + + + + Preview failed + + + + + Image files (*.%1) + + + + + + Save Image + + + + + Saved image %1. + + + + + The file %1 could not be written. + + + + + Please close all forms to enable the loading of additional fonts. + + + + + Printed %1. + + + + + QDesignerAppearanceOptionsPage + + + Appearance + Tab in preferences dialog + + + + + QDesignerAppearanceOptionsWidget + + + Docked Window + + + + + Multiple Top-Level Windows + + + + + Toolwindow Font + + + + + QDesignerAxWidget + + + Reset control + + + + + Set control + + + + + Control loaded + + + + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". + + + + + QDesignerFormBuilder + + + Script errors occurred: + + + + + The preview failed to build. + + + + + Designer + + + + + QDesignerFormWindow + + + %1 - %2[*] + + + + + Save Form? + + + + + Do you want to save the changes to this document before closing? + + + + + If you don't save, your changes will be lost. + + + + + QDesignerMenu + + + Type Here + + + + + Add Separator + + + + + Insert separator + + + + + Remove separator + + + + + Remove action '%1' + + + + + + Add separator + + + + + Insert action + + + + + QDesignerMenuBar + + + Type Here + + + + + Remove Menu '%1' + + + + + Remove Menu Bar + + + + + Menu + + + + + QDesignerPluginManager + + + An XML error was encountered when parsing the XML of the custom widget %1: %2 + + + + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. + + + + + The class attribute for the class %1 is missing. + + + + + The class attribute for the class %1 does not match the class name %2. + + + + + QDesignerPropertySheet + + + Dynamic Properties + + + + + QDesignerResource + + + The layout type '%1' is not supported, defaulting to grid. + + + + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. +Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. + + + + + Unexpected element <%1> + Parsing clipboard contents + + + + + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents + + + + + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents + + + + + QDesignerSharedSettings + + + The template path %1 could not be created. + + + + + An error has been encountered while parsing device profile XML: %1 + + + + + QDesignerToolWindow + + + Property Editor + + + + + Action Editor + + + + + Object Inspector + + + + + Resource Browser + + + + + Signal/Slot Editor + + + + + Widget Box + + + + + QDesignerWidgetBox + + + An error has been encountered at line %1 of %2: %3 + + + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + + + + + Unexpected end of file encountered when parsing widgets. + + + + + A widget element could not be found. + + + + + QDesignerWorkbench + + + &File + + + + + Edit + + + + + F&orm + + + + + Preview in + + + + + &View + + + + + &Settings + + + + + &Window + + + + + &Help + + + + + Toolbars + + + + + Save Forms? + + + + + There are %n forms with unsaved changes. Do you want to review these changes before quitting? + + + + + + + If you do not review your documents, all your changes will be lost. + + + + + Discard Changes + + + + + Review Changes + + + + + Backup Information + + + + + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? + + + + + The file <b>%1</b> could not be opened. + + + + + The file <b>%1</b> is not a valid Designer ui file. + + + + + QFormBuilder + + + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method + + + + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. + + + + + QFormBuilder was unable to create a widget of the class '%1'. + + + + + The layout type `%1' is not supported. + + + + + The set-type property %1 could not be read. + + + + + The enumeration-type property %1 could not be read. + + + + + Reading properties of the type %1 is not supported yet. + + + + + The property %1 could not be written. The type %2 is not supported yet. + + + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + + + + + The flag-value '%1' is invalid. Zero will be used instead. + + + + + QStackedWidgetEventFilter + + + Previous Page + + + + + Next Page + + + + + Delete + + + + + Before Current Page + + + + + After Current Page + + + + + Change Page Order... + + + + + Change Page Order + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QStackedWidgetPreviewEventFilter + + + Go to previous page of %1 '%2' (%3/%4). + + + + + Go to next page of %1 '%2' (%3/%4). + + + + + QTabWidgetEventFilter + + + Delete + + + + + Before Current Page + + + + + After Current Page + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QToolBoxHelper + + + Delete Page + + + + + Before Current Page + + + + + After Current Page + + + + + Change Page Order... + + + + + Change Page Order + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QtBoolEdit + + + + + True + + + + + + False + + + + + QtBoolPropertyManager + + + True + + + + + False + + + + + QtCharEdit + + + Clear Char + + + + + QtColorEditWidget + + + ... + + + + + QtColorPropertyManager + + + Red + + + + + Green + + + + + Blue + + + + + Alpha + + + + + QtCursorDatabase + + + Arrow + + + + + Up Arrow + + + + + Cross + + + + + Wait + + + + + IBeam + + + + + Size Vertical + + + + + Size Horizontal + + + + + Size Backslash + + + + + Size Slash + + + + + Size All + + + + + Blank + + + + + Split Vertical + + + + + Split Horizontal + + + + + Pointing Hand + + + + + Forbidden + + + + + Open Hand + + + + + Closed Hand + + + + + What's This + + + + + Busy + + + + + QtFontEditWidget + + + ... + + + + + Select Font + + + + + QtFontPropertyManager + + + Family + + + + + Point Size + + + + + Bold + + + + + Italic + + + + + Underline + + + + + Strikeout + + + + + Kerning + + + + + QtGradientDialog + + + Edit Gradient + + + + + QtGradientEditor + + + Start X + + + + + Start Y + + + + + Final X + + + + + Final Y + + + + + + Central X + + + + + + Central Y + + + + + Focal X + + + + + Focal Y + + + + + Radius + + + + + Angle + + + + + Form + + + + + Gradient Editor + + + + + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + Gradient Stops Editor + + + + + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. + + + + + Zoom + + + + + Reset Zoom + + + + + Position + + + + + Hue + + + + + H + + + + + Saturation + + + + + S + + + + + Sat + + + + + Value + + + + + V + + + + + Val + + + + + Alpha + + + + + A + + + + + Type + + + + + Spread + + + + + Color + + + + + Current stop's color + + + + + Show HSV specification + + + + + HSV + + + + + Show RGB specification + + + + + RGB + + + + + Current stop's position + + + + + % + + + + + Zoom In + + + + + Zoom Out + + + + + Toggle details extension + + + + + > + + + + + Linear Type + + + + + ... + + + + + Radial Type + + + + + Conical Type + + + + + Pad Spread + + + + + Repeat Spread + + + + + Reflect Spread + + + + + QtGradientStopsWidget + + + New Stop + + + + + Delete + + + + + Flip All + + + + + Select All + + + + + Zoom In + + + + + Zoom Out + + + + + Reset Zoom + + + + + QtGradientView + + + Grad + + + + + Remove Gradient + + + + + Are you sure you want to remove the selected gradient? + + + + + + New... + + + + + + Edit... + + + + + + Rename + + + + + + Remove + + + + + Gradient View + + + + + QtGradientViewDialog + + + + Select Gradient + + + + + QtKeySequenceEdit + + + Clear Shortcut + + + + + QtLocalePropertyManager + + + %1, %2 + + + + + Language + + + + + Country + + + + + QtPointFPropertyManager + + + (%1, %2) + + + + + X + + + + + Y + + + + + QtPointPropertyManager + + + (%1, %2) + + + + + X + + + + + Y + + + + + QtPropertyBrowserUtils + + + [%1, %2, %3] (%4) + + + + + [%1, %2] + + + + + QtRectFPropertyManager + + + [(%1, %2), %3 x %4] + + + + + X + + + + + Y + + + + + Width + + + + + Height + + + + + QtRectPropertyManager + + + [(%1, %2), %3 x %4] + + + + + X + + + + + Y + + + + + Width + + + + + Height + + + + + QtResourceEditorDialog + + + %1 already exists. +Do you want to replace it? + + + + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. + + + + + %1 [read-only] + + + + + + %1 [missing] + + + + + <no prefix> + + + + + + New Resource File + + + + + + Resource files (*.qrc) + + + + + Import Resource File + + + + + newPrefix + + + + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> + + + + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> + + + + + Add Files + + + + + Incorrect Path + + + + + + + + Copy + + + + + Copy As... + + + + + Keep + + + + + Skip + + + + + Clone Prefix + + + + + Enter the suffix which you want to add to the names of the cloned files. +This could for example be a language extension like "_de". + + + + + + Copy As + + + + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> + + + + + Could not overwrite %1. + + + + + Could not copy +%1 +to +%2 + + + + + A parse error occurred at line %1, column %2 of %3: +%4 + + + + + Save Resource File + + + + + Could not write %1: %2 + + + + + Edit Resources + + + + + New... + + + + + Open... + + + + + Open Resource File + + + + + + Remove + + + + + + Move Up + + + + + + Move Down + + + + + + Add Prefix + + + + + Add Files... + + + + + Change Prefix + + + + + Change Language + + + + + Change Alias + + + + + Clone Prefix... + + + + + Prefix / Path + + + + + Language / Alias + + + + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> + + + + + Resource Warning + + + + + Dialog + + + + + New File + + + + + N + + + + + Remove File + + + + + R + + + + + I + + + + + New Resource + + + + + A + + + + + Remove Resource or File + + + + + QtResourceView + + + Size: %1 x %2 +%3 + + + + + Edit Resources... + + + + + Reload + + + + + Copy Path + + + + + QtResourceViewDialog + + + Select Resource + + + + + QtSizeFPropertyManager + + + %1 x %2 + + + + + Width + + + + + Height + + + + + QtSizePolicyPropertyManager + + + + <Invalid> + + + + + [%1, %2, %3, %4] + + + + + Horizontal Policy + + + + + Vertical Policy + + + + + Horizontal Stretch + + + + + Vertical Stretch + + + + + QtSizePropertyManager + + + %1 x %2 + + + + + Width + + + + + Height + + + + + QtToolBarDialog + + + Custom Toolbar + + + + + < S E P A R A T O R > + + + + + Customize Toolbars + + + + + 1 + + + + + Actions + + + + + Toolbars + + + + + Add new toolbar + + + + + New + + + + + Remove selected toolbar + + + + + Remove + + + + + Rename toolbar + + + + + Rename + + + + + Move action up + + + + + Up + + + + + Remove action from toolbar + + + + + <- + + + + + Add action to toolbar + + + + + -> + + + + + Move action down + + + + + Down + + + + + Current Toolbar Actions + + + + + QtTreePropertyBrowser + + + Property + + + + + Value + + + + + SaveFormAsTemplate + + + Add path... + + + + + Template Exists + + + + + A template with the name %1 already exists. +Do you want overwrite the template? + + + + + Overwrite Template + + + + + Open Error + + + + + There was an error opening template %1 for writing. Reason: %2 + + + + + Write Error + + + + + There was an error writing the template %1 to disk. Reason: %2 + + + + + Pick a directory to save templates in + + + + + Save Form As Template + + + + + &Name: + + + + + &Category: + + + + + ScriptErrorDialog + + + An error occurred while running the scripts for "%1": + + + + + + SelectSignalDialog + + + Go to slot + + + + + Select signal + + + + + signal + + + + + class + + + + + SignalSlotConnection + + + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) + + + + + SignalSlotDialogClass + + + Signals and slots + + + + + Slots + + + + + Add + + + + + ... + + + + + Delete + + + + + Signals + + + + + Spacer + + + Horizontal Spacer '%1', %2 x %3 + + + + + Vertical Spacer '%1', %2 x %3 + + + + + TemplateOptionsPage + + + Template Paths + Tab in preferences dialog + + + + + ToolBarManager + + + Configure Toolbars... + + + + + Window + + + + + Help + + + + + Style + + + + + Dock views + + + + + Toolbars + + + + + VersionDialog + + + <h3>%1</h3><br/><br/>Version %2 + + + + + Qt Designer + + + + + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> + + + + + %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + + WidgetDataBase + + + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. + + + + + qdesigner_internal::ActionEditor + + + New... + + + + + Edit... + + + + + Go to slot... + + + + + Copy + + + + + Cut + + + + + Paste + + + + + Select all + + + + + Delete + + + + + Actions + + + + + Configure Action Editor + + + + + Icon View + + + + + Detailed View + + + + + New action + + + + + Edit action + + + + + Remove action '%1' + + + + + Remove actions + + + + + Used In + + + + + qdesigner_internal::ActionModel + + + Name + + + + + Used + + + + + Text + + + + + Shortcut + + + + + Checkable + + + + + ToolTip + + + + + qdesigner_internal::BuddyEditor + + + Add buddy + + + + + Remove buddies + + + + + Remove %n buddies + + + + + + + Add %n buddies + + + + + + + Set automatically + + + + + qdesigner_internal::BuddyEditorPlugin + + + Edit Buddies + + + + + qdesigner_internal::BuddyEditorTool + + + Edit Buddies + + + + + qdesigner_internal::ButtonGroupMenu + + + Select members + + + + + Break + + + + + qdesigner_internal::ButtonTaskMenu + + + Assign to button group + + + + + Button group + + + + + New button group + + + + + Change text... + + + + + None + + + + + Button group '%1' + + + + + qdesigner_internal::CodeDialog + + + Save... + + + + + Copy All + + + + + &Find in Text... + + + + + A temporary form file could not be created in %1. + + + + + The temporary form file %1 could not be written. + + + + + %1 - [Code] + + + + + Save Code + + + + + Header Files (*.%1) + + + + + The file %1 could not be opened: %2 + + + + + The file %1 could not be written: %2 + + + + + %1 - Error + + + + + qdesigner_internal::ColorAction + + + Text Color + + + + + qdesigner_internal::ComboBoxTaskMenu + + + Edit Items... + + + + + Change Combobox Contents + + + + + qdesigner_internal::CommandLinkButtonTaskMenu + + + Change description... + + + + + qdesigner_internal::ConnectionEdit + + + Select All + + + + + Deselect All + + + + + Delete + + + + + qdesigner_internal::ConnectionModel + + + Sender + + + + + Signal + + + + + Receiver + + + + + Slot + + + + + <sender> + + + + + <signal> + + + + + <receiver> + + + + + <slot> + + + + + The connection already exists!<br>%1 + + + + + Signal and Slot Editor + + + + + qdesigner_internal::ContainerWidgetTaskMenu + + + Delete + + + + + Insert + + + + + Insert Page Before Current Page + + + + + Insert Page After Current Page + + + + + Add Subwindow + + + + + Subwindow + + + + + Page + + + + + Page %1 of %2 + + + + + qdesigner_internal::DPI_Chooser + + + System (%1 x %2) + System resolution + + + + + User defined + + + + + x + DPI X/Y separator + + + + + qdesigner_internal::DesignerPropertyManager + + + + AlignLeft + + + + + AlignHCenter + + + + + AlignRight + + + + + AlignJustify + + + + + AlignTop + + + + + + AlignVCenter + + + + + AlignBottom + + + + + %1, %2 + + + + + Customized (%n roles) + + + + + + + Inherited + + + + + Horizontal + + + + + Vertical + + + + + Normal Off + + + + + Normal On + + + + + Disabled Off + + + + + Disabled On + + + + + Active Off + + + + + Active On + + + + + Selected Off + + + + + Selected On + + + + + + translatable + + + + + + disambiguation + + + + + + comment + + + + + qdesigner_internal::DeviceProfileDialog + + + Device Profiles (*.%1) + + + + + Default + + + + + Save Profile + + + + + Save Profile - Error + + + + + Unable to open the file '%1' for writing: %2 + + + + + Open profile + + + + + + Open Profile - Error + + + + + Unable to open the file '%1' for reading: %2 + + + + + '%1' is not a valid profile: %2 + + + + + qdesigner_internal::Dialog + + + Dialog + + + + + StringList + + + + + New String + + + + + &New + + + + + Delete String + + + + + &Delete + + + + + &Value: + + + + + Move String Up + + + + + Up + + + + + Move String Down + + + + + Down + + + + + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + + + + + Edit the selected profile + + + + + Delete the selected profile + + + + + Add Profile + + + + + New profile + + + + + Edit Profile + + + + + Delete Profile + + + + + Would you like to delete the profile '%1'? + + + + + Default + + + + + qdesigner_internal::FilterWidget + + + <Filter> + + + + + qdesigner_internal::FormEditor + + + Resource File Changed + + + + + The file "%1" has changed outside Designer. Do you want to reload it? + + + + + qdesigner_internal::FormLayoutMenu + + + Add form layout row... + + + + + qdesigner_internal::FormWindow + + + Edit contents + + + + + F2 + + + + + Insert widget '%1' + + + + + Resize + + + + + + Key Move + + + + + Paste %n action(s) + + + + + + + Paste %n widget(s) + + + + + + + Paste (%1 widgets, %2 actions) + + + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. + + + + + Break the layout of the container you want to paste into, select this container and then paste again. + + + + + Paste error + + + + + Raise widgets + + + + + Lower widgets + + + + + Select Ancestor + + + + + Lay out + + + + + + Drop widget + + + + + A QMainWindow-based form does not contain a central widget. + + + + + qdesigner_internal::FormWindowBase + + + Delete '%1' + + + + + Delete + + + + + qdesigner_internal::FormWindowManager + + + Cu&t + + + + + Cuts the selected widgets and puts them on the clipboard + + + + + &Copy + + + + + Copies the selected widgets to the clipboard + + + + + &Paste + + + + + Pastes the clipboard's contents + + + + + &Delete + + + + + Deletes the selected widgets + + + + + Select &All + + + + + Selects all widgets + + + + + Bring to &Front + + + + + + Raises the selected widgets + + + + + Send to &Back + + + + + + Lowers the selected widgets + + + + + Adjust &Size + + + + + Adjusts the size of the selected widget + + + + + Lay Out &Horizontally + + + + + Lays out the selected widgets horizontally + + + + + Lay Out &Vertically + + + + + Lays out the selected widgets vertically + + + + + Lay Out in a &Form Layout + + + + + Lays out the selected widgets in a form layout + + + + + Lay Out in a &Grid + + + + + Lays out the selected widgets in a grid + + + + + Lay Out Horizontally in S&plitter + + + + + Lays out the selected widgets horizontally in a splitter + + + + + Lay Out Vertically in Sp&litter + + + + + Lays out the selected widgets vertically in a splitter + + + + + &Break Layout + + + + + Breaks the selected layout + + + + + Si&mplify Grid Layout + + + + + Removes empty columns and rows + + + + + &Preview... + + + + + Preview current form + + + + + Form &Settings... + + + + + Break Layout + + + + + Adjust Size + + + + + Could not create form preview + Title of warning message box + + + + + Form Settings - %1 + + + + + qdesigner_internal::FormWindowSettings + + + None + + + + + Device Profile: %1 + + + + + qdesigner_internal::GridPanel + + + Form + + + + + Grid + + + + + Visible + + + + + Grid &X + + + + + Snap + + + + + Reset + + + + + Grid &Y + + + + + qdesigner_internal::GroupBoxTaskMenu + + + Change title... + + + + + qdesigner_internal::HtmlTextEdit + + + Insert HTML entity + + + + + qdesigner_internal::IconSelector + + + The pixmap file '%1' cannot be read. + + + + + The file '%1' does not appear to be a valid pixmap file: %2 + + + + + The file '%1' could not be read: %2 + + + + + Choose a Pixmap + + + + + Pixmap Read Error + + + + + ... + + + + + Normal Off + + + + + Normal On + + + + + Disabled Off + + + + + Disabled On + + + + + Active Off + + + + + Active On + + + + + Selected Off + + + + + Selected On + + + + + Choose Resource... + + + + + Choose File... + + + + + Reset + + + + + Reset All + + + + + qdesigner_internal::ItemListEditor + + + Properties &<< + + + + + + Properties &>> + + + + + Items List + + + + + New Item + + + + + &New + + + + + Delete Item + + + + + &Delete + + + + + Move Item Up + + + + + U + + + + + Move Item Down + + + + + D + + + + + qdesigner_internal::LabelTaskMenu + + + Change rich text... + + + + + Change plain text... + + + + + qdesigner_internal::LineEditTaskMenu + + + Change text... + + + + + qdesigner_internal::ListWidgetEditor + + + New Item + + + + + Edit List Widget + + + + + Edit Combobox + + + + + qdesigner_internal::ListWidgetTaskMenu + + + Edit Items... + + + + + Change List Contents + + + + + qdesigner_internal::MdiContainerWidgetTaskMenu + + + Next Subwindow + + + + + Previous Subwindow + + + + + Tile + + + + + Cascade + + + + + qdesigner_internal::MenuTaskMenu + + + Remove + + + + + qdesigner_internal::MorphMenu + + + Morph into + + + + + qdesigner_internal::NewActionDialog + + + New Action... + + + + + &Text: + + + + + Object &name: + + + + + &Icon: + + + + + Shortcut: + + + + + Checkable: + + + + + ToolTip: + + + + + ... + + + + + qdesigner_internal::NewDynamicPropertyDialog + + + Set Property Name + + + + + The current object already has a property named '%1'. +Please select another, unique one. + + + + + The '_q_' prefix is reserved for the Qt library. +Please select another name. + + + + + Create Dynamic Property + + + + + Property Name + + + + + horizontalSpacer + + + + + Property Type + + + + + qdesigner_internal::NewFormWidget + + + Default size + + + + + QVGA portrait (240x320) + + + + + QVGA landscape (320x240) + + + + + VGA portrait (480x640) + + + + + VGA landscape (640x480) + + + + + Widgets + New Form Dialog Categories + + + + + Custom Widgets + + + + + None + + + + + Error loading form + + + + + Internal error: No template selected. + + + + + 0 + + + + + Choose a template for a preview + + + + + Embedded Design + + + + + Device: + + + + + Screen Size: + + + + + qdesigner_internal::NewPromotedClassPanel + + + Add + + + + + New Promoted Class + + + + + Base class name: + + + + + Promoted class name: + + + + + Header file: + + + + + Global include + + + + + Reset + + + + + qdesigner_internal::ObjectInspector + + + &Find in Text... + + + + + qdesigner_internal::ObjectInspector::ObjectInspectorPrivate + + + Change Current Page + + + + + qdesigner_internal::OrderDialog + + + Index %1 (%2) + + + + + %1 %2 + + + + + Change Page Order + + + + + Page Order + + + + + Move page up + + + + + Move page down + + + + + qdesigner_internal::PaletteEditor + + + Edit Palette + + + + + Tune Palette + + + + + Show Details + + + + + Compute Details + + + + + Quick + + + + + Preview + + + + + Disabled + + + + + Inactive + + + + + Active + + + + + qdesigner_internal::PaletteEditorButton + + + Change Palette + + + + + qdesigner_internal::PaletteModel + + + Color Role + + + + + Active + + + + + Inactive + + + + + Disabled + + + + + qdesigner_internal::PixmapEditor + + + Choose Resource... + + + + + Choose File... + + + + + Copy Path + + + + + Paste Path + + + + + + ... + + + + + qdesigner_internal::PlainTextEditorDialog + + + Edit text + + + + + qdesigner_internal::PluginDialog + + + Components + + + + + Plugin Information + + + + + Refresh + + + + + Scan for newly installed custom widget plugins. + + + + + Qt Designer couldn't find any plugins + + + + + Qt Designer found the following plugins + + + + + New custom widget plugins have been found. + + + + + qdesigner_internal::PreviewActionGroup + + + %1 Style + + + + + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate + + + Load Custom Device Skin + + + + + All QVFB Skins (*.%1) + + + + + %1 - Duplicate Skin + + + + + The skin '%1' already exists. + + + + + %1 - Error + + + + + %1 is not a valid skin directory: +%2 + + + + + qdesigner_internal::PreviewDeviceSkin + + + &Close + + + + + qdesigner_internal::PreviewManager + + + %1 - [Preview] + + + + + qdesigner_internal::PreviewWidget + + + Preview Window + + + + + LineEdit + + + + + ComboBox + + + + + PushButton + + + + + ButtonGroup2 + + + + + CheckBox1 + + + + + CheckBox2 + + + + + ButtonGroup + + + + + RadioButton1 + + + + + RadioButton2 + + + + + RadioButton3 + + + + + qdesigner_internal::PromotionModel + + + Name + + + + + Header file + + + + + Global include + + + + + Usage + + + + + qdesigner_internal::PromotionTaskMenu + + + Promoted widgets... + + + + + Promote to ... + + + + + Change signals/slots... + + + + + Promote to + + + + + Demote to %1 + + + + + qdesigner_internal::PropertyEditor + + + Add Dynamic Property... + + + + + Remove Dynamic Property + + + + + Sorting + + + + + Color Groups + + + + + Tree View + + + + + Drop Down Button View + + + + + String... + + + + + Bool... + + + + + Other... + + + + + Configure Property Editor + + + + + Object: %1 +Class: %2 + + + + + qdesigner_internal::PropertyLineEdit + + + Insert line break + + + + + qdesigner_internal::QDesignerPromotionDialog + + + Promoted Widgets + + + + + Promoted Classes + + + + + Promote + + + + + Change signals/slots... + + + + + %1 - Error + + + + + qdesigner_internal::QDesignerResource + + + Loading qrc file + + + + + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> + + + + + New location for %1 + + + + + Resource files (*.qrc) + + + + + qdesigner_internal::QDesignerTaskMenu + + + Change objectName... + + + + + Change toolTip... + + + + + Change whatsThis... + + + + + Change styleSheet... + + + + + Create Menu Bar + + + + + Add Tool Bar + + + + + Create Status Bar + + + + + Remove Status Bar + + + + + Change script... + + + + + Change signals/slots... + + + + + Go to slot... + + + + + Size Constraints + + + + + Set Minimum Width + + + + + Set Minimum Height + + + + + Set Minimum Size + + + + + Set Maximum Width + + + + + Set Maximum Height + + + + + Set Maximum Size + + + + + Edit ToolTip + + + + + Edit WhatsThis + + + + + no signals available + + + + + Set size constraint on %n widget(s) + + + + + + + qdesigner_internal::QDesignerWidgetBox + + + + Unexpected element <%1> + + + + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 +%5 + + + + + The XML code specified for the widget %1 does not contain any widget elements. +%2 + + + + + qdesigner_internal::QtGradientEditor + + + Linear + + + + + Radial + + + + + Conical + + + + + Pad + + + + + Repeat + + + + + Reflect + + + + + qdesigner_internal::QtGradientStopsController + + + H + + + + + S + + + + + V + + + + + + Hue + + + + + Sat + + + + + Val + + + + + Saturation + + + + + Value + + + + + R + + + + + G + + + + + B + + + + + Red + + + + + Green + + + + + Blue + + + + + qdesigner_internal::RichTextEditorDialog + + + Edit text + + + + + Rich Text + + + + + Source + + + + + &OK + + + + + &Cancel + + + + + qdesigner_internal::RichTextEditorToolBar + + + Bold + + + + + CTRL+B + + + + + Italic + + + + + CTRL+I + + + + + Underline + + + + + CTRL+U + + + + + Left Align + + + + + Center + + + + + Right Align + + + + + Justify + + + + + Superscript + + + + + Subscript + + + + + Insert &Link + + + + + Insert &Image + + + + + qdesigner_internal::ScriptDialog + + + Edit script + + + + + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. + + + + + Syntax error + + + + + qdesigner_internal::ScriptErrorDialog + + + Script errors + + + + + qdesigner_internal::SignalSlotDialog + + + There is already a slot with the signature '%1'. + + + + + There is already a signal with the signature '%1'. + + + + + %1 - Duplicate Signature + + + + + + Signals/Slots of %1 + + + + + qdesigner_internal::SignalSlotEditorPlugin + + + Edit Signals/Slots + + + + + F4 + + + + + qdesigner_internal::SignalSlotEditorTool + + + Edit Signals/Slots + + + + + qdesigner_internal::StatusBarTaskMenu + + + Remove + + + + + qdesigner_internal::StringListEditorButton + + + Change String List + + + + + qdesigner_internal::StyleSheetEditorDialog + + + + Valid Style Sheet + + + + + Add Resource... + + + + + Add Gradient... + + + + + Add Color... + + + + + Add Font... + + + + + Edit Style Sheet + + + + + Invalid Style Sheet + + + + + qdesigner_internal::TabOrderEditor + + + Start from Here + + + + + Restart + + + + + Tab Order List... + + + + + Tab Order List + + + + + Tab Order + + + + + qdesigner_internal::TabOrderEditorPlugin + + + Edit Tab Order + + + + + qdesigner_internal::TabOrderEditorTool + + + Edit Tab Order + + + + + qdesigner_internal::TableWidgetEditor + + + New Column + + + + + New Row + + + + + &Columns + + + + + &Rows + + + + + Properties &<< + + + + + + Properties &>> + + + + + Edit Table Widget + + + + + &Items + + + + + Table Items + + + + + qdesigner_internal::TableWidgetTaskMenu + + + Edit Items... + + + + + qdesigner_internal::TemplateOptionsWidget + + + Pick a directory to save templates in + + + + + Form + + + + + Additional Template Paths + + + + + ... + + + + + qdesigner_internal::TextEditTaskMenu + + + Edit HTML + + + + + Change HTML... + + + + + Edit Text + + + + + Change Plain Text... + + + + + qdesigner_internal::TextEditor + + + Choose Resource... + + + + + Choose File... + + + + + ... + + + + + Choose a File + + + + + qdesigner_internal::ToolBarEventFilter + + + Insert Separator before '%1' + + + + + Append Separator + + + + + Remove action '%1' + + + + + Remove Toolbar '%1' + + + + + Insert Separator + + + + + qdesigner_internal::TreeWidgetEditor + + + New Column + + + + + &Columns + + + + + Per column properties + + + + + Common properties + + + + + + New Item + + + + + + New Subitem + + + + + Properties &<< + + + + + + Properties &>> + + + + + Edit Tree Widget + + + + + &Items + + + + + Tree Items + + + + + 1 + + + + + &New + + + + + New &Subitem + + + + + Delete Item + + + + + &Delete + + + + + Move Item Left (before Parent Item) + + + + + L + + + + + Move Item Right (as a First Subitem of the Next Sibling Item) + + + + + R + + + + + Move Item Up + + + + + U + + + + + Move Item Down + + + + + D + + + + + qdesigner_internal::TreeWidgetTaskMenu + + + Edit Items... + + + + + qdesigner_internal::WidgetBox + + + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. + + + + + qdesigner_internal::WidgetBoxTreeWidget + + + Scratchpad + + + + + Custom Widgets + + + + + Expand all + + + + + Collapse all + + + + + List View + + + + + Icon View + + + + + Remove + + + + + Edit name + + + + + qdesigner_internal::WidgetDataBase + + + A custom widget plugin whose class name (%1) matches that of an existing class has been found. + + + + + qdesigner_internal::WidgetEditorTool + + + Edit Widgets + + + + + qdesigner_internal::WidgetFactory + + + The custom widget factory registered for widgets of class %1 returned 0. + + + + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. + + + + + %1 Widget + + + + + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. + + + + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. +This indicates an inconsistency in the ui-file. + + + + + Cannot create style '%1'. + + + + + qdesigner_internal::WizardContainerWidgetTaskMenu + + + Next + + + + + Back + + + + + qdesigner_internal::ZoomMenu + + + %1 % + Zoom factor + + + + diff --git a/translations/designer_untranslated.ts b/translations/designer_untranslated.ts index 209d871..1666363 100644 --- a/translations/designer_untranslated.ts +++ b/translations/designer_untranslated.ts @@ -4,7 +4,7 @@ - + <object> @@ -19,7 +19,7 @@ - + The moose in the noose ate the goose who was loose. @@ -28,7 +28,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous @@ -74,7 +74,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts @@ -186,7 +186,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. @@ -204,7 +204,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. @@ -232,7 +232,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush @@ -325,19 +325,24 @@ ate the goose who was loose. Command - - + + Change signal - - + + Change slot - + + Change signal-slot connection + + + + Change sender @@ -347,7 +352,7 @@ ate the goose who was loose. - + Add connection @@ -372,7 +377,7 @@ ate the goose who was loose. - + Insert '%1' @@ -397,7 +402,7 @@ ate the goose who was loose. - + Promote to custom widget @@ -427,48 +432,48 @@ ate the goose who was loose. - - - + + + Move Page - - - - + + + + Delete Page - - + + Page - - - + + + page - - - - + + + + Insert Page - + tab - + Change Tab order @@ -513,12 +518,12 @@ ate the goose who was loose. - + Change Layout Item Geometry - + Change Table Contents @@ -560,7 +565,7 @@ ate the goose who was loose. - + Set action text @@ -571,7 +576,7 @@ ate the goose who was loose. - + Move action @@ -586,7 +591,7 @@ ate the goose who was loose. - + Change signals/slots @@ -611,17 +616,17 @@ ate the goose who was loose. - + Change Z-order of '%1' - + Simplify Grid Layout - + Create button group @@ -642,7 +647,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup @@ -659,23 +664,23 @@ ate the goose who was loose. - + Morph %1/'%2' into %3 MorphWidgetCommand description - + Change layout of '%1' from %2 to %3 - + Change script - + Changed '%1' of '%2' @@ -749,7 +754,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution @@ -770,7 +775,7 @@ ate the goose who was loose. Designer - + Qt Designer @@ -836,7 +841,7 @@ ate the goose who was loose. - + Custom Widgets @@ -846,7 +851,7 @@ ate the goose who was loose. - + Unable to launch %1. @@ -859,7 +864,7 @@ ate the goose who was loose. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. @@ -880,7 +885,7 @@ ate the goose who was loose. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile @@ -922,7 +927,7 @@ ate the goose who was loose. DeviceSkin - + The image file '%1' could not be loaded. @@ -980,7 +985,7 @@ ate the goose who was loose. EmbeddedOptionsControl - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description @@ -1004,7 +1009,7 @@ ate the goose who was loose. FontPanel - + Font @@ -1032,7 +1037,7 @@ ate the goose who was loose. FontPropertyManager - + PreferDefault @@ -1055,7 +1060,7 @@ ate the goose who was loose. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values @@ -1070,7 +1075,7 @@ ate the goose who was loose. FormEditorOptionsPage - + %1 % @@ -1137,7 +1142,7 @@ ate the goose who was loose. FormWindow - + Unexpected element <%1> @@ -1213,7 +1218,7 @@ ate the goose who was loose. IconSelector - + All Pixmaps ( @@ -1221,7 +1226,7 @@ ate the goose who was loose. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser @@ -1230,7 +1235,7 @@ ate the goose who was loose. LanguageResourceDialog - + Choose Resource @@ -1238,7 +1243,7 @@ ate the goose who was loose. MainWindowBase - + Main Not currently used (main tool bar) @@ -1272,7 +1277,7 @@ ate the goose who was loose. NewForm - + C&reate @@ -1325,7 +1330,7 @@ ate the goose who was loose. NewFormWidget - + Unable to open the form template file '%1': %2 @@ -1333,7 +1338,7 @@ ate the goose who was loose. ObjectInspectorModel - + Object @@ -1356,7 +1361,7 @@ ate the goose who was loose. ObjectNameDialog - + Change Object Name @@ -1367,49 +1372,13 @@ ate the goose who was loose. - qdesigner_internal::PluginDialog - - - Components - - + PluginDialog - - + Plugin Information - - Refresh - - - - - Scan for newly installed custom widget plugins. - - - - - Qt Designer couldn't find any plugins - - - - - Qt Designer found the following plugins - - - - - New custom widget plugins have been found. - - - - - TextLabel - - - 1 @@ -1426,7 +1395,7 @@ ate the goose who was loose. PreviewConfigurationWidget - + Default @@ -1474,7 +1443,7 @@ ate the goose who was loose. PromotionModel - + Not used Usage of promoted widgets @@ -1483,7 +1452,7 @@ ate the goose who was loose. Q3WizardContainer - + Page @@ -1492,7 +1461,7 @@ ate the goose who was loose. QAbstractFormBuilder - + Unexpected element <%1> @@ -1538,7 +1507,7 @@ This indicates an inconsistency in the ui-file. - + Invalid QButtonGroup reference '%1' referenced by '%2'. @@ -1551,7 +1520,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control @@ -1564,7 +1533,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control @@ -1587,7 +1556,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. @@ -1637,7 +1606,7 @@ This indicates an inconsistency in the ui-file. - + Exception at line %1: %2 @@ -1656,7 +1625,7 @@ Script: %3 QDesigner - + %1 - warning @@ -1674,7 +1643,7 @@ Script: %3 QDesignerActions - + Edit Widgets @@ -1841,12 +1810,12 @@ Do you want to update the file location or generate a new form? - + &Close Preview - + Save &Image... @@ -1870,7 +1839,7 @@ Would you like to retry? - + The backup file %1 could not be written. @@ -1902,7 +1871,7 @@ Would you like to retry? - + &New... @@ -1933,12 +1902,12 @@ Would you like to retry? - + &Close - + View &Code... @@ -1949,23 +1918,23 @@ Would you like to retry? - + Preview failed - + Code generation failed - + Assistant - + Saved image %1. @@ -1980,7 +1949,7 @@ Would you like to retry? - + ALT+CTRL+S @@ -1988,7 +1957,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog @@ -2025,7 +1994,7 @@ Would you like to retry? - + Control loaded @@ -2038,7 +2007,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: @@ -2056,7 +2025,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] @@ -2141,7 +2110,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 @@ -2164,7 +2133,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties @@ -2172,18 +2141,18 @@ Would you like to retry? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents @@ -2204,7 +2173,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. @@ -2217,7 +2186,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor @@ -2250,7 +2219,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 @@ -2273,7 +2242,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File @@ -2348,7 +2317,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The file <b>%1</b> could not be opened. @@ -2358,7 +2327,7 @@ Container pages should only be added by specifying them in XML returned by the d - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? @@ -2368,7 +2337,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method @@ -2389,7 +2358,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The set-type property %1 could not be read. @@ -2409,7 +2378,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. @@ -2422,7 +2391,7 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetEventFilter - + Previous Page @@ -2483,7 +2452,7 @@ Container pages should only be added by specifying them in XML returned by the d QTabWidgetEventFilter - + Delete @@ -2511,7 +2480,7 @@ Container pages should only be added by specifying them in XML returned by the d QToolBoxHelper - + Delete Page @@ -2549,7 +2518,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolEdit - + True @@ -2565,7 +2534,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolPropertyManager - + True @@ -2578,7 +2547,7 @@ Container pages should only be added by specifying them in XML returned by the d QtCharEdit - + Clear Char @@ -2594,7 +2563,7 @@ Container pages should only be added by specifying them in XML returned by the d QtColorPropertyManager - + Red @@ -2774,7 +2743,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientEditor - + Start X @@ -3049,7 +3018,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientStopsWidget - + New Stop @@ -3087,7 +3056,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientView - + Grad @@ -3134,7 +3103,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientViewDialog - + Select Gradient @@ -3151,7 +3120,7 @@ Container pages should only be added by specifying them in XML returned by the d QtLocalePropertyManager - + %1, %2 @@ -3218,22 +3187,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectFPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -3246,22 +3215,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -3274,7 +3243,7 @@ Container pages should only be added by specifying them in XML returned by the d QtResourceEditorDialog - + %1 already exists. Do you want to replace it? @@ -3285,7 +3254,7 @@ Do you want to replace it? - + %1 [read-only] @@ -3554,7 +3523,7 @@ to QtResourceView - + Size: %1 x %2 %3 @@ -3586,7 +3555,7 @@ to QtSizeFPropertyManager - + %1 x %2 @@ -3604,7 +3573,7 @@ to QtSizePolicyPropertyManager - + <Invalid> @@ -3638,7 +3607,7 @@ to QtSizePropertyManager - + %1 x %2 @@ -3656,7 +3625,7 @@ to QtToolBarDialog - + < S E P A R A T O R > @@ -3764,7 +3733,7 @@ to QtTreePropertyBrowser - + Property @@ -3777,7 +3746,7 @@ to SaveFormAsTemplate - + Add path... @@ -3841,7 +3810,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": @@ -3873,7 +3842,7 @@ Do you want overwrite the template? SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -3914,7 +3883,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 @@ -3927,7 +3896,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog @@ -3969,17 +3938,12 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 - - Open Source Edition - - - - + Qt Designer @@ -3989,30 +3953,15 @@ Do you want overwrite the template? - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. @@ -4020,22 +3969,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions - + New... - + Delete - + New action @@ -4045,12 +3994,17 @@ Do you want overwrite the template? - + Edit... + Go to slot... + + + + Copy @@ -4070,7 +4024,7 @@ Do you want overwrite the template? - + Icon View @@ -4080,7 +4034,7 @@ Do you want overwrite the template? - + Remove actions @@ -4090,12 +4044,12 @@ Do you want overwrite the template? - + Used In - + Configure Action Editor @@ -4103,7 +4057,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name @@ -4136,7 +4090,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy @@ -4168,7 +4122,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies @@ -4176,7 +4130,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies @@ -4230,7 +4184,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... @@ -4288,7 +4242,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color @@ -4296,7 +4250,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... @@ -4388,7 +4342,7 @@ Do you want overwrite the template? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page @@ -4451,7 +4405,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft @@ -4576,7 +4530,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) @@ -4736,7 +4690,7 @@ Do you want overwrite the template? qdesigner_internal::FilterWidget - + <Filter> @@ -4744,7 +4698,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed @@ -4765,7 +4719,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents @@ -4775,7 +4729,7 @@ Do you want overwrite the template? - + Resize @@ -4859,7 +4813,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowBase - + Delete @@ -4872,7 +4826,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowManager - + Cu&t @@ -4954,7 +4908,7 @@ Do you want overwrite the template? - + Lay Out &Horizontally @@ -5004,7 +4958,7 @@ Do you want overwrite the template? - + &Break Layout @@ -5029,7 +4983,7 @@ Do you want overwrite the template? - + Break Layout @@ -5045,17 +4999,17 @@ Do you want overwrite the template? - + Form Settings - %1 - + Removes empty columns and rows - + Lay Out in a &Form Layout @@ -5065,7 +5019,7 @@ Do you want overwrite the template? - + Si&mplify Grid Layout @@ -5073,7 +5027,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowSettings - + None @@ -5124,7 +5078,7 @@ Do you want overwrite the template? qdesigner_internal::GroupBoxTaskMenu - + Change title... @@ -5140,7 +5094,7 @@ Do you want overwrite the template? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. @@ -5292,7 +5246,7 @@ Do you want overwrite the template? qdesigner_internal::LabelTaskMenu - + Change rich text... @@ -5305,7 +5259,7 @@ Do you want overwrite the template? qdesigner_internal::LineEditTaskMenu - + Change text... @@ -5313,7 +5267,7 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetEditor - + Edit List Widget @@ -5331,7 +5285,7 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... @@ -5367,7 +5321,7 @@ Do you want overwrite the template? qdesigner_internal::MenuTaskMenu - + Remove @@ -5426,7 +5380,7 @@ Do you want overwrite the template? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name @@ -5545,7 +5499,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add @@ -5583,7 +5537,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... @@ -5599,7 +5553,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) @@ -5680,7 +5634,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette @@ -5688,7 +5642,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role @@ -5740,15 +5694,53 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text + qdesigner_internal::PluginDialog + + + Components + + + + + Plugin Information + + + + + Refresh + + + + + Scan for newly installed custom widget plugins. + + + + + Qt Designer couldn't find any plugins + + + + + Qt Designer found the following plugins + + + + + New custom widget plugins have been found. + + + + qdesigner_internal::PreviewActionGroup - + %1 Style @@ -5790,7 +5782,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close @@ -5887,7 +5879,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... @@ -5915,7 +5907,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... @@ -5974,7 +5966,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break @@ -6033,14 +6025,14 @@ Class: %2 qdesigner_internal::QDesignerTaskMenu - + Set size constraint on %n widget(s) - + Change objectName... @@ -6130,7 +6122,7 @@ Class: %2 - + Edit ToolTip @@ -6140,7 +6132,7 @@ Class: %2 - + no signals available @@ -6148,7 +6140,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> @@ -6202,7 +6194,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H @@ -6377,7 +6369,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script @@ -6427,7 +6419,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots @@ -6440,7 +6432,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots @@ -6448,7 +6440,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove @@ -6456,7 +6448,7 @@ Class: %2 qdesigner_internal::StringListEditorButton - + Change String List @@ -6464,7 +6456,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet @@ -6503,7 +6495,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here @@ -6531,7 +6523,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order @@ -6539,7 +6531,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order @@ -6547,7 +6539,7 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column @@ -6596,7 +6588,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... @@ -6627,7 +6619,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... @@ -6673,7 +6665,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator @@ -6701,7 +6693,7 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns @@ -6827,7 +6819,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... @@ -6835,7 +6827,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. @@ -6843,17 +6835,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad - + Custom Widgets - + Expand all @@ -6894,7 +6886,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets @@ -6902,12 +6894,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. @@ -6949,7 +6941,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor diff --git a/translations/designer_zh_CN.ts b/translations/designer_zh_CN.ts index 0024ea3..5a78afaa 100644 --- a/translations/designer_zh_CN.ts +++ b/translations/designer_zh_CN.ts @@ -1,23 +1,22 @@ - - + The moose in the noose ate the goose who was loose. The moose in the noose ate the goose who was loose. - + <object> <对象> - + <signal> <ä¿¡å·> @@ -45,7 +44,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous &上一个 @@ -91,7 +90,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts 附加字体 @@ -203,7 +202,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. 无法å‘é€è¯·æ±‚:助手无å“应。 @@ -221,7 +220,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. 组件“%1â€ç¼ºå°‘必需的属性“%2â€ã€‚ @@ -249,7 +248,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush 无画刷 @@ -342,19 +341,24 @@ ate the goose who was loose. Command - - + + Change signal 改å˜ä¿¡å· - - + + Change slot 改å˜æ§½ - + + Change signal-slot connection + + + + Change sender 改å˜å‘é€è€… @@ -364,7 +368,7 @@ ate the goose who was loose. 改å˜æŽ¥æ”¶è€… - + Add connection 添加连接 @@ -397,7 +401,7 @@ ate the goose who was loose. é‡ç½®â€œ%2â€çš„“%1†- + Insert '%1' æ’入“%1†@@ -422,7 +426,7 @@ ate the goose who was loose. é‡å®šä¹‰â€œ%1â€çš„父对象 - + Promote to custom widget æå‡è‡³è‡ªå®šä¹‰çª—å£éƒ¨ä»¶ @@ -452,48 +456,48 @@ ate the goose who was loose. å–消布局 - - - + + + Move Page 移动页 - - - - + + + + Delete Page 删除页 - - + + Page 页 - - - + + + page 页 - - - - + + + + Insert Page æ’入页 - + tab 标签页 - + Change Tab order 改å˜åˆ¶è¡¨ç¬¦é¡ºåº @@ -542,12 +546,12 @@ ate the goose who was loose. 改å˜è¡¨å•å¸ƒå±€é¡¹çš„几何ä½ç½® - + Change Layout Item Geometry 改å˜å¸ƒå±€é¡¹çš„几何ä½ç½® - + Change Table Contents 改å˜è¡¨æ ¼å†…容 @@ -631,7 +635,7 @@ ate the goose who was loose. - + Set action text 设定动作文本 @@ -642,7 +646,7 @@ ate the goose who was loose. - + Move action 移动动作 @@ -657,17 +661,17 @@ ate the goose who was loose. æ’å…¥èœå• - + Change Z-order of '%1' 改å˜â€œ%1â€çš„ Z é¡ºåº - + Simplify Grid Layout 简易网格布局 - + Delete Subwindow 删除å­çª—å£ @@ -687,12 +691,12 @@ ate the goose who was loose. å­çª—å£ - + Change signals/slots 改å˜ä¿¡å·/槽 - + Create button group 创建按钮组 @@ -713,7 +717,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup 添加“%1â€åˆ°â€œ%2†@@ -730,23 +734,23 @@ ate the goose who was loose. 从“%2â€ä¸­ç§»é™¤â€œ%1†- + Morph %1/'%2' into %3 MorphWidgetCommand description å°†%1/“%2â€å˜å½¢ä¸º%3 - + Change layout of '%1' from %2 to %3 将“%1â€çš„布局从%2å˜ä¸º%3 - + Change script 改å˜è„šæœ¬ - + Changed '%1' of '%2' 已改å˜â€œ%2â€ä¸ªä¸­çš„“%1â€ä¸ª @@ -820,7 +824,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution 标准(96 x 96) @@ -841,7 +845,7 @@ ate the goose who was loose. Designer - + Qt Designer Qt 设计师 @@ -856,7 +860,7 @@ The old form has been untouched, but you will have to save this form under a new 旧的窗体没有改å˜ï¼Œä½†æ˜¯æ‚¨å°†ä¸å¾—ä¸ä½¿ç”¨æ–°çš„å称ä¿å­˜è¿™ä¸ªè¡¨å•ã€‚ - + Custom Widgets 自定义窗å£éƒ¨ä»¶ @@ -866,7 +870,7 @@ The old form has been untouched, but you will have to save this form under a new æå‡çª—å£éƒ¨ä»¶ - + Unable to launch %1. ä¸èƒ½å¯åŠ¨ %1。 @@ -876,7 +880,7 @@ The old form has been untouched, but you will have to save this form under a new %1 超时。 - + This file cannot be read because it was created using %1. ä¸èƒ½è¯»å–这个文件,因为它是被使用 %1 创建的。 @@ -945,7 +949,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 ä¸æ˜¯â€œ%2â€ä¸­çš„一个有效的枚举值。 @@ -966,7 +970,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1'ä¸æ˜¯ä¸€ä¸ªæ•°å­— @@ -1008,7 +1012,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. 无法加载图åƒæ–‡ä»¶â€œ%1â€ã€‚ @@ -1066,66 +1070,56 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - None - æ—  + æ—  - Add a profile - 添加æ述文件 + 添加æ述文件 - Edit the selected profile - 编辑选中的æ述文件 + 编辑选中的æ述文件 - Delete the selected profile - 删除选中的æ述文件 + 删除选中的æ述文件 - Add Profile - 添加æ述文件 + 添加æ述文件 - New profile - 新建æ述文件 + 新建æ述文件 - Edit Profile - 编辑æ述文件 + 编辑æ述文件 - Delete Profile - 删除æ述文件 + 删除æ述文件 - Would you like to delete the profile '%1'? - ä½ è¦åˆ é™¤æ述文件“%1â€å—? + ä½ è¦åˆ é™¤æ述文件“%1â€å—? - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>字体</b></td><td>%1,%2</td></tr><tr><td><b>风格</b></td><td>%3</td><tr><td><b>解æžåº¦</b></td><td>%4 x %5</td></tr></table></html> - Default - 默认 + 默认 EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog 嵌入å¼è®¾è®¡ @@ -1163,7 +1157,7 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font 字体 @@ -1191,7 +1185,7 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault 首选默认 @@ -1214,7 +1208,7 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values “%1â€ï¼šâ€œ%2â€æ— æ•ˆçš„拉伸值 @@ -1229,7 +1223,7 @@ The old form has been untouched, but you will have to save this form under a new FormEditorOptionsPage - + %1 % %1 % @@ -1296,7 +1290,7 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> 未预期的元素<%1> @@ -1372,7 +1366,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( 所有åƒç´ æ˜ å°„ ( @@ -1380,7 +1374,7 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX图标选择关闭 @@ -1389,7 +1383,7 @@ The old form has been untouched, but you will have to save this form under a new LanguageResourceDialog - + Choose Resource é€‰æ‹©èµ„æº @@ -1397,7 +1391,7 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main Not currently used (main tool bar) ä¸»è¦ @@ -1439,7 +1433,7 @@ The old form has been untouched, but you will have to save this form under a new é€‰æ‹©ä¸€ä¸ªç”¨äºŽé¢„è§ˆçš„æ¨¡æ¿ - + New Form 新建窗体 @@ -1504,7 +1498,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 无法打开窗体模版文件'%1':%2 @@ -1512,7 +1506,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object 对象 @@ -1522,7 +1516,7 @@ The old form has been untouched, but you will have to save this form under a new ç±» - + separator 分隔符 @@ -1535,7 +1529,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name 改å˜å¯¹è±¡å称 @@ -1597,52 +1591,16 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog + PluginDialog - - Components - 组件 - - - - + Plugin Information - æ’ä»¶ä¿¡æ¯ - - - - Qt Designer couldn't find any plugins - Qt 设计师无法找到任何æ’件 - - - - Qt Designer found the following plugins - Qt 设计师已ç»æ‰¾åˆ°å¦‚下æ’件 - - - - TextLabel - 文本标签 - - - - Refresh - 刷新 - - - - Scan for newly installed custom widget plugins. - 扫æ新安装的自定义窗å£éƒ¨ä»¶æ’件。 + æ’ä»¶ä¿¡æ¯ - - New custom widget plugins have been found. - 新的自定义窗å£éƒ¨ä»¶æ’件已ç»è¢«æ‰¾åˆ°ã€‚ - - - + 1 - 1 + 1 @@ -1688,7 +1646,7 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default 默认 @@ -1736,7 +1694,7 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used Usage of promoted widgets 没有被使用 @@ -1752,7 +1710,7 @@ There's nothing more here. You should get back to work. Q3WizardContainer - + Page 页 @@ -1761,7 +1719,7 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> 未预期的元素<%1> @@ -1808,7 +1766,7 @@ This indicates an inconsistency in the ui-file. 在应用制表符时中断:无法找到窗å£éƒ¨ä»¶â€œ%1â€ã€‚ - + Invalid QButtonGroup reference '%1' referenced by '%2'. “%2â€å‚考了无效的QButtonGroupå‚考“%1â€ã€‚ @@ -1854,7 +1812,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX 控件 @@ -1867,7 +1825,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control 设置控件 @@ -1890,7 +1848,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ä¸æ˜¯æå‡çš„类。 @@ -1940,7 +1898,7 @@ This indicates an inconsistency in the ui-file. 无法设定一个空白包å«æ–‡ä»¶ã€‚ - + Exception at line %1: %2 %1 è¡Œå‘生æ„外:%2 @@ -1960,7 +1918,7 @@ Script: %3 QDesigner - + %1 - warning %1 - 警告 @@ -1993,7 +1951,7 @@ Script: %3 CTRL+O - + Clear &Menu 清空èœå•(&M) @@ -2006,7 +1964,7 @@ Script: %3 CTRL+W - + &Quit 退出(&Q) @@ -2079,17 +2037,17 @@ Script: %3 - + About Qt Designer 关于 Qt 设计师 - + About Qt 关于 Qt - + &Recent Forms 最近的窗体(&R) @@ -2130,19 +2088,19 @@ Would you like to retry or select a different file? 选择新文件 - + %1 already exists. Do you want to replace it? %1 å·²ç»å­˜åœ¨ã€‚ 您想è¦æ›¿æ¢å®ƒä¹ˆï¼Ÿ - + &Close Preview 关闭预览(&C) - + Preferences... 属性... @@ -2152,19 +2110,19 @@ Do you want to replace it? CTRL+SHIFT+S - + Designer UI files (*.%1);;All Files (*) 设计师 UI 文件 (*.%1);;全部文件 (*) - + Saved %1. %1 已被ä¿å­˜ã€‚ - + Read error 读å–错误 @@ -2216,7 +2174,7 @@ Would you like to retry? 窗体设定 - %1 - + &New... 新建(&N)... @@ -2247,12 +2205,12 @@ Would you like to retry? - + &Close 关闭(&C) - + Save &Image... ä¿å­˜å›¾åƒ(&I)... @@ -2276,18 +2234,18 @@ Would you like to retry? ALT+CTRL+S - + Save Form As 窗体å¦å­˜ä¸º - + Preview failed 预览失败 - + Code generation failed 代ç ç”Ÿæˆå¤±è´¥ @@ -2302,12 +2260,12 @@ Would you like to retry? - + Assistant 助手 - + The backup file %1 could not be written. 备份文件%1无法被写入。 @@ -2349,7 +2307,7 @@ Would you like to retry? 请关闭所有窗体文件,以便加载附加字体 - + Printed %1. %1 已被打å°ã€‚ @@ -2357,7 +2315,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog 外观 @@ -2366,7 +2324,7 @@ Would you like to retry? QDesignerAppearanceOptionsWidget - + Docked Window é”šæŽ¥çš„çª—å£ @@ -2376,7 +2334,7 @@ Would you like to retry? å¤šä¸ªé¡¶çº§çª—å£ - + Toolwindow Font 工具窗å£å­—体 @@ -2394,7 +2352,7 @@ Would you like to retry? 设置控件 - + Control loaded 控件已ç»åŠ è½½ @@ -2407,7 +2365,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: å‘生脚本错误: @@ -2425,7 +2383,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2448,7 +2406,7 @@ Would you like to retry? QDesignerMenu - + Type Here 在这里输入 @@ -2458,7 +2416,7 @@ Would you like to retry? 添加分隔符 - + Remove action '%1' 移除动作“%1†@@ -2517,7 +2475,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 在解æžè‡ªå®šä¹‰çª—å£éƒ¨ä»¶%1çš„XMLæ—¶å‘生错误:%2 @@ -2551,7 +2509,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties 动æ€å±žæ€§ @@ -2564,14 +2522,14 @@ Would you like to retry? ä¸æ”¯æŒå¸ƒå±€ç±»åž‹â€œ%1â€ï¼Œé»˜è®¤ä¸ºç½‘格。 - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. 在查询页é¢#%5时,窗å£éƒ¨ä»¶â€œ%1â€(%2)的容器扩展返回了一个没有被设计师管ç†çš„窗å£éƒ¨ä»¶ã€‚ 容器页é¢åº”该åªèƒ½ç”±è‡ªå®šä¹‰çª—å£éƒ¨ä»¶çš„domXml()方法传回的XML指定。 - + Unexpected element <%1> Parsing clipboard contents 未预期的元素<%1> @@ -2599,7 +2557,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. 无法创建临时路径 %1。 @@ -2619,7 +2577,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor 属性编辑器 @@ -2656,7 +2614,7 @@ Container pages should only be added by specifying them in XML returned by the d 窗å£éƒ¨ä»¶ç›’ - + An error has been encountered at line %1 of %2: %3 在%2的第%1è¡Œå‘生错误:%3 @@ -2679,7 +2637,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File 文件(&F) @@ -2790,7 +2748,7 @@ Container pages should only be added by specifying them in XML returned by the d 设计师在您上一次对è¯ä¸­æ²¡æœ‰æ­£å¸¸ç»ˆæ­¢ã€‚还有一些备份文件存在,您想è¦åŠ è½½å®ƒä»¬ä¹ˆï¼Ÿ - + The file <b>%1</b> could not be opened. 无法打开文件 <b>%1</b>。 @@ -2804,7 +2762,7 @@ Container pages should only be added by specifying them in XML returned by the d 文件 - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? 还有 %n 个窗体没有ä¿å­˜å˜åŒ–。您想è¦åœ¨é€€å‡ºä¹‹å‰è¯„审这些å˜åŒ–么? @@ -2834,7 +2792,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method 一个空白的类å称被传é€åˆ°%1(对象å称:%2)。 @@ -2855,7 +2813,7 @@ Container pages should only be added by specifying them in XML returned by the d 布局类型“%1â€ä¸è¢«æ”¯æŒã€‚ - + The set-type property %1 could not be read. 无法读å–集类型属性 %1。 @@ -2875,7 +2833,7 @@ Container pages should only be added by specifying them in XML returned by the d 属性 %1 无法被写入。还ä¸æ”¯æŒç±»åž‹ %2。 - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. 枚举å˜é‡å€¼â€œ%1â€æ˜¯æ— æ•ˆçš„。默认值“%2â€å°†ä¼šè¢«ç”¨æ¥æ›¿ä»£ã€‚ @@ -3134,7 +3092,7 @@ This indicates an inconsistency in the ui-file. QStackedWidgetEventFilter - + Previous Page 上一页 @@ -3195,7 +3153,7 @@ This indicates an inconsistency in the ui-file. QTabWidgetEventFilter - + Delete 删除 @@ -3223,7 +3181,7 @@ This indicates an inconsistency in the ui-file. QToolBoxHelper - + Delete Page 删除页 @@ -3261,7 +3219,7 @@ This indicates an inconsistency in the ui-file. QtBoolEdit - + True @@ -3277,7 +3235,7 @@ This indicates an inconsistency in the ui-file. QtBoolPropertyManager - + True 真 @@ -3290,7 +3248,7 @@ This indicates an inconsistency in the ui-file. QtCharEdit - + Clear Char 清除字符 @@ -3306,7 +3264,7 @@ This indicates an inconsistency in the ui-file. QtColorPropertyManager - + Red 红色 @@ -3494,7 +3452,7 @@ This indicates an inconsistency in the ui-file. QtGradientEditor - + Start X 开始 X @@ -3769,7 +3727,7 @@ This indicates an inconsistency in the ui-file. QtGradientStopsWidget - + New Stop 新建中止点 @@ -3807,7 +3765,7 @@ This indicates an inconsistency in the ui-file. QtGradientView - + Grad æ¸å˜ @@ -3854,7 +3812,7 @@ This indicates an inconsistency in the ui-file. QtGradientViewDialog - + Select Gradient 选择æ¸å˜ @@ -3871,7 +3829,7 @@ This indicates an inconsistency in the ui-file. QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3938,22 +3896,22 @@ This indicates an inconsistency in the ui-file. QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width 宽度 @@ -3966,22 +3924,22 @@ This indicates an inconsistency in the ui-file. QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width 宽度 @@ -3994,7 +3952,7 @@ This indicates an inconsistency in the ui-file. QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 å·²ç»å­˜åœ¨ã€‚ @@ -4006,7 +3964,7 @@ Do you want to replace it? 这个文件好åƒä¸æ˜¯ä¸€ä¸ªèµ„æºæ–‡ä»¶ï¼›æˆ‘们所期望的是“%2â€ï¼Œä½†æ˜¯åªæ‰¾åˆ°äº†å…ƒç´ â€œ%1â€ã€‚ - + %1 [read-only] %1 [åªè¯»] @@ -4298,7 +4256,7 @@ to QtResourceView - + Size: %1 x %2 %3 大å°ï¼š%1 x %2 @@ -4331,7 +4289,7 @@ to QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -4349,12 +4307,18 @@ to QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] - + Horizontal Policy 水平策略 @@ -4377,7 +4341,7 @@ to QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -4395,7 +4359,7 @@ to QtToolBarDialog - + Custom Toolbar è‡ªå®šä¹‰å·¥å…·æ  @@ -4503,7 +4467,7 @@ to QtTreePropertyBrowser - + Property 属性 @@ -4516,7 +4480,7 @@ to SaveFormAsTemplate - + Add path... 添加路径... @@ -4581,7 +4545,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": 在è¿è¡Œâ€œ%1â€çš„脚本过程中å‘生一个错误: @@ -4600,11 +4564,21 @@ Do you want overwrite the template? Select signal é€‰æ‹©ä¿¡å· + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -4645,7 +4619,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 水平间隔器“%1â€ï¼Œ%2 x %3 @@ -4658,7 +4632,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog 模æ¿è·¯å¾„ @@ -4700,29 +4674,27 @@ Do you want overwrite the template? VersionDialog - + Qt Designer Qt 设计师 - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>版本 %2 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt è®¾è®¡å¸ˆæ˜¯ç”¨äºŽå¼€å‘ Qt 应用程åºçš„图形用户界é¢è®¾è®¡å¸ˆã€‚<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 @@ -4730,20 +4702,18 @@ Do you want overwrite the template? %1<br/>%2<br/>版æƒæ‰€æœ‰ 2000-$THISYEAR$ Nokia Corporation and/or its subsidiary(-ies)。所有æƒåˆ©å·²è¢«ä¿ç•™ã€‚<br/><br/>本程åºæ˜¯åœ¨<b>没有任何担ä¿ï¼ˆå…¶ä¸­åŒ…括任何特定目的的设计ã€å•†ä¸šå’Œé€‚当性的担ä¿ï¼‰</b>çš„æ¡ä»¶ä¸‹æ供的。<br/> - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - 这个版本的 Qt 设计师是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œæ‚¨éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/about/businessmodel</tt>。 + 这个版本的 Qt 设计师是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œæ‚¨éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/about/businessmodel</tt>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. 这个文件包å«äº†ä¸€ä¸ªè‡ªå®šä¹‰çª—å£éƒ¨ä»¶â€œ%1â€ï¼Œå…¶åŸºç±»(%2)和窗å£éƒ¨ä»¶æ•°æ®åº“(%3)的当å‰æ¡ç›®ä¸åŒã€‚这个窗å£éƒ¨ä»¶æ•°æ®åº“并未åšä»»ä½•æ”¹åŠ¨ã€‚ @@ -4751,22 +4721,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions 动作 - + New... 新建... - + Delete 删除 - + New action 新建动作 @@ -4776,12 +4746,17 @@ Do you want overwrite the template? 编辑动作 - + Edit... 编辑... + Go to slot... + 转到槽... + + + Copy å¤åˆ¶ @@ -4801,7 +4776,7 @@ Do you want overwrite the template? 选择全部 - + Configure Action Editor é…置动作编辑器 @@ -4816,7 +4791,7 @@ Do you want overwrite the template? 细节视图 - + Remove actions 移除动作 @@ -4826,7 +4801,7 @@ Do you want overwrite the template? 移除动作“%1†- + Used In 用于 @@ -4841,7 +4816,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name å称 @@ -4874,7 +4849,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy 添加伙伴 @@ -4906,7 +4881,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies 编辑伙伴 @@ -4914,7 +4889,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies 编辑伙伴 @@ -4968,7 +4943,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... ä¿å­˜... @@ -5026,7 +5001,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color 文本颜色 @@ -5034,7 +5009,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... 编辑项目... @@ -5073,7 +5048,7 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel - + Sender å‘é€è€… @@ -5093,7 +5068,7 @@ Do you want overwrite the template? 槽 - + <sender> <å‘é€è€…> @@ -5126,7 +5101,7 @@ Do you want overwrite the template? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page 在当å‰é¡µä¹‹å‰æ’入页 @@ -5189,7 +5164,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft AlignLeft @@ -5330,7 +5305,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) 设备æ述文件(*.%1) @@ -5437,14 +5412,60 @@ Do you want overwrite the template? qdesigner_internal::EmbeddedOptionsControl + + Add a profile + 添加æ述文件 + + + + Edit the selected profile + 编辑选中的æ述文件 + + + + Delete the selected profile + 删除选中的æ述文件 + + + + Add Profile + 添加æ述文件 + + + + New profile + 新建æ述文件 + + + + Edit Profile + 编辑æ述文件 + + + + Delete Profile + 删除æ述文件 + + + + Would you like to delete the profile '%1'? + ä½ è¦åˆ é™¤æ述文件“%1â€å—? + + + + Default + 默认 + + + None - æ—  + æ—  qdesigner_internal::FilterWidget - + <Filter> <过滤器> @@ -5452,7 +5473,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed 资æºæ–‡ä»¶å·²æ”¹å˜ @@ -5473,7 +5494,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents 编辑内容 @@ -5487,7 +5508,7 @@ Do you want overwrite the template? æ’入窗å£éƒ¨ä»¶%1 - + Resize é‡å®šä¹‰å¤§å° @@ -5531,13 +5552,13 @@ and then paste again. 布局 - + Drop widget 丢弃窗å£éƒ¨ä»¶ - + Paste %n action(s) 粘贴 %n 个动作 @@ -5576,7 +5597,7 @@ and then paste again. 选择祖先 - + A QMainWindow-based form does not contain a central widget. 一个基于 QMainWindow 的窗体没有包å«ä¸­å¤®çª—å£éƒ¨ä»¶ã€‚ @@ -5584,7 +5605,7 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 删除 @@ -5597,7 +5618,7 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 剪切(&T) @@ -5679,7 +5700,7 @@ and then paste again. 调整选中的窗å£éƒ¨ä»¶çš„å¤§å° - + Lay Out &Horizontally 水平布局(&H) @@ -5729,7 +5750,7 @@ and then paste again. 在一个分裂器中垂直布局选中的窗å£éƒ¨ä»¶ - + &Break Layout 打破布局(&B) @@ -5754,7 +5775,7 @@ and then paste again. 窗体设定(&S)... - + Break Layout 打破布局 @@ -5770,12 +5791,12 @@ and then paste again. 无法创建窗体预览 - + Form Settings - %1 窗体设定 - %1 - + Lay Out in a &Form Layout 在窗体布局中布局(&F) @@ -5785,7 +5806,7 @@ and then paste again. 在一个窗体布局中布局选中的窗å£éƒ¨ä»¶ - + Si&mplify Grid Layout 简易网格布局(&M) @@ -5798,7 +5819,7 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None æ—  @@ -5849,7 +5870,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... 改å˜æ ‡é¢˜... @@ -5865,7 +5886,7 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. 无法读å–åƒç´ æ˜ å°„文件“%1â€ã€‚ @@ -5958,7 +5979,7 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< 属性&<< @@ -6017,7 +6038,7 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... 改å˜å¤šä¿¡æ¯æ–‡æœ¬... @@ -6030,7 +6051,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... 改å˜æ–‡æœ¬... @@ -6062,7 +6083,7 @@ and then paste again. U - + New Item 新建项目 @@ -6096,7 +6117,7 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... 编辑项目... @@ -6132,7 +6153,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 移除 @@ -6191,7 +6212,7 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name 设置属性å称 @@ -6311,7 +6332,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 添加 @@ -6349,7 +6370,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... 在文本中查找(&F)... @@ -6365,7 +6386,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) 索引 %1 (%2) @@ -6446,7 +6467,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette 改å˜è°ƒè‰²æ¿ @@ -6454,7 +6475,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role 颜色角色 @@ -6506,15 +6527,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text 编辑文本 + qdesigner_internal::PluginDialog + + + Components + 组件 + + + + Plugin Information + æ’ä»¶ä¿¡æ¯ + + + + Qt Designer couldn't find any plugins + Qt 设计师无法找到任何æ’件 + + + + Qt Designer found the following plugins + Qt 设计师已ç»æ‰¾åˆ°å¦‚下æ’件 + + + TextLabel + 文本标签 + + + + Refresh + 刷新 + + + + Scan for newly installed custom widget plugins. + 扫æ新安装的自定义窗å£éƒ¨ä»¶æ’件。 + + + + New custom widget plugins have been found. + 新的自定义窗å£éƒ¨ä»¶æ’件已ç»è¢«æ‰¾åˆ°ã€‚ + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 风格 @@ -6557,7 +6624,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close 关闭(&C) @@ -6658,7 +6725,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... æå‡çš„窗å£éƒ¨ä»¶... @@ -6686,7 +6753,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... 添加动æ€å±žæ€§ ... @@ -6742,7 +6809,7 @@ Please select another name. %2 - + Object: %1 Class: %2 对象:%1 @@ -6752,7 +6819,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break æ’å…¥æ¢è¡Œç¬¦ @@ -6901,7 +6968,7 @@ Class: %2 è®¾ç½®æœ€å¤§å¤§å° - + Edit ToolTip 编辑工具æ示 @@ -6910,8 +6977,13 @@ Class: %2 Edit WhatsThis 编辑这是什么 + + + no signals available + + - + Set size constraint on %n widget(s) 为 %n 个窗å£éƒ¨ä»¶è®¾ç½®å¤§å°é™å®š @@ -6921,7 +6993,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> 未预期的元素<%1> @@ -6977,7 +7049,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -7152,7 +7224,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script 编辑脚本 @@ -7202,7 +7274,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots 编辑信å·/槽 @@ -7215,7 +7287,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots 编辑信å·/槽 @@ -7223,7 +7295,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 移除 @@ -7231,7 +7303,7 @@ Class: %2 qdesigner_internal::StringListEditorButton - + Change String List 改å˜å­—符串列表 @@ -7239,7 +7311,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet 编辑样å¼è¡¨ @@ -7278,7 +7350,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here 从这里开始 @@ -7306,7 +7378,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order 编辑 Tab é¡ºåº @@ -7314,7 +7386,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order 编辑 Tab é¡ºåº @@ -7356,7 +7428,7 @@ Class: %2 表格行 - + New Row 新建行 @@ -7431,7 +7503,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... 编辑项目... @@ -7462,7 +7534,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... 改å˜HTML... @@ -7508,7 +7580,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator æ’入分隔符 @@ -7558,7 +7630,7 @@ Class: %2 树项目 - + &Columns 列(&C) @@ -7705,7 +7777,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... 编辑项目... @@ -7713,7 +7785,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. 警告:部件框中的部件创建失败。å¯èƒ½æ˜¯ç”±äºŽæ— æ•ˆçš„自定义部件XML引起的。 @@ -7748,17 +7820,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad ä¾¿æ¡ - + Custom Widgets 自定义窗å£éƒ¨ä»¶ - + Expand all 全部展开 @@ -7799,7 +7871,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets 编辑窗å£éƒ¨ä»¶ @@ -7807,12 +7879,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. 为类 %1 的窗å£éƒ¨ä»¶æ³¨å†Œçš„自定义窗å£éƒ¨ä»¶å·¥åŽ‚返回 0。 - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. 在使用为类 %1 的窗å£éƒ¨ä»¶æ³¨å†Œçš„自定义窗å£éƒ¨ä»¶å·¥åŽ‚创建一个窗å£éƒ¨ä»¶æ—¶ï¼Œå‘生了类å称ä¸åŒ¹é…。它返回了一个类 %2 的窗å£éƒ¨ä»¶ã€‚ @@ -7855,7 +7927,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_zh_TW.ts b/translations/designer_zh_TW.ts index 6dfd546..83c3c66 100644 --- a/translations/designer_zh_TW.ts +++ b/translations/designer_zh_TW.ts @@ -1,25 +1,27 @@ - - + + - + The moose in the noose ate the goose who was loose. The moose in the noose ate the goose who was loose. - + <object> <物件> + <signal> <信號> + <slot> <信號槽> @@ -42,23 +44,27 @@ ate the goose who was loose. AbstractFindWidget - + &Previous å‰ä¸€å€‹(&P) + &Next 下一個(&N) + &Case sensitive å€åˆ†å¤§å°å¯«(&C) + Whole &words 整個單字(&W) + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;æœå°‹æŠ˜å›ž @@ -66,14 +72,17 @@ ate the goose who was loose. AddLinkDialog + Insert Link æ’å…¥é€£çµ + Title: 標題: + URL: 網å€ï¼š @@ -81,7 +90,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts é¡å¤–çš„å­—åž‹ @@ -89,30 +98,37 @@ ate the goose who was loose. AppFontManager + '%1' is not a file. %1 ä¸æ˜¯ä¸€å€‹æª”案。 + The font file '%1' does not have read permissions. 您沒有讀å–字型檔 %1 的權é™ã€‚ + The font file '%1' is already loaded. 字型檔 %1 已載入。 + The font file '%1' could not be loaded. 無法載入字型檔 %1。 + '%1' is not a valid font id. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„字型代碼。 + There is no loaded font matching the id '%1'. 已載入的字型中沒有一個符åˆä»£ç¢¼ %1。 + The font '%1' (%2) could not be unloaded. 無法å¸è¼‰å­—åž‹ %1(%2)。 @@ -120,42 +136,52 @@ ate the goose who was loose. AppFontWidget + Fonts å­—åž‹ + Add font files 新增字型檔 + Remove current font file 移除ç¾æœ‰çš„字型檔 + Remove all font files 移除所有字型檔 + Add Font Files 新增字型檔 + Font files (*.ttf) 字型檔(*.ttf) + Error Adding Fonts 新增字型時發生錯誤 + Error Removing Fonts 移除字型時發生錯誤 + Remove Fonts 移除字型 + Would you like to remove all fonts? 您è¦ç§»é™¤æ‰€æœ‰çš„字型嗎? @@ -163,10 +189,12 @@ ate the goose who was loose. AppearanceOptionsWidget + Form 表單 + User Interface Mode 使用者介é¢æ¨¡å¼ @@ -174,15 +202,17 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. 無法傳é€è¦æ±‚:å°å¹«æ‰‹æœªå›žæ‡‰ã€‚ + The binary '%1' does not exist. 執行檔 %1 ä¸å­˜åœ¨ã€‚ + Unable to launch assistant (%1). 無法啟動å°å¹«æ‰‹ï¼ˆ%1)。 @@ -190,23 +220,27 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. 元素 %1 中缺少必須的屬性 %2。 + Empty brush name encountered. é‡åˆ°ç©ºç™½çš„筆刷å稱。 + An unexpected element '%1' was encountered. é‡åˆ°æœªé æœŸçš„元素 %1。 + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 讀å–筆刷定義檔 %1 時發生錯誤,在第 %2 行第 %3 欄:%4 + An error occurred when reading the resource file '%1' at line %2, column %3: %4 讀å–資æºæª” %1 時發生錯誤,在第 %2 行第 %3 欄:%4 @@ -214,75 +248,92 @@ ate the goose who was loose. BrushPropertyManager - + No brush 沒有筆刷 + Solid 固體 + Dense 1 濃稠 1 + Dense 2 濃稠 2 + Dense 3 濃稠 3 + Dense 4 濃稠 4 + Dense 5 濃稠 5 + Dense 6 濃稠 6 + Dense 7 濃稠 7 + Horizontal æ°´å¹³ + Vertical åž‚ç›´ + Cross äº¤å‰ + Backward diagonal 往回斜線 + Forward diagonal å¾€å‰æ–œç·š + Crossing diagonal 交å‰æ–œç·š + Style æ¨£å¼ + Color é¡è‰² + [%1, %2] [%1, %2] @@ -290,132 +341,180 @@ ate the goose who was loose. Command + + Change signal 變更信號 + + Change slot 變更信號槽 + + Change signal-slot connection + + + + Change sender 變更發é€è€… + Change receiver 變更接收者 - + Add connection 新增連線 + Adjust connection 調整連線 + Delete connections 刪除連線 + Change source è®Šæ›´ä¾†æº + Change target 變更目標 - + Insert '%1' æ’å…¥ '%1' + Raise '%1' æå‡ '%1' + Lower '%1' é™ä½Ž '%1' + Delete '%1' 刪除 '%1' + Reparent '%1' é‡å®šç¾©çˆ¶ç‰©ä»¶ '%1' + Promote to custom widget æå‡åˆ°è‡ªè¨‚元件 + Demote from custom widget 從自訂元件é™ç´š + Lay out using grid 使用格線佈局 + Lay out vertically 垂直佈局 + Lay out horizontally 水平佈局 + Break layout 打斷佈局 + + + Move Page 移動é é¢ + + + + Delete Page 刪除é é¢ + + Page é é¢ + + + page é é¢ + + + + Insert Page æ’å…¥é é¢ + tab 定ä½é»ž + Change Tab order 變更定ä½é †åº + Create Menu Bar 建立é¸å–®åˆ— + Delete Menu Bar 刪除é¸å–®åˆ— + Create Status Bar 建立狀態列 + Delete Status Bar 刪除狀態列 + Add Tool Bar 新增工具列 @@ -424,14 +523,17 @@ ate the goose who was loose. 設定嵌入視窗元件 + Add Dock Window 新增嵌入視窗 + Adjust Size of '%1' 調整 '%1' çš„å¤§å° + Change Layout Item Geometry 變更佈局項目ä½ç½® @@ -440,56 +542,70 @@ ate the goose who was loose. æ’入列 + Change Table Contents 變更表格內容 + Change Tree Contents 變更樹狀圖內容 + + Add action 新增動作 + + Remove action 移除動作 + Add menu 新增é¸å–® + Remove menu 移除é¸å–® + Create submenu 建立å­é¸å–® + Delete Tool Bar 刪除工具列 - + Set action text 設定動作文字 + Insert action æ’入動作 - + + Move action 移動動作 + Change Title 變更標題 + Insert Menu æ’å…¥é¸å–® @@ -544,119 +660,142 @@ ate the goose who was loose. + Change Z-order of '%1' 變更 %1 çš„ Z é †åº + Simplify Grid Layout 簡化格線佈局 + Change Form Layout Item Geometry 變更表單佈局項目的ä½ç½® + Delete Subwindow 刪除å­è¦–窗 + Insert Subwindow æ’å…¥å­è¦–窗 + subwindow å­è¦–窗 + Subwindow å­è¦–窗 - + Change signals/slots 變更信號/信號槽 - + Create button group 建立按éµç¾¤çµ„ + Break button group 打破按éµç¾¤çµ„ + Break button group '%1' 打破按éµç¾¤çµ„ %1 + Add buttons to group 將按éµæ–°å¢žåˆ°ç¾¤çµ„ - + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup å°‡ %1 新增到 %2 + Remove buttons from group 將按éµå¾žç¾¤çµ„內移除 + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup å°‡ %1 從 %2 內移除 - + Morph %1/'%2' into %3 + MorphWidgetCommand description å°‡ %1/%2 變形為 %3 - + Change layout of '%1' from %2 to %3 å°‡ %1 的佈局由 %2 變為 %3 - + Change script 變更文稿 - + Changed '%1' of '%2' 已變更 %1 個,共 %2 個 + Changed '%1' of %n objects 已變更 %1 個,共 %n 個物件 + Reset '%1' of '%2' å·²é‡ç½® %1 個,共 %2 個 + Reset '%1' of %n objects å·²é‡ç½® %1 個,共 %n 個物件 + Add dynamic property '%1' to '%2' 新增動態屬性 %1 到 %2 + Add dynamic property '%1' to %n objects 新增動態屬性 %1 到 %n 個物件 + Remove dynamic property '%1' from '%2' 從 %2 移除動態屬性 %1 + Remove dynamic property '%1' from %n objects 從 %n 個物件移除動態屬性 %1 @@ -666,18 +805,22 @@ ate the goose who was loose. ConnectDialog + Configure Connection 設定連線 + GroupBox 群組盒 + Edit... 編輯... + Show signals and slots inherited from QWidget 顯示從 QWidget 繼承的信號與信號槽 @@ -685,23 +828,28 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) + Embedded device standard screen resolution 標準(96 x 96) + Greenphone (179 x 185) + Embedded device screen resolution 綠色手機(179 x 185) + High (192 x 192) + Embedded device high definition screen resolution 高(192 x 192) Designer - + Qt Designer Qt 設計家 @@ -710,52 +858,64 @@ ate the goose who was loose. 此檔案包å«æœ€ä¸Šå±¤çš„間隔器。<br>它們<b>尚未</b>存到表單中。<br>也許您忘了建立佈局? + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. 此檔案包å«æœ€ä¸Šå±¤çš„間隔器。<br>它們<b>尚未</b>存到表單中。 + Perhaps you forgot to create a layout? 也許您忘了建立佈局? + Invalid ui file: The root element <ui> is missing. ä¸åˆæ³•çš„ ui 檔。沒有根元素 <ui>。 + An error has occurred while reading the ui file at line %1, column %2: %3 è®€å– ui 檔時發生錯誤,在第 %1 行,第 %2 欄:%3 + This file cannot be read because it was created using %1. 此檔案無法讀å–,因為是用 %1 建立的。 + This file was created using Designer from Qt-%1 and cannot be read. 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–。 + This file cannot be read because the extra info extension failed to load. 此檔案無法讀å–,因為載入é¡å¤–的資訊延伸時失敗。 + The converted file could not be read. 轉æ›å¾Œçš„檔案無法讀å–。 + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. 此檔案是用 Qt-%1 的設計家建立的,將會自動轉æ›æˆæ–°å¼çš„表單。 + The old form has not been touched, but you will have to save the form under a new name. 舊表單ä¸æœƒåšä»»ä½•æ›´å‹•ï¼Œä½†æ˜¯æ‚¨å¿…é ˆå¦å­˜æ–°æª”。 + This file was created using Designer from Qt-%1 and could not be read: %2 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–: %2 + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. 請執行 <b>uic3 &nbsp; -convert</b> 將它轉æ›æˆ Qt 4 çš„ ui æ ¼å¼ã€‚ @@ -770,19 +930,22 @@ The old form has been untouched, but you will have to save this form under a new 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–。<br>%2<br>請先用 <b>uic3 -convert</b> 將它轉æ›æˆ Qt-4 çš„æ ¼å¼ã€‚ + Custom Widgets 自訂元件 + Promoted Widgets å·²æå‡çš„元件 - + Unable to launch %1. 無法啟動 %1。 + %1 timed out. %1 逾時。 @@ -812,10 +975,12 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum + %1 is not a valid enumeration value of '%2'. %1 ä¸æ˜¯ %2 çš„åˆæ³•åˆ—舉值。 + '%1' could not be converted to an enumeration value of type '%2'. %1 無法轉æ›ç‚º %2 型態的列舉值。 @@ -823,6 +988,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaFlags + '%1' could not be converted to a flag value of type '%2'. %1 無法轉æ›ç‚º %2 型態的旗標值。 @@ -830,11 +996,13 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. + Reading a number for an embedded device profile %1 ä¸æ˜¯ä¸€å€‹æ•¸å­—。 + An invalid tag <%1> was encountered. é‡åˆ°ä¸åˆæ³•çš„標籤 <%1>。 @@ -842,22 +1010,27 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfileDialog + &Family 家æ—(&F) + &Point Size 點大å°(&P) + Style æ¨£å¼ + Device DPI è£ç½®çš„ DPI + Name å稱 @@ -865,47 +1038,57 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. 無法載入影åƒæª” %1。 + The skin directory '%1' does not contain a configuration file. 外觀目錄 %1 沒有設定檔。 + The skin configuration file '%1' could not be opened. 外觀設定檔 %1 無法開啟。 + The skin configuration file '%1' could not be read: %2 外觀設定檔 %1 無法讀å–:%2 + Syntax error: %1 語法錯誤:%1 + The skin "up" image file '%1' does not exist. 外觀中的「上ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "down" image file '%1' does not exist. 外觀中的「下ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "closed" image file '%1' does not exist. 外觀中的「關閉ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin cursor image file '%1' does not exist. 外觀中的游標影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + Syntax error in area definition: %1 å€åŸŸå®šç¾©ä¸­æœ‰èªžæ³•éŒ¯èª¤ï¼š%1 + Mismatch in number of areas, expected %1, got %2. å€åŸŸæ•¸é‡ä¸ç¬¦ã€‚應為 %1,實際上為 %2。 @@ -913,59 +1096,64 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - None - ç„¡ + ç„¡ Add a profile - 新增設定檔 + 新增設定檔 Edit the selected profile - 編輯é¸å–的設定檔 + 編輯é¸å–的設定檔 Delete the selected profile - 刪除é¸å–的設定檔 + 刪除é¸å–的設定檔 Add Profile - 新增設定檔 + 新增設定檔 New profile - 新增設定檔 + 新增設定檔 Edit Profile - 編輯設定檔 + 編輯設定檔 Delete Profile - 刪除設定檔 + 刪除設定檔 Would you like to delete the profile '%1'? - 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description <html><table><tr><td><b>å­—åž‹</b></td><td>%1,%2</td></tr><tr><td><b>樣å¼</b></td><td>%3</td><tr><td><b>解æžåº¦</b></td><td>%4 x %5</td></tr></table></html> Default - é è¨­ + é è¨­ EmbeddedOptionsPage + Embedded Design + Tab in preferences dialog 嵌入å¼è¨­è¨ˆ + Device Profiles + EmbeddedOptionsControl group box" è£ç½®è¨­å®šæª” @@ -995,23 +1183,27 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font å­—åž‹ + &Writing system 寫入系統(&W) + &Family 家æ—(&F) + &Style 風格(&S) + &Point size 點大å°(&P) @@ -1019,19 +1211,22 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault é è¨­å–œå¥½è¨­å®š + NoAntialias 沒有å鋸齒 + PreferAntialias é è¨­å鋸齒 + Antialiasing å鋸齒 @@ -1039,35 +1234,43 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' + Parsing layout stretch values %1 的延伸值ä¸åˆæ³•ï¼š%2 + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values %1 的最å°å€¼ä¸åˆæ³•ï¼š%2 FormEditorOptionsPage - + %1 % %1 % + Preview Zoom é è¦½ç¸®æ”¾ + Default Zoom é è¨­ç¸®æ”¾ + Forms + Tab in preferences dialog 表單 + Default Grid é è¨­æ ¼ç·š @@ -1075,30 +1278,37 @@ The old form has been untouched, but you will have to save this form under a new FormLayoutRowDialog + Add Form Layout Row 新增表單佈局列 + &Label text: 標籤文字(&L): + Field &type: 欄ä½åž‹æ…‹(&T): + &Field name: 欄ä½å稱(&F): + &Buddy: åŒä¼´(&B): + &Row: 列(&R): + Label &name: 標籤å稱(&N): @@ -1106,11 +1316,12 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> 未é æœŸçš„元素 <%1> + Error while pasting clipboard contents at line %1, column %2: %3 貼上剪貼簿內容時發生錯誤,在第 %1 行第 %2 欄:%3 @@ -1118,50 +1329,62 @@ The old form has been untouched, but you will have to save this form under a new FormWindowSettings + Form Settings 表單設定 + Layout &Default 佈局é è¨­å€¼(&D) + &Spacing: 間隔空間(&S): + &Margin: 邊緣留白(&M): + &Layout Function 佈局功能(&L) + Ma&rgin: 邊緣留白(&R): + Spa&cing: 間隔空間(&C): + Embedded Design 嵌入å¼è¨­è¨ˆ + &Author 作者(&A) + &Include Hints 引入æ示(&I) + &Pixmap Function åƒç´ åœ–功能(&P) + Grid 格線 @@ -1169,7 +1392,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( 所有åƒç´ åœ– ( @@ -1177,14 +1400,16 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser XX 圖示é¸æ“‡é—œé–‰ LanguageResourceDialog + Choose Resource é¸æ“‡è³‡æº @@ -1192,27 +1417,33 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main + Not currently used (main tool bar) ä¸»è¦ + File 檔案 + Edit 編輯 + Tools 工具 + Form 表單 + Qt Designer Qt 設計家 @@ -1220,23 +1451,27 @@ The old form has been untouched, but you will have to save this form under a new NewForm - + C&reate 建立(&R) + Recent 最近的 + &Close 關閉(&C) + &Open... é–‹å•Ÿ(&O)... + &Recent Forms 最近開啟的表單(&R) @@ -1249,10 +1484,12 @@ The old form has been untouched, but you will have to save this form under a new é¸æ“‡é è¦½çš„樣本 + Read error 讀å–錯誤 + New Form 新表單 @@ -1261,6 +1498,7 @@ The old form has been untouched, but you will have to save this form under a new 0 + Show this Dialog on Startup 啟動時顯示此å°è©±æ¡† @@ -1273,10 +1511,12 @@ The old form has been untouched, but you will have to save this form under a new 自訂元件 + A temporary form file could not be created in %1. 無法於 %1 建立暫存表單檔。 + The temporary form file %1 could not be written. 無法寫入暫存表單檔 %1。 @@ -1284,7 +1524,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 無法開啟表單樣本檔 %1:%2 @@ -1292,19 +1532,22 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object 物件 + Class 類別 + separator 分隔器 + <noname> <未命å> @@ -1312,11 +1555,12 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name 變更物件å稱 + Object Name 物件å稱 @@ -1373,43 +1617,16 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog - - - Components - 組件 - + PluginDialog + Plugin Information - 外掛程å¼è³‡è¨Š - - - Refresh - 刷新 - - - Scan for newly installed custom widget plugins. - 掃æ是å¦æœ‰æ–°å®‰è£çš„自訂元件外掛程å¼ã€‚ - - - Qt Designer couldn't find any plugins - Qt 設計家找ä¸åˆ°ä»»ä½•çš„外掛程å¼ã€‚ - - - Qt Designer found the following plugins - Qt è¨­è¨ˆå®¶æ‰¾åˆ°ä»¥ä¸‹çš„å¤–æŽ›ç¨‹å¼ - - - New custom widget plugins have been found. - 找到新的自訂元件外掛程å¼ã€‚ - - - TextLabel - 文字標籤 + 外掛程å¼è³‡è¨Š + 1 - 1 + 1 @@ -1435,6 +1652,7 @@ There's nothing more here. You should get back to work. è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Preferences 喜好設定 @@ -1454,39 +1672,47 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default é è¨­ + None ç„¡ + Browse... ç€è¦½... + Form 表單 + Print/Preview Configuration 列å°/é è¦½è¨­å®š + Style æ¨£å¼ + Style sheet 樣å¼è¡¨ + ... ... + Device skin è£ç½®å¤–觀 @@ -1494,8 +1720,9 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used + Usage of promoted widgets 未使用 @@ -1509,6 +1736,8 @@ There's nothing more here. You should get back to work. Q3WizardContainer + + Page é é¢ @@ -1516,48 +1745,58 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> 未é æœŸçš„元素 <%1> + An error has occurred while reading the ui file at line %1, column %2: %3 è®€å– ui 檔時發生錯誤,在第 %1 行,第 %2 欄:%3 + Invalid ui file: The root element <ui> is missing. ä¸åˆæ³•çš„ ui 檔。沒有根元素 <ui>。 + The creation of a widget of the class '%1' failed. 建立類別 %1 的元件時失敗。 + Attempt to add child that is not of class QWizardPage to QWizard. 試圖將ä¸æ˜¯ QWizardPage çš„å­é¡žåˆ¥åŠ å…¥ QWizard。 + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. 您試圖將一個佈局新增到元件 %1(%2)中,但該元件已經有一個éžç›’狀型態為 %3 的未管ç†ä½ˆå±€ã€‚這表示在 ui 檔中有發生ä¸ä¸€è‡´çš„情æ³ã€‚ + Empty widget item in %1 '%2'. 空白的元件項目於 %1「%2ã€ã€‚ + Flags property are not supported yet. 尚未支æ´æ——標屬性。 + While applying tab stops: The widget '%1' could not be found. 套用定ä½é»žæ™‚:找ä¸åˆ°å…ƒä»¶ %1。 + Invalid QButtonGroup reference '%1' referenced by '%2'. %2 åƒè€ƒäº†ä¸åˆæ³•çš„ QButtonGroup åƒè€ƒ %1。 + This version of the uitools library is linked without script support. 這個 uitools 函å¼åº«çš„版本沒有支æ´æ–‡ç¨¿ã€‚ @@ -1598,11 +1837,12 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX 控制 + ActiveX control widget ActiveX 控制元件 @@ -1610,19 +1850,22 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control 設定控制 + Reset Control é‡ç½®æŽ§åˆ¶ + Licensed Control 已授權的控制 + The control requires a design-time license 此控制è¦æ±‚設計期間的授權 @@ -1630,56 +1873,67 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ä¸æ˜¯ä¸€å€‹å·²æå‡çš„類別。 + The base class %1 is invalid. 基底類別 %1 ä¸åˆæ³•ã€‚ + The class %1 already exists. 類別 %1 已存在。 + Promoted Widgets å·²æå‡å…ƒä»¶ + The class %1 cannot be removed 類別 %1 無法移除 + The class %1 cannot be removed because it is still referenced. 類別 %1 無法移除,因為它ä»åœ¨è¢«åƒè€ƒä¸­ã€‚ + The class %1 cannot be renamed 類別 %1 無法é‡æ–°å‘½å + The class %1 cannot be renamed to an empty name. 類別 %1 無法é‡æ–°å‘½å為空的å稱。 + There is already a class named %1. 已經有å為 %1 的類別。 + Cannot set an empty include file. ä¸æ³•è¨­å®šç©ºçš„引入檔。 - + Exception at line %1: %2 例外發生於行 %1:%2 + Unknown error 未知的錯誤 + An error occurred while running the script for %1: %2 Script: %3 執行 %1 的文稿時發生錯誤:%2 @@ -1689,15 +1943,17 @@ Script: %3 QDesigner - + %1 - warning %1─警告 + Qt Designer Qt 設計家 + This application cannot be used for the Console edition of Qt 此應用程å¼ç„¡æ³•ç”¨æ–¼ä¸»æŽ§å°ç‰ˆçš„ Qt @@ -1712,7 +1968,7 @@ Script: %3 QDesignerActions - + Edit Widgets 編輯元件 @@ -1745,6 +2001,7 @@ Script: %3 關閉表單(&C) + &Quit 離開(&Q) @@ -1757,14 +2014,17 @@ Script: %3 表單設定(&S)... + &Minimize 最å°åŒ–(&M) + Bring All to Front 把全部都帶到å‰æ™¯ + Preferences... 喜好設定 @@ -1777,6 +2037,7 @@ Script: %3 CTRL+O + Clear &Menu 清除é¸å–®(&M) @@ -1785,6 +2046,7 @@ Script: %3 CTRL+S + CTRL+SHIFT+S CTRL+SHIFT+S @@ -1793,6 +2055,7 @@ Script: %3 CTRL+W + CTRL+Q CTRL+Q @@ -1805,6 +2068,7 @@ Script: %3 CTRL+SHIFT+Z + CTRL+R CTRL+R @@ -1813,38 +2077,51 @@ Script: %3 %1 風格 + CTRL+M CTRL+M + Qt Designer &Help Qt 設計家說明(&H) + Current Widget Help ç›®å‰å…ƒä»¶èªªæ˜Ž + What's New in Qt Designer? Qt 設計家有什麼新功能? + About Plugins é—œæ–¼å¤–æŽ›ç¨‹å¼ + + About Qt Designer 關於 Qt 設計家 + About Qt 關於 Qt + + Open Form 開啟表單 + + + Designer UI files (*.%1);;All Files (*) 設計家介é¢æª” (*.%1);;所有檔案 (*) @@ -1857,54 +2134,67 @@ Script: %3 儲存 + %1 already exists. Do you want to replace it? %1 已存在。 您è¦å–代它嗎? + Saved %1. 已儲存 %1。 + Additional Fonts... é¡å¤–çš„å­—åž‹ + &Recent Forms 最近開啟的表單(&R) + Designer 設計家 + Feature not implemented yet! åŠŸèƒ½å°šæœªå¯¦ä½œï¼ + Read error 讀å–錯誤 + %1 Do you want to update the file location or generate a new form? %1 您è¦æ›´æ–°æª”案ä½ç½®ï¼Œé‚„是建立新的表單? + &Update æ›´æ–°(&U) + &New Form 新增表單(&N) + + Save Form? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ + Could not open file 無法開啟檔案 @@ -1917,10 +2207,12 @@ Would you like to retry or change your file? 您è¦é‡è©¦ï¼Œé‚„是è¦æ”¹è®Šæª”案? + Select New File é¸æ“‡æ–°æª”案 + Could not write file 無法寫入檔案 @@ -1933,6 +2225,7 @@ Would you like to retry? 您è¦é‡è©¦å—Žï¼Ÿ + &Close Preview 關閉é è¦½(&C) @@ -1945,38 +2238,48 @@ Would you like to retry? F3 + &New... 新增(&N)... + &Open... é–‹å•Ÿ(&O)... + &Save 儲存(&S) + Save &As... å¦å­˜æ–°æª”(&A)... + Save A&ll 全部儲存(&A) + Save As &Template... 儲存為樣本(&T)... + + &Close 關閉(&C) + Save &Image... 儲存影åƒ(&I)... + &Print... 列å°(&P)... @@ -1985,26 +2288,33 @@ Would you like to retry? é è¦½(&P)... + View &Code... 檢視程å¼ç¢¼(&C)... + ALT+CTRL+S ALT+CTRL+S + + Save Form As å¦å­˜è¡¨å–® + Preview failed é è¦½å¤±æ•— + Code generation failed 程å¼ç¢¼ç”¢ç”Ÿå¤±æ•— + The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -2013,6 +2323,7 @@ Would you like to retry or select a different file? 您è¦å†å˜—試,還是è¦é¸æ“‡å…¶å®ƒæª”案? + It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -2021,42 +2332,55 @@ Would you like to retry? 您è¦é‡è©¦å—Žï¼Ÿ + + Assistant å°åŠ©æ‰‹ + + The backup file %1 could not be written. 備份檔 %1 無法寫入。 + The backup directory %1 could not be created. 無法建立備份目錄 %1。 + The temporary backup directory %1 could not be created. 無法建立暫存備份目錄 %1。 + Image files (*.%1) å½±åƒæª” (*.%1) + + Save Image å„²å­˜å½±åƒ + Saved image %1. å·²å„²å­˜å½±åƒ %1。 + The file %1 could not be written. 檔案 %1 無法寫入。 + Please close all forms to enable the loading of additional fonts. 請關閉所有表單,æ‰èƒ½è¼‰å…¥é¡å¤–的字型。 + Printed %1. å·²åˆ—å° %1。 @@ -2064,22 +2388,26 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance + Tab in preferences dialog 外觀 QDesignerAppearanceOptionsWidget + Docked Window 已嵌入視窗 + Multiple Top-Level Windows 多個頂層視窗 + Toolwindow Font 工具視窗字型 @@ -2087,19 +2415,22 @@ Would you like to retry? QDesignerAxWidget + Reset control é‡ç½®æŽ§åˆ¶ + Set control 設定控制 - + Control loaded 控制已載入 + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". 執行型態 %1 çš„ meta 呼å«æ™‚發生 COM 例外,索引 %2/%3。 @@ -2107,15 +2438,17 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: 發生文稿錯誤: + The preview failed to build. 建立é è¦½æ™‚失敗。 + Designer 設計家 @@ -2123,19 +2456,22 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] + Save Form? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ + Do you want to save the changes to this document before closing? 您è¦åœ¨é—œé–‰å‰å…ˆå„²å­˜å°æ­¤æ–‡ä»¶çš„變更嗎? + If you don't save, your changes will be lost. 如果您ä¸å„²å­˜ï¼Œæ‰€åšçš„變更將éºå¤±ã€‚ @@ -2143,30 +2479,38 @@ Would you like to retry? QDesignerMenu + Type Here 在此輸入 + Add Separator 新增分隔器 + Insert separator æ’入分隔器 + Remove separator 移除分隔器 + Remove action '%1' 移除動作 %1 + + Add separator 新增分隔器 + Insert action æ’入動作 @@ -2174,18 +2518,22 @@ Would you like to retry? QDesignerMenuBar + Type Here 在此輸入 + Remove Menu '%1' 移除é¸å–® %1 + Remove Menu Bar 移除é¸å–®åˆ— + Menu é¸å–® @@ -2200,19 +2548,22 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 剖æžè‡ªè¨‚元件 %1 çš„ XML æ ¼å¼æ™‚發生錯誤:%2 + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. 自訂元件 %1 çš„ XML 未包å«ä»»ä½• <widget> 或 <ui> 元素。 + The class attribute for the class %1 is missing. 類別 %1 éºå¤±äº†é¡žåˆ¥å±¬æ€§ã€‚ + The class attribute for the class %1 does not match the class name %2. 類別 %1 的類別屬性與類別å稱 %2 ä¸ç¬¦ã€‚ @@ -2231,7 +2582,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties 動態屬性 @@ -2239,25 +2590,33 @@ Would you like to retry? QDesignerResource + The layout type '%1' is not supported, defaulting to grid. 未支æ´ä½ˆå±€åž‹æ…‹ %1。改使用é è¨­çš„格線型態。 + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. 元件 %1(%2)的容器延伸在查詢é é¢ #%5 時傳回了éžè¨­è¨ˆå™¨ %3(%4)管ç†çš„元件。 容器é é¢æ‡‰è©²åªèƒ½ç¶“由自訂元件的 domXml() 方法傳回的 XML 內指定加入。 + Unexpected element <%1> + Parsing clipboard contents 未é æœŸçš„元素 <%1> + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents 貼上剪貼簿內容時發生錯誤,在第 %1 行第 %2 欄:%3 + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents 貼上剪貼簿內容時發生錯誤:沒有根元素 <ui>。 @@ -2275,11 +2634,12 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. 無法建立樣本路徑 %1。 + An error has been encountered while parsing device profile XML: %1 剖æžè£ç½®è¨­å®šæª” XML 時發生錯誤:%1 @@ -2387,27 +2747,32 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor 屬性編輯器 + Action Editor 動作編輯器 + Object Inspector 物件指示器 + Resource Browser 資æºç€è¦½å™¨ + Signal/Slot Editor 信號/信號槽編輯器 + Widget Box 元件盒 @@ -2419,19 +2784,22 @@ Container pages should only be added by specifying them in XML returned by the d 元件盒 - + An error has been encountered at line %1 of %2: %3 在 %2 的第 %1 行發生錯誤:%3 + Unexpected element <%1> encountered when parsing for <widget> or <ui> å‰–æž <widget> 或 <ui> 時é‡åˆ°æœªé æœŸçš„元素 <%1> + Unexpected end of file encountered when parsing widgets. 剖æžå…ƒä»¶æ™‚é‡åˆ°æœªé æœŸçš„檔案çµæŸã€‚ + A widget element could not be found. 找ä¸åˆ°å…ƒä»¶çš„元素。 @@ -2439,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File 檔案(&F) @@ -2452,10 +2820,12 @@ Container pages should only be added by specifying them in XML returned by the d 編輯(&E) + F&orm 表單(&O) + Preview in é è¦½æ–¼ @@ -2464,10 +2834,12 @@ Container pages should only be added by specifying them in XML returned by the d 工具(&T) + &Window 視窗(&W) + &Help 說明(&H) @@ -2476,6 +2848,7 @@ Container pages should only be added by specifying them in XML returned by the d 檔案 + Edit 編輯 @@ -2488,6 +2861,7 @@ Container pages should only be added by specifying them in XML returned by the d 表單 + Toolbars 工具列 @@ -2500,6 +2874,7 @@ Container pages should only be added by specifying them in XML returned by the d Qt 設計家 + Save Forms? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ @@ -2508,30 +2883,37 @@ Container pages should only be added by specifying them in XML returned by the d 若您ä¸æª¢æŸ¥æ‚¨çš„文件,所有變更將éºå¤±ã€‚ + &View 檢視(&V) + &Settings 設定(&S) + If you do not review your documents, all your changes will be lost. 若您ä¸æª¢æŸ¥æ‚¨çš„文件,所有變更將éºå¤±ã€‚ + Discard Changes 丟棄變更 + Review Changes 檢查變更 + Backup Information 備份資訊 + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? 設計器上次並未正確çµæŸï¼Œä¸éŽæœ‰ç•™ä¸‹å‚™ä»½æª”。您è¦è¼‰å…¥å‚™ä»½æª”嗎? @@ -2540,14 +2922,17 @@ Container pages should only be added by specifying them in XML returned by the d 設計家在您上次工作階段並沒有正確地çµæŸã€‚有一些備份檔案存在,您è¦è¼‰å…¥å®ƒå€‘嗎? + The file <b>%1</b> could not be opened. 檔案 %1 無法開啟。 + The file <b>%1</b> is not a valid Designer ui file. 檔案 %1 ä¸æ˜¯åˆæ³•çš„設計家介é¢æª”。 + There are %n forms with unsaved changes. Do you want to review these changes before quitting? 有 %n 個表單有未儲存的變更。您è¦åœ¨é›¢é–‹å‰å…ˆæª¢æŸ¥é€™äº›è®Šæ›´å—Žï¼Ÿ @@ -2577,45 +2962,53 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method 傳é€äº†ç©ºç™½çš„類別å稱給 %1(物件å稱:%2) + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder 無法建立類別 %1 的自訂元件。改為使用é è¨­çš„基礎類別 %2。 + QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder 無法建立類別 %1 的元件。 + The layout type `%1' is not supported. 佈局型態 %1 未被支æ´ã€‚ - + The set-type property %1 could not be read. 設定型態屬性 %1 無法被讀å–。 + The enumeration-type property %1 could not be read. 列舉型態屬性 %1 無法被讀å–。 + Reading properties of the type %1 is not supported yet. åž‹æ…‹ %1 的讀å–屬性尚未被支æ´ã€‚ + The property %1 could not be written. The type %2 is not supported yet. 屬性 %1 無法被寫入。型態 %2 尚未被支æ´ã€‚ - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. 列舉數值 %1 ä¸åˆæ³•ã€‚將改用é è¨­å€¼ %2。 + The flag-value '%1' is invalid. Zero will be used instead. 旗標值 %1 ä¸åˆæ³•ï¼Œå°‡æ”¹ç”¨ 0。 @@ -2881,39 +3274,47 @@ This indicates an inconsistency in the ui-file. QStackedWidgetEventFilter - + Previous Page å‰ä¸€é  + Next Page ä¸‹ä¸€é  + Delete 刪除 + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Change Page Order... 變更é é¢é †åº... + Change Page Order 變更é é¢é †åº + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2921,10 +3322,12 @@ This indicates an inconsistency in the ui-file. QStackedWidgetPreviewEventFilter + Go to previous page of %1 '%2' (%3/%4). 跳到 %1 çš„å‰ä¸€é ã€Œ%2ã€ï¼ˆç¬¬ %3 é ï¼Œå…± %4 é ï¼‰ã€‚ + Go to next page of %1 '%2' (%3/%4). 跳到 %1 的下一é ã€Œ%2ã€ï¼ˆç¬¬ %3 é ï¼Œå…± %4 é ï¼‰ã€‚ @@ -2932,23 +3335,27 @@ This indicates an inconsistency in the ui-file. QTabWidgetEventFilter - + Delete 刪除 + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2956,31 +3363,37 @@ This indicates an inconsistency in the ui-file. QToolBoxHelper - + Delete Page 刪除é é¢ + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Change Page Order... 變更é é¢é †åº... + Change Page Order 變更é é¢é †åº + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2988,10 +3401,15 @@ This indicates an inconsistency in the ui-file. QtBoolEdit + + + True 真 + + False å‡ @@ -2999,11 +3417,12 @@ This indicates an inconsistency in the ui-file. QtBoolPropertyManager - + True 真 + False å‡ @@ -3011,7 +3430,7 @@ This indicates an inconsistency in the ui-file. QtCharEdit - + Clear Char 清除字元 @@ -3019,6 +3438,7 @@ This indicates an inconsistency in the ui-file. QtColorEditWidget + ... ... @@ -3026,19 +3446,22 @@ This indicates an inconsistency in the ui-file. QtColorPropertyManager - + Red ç´… + Green 綠 + Blue è— + Alpha Alpha @@ -3046,78 +3469,97 @@ This indicates an inconsistency in the ui-file. QtCursorDatabase + Arrow ç®­é ­ + Up Arrow 上箭頭 + Cross äº¤å‰ + Wait 等待 + IBeam I åž‹ + Size Vertical åž‚ç›´å¤§å° + Size Horizontal æ°´å¹³å¤§å° + Size Backslash åæ–œç·šå¤§å° + Size Slash æ–œç·šå¤§å° + Size All å…¨éƒ¨å¤§å° + Blank 空白 + Split Vertical 垂直分割 + Split Horizontal 水平分割 + Pointing Hand 指å‘手 + Forbidden ç¦æ­¢çš„ + Open Hand 開啟的手 + Closed Hand 關閉的手 + What's This 這是什麼 + Busy 忙碌 @@ -3129,11 +3571,12 @@ This indicates an inconsistency in the ui-file. QtFontEditWidget - + ... ... + Select Font é¸æ“‡å­—åž‹ @@ -3145,30 +3588,37 @@ This indicates an inconsistency in the ui-file. [%1, %2] + Family å®¶æ— + Point Size é»žå¤§å° + Bold ç²—é«” + Italic 斜體 + Underline 底線 + Strikeout 刪除線 + Kerning 上下çªå‡º @@ -3176,6 +3626,7 @@ This indicates an inconsistency in the ui-file. QtGradientDialog + Edit Gradient 編輯漸層 @@ -3183,219 +3634,274 @@ This indicates an inconsistency in the ui-file. QtGradientEditor - + Start X 起點 X 座標 + Start Y 起點 Y 座標 + Final X 終點 X 座標 + Final Y 終點 Y 座標 + + Central X 中心 X 座標 + + Central Y 中心 Y 座標 + Focal X 焦點 X 座標 + Focal Y 焦點 Y 座標 + Radius åŠå¾‘ + Angle 角度 + Form 表單 + Gradient Editor 漸層編輯器 + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. æ­¤å€åŸŸé¡¯ç¤ºæ­£åœ¨ç·¨è¼¯ä¸­çš„漸層é è¦½ã€‚它也å…許您用拖放來編輯此漸層型態的一些åƒæ•¸ï¼Œå¦‚起點與終點,åŠå¾‘等等。 + 1 1 + 2 2 + 3 3 + 4 4 + 5 5 + Gradient Stops Editor 漸層åœæ­¢é»žç·¨è¼¯å™¨ + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. 這個å€åŸŸå¯ä»¥è®“您編輯漸層åœæ­¢é»žã€‚雙擊ç¾æœ‰çš„åœæ­¢é»žå¯ä»¥è¤‡è£½ä¸€ä»½ã€‚在åœæ­¢é»žå¤–雙擊å¯ä»¥ç”¢ç”Ÿæ–°çš„åœæ­¢é»žã€‚拖放åœæ­¢é»žå¯ä»¥æ”¹è®Šä½ç½®ã€‚點擊滑鼠å³éµæœƒå‡ºç¾é¸å–®ï¼Œå¯ä»¥é¸æ“‡æ›´å¤šå‹•ä½œã€‚ + Zoom 縮放 + Reset Zoom é‡ç½®ç¸®æ”¾ + Position ä½ç½® + Hue 色調 + H H + Saturation 飽和度 + S S + Sat Sat + Value 數值 + V V + Val Val + Alpha Alpha + A A + Type åž‹æ…‹ + Spread 散布 + Color é¡è‰² + Current stop's color ç›®å‰åœæ­¢é»žçš„é¡è‰² + Show HSV specification 顯示 HSV è¦æ ¼ + HSV HSV + Show RGB specification 顯示 RGB è¦æ ¼ + RGB RGB + Current stop's position ç›®å‰åœæ­¢é»žä½ç½® + % % + Zoom In 放大 + Zoom Out ç¸®å° + Toggle details extension 切æ›è©³æƒ…延伸 + > > + Linear Type 線性型態 + ... ... + Radial Type 放射型態 + Conical Type 圓éŒåž‹æ…‹ + Pad Spread 填補散布 + Repeat Spread é‡è¦†æ•£å¸ƒ + Reflect Spread å射散布 @@ -3403,31 +3909,37 @@ This indicates an inconsistency in the ui-file. QtGradientStopsWidget - + New Stop 新增åœæ­¢é»ž + Delete 刪除 + Flip All 全部翻轉 + Select All 全部é¸å– + Zoom In 放大 + Zoom Out ç¸®å° + Reset Zoom é‡ç½®ç¸®æ”¾ @@ -3435,35 +3947,46 @@ This indicates an inconsistency in the ui-file. QtGradientView - + Grad 漸層 + Remove Gradient 移除漸層 + Are you sure you want to remove the selected gradient? 您確定è¦ç§»é™¤é¸å–的漸層嗎? + + New... 新增... + + Edit... 編輯... + + Rename é‡æ–°å‘½å + + Remove 移除 + Gradient View 漸層檢視 @@ -3471,6 +3994,8 @@ This indicates an inconsistency in the ui-file. QtGradientViewDialog + + Select Gradient é¸æ“‡æ¼¸å±¤ @@ -3478,7 +4003,7 @@ This indicates an inconsistency in the ui-file. QtKeySequenceEdit - + Clear Shortcut 清除æ·å¾‘ @@ -3486,14 +4011,17 @@ This indicates an inconsistency in the ui-file. QtLocalePropertyManager + %1, %2 %1,%2 + Language 語言 + Country 國家 @@ -3501,14 +4029,17 @@ This indicates an inconsistency in the ui-file. QtPointFPropertyManager + (%1, %2) (%1,%2) + X X + Y Y @@ -3516,14 +4047,17 @@ This indicates an inconsistency in the ui-file. QtPointPropertyManager + (%1, %2) (%1,%2) + X X + Y Y @@ -3531,10 +4065,12 @@ This indicates an inconsistency in the ui-file. QtPropertyBrowserUtils + [%1, %2, %3] (%4) [%1, %2, %3] (%4) + [%1, %2] [%1, %2] @@ -3542,23 +4078,27 @@ This indicates an inconsistency in the ui-file. QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3x%4] + X X + Y Y + Width 寬度 + Height 高度 @@ -3566,22 +4106,27 @@ This indicates an inconsistency in the ui-file. QtRectPropertyManager + [(%1, %2), %3 x %4] [(%1, %2), %3x%4] + X X + Y Y + Width 寬度 + Height 高度 @@ -3589,41 +4134,52 @@ This indicates an inconsistency in the ui-file. QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 已存在。 您è¦å–代它嗎? + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. 此檔案似乎ä¸æ˜¯è³‡æºæª”;應該是元素 %2 但是找到元素 %1。 + %1 [read-only] %1 [唯讀] + + %1 [missing] %1 [éºå¤±] + <no prefix> <沒有å‰ç½®å­—串> + + New Resource File 新資æºæª” + + Resource files (*.qrc) 資æºæª” (*.qrc) + Import Resource File 匯入資æºæª” + newPrefix æ–°å‰ç½®å­—串 @@ -3632,48 +4188,63 @@ Do you want to replace it? <p><b>警告:</b>檔案:</p><p>%1</p><p>放在目å‰è³‡æºæª”目錄之外。</p><p>您å¯ä»¥æŒ‰ä¸‹</p><table><tr><th>複製</th><td>來將檔案複製到資æºæª”目錄中。</td></tr><tr><th>複製為...</th><td>來將檔案複製到æŸä¸€å€‹è³‡æºæª”çš„å­ç›®éŒ„。</td></tr><tr><th>ä¿æŒ</th><td>使用它目å‰çš„ä½ç½®ã€‚</td></tr></table> + Add Files 新增檔案 + Incorrect Path ä¸æ­£ç¢ºçš„路徑 + + + + Copy 複製 + Copy As... 複製為... + Keep ä¿æŒ + Skip ç•¥éŽ + Clone Prefix 複製å‰ç½®å­—串 + Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". 請輸入您è¦è¤‡è£½æª”案的檔å的後置字串。 å¯ä»¥ç”¨èªžè¨€çš„延伸代碼,例如 "_tw"。 + + Copy As 複製為 + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>é¸å–的檔案:</p><p>%1</p><p>在目å‰çš„資æºæª”目錄:</p><p>%2</p><p>之外。請é¸æ“‡åœ¨è©²ç›®éŒ„之內的路徑存放。</p> + Could not overwrite %1. 無法覆寫 %1。 @@ -3688,14 +4259,17 @@ to: %2 + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>警告:</b>檔案</p><p>%1</p><p>放在目å‰è³‡æºæª”的父目錄以外。</p> + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>è¦è§£æ±ºæ­¤å•é¡Œï¼Œè«‹æŒ‰</p><table><tr><th align="left">複製</th><td>將該檔案複製到資æºæª”的父目錄。</td></tr><tr><th align="left">複製為...</th><td>將該檔案複製到資æºæª”的父目錄底下的æŸå€‹å­ç›®éŒ„。</td></tr><tr><th align="left">ä¿æŒ</th><td>則ä¸ç§»å‹•è©²æª”案。</td></tr></table> + Could not copy %1 to @@ -3706,120 +4280,153 @@ to %2 + A parse error occurred at line %1, column %2 of %3: %4 %3 中發生剖æžéŒ¯èª¤æ–¼è¡Œ %1 欄 %2: %4 + Save Resource File 儲存資æºæª” + Could not write %1: %2 無法寫入 %1:%2 + Edit Resources ç·¨è¼¯è³‡æº + New... 新增... + Open... é–‹å•Ÿ... + Open Resource File 開啟資æºæª” + + Remove 移除 + + Move Up 上移 + + Move Down 下移 + + Add Prefix 新增å‰ç½®å­—串 + Add Files... 新增檔案... + Change Prefix 變更å‰ç½®å­—串 + Change Language 變更語言 + Change Alias 變更別å + Clone Prefix... 複製å‰ç½®å­—串... + Prefix / Path å‰ç½®å­—串/路徑 + Language / Alias 語言/別å + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>警告:</b>é‡æ–°è¼‰å…¥è³‡æº</p><pre>%1</pre> <p>時發生å•é¡Œã€‚</p></html> + Resource Warning 資æºè­¦å‘Š + Dialog å°è©±æ¡† + New File 新增檔案 + N N + Remove File 移除檔案 + R R + I I + New Resource æ–°å¢žè³‡æº + A A + Remove Resource or File 移除資æºæˆ–檔案 @@ -3831,21 +4438,24 @@ to QtResourceView - + Size: %1 x %2 %3 大å°ï¼š%1x%2 %3 + Edit Resources... 編輯資æº... + Reload é‡æ–°è¼‰å…¥ + Copy Path 複製路徑 @@ -3853,6 +4463,7 @@ to QtResourceViewDialog + Select Resource é¸æ“‡è³‡æº @@ -3860,14 +4471,17 @@ to QtSizeFPropertyManager + %1 x %2 %1x%2 + Width 寬度 + Height 高度 @@ -3875,22 +4489,33 @@ to QtSizePolicyPropertyManager + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] + Horizontal Policy 水平政策 + Vertical Policy 垂直政策 + Horizontal Stretch 水平伸展 + Vertical Stretch 垂直伸展 @@ -3898,14 +4523,17 @@ to QtSizePropertyManager + %1 x %2 %1x%2 + Width 寬度 + Height 高度 @@ -3913,87 +4541,107 @@ to QtToolBarDialog - + Custom Toolbar 自訂工具列 + < S E P A R A T O R > <分隔器> + Customize Toolbars 自訂工具列 + 1 1 + Actions 動作 + Toolbars 工具列 + Add new toolbar 新增工具列 + New 新增 + Remove selected toolbar 移除é¸å–的工具列 + Remove 移除 + Rename toolbar é‡æ–°å‘½å工具列 + Rename é‡æ–°å‘½å + Move action up 將動作上移 + Up 上 + Remove action from toolbar 從工具列移除動作 + <- <- + Add action to toolbar 新增動作到工具列 + -> -> + Move action down 將動作下移 + Down 下 + Current Toolbar Actions ç›®å‰å·¥å…·åˆ—的動作 @@ -4001,11 +4649,12 @@ to QtTreePropertyBrowser - + Property 屬性 + Value 數值 @@ -4013,53 +4662,64 @@ to SaveFormAsTemplate - + Add path... 新增路徑... + Template Exists 樣本已存在 + A template with the name %1 already exists. Do you want overwrite the template? å稱為 %1 的樣本已存在。 您è¦è¦†å¯«æ­¤æ¨£æœ¬å—Žï¼Ÿ + Overwrite Template 覆寫樣本 + Open Error 開啟錯誤 + There was an error opening template %1 for writing. Reason: %2 開啟樣本 %1 以寫入時失敗。ç†ç”±ï¼š%2 + Write Error 寫入錯誤 + There was an error writing the template %1 to disk. Reason: %2 將樣本 %1 寫入ç£ç¢Ÿæ™‚發生錯誤。ç†ç”±ï¼š%2 + Pick a directory to save templates in è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Save Form As Template 將表單存為樣本 + &Category: 分類(&C): + &Name: å稱(&N): @@ -4067,7 +4727,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": 執行 %1 的文稿時發生錯誤: @@ -4077,17 +4737,30 @@ Do you want overwrite the template? SelectSignalDialog + Go to slot 跳到信號槽 + Select signal é¸æ“‡ä¿¡è™Ÿ + + + signal + + + + + class + + SignalSlotConnection + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) 發é€è€…(%1),信號(%2),接收者(%3),信號槽(%4) @@ -4095,26 +4768,32 @@ Do you want overwrite the template? SignalSlotDialogClass + Signals and slots 信號與信號槽 + Slots 信號槽 + Add 新增 + ... ... + Delete 刪除 + Signals 信號 @@ -4122,11 +4801,12 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 水平空間 %1,%2x%3 + Vertical Spacer '%1', %2 x %3 垂直空間 %1,%2x%3 @@ -4134,35 +4814,41 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths + Tab in preferences dialog 樣本路徑 ToolBarManager - + Configure Toolbars... 設定工具列... + Window 視窗 + Help 說明 + Style æ¨£å¼ + Dock views 嵌入檢視 + Toolbars 工具列 @@ -4170,19 +4856,21 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>版本 %2 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ + Qt Designer Qt 設計家 + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br />Qt 設計家是一套圖形使用者介é¢æ‡‰ç”¨ç¨‹å¼ï¼Œç”¨æ–¼è¨­è¨ˆ Qt 的應用程å¼ã€‚<br /> @@ -4192,25 +4880,26 @@ Do you want overwrite the template? This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。<br /> + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。<br /> + %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - 此版本的 Qt 設計家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a>。<br/> + 此版本的 Qt 設計家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a>。<br/> This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§æ­¤è»Ÿé«”套件中的授權檔。<br /> + 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§æ­¤è»Ÿé«”套件中的授權檔。<br /> WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. 此檔案包å«äº†è‡ªè¨‚元件 %1,其基礎類別(%2)與在元件資料庫目å‰çš„項目(%3)ä¸åŒã€‚元件資料庫並未åšæ›´å‹•ã€‚ @@ -4218,23 +4907,27 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions 動作 + New... 新增... + Delete 刪除 + New action 新動作 + Edit action 編輯動作 @@ -4247,46 +4940,62 @@ Do you want overwrite the template? åŠŸèƒ½å°šæœªå¯¦ä½œï¼ + Edit... 編輯... + + Go to slot... + 跳到信號槽... + + + Copy 複製 + Cut 剪下 + Paste 貼上 + Select all 全部é¸å– + Configure Action Editor 設定動作編輯器 + Icon View 圖示檢視 + Detailed View 詳情檢視 + Remove actions 移除動作 + Remove action '%1' 移除動作 %1 + Used In 使用於 @@ -4301,27 +5010,32 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name å稱 + Used 已使用 + Text 文字 + Shortcut æ·å¾‘ + Checkable å¯å‹¾é¸ + ToolTip 工具æ示 @@ -4329,27 +5043,31 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy 新增åŒä¼´ + Remove buddies 移除åŒä¼´ + Remove %n buddies 移除 %n 個項目 + Add %n buddies 新增 %n 個項目 + Set automatically 自動設定 @@ -4357,7 +5075,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies 編輯åŒä¼´ @@ -4365,7 +5083,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies 編輯åŒä¼´ @@ -4373,11 +5091,12 @@ Do you want overwrite the template? qdesigner_internal::ButtonGroupMenu - + Select members é¸æ“‡æˆå“¡ + Break 打斷 @@ -4385,26 +5104,32 @@ Do you want overwrite the template? qdesigner_internal::ButtonTaskMenu + Assign to button group 指定按éµç¾¤çµ„ + Button group 按éµç¾¤çµ„ + New button group 新增按éµç¾¤çµ„ + Change text... 變更文字... + None ç„¡ + Button group '%1' 按éµç¾¤çµ„ %1 @@ -4412,47 +5137,57 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... 儲存... + Copy All 全部複製 + &Find in Text... 在文字中尋找(&F)... + A temporary form file could not be created in %1. 無法於 %1 建立暫存表單檔。 + The temporary form file %1 could not be written. 無法寫入暫存表單檔 %1。 + %1 - [Code] %1─[æºç¢¼] + Save Code 儲存程å¼ç¢¼ + Header Files (*.%1) 標頭檔 (*.%1) + The file %1 could not be opened: %2 檔案 %1 無法開啟:%2 + The file %1 could not be written: %2 檔案 %1 無法寫入:%2 + %1 - Error %1─錯誤 @@ -4460,7 +5195,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color 文字é¡è‰² @@ -4468,11 +5203,12 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... 編輯項目... + Change Combobox Contents 變更下拉å¼é¸å–®å…§å®¹ @@ -4480,7 +5216,7 @@ Do you want overwrite the template? qdesigner_internal::CommandLinkButtonTaskMenu - + Change description... 變更æè¿°... @@ -4503,15 +5239,17 @@ Do you want overwrite the template? qdesigner_internal::ConnectionEdit - + Select All 全部é¸å– + Deselect All 全部å–消é¸å– + Delete 刪除 @@ -4519,38 +5257,47 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel + Sender 發é€è€… + Signal 信號 + Receiver 接收者 + Slot 信號槽 + <sender> <發é€è€…> + <signal> <信號> + <receiver> <接收者> + <slot> <信號槽> + Signal and Slot Editor 信號與信號槽編輯器 @@ -4559,6 +5306,7 @@ Do you want overwrite the template? 連線已存在。<br>發é€è€…(%1),信號(%2),接收者(%3),信號槽(%4) + The connection already exists!<br>%1 連線已存在ï¼<br>%1 @@ -4570,35 +5318,42 @@ Do you want overwrite the template? 刪除é é¢ - + Insert Page Before Current Page 在目å‰é é¢ä¹‹å‰æ’å…¥ + Insert Page After Current Page 在目å‰é é¢ä¹‹å¾Œæ’å…¥ + Delete 刪除 + Insert æ’å…¥ + Add Subwindow 新增å­è¦–窗 + Subwindow å­è¦–窗 + Page é é¢ + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  @@ -4606,46 +5361,59 @@ Do you want overwrite the template? qdesigner_internal::DPI_Chooser - + System (%1 x %2) + System resolution 系統(%1 x %2) + User defined 使用者定義 + x + DPI X/Y separator x qdesigner_internal::DesignerPropertyManager + + AlignLeft 置左å°é½Š + AlignHCenter 置中å°é½Š + AlignRight ç½®å³å°é½Š + AlignJustify å…©é‚Šå°é½Š + AlignTop 置頂å°é½Š + + AlignVCenter 垂直置中 + AlignBottom 置底å°é½Š @@ -4662,68 +5430,87 @@ Do you want overwrite the template? é è¨­å鋸齒 + %1, %2 %1,%2 + Customized (%n roles) 自訂(%n 個角色) + Inherited 繼承 + Horizontal æ°´å¹³ + Vertical åž‚ç›´ + Normal Off 正常時關閉 + Normal On 正常時開啟 + Disabled Off 關閉時關閉 + Disabled On 關閉時開啟 + Active Off 啟用時關閉 + Active On 啟用時開啟 + Selected Off é¸æ“‡æ™‚關閉 + Selected On é¸æ“‡æ™‚é–‹å•Ÿ + + translatable å¯ç¿»è­¯ + + disambiguation 澄清 + + comment 註解 @@ -4735,39 +5522,48 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) è£ç½®è¨­å®šæª”(*.%1) + Default é è¨­ + Save Profile 儲存設定檔 + Save Profile - Error 儲存設定檔 ─ 錯誤 + Unable to open the file '%1' for writing: %2 無法開啟檔案 %1 以寫入:%2 + Open profile 開啟設定檔 + + Open Profile - Error 開啟設定檔 ─ 錯誤 + Unable to open the file '%1' for reading: %2 無法開啟檔案 %1 以讀å–:%2 + '%1' is not a valid profile: %2 %1 ä¸æ˜¯åˆæ³•çš„設定檔:%2 @@ -4775,46 +5571,57 @@ Do you want overwrite the template? qdesigner_internal::Dialog + Dialog å°è©±æ¡† + StringList 字串列表 + New String 新增字串 + &New 新增(&N) + Delete String 刪除字串 + &Delete 刪除(&D) + &Value: 數值(&V): + Move String Up 字串上移 + Up 上 + Move String Down 字串下移 + Down 下 @@ -4861,14 +5668,60 @@ Do you want overwrite the template? qdesigner_internal::EmbeddedOptionsControl + + Add a profile + 新增設定檔 + + + + Edit the selected profile + 編輯é¸å–的設定檔 + + + + Delete the selected profile + 刪除é¸å–的設定檔 + + + + Add Profile + 新增設定檔 + + + + New profile + 新增設定檔 + + + + Edit Profile + 編輯設定檔 + + + + Delete Profile + 刪除設定檔 + + + + Would you like to delete the profile '%1'? + 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + + + + Default + é è¨­ + + + None - ç„¡ + ç„¡ qdesigner_internal::FilterWidget - + <Filter> <éŽæ¿¾å™¨> @@ -4895,11 +5748,12 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed 資æºæª”已變更 + The file "%1" has changed outside Designer. Do you want to reload it? 檔案 %1 在設計器之外被人更動éŽã€‚您è¦é‡æ–°è¼‰å…¥å—Žï¼Ÿ @@ -4907,7 +5761,7 @@ Do you want overwrite the template? qdesigner_internal::FormLayoutMenu - + Add form layout row... 新增表單佈局列... @@ -4915,10 +5769,12 @@ Do you want overwrite the template? qdesigner_internal::FormWindow + Edit contents 編輯內容 + F2 F2 @@ -4927,10 +5783,13 @@ Do you want overwrite the template? æ’入元件 %1 + Resize é‡æ–°èª¿æ•´å¤§å° + + Key Move éµç§»å‹• @@ -4939,6 +5798,7 @@ Do you want overwrite the template? 貼上 + Paste error 貼上錯誤 @@ -4955,54 +5815,67 @@ and then paste again. 打斷佈局 + Lay out 佈局 + + Drop widget 丟棄元件 + Paste %n action(s) 貼上 %n 個動作 + Insert widget '%1' æ’入元件 %1 + Paste %n widget(s) 貼上 %n 個元件 + Paste (%1 widgets, %2 actions) 貼上(%1 個元件,%2 個動作) + Cannot paste widgets. Designer could not find a container without a layout to paste into. 無法貼上元件。設計器找ä¸åˆ°æ²’有佈局的容器來貼上。 + Break the layout of the container you want to paste into, select this container and then paste again. 請先打斷您è¦è²¼ä¸Šçš„容器佈局,å†é¸æ“‡è©²å®¹å™¨ï¼Œä¸¦é‡æ–°è²¼ä¸Šã€‚ + Raise widgets 抬å‡å…ƒä»¶ + Lower widgets é™ä½Žå…ƒä»¶ + Select Ancestor é¸æ“‡ç¥–å…ˆ + A QMainWindow-based form does not contain a central widget. QMainWindow 為基底的表單並未包å«ä¸­å¤®å…ƒä»¶ã€‚ @@ -5010,11 +5883,12 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 刪除 + Delete '%1' 刪除 '%1' @@ -5022,160 +5896,200 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 剪下(&T) + Cuts the selected widgets and puts them on the clipboard 剪下é¸å–的元件,並放到剪貼簿中 + &Copy 複製(&C) + Copies the selected widgets to the clipboard å°‡é¸å–的元件複製進剪貼簿 + &Paste 貼上(&P) + Pastes the clipboard's contents 貼上剪貼簿中的內容 + &Delete 刪除(&D) + Deletes the selected widgets 刪除é¸å–的元件 + Select &All 全部é¸å–(&A) + Selects all widgets é¸æ“‡æ‰€æœ‰çš„元件 + Bring to &Front 帶到å‰æ™¯(&F) + + Raises the selected widgets 抬å‡é¸å–的元件 + Send to &Back é€å›žèƒŒæ™¯(&B) + + Lowers the selected widgets é™ä½Žé¸å–的元件 + Adjust &Size 調整大å°(&S) + Adjusts the size of the selected widget 調整é¸å–çš„å…ƒä»¶å¤§å° + Lay Out &Horizontally 水平佈局(&H) + Lays out the selected widgets horizontally å°‡é¸å–的元件åšæ°´å¹³ä½ˆå±€ + Lay Out &Vertically 垂直佈局(&V) + Lays out the selected widgets vertically å°‡é¸å–的元件åšåž‚直佈局 + Lay Out in a &Grid 使用格線佈局(&G) + Lays out the selected widgets in a grid å°‡é¸å–的元件佈局在格線內 + Lay Out Horizontally in S&plitter 以水平分離佈局(&P) + Lays out the selected widgets horizontally in a splitter å°‡é¸å–的元件在分離器中åšæ°´å¹³ä½ˆå±€ + Lay Out Vertically in Sp&litter 以垂直分離佈局(&L) + Lays out the selected widgets vertically in a splitter å°‡é¸å–的元件在分離器中åšåž‚直佈局 + &Break Layout 打斷佈局(&B) + Breaks the selected layout 打斷é¸å–的佈局 + &Preview... é è¦½(&P)... + Preview current form é è¦½ç›®å‰çš„表單 + Form &Settings... 表單設定(&S)... + Break Layout 打斷佈局 + Adjust Size èª¿æ•´å¤§å° + Could not create form preview Title of warning message box 無法建立表單é è¦½ + Form Settings - %1 表單設定─%1 + Lay Out in a &Form Layout 在表單中佈局(&F) + Lays out the selected widgets in a form layout å°‡é¸å–的元件於表單中佈局 + Si&mplify Grid Layout 簡化格線佈局(&M) + Removes empty columns and rows 移除空的欄與列 @@ -5183,11 +6097,12 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None ç„¡ + Device Profile: %1 è£ç½®è¨­å®šæª”:%1 @@ -5206,30 +6121,37 @@ and then paste again. qdesigner_internal::GridPanel + Form 表單 + Grid 格線 + Visible å¯è¦‹çš„ + Grid &X X 軸格線(&X) + Snap 貼齊 + Reset é‡ç½® + Grid &Y Y 軸格線(&Y) @@ -5237,7 +6159,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... 變更標題... @@ -5245,6 +6167,7 @@ and then paste again. qdesigner_internal::HtmlTextEdit + Insert HTML entity æ’å…¥ HTML entity @@ -5252,75 +6175,92 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. 無法讀å–åƒç´ æª” %1。 + The file '%1' does not appear to be a valid pixmap file: %2 檔案 %1 似乎ä¸æ˜¯åˆæ³•çš„åƒç´ æª”:%2 + The file '%1' could not be read: %2 檔案 %1 無法讀å–:%2 + Choose a Pixmap é¸æ“‡åƒç´ åœ– + Pixmap Read Error åƒç´ åœ–讀å–錯誤 + ... ... + Normal Off 正常時關閉 + Normal On 正常時開啟 + Disabled Off 關閉時關閉 + Disabled On 關閉時開啟 + Active Off 啟用時關閉 + Active On 啟用時開啟 + Selected Off é¸æ“‡æ™‚關閉 + Selected On é¸æ“‡æ™‚é–‹å•Ÿ + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + Reset é‡ç½® + Reset All 全部é‡ç½® @@ -5328,47 +6268,58 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> + Items List 項目列表 + New Item 新增項目 + &New 新增(&N) + Delete Item 刪除項目 + &Delete 刪除(&D) + Move Item Up 將項目上移 + U U + Move Item Down 將項目下移 + D D @@ -5376,11 +6327,12 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... 變更 rich text... + Change plain text... 變更純文字... @@ -5388,7 +6340,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... 變更文字... @@ -5396,15 +6348,17 @@ and then paste again. qdesigner_internal::ListWidgetEditor - + Edit List Widget 編輯列表元件 + Edit Combobox 編輯下拉å¼é¸å–® + New Item 新增項目 @@ -5484,11 +6438,12 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... 編輯項目... + Change List Contents 變更列表內容 @@ -5496,19 +6451,22 @@ and then paste again. qdesigner_internal::MdiContainerWidgetTaskMenu - + Next Subwindow 下一個å­è¦–窗 + Previous Subwindow å‰ä¸€å€‹å­è¦–窗 + Tile 鋪排 + Cascade 串接 @@ -5516,7 +6474,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 移除 @@ -5524,7 +6482,7 @@ and then paste again. qdesigner_internal::MorphMenu - + Morph into 變型為 @@ -5532,34 +6490,42 @@ and then paste again. qdesigner_internal::NewActionDialog + New Action... 新增動作... + &Text: 文字(&T) + Shortcut: æ·å¾‘: + Checkable: å¯å‹¾é¸ï¼š + ToolTip: 工具æ示: + ... ... + &Icon: 圖示(&I) + Object &name: 物件å稱(&N): @@ -5567,11 +6533,12 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name 設定屬性å稱 + The current object already has a property named '%1'. Please select another, unique one. ç›®å‰çš„物件已經有å為 %1 的屬性了。 @@ -5584,25 +6551,29 @@ Please select another name. è«‹é¸æ“‡å¦å¤–çš„å稱。 + Create Dynamic Property 建立動態屬性 + Property Name 屬性å稱 + Property Type 屬性型態 - + The '_q_' prefix is reserved for the Qt library. Please select another name. å‰ç½®å­—串 '_q_' 是ä¿ç•™çµ¦ Qt 函å¼åº«ç”¨çš„。 è«‹é¸æ“‡å…¶å®ƒå­—串。 + horizontalSpacer 水平間隔 @@ -5610,62 +6581,78 @@ Please select another name. qdesigner_internal::NewFormWidget + Default size é è¨­å¤§å° + QVGA portrait (240x320) QVGA 縱å‘(240 x 320) + QVGA landscape (320x240) QVGA æ©«å‘(320 x 240) + VGA portrait (480x640) VGA 縱å‘(480 x 640) + VGA landscape (640x480) VGA æ©«å‘(640 x 480) + Widgets + New Form Dialog Categories 元件 + Custom Widgets 自訂元件 + None ç„¡ + Error loading form 載入表單時發生錯誤 + Internal error: No template selected. 內部錯誤:沒有é¸æ“‡æ¨£æœ¬ã€‚ + 0 0 + Choose a template for a preview é¸æ“‡é è¦½çš„樣本 + Embedded Design 嵌入å¼è¨­è¨ˆ + Device: è£ç½®ï¼š + Screen Size: 螢幕大å°ï¼š @@ -5673,31 +6660,37 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 新增 + New Promoted Class 新增æå‡çš„元件 + Base class name: 基底類別å稱: + Promoted class name: æå‡çš„類別å稱: + Header file: 標頭檔: + Global include 全域引入 + Reset é‡ç½® @@ -5721,7 +6714,7 @@ Please select another name. 分隔器 - + &Find in Text... 在文字中尋找(&F)... @@ -5729,6 +6722,7 @@ Please select another name. qdesigner_internal::ObjectInspector::ObjectInspectorPrivate + Change Current Page 變更目å‰çš„é é¢ @@ -5736,15 +6730,17 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) 索引 %1(%2) + Change Page Order 變更é é¢é †åº + Page Order é é¢é †åº @@ -5757,15 +6753,17 @@ Please select another name. 下 - + %1 %2 %1 %2 + Move page up é é¢ä¸Šç§» + Move page down é é¢ä¸‹ç§» @@ -5773,38 +6771,47 @@ Please select another name. qdesigner_internal::PaletteEditor + Edit Palette 編輯調色盤 + Tune Palette 調整調色盤 + Show Details 顯示詳情 + Compute Details 計算詳情 + Quick å¿« + Preview é è¦½ + Disabled 已關閉 + Inactive 未啟動 + Active å•Ÿå‹• @@ -5812,7 +6819,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette 變更調色盤 @@ -5820,19 +6827,22 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role é¡è‰²è§’色 + Active å•Ÿå‹• + Inactive 未啟動 + Disabled 已關閉 @@ -5840,22 +6850,28 @@ Please select another name. qdesigner_internal::PixmapEditor + Copy Path 複製路徑 + Paste Path 貼上路徑 + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + + ... ... @@ -5863,15 +6879,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text 編輯文字 + qdesigner_internal::PluginDialog + + + Components + 組件 + + + + Plugin Information + 外掛程å¼è³‡è¨Š + + + + Refresh + 刷新 + + + + Scan for newly installed custom widget plugins. + 掃æ是å¦æœ‰æ–°å®‰è£çš„自訂元件外掛程å¼ã€‚ + + + + Qt Designer couldn't find any plugins + Qt 設計家找ä¸åˆ°ä»»ä½•çš„外掛程å¼ã€‚ + + + + Qt Designer found the following plugins + Qt è¨­è¨ˆå®¶æ‰¾åˆ°ä»¥ä¸‹çš„å¤–æŽ›ç¨‹å¼ + + + + New custom widget plugins have been found. + 找到新的自訂元件外掛程å¼ã€‚ + + + TextLabel + 文字標籤 + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 æ¨£å¼ @@ -5879,27 +6941,32 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - + Load Custom Device Skin 載入自訂è£ç½®å¤–觀 + All QVFB Skins (*.%1) 所有 QVFB 外觀檔 (*.%1) + %1 - Duplicate Skin %1─複製外觀 + The skin '%1' already exists. 外觀 %1 已存在。 + %1 - Error %1─錯誤 + %1 is not a valid skin directory: %2 %1 ä¸æ˜¯åˆæ³•çš„外觀目錄: @@ -5909,7 +6976,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close 關閉(&C) @@ -5917,6 +6984,7 @@ Please select another name. qdesigner_internal::PreviewManager + %1 - [Preview] %1─[é è¦½] @@ -5928,46 +6996,57 @@ Please select another name. qdesigner_internal::PreviewWidget + Preview Window é è¦½è¦–窗 + LineEdit 行編輯器 + ComboBox 下拉å¼é¸å–® + PushButton æŒ‰éµ + ButtonGroup2 按éµç¾¤çµ„2 + CheckBox1 勾é¸ç›’1 + CheckBox2 勾é¸ç›’2 + ButtonGroup 按éµç¾¤çµ„ + RadioButton1 å–®é¸åœ“鈕1 + RadioButton2 å–®é¸åœ“鈕2 + RadioButton3 å–®é¸åœ“鈕3 @@ -5975,19 +7054,22 @@ Please select another name. qdesigner_internal::PromotionModel - + Name å稱 + Header file 標頭檔 + Global include 全域引入 + Usage 用法 @@ -5995,23 +7077,27 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... å·²æå‡å…ƒä»¶ + Promote to ... æå‡åˆ°... + Promote to æå‡åˆ° + Demote to %1 é™ç´šåˆ° %1 + Change signals/slots... 變更信號/信號槽... @@ -6019,43 +7105,52 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... 新增動態屬性... + Remove Dynamic Property 移除動態屬性 + Sorting æŽ’åº + Color Groups é¡è‰²ç¾¤çµ„ + Tree View 樹狀檢視 + Drop Down Button View 放下按éµæª¢è¦– + String... 字串... + Bool... 布林值... + Other... 其它... + Configure Property Editor 設定屬性編輯器 @@ -6066,6 +7161,7 @@ Please select another name. %2 + Object: %1 Class: %2 物件:%1 @@ -6075,7 +7171,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break æ’入行中斷 @@ -6083,23 +7179,27 @@ Class: %2 qdesigner_internal::QDesignerPromotionDialog - + Promoted Widgets å·²æå‡å…ƒä»¶ + Promoted Classes å·²æå‡é¡žåˆ¥ + Promote æå‡ + %1 - Error %1─錯誤 + Change signals/slots... 變更信號/信號槽... @@ -6107,19 +7207,22 @@ Class: %2 qdesigner_internal::QDesignerResource - + Loading qrc file 載入 qrc 檔 + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> 找ä¸åˆ°æŒ‡å®šçš„ qrc 檔 <p><b>%1</b></p><p>您è¦æ›´æ–°ä½ç½®å—Žï¼Ÿ</p> + New location for %1 %1 çš„æ–°ä½ç½® + Resource files (*.qrc) 資æºæª” (*.qrc) @@ -6127,87 +7230,112 @@ Class: %2 qdesigner_internal::QDesignerTaskMenu - + Change objectName... 變更物件å稱... + Change toolTip... 變更工具æ示... + Change whatsThis... 變更「這是什麼?ã€... + Change styleSheet... 變更樣å¼è¡¨... + Create Menu Bar 建立é¸å–®åˆ— + Add Tool Bar 新增工具列 + Create Status Bar 建立狀態列 + Remove Status Bar 移除狀態列 + Change script... 變更文稿... + Change signals/slots... 變更信號/信號槽... + Go to slot... 跳到信號槽... + Size Constraints 大å°é™åˆ¶ + Set Minimum Width 設定最å°å¯¬åº¦ + Set Minimum Height 設定最å°é«˜åº¦ + Set Minimum Size 設定最å°å¤§å° + Set Maximum Width 設定最大寬度 + Set Maximum Height 設定最大高度 + Set Maximum Size è¨­å®šæœ€å¤§å¤§å° + Edit ToolTip 編輯工具æ示 + Edit WhatsThis 編輯「這是什麼〠+ + + no signals available + + + Set size constraint on %n widget(s) 設定 %n 個元件的大å°é™åˆ¶ @@ -6217,16 +7345,20 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox + + Unexpected element <%1> 未é æœŸçš„元素 <%1> + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 在元件 %3 çš„ XML 代碼第 %1 行第 %2 個字元發生剖æžéŒ¯èª¤ï¼š%4 %5 + The XML code specified for the widget %1 does not contain any widget elements. %2 元件 %1 çš„ XML æºç¢¼æœªåŒ…å«ä»»ä½•å…ƒä»¶å…ƒç´ ã€‚ @@ -6274,8 +7406,8 @@ Class: %2 é¡è‰²æ¨£å¼ - RenameF2 - é‡æ–°å‘½åF2 + Rename F2 + é‡æ–°å‘½å F2 Form @@ -6458,27 +7590,32 @@ Class: %2 qdesigner_internal::QtGradientEditor - + Linear 線性 + Radial 放射狀 + Conical 圓éŒç‹€ + Pad 墊å­ç‹€ + Repeat é‡è¦† + Reflect åå°„ @@ -6538,59 +7675,73 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H H + S S + V V + + Hue 色調 + Sat 飽和度 + Val 數值 + Saturation 飽和度 + Value 數值 + R R + G G + B B + Red ç´… + Green 綠 + Blue è— @@ -6759,23 +7910,27 @@ Class: %2 qdesigner_internal::RichTextEditorDialog - + Edit text 編輯文字 + &OK 確定(&O) + &Cancel å–消(&C) + Rich Text Rich Text + Source ä¾†æº @@ -6783,58 +7938,72 @@ Class: %2 qdesigner_internal::RichTextEditorToolBar + Bold ç²—é«” + CTRL+B CTRL+B + Italic 斜體 + CTRL+I CTRL+I + Underline 底線 + CTRL+U CTRL+U + Left Align 置左å°é½Š + Center 置中 + Right Align ç½®å³å°é½Š + Justify å…©é‚Šå°é½Š + Superscript 上標 + Subscript 下標 + Insert &Link æ’入連çµ(&L) + Insert &Image æ’入影åƒ(&I) @@ -6842,15 +8011,17 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script 編輯文稿 + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>請輸入載入表單時è¦åŸ·è¡Œçš„文稿片段。<br>元件與å­å…ƒä»¶å¯ä»¥ç”¨è®Šæ•¸ <i>widget</i> 與 <i>childWidgets</i> 來存å–。 + Syntax error 語法錯誤 @@ -6858,7 +8029,7 @@ Class: %2 qdesigner_internal::ScriptErrorDialog - + Script errors 文稿錯誤 @@ -6873,19 +8044,23 @@ Class: %2 qdesigner_internal::SignalSlotDialog - + There is already a slot with the signature '%1'. 已經有一個信號槽,其簽章為 %1。 + There is already a signal with the signature '%1'. 已經有一個信號,其簽章為 %1。 + %1 - Duplicate Signature %1─複製簽章 + + Signals/Slots of %1 %1 的信號與信號槽 @@ -6893,11 +8068,12 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots 編輯信號與信號槽 + F4 F4 @@ -6905,7 +8081,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots 編輯信號與信號槽 @@ -6913,7 +8089,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 移除 @@ -6925,7 +8101,7 @@ Class: %2 變更字串列表 - + Change String List 變更字串列表 @@ -6933,31 +8109,38 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet 編輯樣å¼è¡¨ + + Valid Style Sheet åˆæ³•æ¨£å¼è¡¨ + Invalid Style Sheet ä¸åˆæ³•çš„樣å¼è¡¨ + Add Resource... 新增資æº... + Add Gradient... 新增漸層... + Add Color... 新增é¡è‰²... + Add Font... 新增字型... @@ -6986,23 +8169,27 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here 從這裡開始 + Restart é‡æ–°é–‹å§‹ + Tab Order List... 定ä½é»žé †åºåˆ—表... + Tab Order List 定ä½é»žé †åºåˆ—表 + Tab Order 定ä½é»žé †åº @@ -7010,7 +8197,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order 編輯定ä½é»žé †åº @@ -7018,7 +8205,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order 編輯定ä½é»žé †åº @@ -7026,35 +8213,43 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column æ–°å¢žæ¬„ä½ + New Row 新增列 + &Columns 欄(&C) + &Rows 列(&R) + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> + Edit Table Widget 編輯表格元件 + &Items é …ç›®(&I) @@ -7119,6 +8314,7 @@ Class: %2 é‡ç½®åˆ—åƒç´ åœ– + Table Items 表格項目 @@ -7182,7 +8378,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... 編輯項目... @@ -7190,18 +8386,22 @@ Class: %2 qdesigner_internal::TemplateOptionsWidget + Pick a directory to save templates in è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Form 表單 + Additional Template Paths é¡å¤–樣本路徑 + ... ... @@ -7209,19 +8409,22 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... 變更 HTML... + Edit HTML 編輯 HTML + Edit Text 編輯文字 + Change Plain Text... 變更純文字... @@ -7229,18 +8432,22 @@ Class: %2 qdesigner_internal::TextEditor + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + Choose a File é¸æ“‡æª”案 + ... ... @@ -7248,23 +8455,27 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator æ’入分隔器 + Remove action '%1' 移除動作 %1 + Remove Toolbar '%1' 移除工具列 %1 + Insert Separator before '%1' 在 %1 之å‰æ’入分隔器 + Append Separator 附加分隔器 @@ -7279,27 +8490,34 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns 欄(&C) + Per column properties æ¯æ¬„屬性 + Common properties å…±åŒå±¬æ€§ + + New Item 新增項目 + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> @@ -7308,18 +8526,22 @@ Class: %2 新增å­é …ç›® + New Column æ–°å¢žæ¬„ä½ + Edit Tree Widget 編輯樹狀圖元件 + &Items é …ç›®(&I) + Tree Items 樹狀圖項目 @@ -7352,14 +8574,18 @@ Class: %2 新增項目(&N) + + New Subitem 新增å­é …ç›® + New &Subitem 新增å­é …ç›®(&S) + Delete Item 刪除項目 @@ -7368,34 +8594,42 @@ Class: %2 刪除項目(&D) + Move Item Left (before Parent Item) 將項目左移(在父項目之å‰ï¼‰ + L L + Move Item Right (as a First Subitem of the Next Sibling Item) 將項目å³ç§»ï¼ˆç§»åˆ°å³é„°é …目的第一個å­é …目) + R R + Move Item Up 將項目上移 + U U + Move Item Down 將項目下移 + D D @@ -7448,14 +8682,17 @@ Class: %2 æ¨¹ç‹€åœ–æ¬„ä½ + 1 1 + &New 新增(&N) + &Delete 刪除(&D) @@ -7467,7 +8704,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... 編輯項目... @@ -7475,7 +8712,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. 警告:在元件盒內建立元件失敗。å¯èƒ½æ˜¯ä¸åˆæ³•çš„自訂元件 XML 造æˆçš„。 @@ -7510,34 +8747,42 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget + Scratchpad æš«å­˜ + Custom Widgets 自訂元件 + Expand all 全部展開 + Collapse all 全部折疊 + List View 列表檢視 + Icon View 圖示檢視 + Remove 移除 + Edit name 編輯å稱 @@ -7545,6 +8790,7 @@ Class: %2 qdesigner_internal::WidgetDataBase + A custom widget plugin whose class name (%1) matches that of an existing class has been found. 類別å稱為 %1 的自訂元件外掛程å¼æ‰¾åˆ°äº†ç›¸åŒå稱的類別。 @@ -7552,7 +8798,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets 編輯元件 @@ -7560,29 +8806,34 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. 類別 %1 的元件的自訂元件工廠註冊時傳回值 0。 + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. 當使用類別 %1 的元件所註冊的自訂元件工廠建立元件時,發生類別å稱ä¸ç›¸ç¬¦çš„錯誤。它傳回的元件為類別 %2 的元件。 + %1 Widget %1 元件 + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. 在建立佈局時,容器 %1(%2)裡目å‰çš„é é¢ç„¡æ³•è¢«æ±ºå®šã€‚這表示介é¢æª”中å¯èƒ½æœ‰ä¸ç›¸ç¬¦çš„情æ³ã€‚å¯èƒ½åœ¨å®¹å™¨å…ƒä»¶è£¡å·²ç¶“建構了一個佈局。 + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. 您試圖將一個佈局新增到元件 %1(%2)中,但該元件已經有一個型態為 %3 的未管ç†ä½ˆå±€ã€‚ 這表示在 ui 檔中有發生ä¸ä¸€è‡´çš„情æ³ã€‚ + Cannot create style '%1'. ç„¡æ³•å»ºç«‹æ¨£å¼ %1。 @@ -7590,10 +8841,12 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::WizardContainerWidgetTaskMenu + Next 下一個 + Back 返回 @@ -7601,8 +8854,9 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % + Zoom factor %1 % diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts index 925b6c2..712f75d 100644 --- a/translations/linguist_de.ts +++ b/translations/linguist_de.ts @@ -1,10 +1,10 @@ - - + + - + (New Entry) @@ -19,7 +19,7 @@ AboutDialog - + Qt Linguist QT Linguist @@ -27,7 +27,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -118,7 +118,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -138,10 +138,21 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + EditorPage @@ -201,7 +212,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. Zusätzliche Kurztaste im Ãœbersetzungstext. @@ -373,7 +384,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -922,9 +933,8 @@ p, li { white-space: pre-wrap; } Gehe zum nächsten unerledigten Eintrag. - Ctrl+L - Ctrl+L + Ctrl+L @@ -950,9 +960,8 @@ p, li { white-space: pre-wrap; } Gehe zum nächsten Eintrag. - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -1153,13 +1162,13 @@ p, li { white-space: pre-wrap; } Eryeuge eine Qt Nachrichtendatei aus der aktuellen Ãœbersetzungsdatei. Der Dateiname wird automatisch aus dem Namen der .ts Datei abgeleitet. - + This is the application's main window. - + Source text Ursprungstext @@ -1212,32 +1221,32 @@ p, li { white-space: pre-wrap; } - + Loading... Lade... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. @@ -1245,7 +1254,7 @@ Skip loading the first named file? - + Related files (%1);; @@ -1255,20 +1264,20 @@ Skip loading the first named file? - - + + File saved. Datei gespeichert. - - + + Release Freigeben - + Qt message files for released applications (*.qm) All files (*) Qt Nachrichtendateien (*.qm) @@ -1332,7 +1341,7 @@ Alle Dateien (*) - + @@ -1344,7 +1353,7 @@ Alle Dateien (*) - + Cannot find the string '%1'. Kann Zeichenkette '%1' nicht finden. @@ -1449,27 +1458,11 @@ Alle Dateien (*) Version %1 - Open Source Edition - Open Source Edition - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + Open Source Edition - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ist ein Werkzeug zum Ãœbersetzen von Qt Anwendungen.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1652,7 +1645,7 @@ Alle Dateien (*) - + All @@ -1672,7 +1665,7 @@ Alle Dateien (*) F5 - + Translation File &Settings... E&instellungen... @@ -1695,11 +1688,21 @@ Alle Dateien (*) Ctrl+T Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German Deutsch @@ -1834,7 +1837,7 @@ Zeile: %2 Index - + Completion status for %1 @@ -1864,7 +1867,7 @@ Zeile: %2 MsgEdit - + This is the right panel of the main window. @@ -1877,13 +1880,13 @@ Zeile: %2 %1 - %2[*] - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist @@ -2002,7 +2005,7 @@ Zeile: %2 PhraseModel - + Source phrase Ursprungstext @@ -2020,7 +2023,7 @@ Zeile: %2 PhraseView - + Insert Einfügen @@ -2048,7 +2051,7 @@ Zeile: %2 - + Translation files (%1);; @@ -2058,37 +2061,38 @@ Zeile: %2 - + - + + - + Qt Linguist Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -2099,11 +2103,11 @@ Zeile: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -2113,10 +2117,15 @@ Zeile: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2155,7 +2164,7 @@ Zeile: %2 SourceCodeView - + <i>Source code not available</i> <i>Quelltext nicht verfügbar</i> @@ -2710,7 +2719,7 @@ Alle Dateien (*) TranslationSettingsDialog - + Any Country Land diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts index ad346bf..b8317b2 100644 --- a/translations/linguist_fr.ts +++ b/translations/linguist_fr.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -11,7 +12,7 @@ AboutDialog - + Qt Linguist @@ -19,7 +20,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -109,7 +110,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -129,15 +130,26 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. @@ -274,7 +286,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -707,11 +719,6 @@ - Ctrl+L - - - - P&rev @@ -727,11 +734,6 @@ - Ctrl+Shift+L - - - - &Done and Next @@ -909,13 +911,13 @@ - + This is the application's main window. - + Source text @@ -968,39 +970,39 @@ - + Loading... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -1010,20 +1012,20 @@ Skip loading the first named file? - - + + File saved. - - + + Release - + Qt message files for released applications (*.qm) All files (*) @@ -1086,7 +1088,7 @@ All files (*) - + @@ -1098,7 +1100,7 @@ All files (*) - + Cannot find the string '%1'. @@ -1193,27 +1195,7 @@ All files (*) - - Open Source Edition - - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1396,7 +1378,7 @@ All files (*) - + All @@ -1416,7 +1398,7 @@ All files (*) - + Translation File &Settings... @@ -1431,11 +1413,21 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German @@ -1529,7 +1521,7 @@ Line: %2 MessageModel - + Completion status for %1 @@ -1552,7 +1544,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1561,13 +1553,13 @@ Line: %2 PhraseBookBox - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist @@ -1670,7 +1662,7 @@ Line: %2 PhraseModel - + Source phrase @@ -1688,7 +1680,7 @@ Line: %2 PhraseView - + Insert @@ -1716,7 +1708,7 @@ Line: %2 - + Translation files (%1);; @@ -1726,37 +1718,38 @@ Line: %2 - + - + + - + Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -1767,11 +1760,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -1781,15 +1774,20 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> @@ -1932,7 +1930,7 @@ Line: %2 TranslationSettingsDialog - + Any Country diff --git a/translations/linguist_ja.ts b/translations/linguist_ja.ts index 41c24ca..7af3ebb 100644 --- a/translations/linguist_ja.ts +++ b/translations/linguist_ja.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -18,7 +19,7 @@ AboutDialog - + Qt Linguist Qt Linguist @@ -30,7 +31,7 @@ %1 é …ç›®ãŒä¸€æ‹¬ç¿»è¨³ã•ã‚Œã¾ã—㟠- + &Cancel キャンセル(&C) @@ -135,7 +136,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -155,10 +156,21 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + EditorPage @@ -186,7 +198,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. 訳ã«ä½™åˆ†ãªã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ãŒã¤ã„ã¦ã„ã¾ã™ã€‚ @@ -373,7 +385,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -507,9 +519,8 @@ Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -552,9 +563,8 @@ Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -838,13 +848,13 @@ ソート順åºã‚’åˆæœŸçŠ¶æ…‹ã«(&R) - + This is the application's main window. - + Source text ソーステキスト @@ -897,39 +907,39 @@ - + Loading... ロードã—ã¦ã„ã¾ã™... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -939,20 +949,20 @@ Skip loading the first named file? - - + + File saved. ファイルãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚ - - + + Release リリース - + Qt message files for released applications (*.qm) All files (*) リリースã•ã‚ŒãŸã‚¢ãƒ—リケーション用㮠Qt メッセージファイル (*.qm) @@ -1016,7 +1026,7 @@ All files (*) - + @@ -1028,7 +1038,7 @@ All files (*) Qt Linguist - + Cannot find the string '%1'. 文字列 '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 @@ -1134,27 +1144,19 @@ All files (*) ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 - Open Source Edition - オープンソース版 + オープンソース版 - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Linguist ã¯ã€ オープンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <tt>http://qtsoftware.com/company/model.html</tt> ã‚’ã”覧ãã ã•ã„。 - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - + ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Linguist ã¯ã€ オープンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <tt>http://qtsoftware.com/company/model.html</tt> ã‚’ã”覧ãã ã•ã„。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。 + ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。 - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ã¯ã€Qt アプリケーションã®ç¿»è¨³ã‚’è¡Œã†ãƒ„ールã§ã™ã€‚</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). å…¨ã¦ã®æ¨©åˆ©ã¯ä¿è­·ã•ã‚Œã¦ã„ã¾ã™ã€‚</p><p>ã“ã®ãƒ—ログラムã¯ã€ã€Œè¨­è¨ˆã€ã€ã€Œå¸‚場性ã€ãŠã‚ˆã³ã€Œç‰¹å®šã®ç›®çš„ã¸ã®é©åˆæ€§ã€ã‚‚å«ã‚€ã€ã‚らゆる種類ã®ã€Œä¿è¨¼ãŒãªãã€ã€ã€Œãã®ã¾ã¾ã§ã€æä¾›ã•ã‚Œã¾ã™ã€‚</p> @@ -1320,7 +1322,7 @@ All files (*) - + All @@ -1409,7 +1411,7 @@ All files (*) ツール(&L) - + Translation 翻訳 @@ -1645,6 +1647,16 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1693,7 +1705,7 @@ All files (*) タブ - + German @@ -1807,7 +1819,7 @@ Line: %2 項目数 - + Completion status for %1 @@ -1837,7 +1849,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1973,7 +1985,7 @@ Line: %2 訳(&T): - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1982,7 +1994,7 @@ Line: %2 PhraseModel - + Definition 定義 @@ -2000,7 +2012,7 @@ Line: %2 PhraseView - + Insert @@ -2028,7 +2040,7 @@ Line: %2 - + Translation files (%1);; @@ -2038,37 +2050,38 @@ Line: %2 - + - + + - + Qt Linguist Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -2079,11 +2092,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -2093,10 +2106,15 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2127,7 +2145,7 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> @@ -2688,7 +2706,7 @@ All files (*) TranslationSettingsDialog - + Any Country 指定ã—ãªã„ diff --git a/translations/linguist_pl.ts b/translations/linguist_pl.ts index 12b98d5..efed849 100644 --- a/translations/linguist_pl.ts +++ b/translations/linguist_pl.ts @@ -1,10 +1,10 @@ - - + + - + (New Entry) (Nowe wyrażenie) @@ -12,7 +12,7 @@ AboutDialog - + Qt Linguist Qt Linguist @@ -20,7 +20,7 @@ BatchTranslationDialog - + Batch translated %n entries Automat przetÅ‚umaczyÅ‚ %n wpis @@ -112,7 +112,7 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>Znaleziono powtórzenia w '%1': @@ -132,15 +132,26 @@ <br>* Komentarz: %3 - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 Nie można utworzyć '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. Prawdopodobnie nadmiarowy klawisz skrótu w tÅ‚umaczeniu. @@ -277,7 +288,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -406,9 +417,8 @@ Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -451,9 +461,8 @@ Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -676,13 +685,13 @@ Zamienia tÅ‚umaczenia we wszystkich pasujÄ…cych do wzorca wpisach. - + This is the application's main window. - + Source text Tekst źródÅ‚owy @@ -735,18 +744,18 @@ MOD - + Loading... Åadowanie... + - Loading File - Qt Linguist Wczytywanie pliku - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -755,7 +764,7 @@ Close the open file(s) first? Czy chcesz najpierw zamknąć otwarty plik (pliki)? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -764,7 +773,7 @@ Skip loading the first named file? Czy chcesz pominąć pierwszy plik? - + %n translation unit(s) loaded. ZaÅ‚adowano %n część z tÅ‚umaczeniami. @@ -773,7 +782,7 @@ Czy chcesz pominąć pierwszy plik? - + Related files (%1);; ZwiÄ…zane pliki (%1);; @@ -783,20 +792,20 @@ Czy chcesz pominąć pierwszy plik? Otwórz pliki z tÅ‚umaczeniami - - + + File saved. Plik zachowany. - - + + Release Wydaj - + Qt message files for released applications (*.qm) All files (*) Pliki z wydanymi tÅ‚umaczeniami (*.qm) @@ -860,7 +869,7 @@ Wszystkie pliki (*) - + @@ -872,7 +881,7 @@ Wszystkie pliki (*) Qt Linguist - + Cannot find the string '%1'. Nie można znaleźć tekstu '%1'. @@ -984,27 +993,19 @@ Wszystkie pliki (*) Wersja %1 - Open Source Edition - Wydanie Open Source + Wydanie Open Source - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - Ta wersja Qt Linguist jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. + Ta wersja Qt Linguist jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - Ten program wydany jest na licencji Qt Commercial. Aby sprawdzić szczegóły licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czany jest do pakietu Qt. + Ten program wydany jest na licencji Qt Commercial. Aby sprawdzić szczegóły licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czany jest do pakietu Qt. - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1170,7 +1171,7 @@ Wszystkie pliki (*) Czy chcesz zachować książke wyrażeÅ„ '%1'? - + All Wszystko @@ -1240,7 +1241,7 @@ Wszystkie pliki (*) &TÅ‚umaczenie - + Translation TÅ‚umaczenie @@ -1468,11 +1469,21 @@ Wszystkie pliki (*) Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. PrzeÅ‚Ä…cz sprawdzanie zgodnoÅ›ci znaczników, tzn. czy: %1, %2, ... sÄ… spójnie użyte w tekÅ›cie źródÅ‚owym i tÅ‚umaczeniu. W przypadku niezgodnoÅ›ci pojawia siÄ™ komunikat w oknie z ostrzeżeniami. + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German Niemieckie @@ -1567,7 +1578,7 @@ Linia: %2 MessageModel - + Completion status for %1 Stan ukoÅ„czenia dla %1 @@ -1590,7 +1601,7 @@ Linia: %2 MsgEdit - + This is the right panel of the main window. @@ -1699,7 +1710,7 @@ Linia: %2 &TÅ‚umaczenie: - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1708,7 +1719,7 @@ Linia: %2 PhraseModel - + Definition Definicja @@ -1726,7 +1737,7 @@ Linia: %2 PhraseView - + Insert Wstaw @@ -1754,7 +1765,7 @@ Linia: %2 Skompilowane tÅ‚umaczenia Qt - + Translation files (%1);; Pliki z tÅ‚umaczeniami (%1);; @@ -1764,37 +1775,38 @@ Linia: %2 Wszystkie pliki (*) - + - + + - + Qt Linguist Qt Linguist - + C++ source files Pliki źródÅ‚owe C++ - + Java source files Pliki źródÅ‚owe Java - + GNU Gettext localization files Pliki GNU Gettext - + Qt Script source files Pliki źródÅ‚owe Qt Script - + Qt translation sources (format 1.1) ŹródÅ‚a tlumaczeÅ„ Qt (format 1.1) @@ -1805,11 +1817,15 @@ Linia: %2 + Qt translation sources (latest format) + + + Qt translation sources - ŹródÅ‚a tlumaczeÅ„ Qt + ŹródÅ‚a tlumaczeÅ„ Qt - + Qt Designer form files Pliki z formularzami Qt Designer @@ -1819,15 +1835,20 @@ Linia: %2 Pliki z formularzami Qt Jambi - + XLIFF localization files Pliki XLIFF + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> <i>Kod źródÅ‚owy nie jest dostÄ™pny</i> @@ -1970,7 +1991,7 @@ Linia: %2 TranslationSettingsDialog - + Any Country Dowolny kraj diff --git a/translations/linguist_tr_TR.ts b/translations/linguist_tr_TR.ts new file mode 100644 index 0000000..1a1baa8 --- /dev/null +++ b/translations/linguist_tr_TR.ts @@ -0,0 +1,1955 @@ + + + + + + + + (New Entry) + + + + + AboutDialog + + + Qt Linguist + + + + + BatchTranslationDialog + + + Qt Linguist - Batch Translation + + + + + Options + + + + + Set translated entries to finished + + + + + Retranslate entries with existing translation + + + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. + + + + + Translate also finished entries + + + + + Phrase book preference + + + + + Move up + + + + + Move down + + + + + The batch translator will search through the selected phrase books in the order given above. + + + + + &Run + + + + + Cancel + + + + + Batch Translation of '%1' - Qt Linguist + + + + + Searching, please wait... + + + + + &Cancel + + + + + Linguist batch translator + + + + + Batch translated %n entries + + + + + + + DataModel + + + <qt>Duplicate messages found in '%1': + + + + + <p>[more duplicates omitted] + + + + + <p>* Context: %1<br>* Source: %2 + + + + + <br>* Comment: %3 + + + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + + Cannot create '%2': %1 + + + + + Universal Form + + + + + ErrorsView + + + Accelerator possibly superfluous in translation. + + + + + Accelerator possibly missing in translation. + + + + + Translation does not end with the same punctuation as the source text. + + + + + A phrase book suggestion for '%1' was ignored. + + + + + Translation does not refer to the same place markers as in the source text. + + + + + Translation does not contain the necessary %n place marker. + + + + + Unknown error + + + + + FindDialog + + + + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + + + + + Find + + + + + This window allows you to search for some text in the translation source file. + + + + + &Find what: + + + + + Type in the text to search for. + + + + + Options + + + + + Source texts are searched when checked. + + + + + &Source texts + + + + + Translations are searched when checked. + + + + + &Translations + + + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + + + + + &Match case + + + + + Comments and contexts are searched when checked. + + + + + &Comments + + + + + Ignore &accelerators + + + + + Click here to find the next occurrence of the text you typed in. + + + + + Find Next + + + + + Click here to close this window. + + + + + Cancel + + + + + LRelease + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + + + + + + + Ignored %n untranslated source text(s) + + + + + + + + MainWindow + + + + This is the application's main window. + + + + + Source text + + + + + + Index + + + + + + Context + + + + + Items + + + + + This panel lists the source contexts. + + + + + Strings + + + + + Phrases and guesses + + + + + Sources and Forms + + + + + Warnings + + + + + MOD + status bar: file(s) modified + + + + + Loading... + + + + + + Loading File - Qt Linguist + + + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + + + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + + + + + %n translation unit(s) loaded. + + + + + + + Related files (%1);; + + + + + Open Translation Files + + + + + + File saved. + + + + + + + Release + + + + + Qt message files for released applications (*.qm) +All files (*) + + + + + + File created. + + + + + + Printing... + + + + + Context: %1 + + + + + finished + + + + + unresolved + + + + + obsolete + + + + + + Printing... (page %1) + + + + + + Printing completed + + + + + + Printing aborted + + + + + Search wrapped. + + + + + + + + + + + + + + Qt Linguist + + + + + + Cannot find the string '%1'. + + + + + Search And Translate in '%1' - Qt Linguist + + + + + + + Translate - Qt Linguist + + + + + Translated %n entry(s) + + + + + + + No more occurrences of '%1'. Start over? + + + + + Create New Phrase Book + + + + + Qt phrase books (*.qph) +All files (*) + + + + + Phrase book created. + + + + + Open Phrase Book + + + + + Qt phrase books (*.qph);;All files (*) + + + + + %n phrase(s) loaded. + + + + + + + + + Add to phrase book + + + + + No appropriate phrasebook found. + + + + + Adding entry to phrasebook %1 + + + + + Select phrase book to add to + + + + + Unable to launch Qt Assistant (%1) + + + + + Version %1 + + + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + + + + + Do you want to save the modified files? + + + + + Do you want to save '%1'? + + + + + Qt Linguist[*] + + + + + %1[*] - Qt Linguist + + + + + + No untranslated translation units left. + + + + + &Window + + + + + Minimize + + + + + Ctrl+M + + + + + Display the manual for %1. + + + + + Display information about %1. + + + + + &Save '%1' + + + + + Save '%1' &As... + + + + + Release '%1' + + + + + Release '%1' As... + + + + + &Close '%1' + + + + + + &Save + + + + + + + Save &As... + + + + + + + Release As... + + + + + + &Close + + + + + Save All + + + + + + &Release All + + + + + Close All + + + + + &Release + + + + + Translation File &Settings for '%1'... + + + + + &Batch Translation of '%1'... + + + + + Search And &Translate in '%1'... + + + + + + Translation File &Settings... + + + + + + &Batch Translation... + + + + + Search And &Translate... + + + + + + File + + + + + + Edit + + + + + + Translation + + + + + + Validation + + + + + + Help + + + + + Cannot read from phrase book '%1'. + + + + + Close this phrase book. + + + + + Enables you to add, modify, or delete entries in this phrase book. + + + + + Print the entries in this phrase book. + + + + + Cannot create phrase book '%1'. + + + + + Do you want to save phrase book '%1'? + + + + + All + + + + + MainWindow + + + + + &Phrases + + + + + &Close Phrase Book + + + + + &Edit Phrase Book + + + + + &Print Phrase Book + + + + + V&alidation + + + + + &View + + + + + Vie&ws + + + + + &Toolbars + + + + + &Help + + + + + &Translation + + + + + &File + + + + + Recently Opened &Files + + + + + &Edit + + + + + &Open... + + + + + Open a Qt translation source file (TS file) for editing + + + + + Ctrl+O + + + + + E&xit + + + + + Close this window and exit. + + + + + Ctrl+Q + + + + + Save + + + + + Save changes made to this Qt translation source file + + + + + Save As... + + + + + Save changes made to this Qt translation source file into a new file. + + + + + Create a Qt message file suitable for released applications from the current message file. + + + + + &Print... + + + + + Print a list of all the translation units in the current translation source file. + + + + + Ctrl+P + + + + + &Undo + + + + + Undo the last editing operation performed on the current translation. + + + + + Ctrl+Z + + + + + &Redo + + + + + Redo an undone editing operation performed on the translation. + + + + + Ctrl+Y + + + + + Cu&t + + + + + Copy the selected translation text to the clipboard and deletes it. + + + + + Ctrl+X + + + + + &Copy + + + + + Copy the selected translation text to the clipboard. + + + + + Ctrl+C + + + + + &Paste + + + + + Paste the clipboard text into the translation. + + + + + Ctrl+V + + + + + Select &All + + + + + Select the whole translation text. + + + + + Ctrl+A + + + + + &Find... + + + + + Search for some text in the translation source file. + + + + + Ctrl+F + + + + + Find &Next + + + + + Continue the search where it was left. + + + + + F3 + + + + + &Prev Unfinished + + + + + Previous unfinished item. + + + + + Move to the previous unfinished item. + + + + + Ctrl+K + + + + + &Next Unfinished + + + + + Next unfinished item. + + + + + Move to the next unfinished item. + + + + + Ctrl+J + + + + + P&rev + + + + + Move to previous item. + + + + + Move to the previous item. + + + + + Ctrl+Shift+K + + + + + Ne&xt + + + + + Next item. + + + + + Move to the next item. + + + + + Ctrl+Shift+J + + + + + &Done and Next + + + + + Mark item as done and move to the next unfinished item. + + + + + Mark this item as done and move to the next unfinished item. + + + + + Copy from source text + + + + + Copies the source text into the translation field. + + + + + Ctrl+B + + + + + &Accelerators + + + + + Toggle the validity check of accelerators. + + + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + + + + + &Ending Punctuation + + + + + Toggle the validity check of ending punctuation. + + + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + + + + + &Phrase matches + + + + + Toggle checking that phrase suggestions are used. + + + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + + + + + Place &Marker Matches + + + + + Toggle the validity check of place markers. + + + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + + + + + &New Phrase Book... + + + + + Create a new phrase book. + + + + + Ctrl+N + + + + + &Open Phrase Book... + + + + + Open a phrase book to assist translation. + + + + + Ctrl+H + + + + + &Reset Sorting + + + + + Sort the items back in the same order as in the message file. + + + + + &Display guesses + + + + + Set whether or not to display translation guesses. + + + + + &Statistics + + + + + Display translation statistics. + + + + + &Manual + + + + + F1 + + + + + About Qt Linguist + + + + + About Qt + + + + + Display information about the Qt toolkit by Trolltech. + + + + + &What's This? + + + + + What's This? + + + + + Enter What's This? mode. + + + + + Shift+F1 + + + + + &Search And Translate... + + + + + Replace the translation on all entries that matches the search source text. + + + + + Batch translate all entries using the information in the phrase books. + + + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. + + + + + Open/Refresh Form &Preview + + + + + Form Preview Tool + + + + + F5 + + + + + &Add to Phrase Book + + + + + Ctrl+T + + + + + Open Read-O&nly... + + + + + &Save All + + + + + Ctrl+S + + + + + Close + + + + + &Close All + + + + + Ctrl+W + + + + + MessageEditor + + + German + + + + + Japanese + + + + + French + + + + + Polish + + + + + Chinese + + + + + This whole panel allows you to view and edit the translation of some source text. + + + + + Source text + + + + + This area shows the source text. + + + + + Source text (Plural) + + + + + This area shows the plural form of the source text. + + + + + Developer comments + + + + + This area shows a comment that may guide you, and the context in which the text occurs. + + + + + Here you can enter comments for your own use. They have no effect on the translated applications. + + + + + %1 translation (%2) + + + + + This is where you can enter or modify the translation of the above source text. + + + + + %1 translation + + + + + %1 translator comments + + + + + '%1' +Line: %2 + + + + + MessageModel + + + Completion status for %1 + + + + + <file header> + + + + + <context comment> + + + + + <unnamed context> + + + + + MsgEdit + + + + This is the right panel of the main window. + + + + + PhraseBookBox + + + + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + + + + + %1[*] - Qt Linguist + + + + + Qt Linguist + + + + + Cannot save phrase book '%1'. + + + + + Edit Phrase Book + + + + + This window allows you to add, modify, or delete entries in a phrase book. + + + + + &Translation: + + + + + This is the phrase in the target language corresponding to the source phrase. + + + + + S&ource phrase: + + + + + This is a definition for the source phrase. + + + + + This is the phrase in the source language. + + + + + &Definition: + + + + + Click here to add the phrase to the phrase book. + + + + + &New Entry + + + + + Click here to remove the entry from the phrase book. + + + + + &Remove Entry + + + + + Settin&gs... + + + + + Click here to save the changes made. + + + + + &Save + + + + + Click here to close this window. + + + + + Close + + + + + PhraseModel + + + Source phrase + + + + + Translation + + + + + Definition + + + + + PhraseView + + + Insert + + + + + Edit + + + + + Guess (%1) + + + + + Guess + + + + + QObject + + + Translation files (%1);; + + + + + All files (*) + + + + + + + + + + + Qt Linguist + + + + + C++ source files + + + + + Java source files + + + + + GNU Gettext localization files + + + + + Compiled Qt translations + + + + + Qt Linguist 'Phrase Book' + + + + + Qt Script source files + + + + + Qt translation sources (format 1.1) + + + + + Qt translation sources (format 2.0) + + + + + Qt translation sources (latest format) + + + + + Qt Designer form files + + + + + Qt Jambi form files + + + + + XLIFF localization files + + + + + SourceCodeView + + + <i>Source code not available</i> + + + + + <i>File %1 not available</i> + + + + + <i>File %1 not readable</i> + + + + + Statistics + + + Statistics + + + + + Close + + + + + Translation + + + + + Source + + + + + 0 + + + + + Words: + + + + + Characters: + + + + + Characters (with spaces): + + + + + TranslateDialog + + + This window allows you to search for some text in the translation source file. + + + + + Type in the text to search for. + + + + + Find &source text: + + + + + &Translate to: + + + + + Search options + + + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + + + + + Match &case + + + + + Mark new translation as &finished + + + + + Click here to find the next occurrence of the text you typed in. + + + + + Find Next + + + + + Translate + + + + + Translate All + + + + + Click here to close this window. + + + + + Cancel + + + + + TranslationSettingsDialog + + + Source language + + + + + Language + + + + + Country/Region + + + + + Target language + + + + + Any Country + + + + + + Settings for '%1' - Qt Linguist + + + + diff --git a/translations/linguist_untranslated.ts b/translations/linguist_untranslated.ts index 5690378..ae3ff20 100644 --- a/translations/linguist_untranslated.ts +++ b/translations/linguist_untranslated.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -11,7 +12,7 @@ AboutDialog - + Qt Linguist @@ -19,7 +20,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -109,7 +110,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -129,15 +130,26 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. @@ -274,7 +286,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -572,11 +584,6 @@ - Ctrl+L - - - - P&rev @@ -592,11 +599,6 @@ - Ctrl+Shift+L - - - - &Done and Next @@ -743,13 +745,13 @@ - + This is the application's main window. - + Source text @@ -802,39 +804,39 @@ - + Loading... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -844,20 +846,20 @@ Skip loading the first named file? - - + + File saved. - - + + Release - + Qt message files for released applications (*.qm) All files (*) @@ -920,7 +922,7 @@ All files (*) - + @@ -932,7 +934,7 @@ All files (*) - + Cannot find the string '%1'. @@ -1027,27 +1029,7 @@ All files (*) - - Open Source Edition - - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1230,7 +1212,7 @@ All files (*) - + All @@ -1410,7 +1392,7 @@ All files (*) - + &Batch Translation... @@ -1431,11 +1413,21 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German @@ -1529,7 +1521,7 @@ Line: %2 MessageModel - + Completion status for %1 @@ -1552,7 +1544,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1661,7 +1653,7 @@ Line: %2 - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1670,7 +1662,7 @@ Line: %2 PhraseModel - + Source phrase @@ -1688,7 +1680,7 @@ Line: %2 PhraseView - + Insert @@ -1716,7 +1708,7 @@ Line: %2 - + Translation files (%1);; @@ -1726,37 +1718,38 @@ Line: %2 - + - + + - + Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -1767,11 +1760,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -1781,15 +1774,20 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> @@ -1932,7 +1930,7 @@ Line: %2 TranslationSettingsDialog - + Any Country diff --git a/translations/linguist_zh_CN.ts b/translations/linguist_zh_CN.ts index a9ecdb6..3a81543 100644 --- a/translations/linguist_zh_CN.ts +++ b/translations/linguist_zh_CN.ts @@ -1,7 +1,6 @@ - @@ -9,7 +8,7 @@ (新短语) - + (New Entry) (新æ¡ç›®ï¼‰ @@ -17,7 +16,7 @@ AboutDialog - + Qt Linguist Qt 语言家 @@ -25,7 +24,7 @@ BatchTranslationDialog - + Batch translated %n entries å·²ç»æ‰¹ç¿»è¯‘ %n 个æ¡ç›® @@ -115,7 +114,7 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>在“%1â€ä¸­æ‰¾åˆ°çš„é‡å¤ä¿¡æ¯ï¼š @@ -135,10 +134,21 @@ <br>* 注释:%3 - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 ä¸èƒ½åˆ›å»º'%2': %1 + + + Universal Form + + EditorPage @@ -198,7 +208,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. 译文中å¯èƒ½åŠ é€Ÿé”®è¿‡å¤šã€‚ @@ -342,7 +352,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -538,9 +548,8 @@ p, li { white-space: pre-wrap; } Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -583,9 +592,8 @@ p, li { white-space: pre-wrap; } Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -816,13 +824,13 @@ p, li { white-space: pre-wrap; } 替æ¢æ‰€æœ‰å’Œæœç´¢çš„æºæ–‡åŒ¹é…çš„æ¡ç›®çš„译文。 - + This is the application's main window. - + Source text æºæ–‡ @@ -875,18 +883,18 @@ p, li { white-space: pre-wrap; } 已修改 - + Loading... 正在载入... + - Loading File - Qt Linguist 正在载入文件 - Qt 语言家 - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -895,7 +903,7 @@ Close the open file(s) first? è¦å°†æ‰“开的文件先关闭么? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -904,14 +912,14 @@ Skip loading the first named file? è¦è·³è¿‡å¯¹ç¬¬ä¸€ä¸ªæ–‡ä»¶çš„加载么? - + %n translation unit(s) loaded. %n 个翻译å•å…ƒå·²ç»è¢«åŠ è½½ã€‚ - + Related files (%1);; 相关文件(%1);; @@ -921,20 +929,20 @@ Skip loading the first named file? 打开翻译文件 - - + + File saved. 文件已ä¿å­˜ã€‚ - - + + Release å‘布 - + Qt message files for released applications (*.qm) All files (*) 用于å‘布应用程åºçš„ Qt 消æ¯æ–‡ä»¶ (*.qm) @@ -998,7 +1006,7 @@ All files (*) - + @@ -1010,7 +1018,7 @@ All files (*) Qt 语言家 - + Cannot find the string '%1'. 无法找到字符串“%1â€ã€‚ @@ -1116,27 +1124,23 @@ All files (*) %1 版本 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - 这个版本的 Qt 语言家是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/model.html</tt>。 + 这个版本的 Qt 语言家是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/model.html</tt>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的å议文件。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt 语言家是一个用于为 Qt 应用程åºæ·»åŠ ç¿»è¯‘的工具。</p><p>%2</p><p>版æƒæ‰€æœ‰ (C) 2000-$THISYEAR$ Nokiaå…¬å¸å’Œ/或它的å­å…¬å¸ã€‚所有æƒåˆ©å·²è¢«ä¿ç•™ã€‚</p><p>本程åºæ˜¯åœ¨<b>没有任何担ä¿ï¼ˆå…¶ä¸­åŒ…括任何特定目的的设计ã€å•†ä¸šå’Œé€‚当性的担ä¿ï¼‰</b>çš„æ¡ä»¶ä¸‹æ供的。</p> @@ -1302,7 +1306,7 @@ All files (*) 是å¦ä¿å­˜çŸ­è¯­ä¹¦'%1'? - + All 全部 @@ -1376,7 +1380,7 @@ All files (*) 译文(&T) - + Translation 译文 @@ -1624,6 +1628,16 @@ All files (*) Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. 切æ¢ç»“æŸæ ‡ç‚¹æœ‰æ•ˆæ€§æ£€æŸ¥ã€‚如果检查失败,会在警告窗å£ä¸­æ˜¾ç¤ºä¸€æ¡æ¶ˆæ¯ã€‚ + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1652,7 +1666,7 @@ All files (*) 制表符 - + German 德语 @@ -1762,7 +1776,7 @@ Line: %2 索引 - + Completion status for %1 %1 的完æˆçŠ¶æ€ @@ -1792,7 +1806,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1801,13 +1815,13 @@ Line: %2 PhraseBookBox - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist %1[*] - Qt 语言家 @@ -1930,7 +1944,7 @@ Line: %2 PhraseModel - + Definition 准确度 @@ -1948,7 +1962,7 @@ Line: %2 PhraseView - + Insert æ’å…¥ @@ -1976,7 +1990,7 @@ Line: %2 已编译的 Qt 翻译 - + Translation files (%1);; 翻译文件(%1);; @@ -1986,37 +2000,38 @@ Line: %2 全部文件(*) - + - + + - + Qt Linguist Qt 语言家 - + C++ source files C++æºæ–‡ä»¶ - + Java source files Javaæºæ–‡ä»¶ - + GNU Gettext localization files GNU Gettext 本地化文件 - + Qt Script source files Qt脚本æºæ–‡ä»¶ - + Qt translation sources (format 1.1) Qt翻译æºï¼ˆæ ¼å¼1.1) @@ -2027,11 +2042,15 @@ Line: %2 + Qt translation sources (latest format) + + + Qt translation sources - Qtç¿»è¯‘æº + Qtç¿»è¯‘æº - + Qt Designer form files Qt设计师表å•æ–‡ä»¶ @@ -2041,10 +2060,15 @@ Line: %2 Qt Jambi表å•æ–‡ä»¶ - + XLIFF localization files XLIFF 本地化文件 + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2083,7 +2107,7 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> <i>æºä»£ç ä¸å¯ç”¨</i> @@ -2651,7 +2675,7 @@ XLIFF 本地化文件 (*.xlf) TranslationSettingsDialog - + Any Country ä»»æ„国家 diff --git a/translations/linguist_zh_TW.ts b/translations/linguist_zh_TW.ts index 47aff95..7bb7e57 100644 --- a/translations/linguist_zh_TW.ts +++ b/translations/linguist_zh_TW.ts @@ -1,6 +1,6 @@ - - + + @@ -8,7 +8,7 @@ (新片語) - + (New Entry) (新項目) @@ -23,7 +23,7 @@ AboutDialog - + Qt Linguist Qt 語言家 @@ -31,73 +31,89 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist 批次翻譯 %1 ─ Qt 語言家 + Searching, please wait... æœå°‹ä¸­ï¼Œè«‹ç¨å€™... + &Cancel å–消(&C) + Linguist batch translator 語言家批次翻譯器 + Batch translated %n entries 已批次翻譯 %n 個æ¢ç›® + Qt Linguist - Batch Translation Qt 語言家─批次翻譯 + Options é¸é … + Set translated entries to finished 將已翻譯æ¢ç›®è¨­ç‚ºå®Œæˆ + Retranslate entries with existing translation 以ç¾æœ‰çš„翻譯來é‡æ–°ç¿»è­¯é …ç›® + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. 注æ„,若上述的「將已翻譯æ¢ç›®è¨­ç‚ºå®Œæˆã€æœªè¢«å‹¾é¸ï¼Œå‰‡è®Šæ›´çš„項目將會設為「未完æˆã€ã€‚ + Translate also finished entries 也å°å·²å®Œæˆçš„é …ç›®åšç¿»è­¯ + Phrase book preference 片語書喜好設定 + Move up 上移 + Move down 下移 + The batch translator will search through the selected phrase books in the order given above. 批次翻譯器會ä¾æŒ‡å®šçš„é †åºæœå°‹é¸å–的片語書。 + &Run 執行(&R) + Cancel å–消 @@ -105,26 +121,41 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>複製在 %1 找到的訊æ¯ï¼š + <p>[more duplicates omitted] <p>[çœç•¥æ›´å¤šè¤‡è£½] + <p>* Context: %1<br>* Source: %2 <p>* 內文:%1<br>* æºç¢¼ï¼š%2 + <br>* Comment: %3 <br>* 註解:%3 + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 無法建立 %2:%1 + + + Universal Form + + EditorPage @@ -196,31 +227,37 @@ ErrorsView - + Accelerator possibly superfluous in translation. 翻譯中的快æ·éµå¯èƒ½éŽå¤šã€‚ + Accelerator possibly missing in translation. 翻譯中的快æ·éµå¯èƒ½æœ‰éºå¤±ã€‚ + Translation does not end with the same punctuation as the source text. 翻譯沒有以與原始訊æ¯ç›¸åŒçš„標點çµæŸã€‚ + A phrase book suggestion for '%1' was ignored. å° %1 的片語書建議已被忽略。 + Translation does not refer to the same place markers as in the source text. 翻譯中使用了原始訊æ¯ä¸­æ²’有的åƒæ•¸ç¬¦ã€‚ + Translation does not contain the necessary %n place marker. 翻譯中未包å«å¿…須的 %n åƒæ•¸ç¬¦ã€‚ + Unknown error 未知的錯誤 @@ -232,6 +269,7 @@ Qt 語言家 + This window allows you to search for some text in the translation source file. 此視窗讓您æœå°‹ç¿»è­¯æºç¢¼æª”中的一些文字。 @@ -240,14 +278,17 @@ è¦æœå°‹çš„文字: + Type in the text to search for. 請輸入è¦æœå°‹çš„文字。 + Options é¸é … + Source texts are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹åŽŸå§‹è¨Šæ¯ä¸­çš„文字。 @@ -256,6 +297,7 @@ 原始訊æ¯æ–‡å­— + Translations are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹å·²ç¿»è­¯çš„文字。 @@ -264,6 +306,7 @@ 翻譯 + Texts such as 'TeX' and 'tex' are considered as different when checked. 勾é¸æ­¤é …目的話,TeX 與 tex 會被èªç‚ºæ˜¯å…©å€‹ä¸åŒçš„字串。 @@ -272,6 +315,7 @@ 符åˆå¤§å°å¯« + Comments and contexts are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹è¨»è§£èˆ‡å…§æ–‡ã€‚ @@ -280,51 +324,62 @@ 註解 + Click here to find the next occurrence of the text you typed in. 點é¸é€™è£¡ä»¥å°‹æ‰¾ä¸‹ä¸€ç­†ç¬¦åˆçš„字串。 + Find Next 尋找下一個 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 + Cancel å–消 + Find 尋找 + &Find what: 尋找什麼(&F): + &Source texts 來æºæ–‡å­—(&S) + &Translations 翻譯(&T) + &Match case 符åˆå¤§å°å¯«(&M) + &Comments 註解(&C) + Ignore &accelerators 忽略快æ·éµ(&A) - + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog @@ -359,7 +414,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -368,6 +423,7 @@ + Ignored %n untranslated source text(s) @@ -462,38 +518,47 @@ p, li { white-space: pre-wrap; } MainWindow + MainWindow 主視窗 + &Phrases 片語(&P) + &Close Phrase Book 關閉片語書(&C) + &Edit Phrase Book 編輯片語書(&E) + &Print Phrase Book 列å°ç‰‡èªžæ›¸(&P) + V&alidation 確èª(&A) + &View 檢視(&V) + Vie&ws 檢視(&W) + &Toolbars 工具列(&T) @@ -502,14 +567,17 @@ p, li { white-space: pre-wrap; } 工具(&L) + &Help 說明(&H) + &Translation 翻譯(&T) + &File 檔案(&F) @@ -518,6 +586,7 @@ p, li { white-space: pre-wrap; } 最近開啟的檔案(&C) + &Edit 編輯(&E) @@ -530,63 +599,80 @@ p, li { white-space: pre-wrap; } é–‹å•Ÿ(&O) + Open a Qt translation source file (TS file) for editing é–‹å•Ÿ Qt 翻譯æºç¢¼æª” (TS 檔) 來編輯 + Ctrl+O Ctrl+Q + E&xit 離開(&X) + Close this window and exit. 關閉視窗並離開。 + Ctrl+Q Ctrl+Q + + &Save 儲存(&S) + Save changes made to this Qt translation source file 儲存å°æ­¤æª”案的變更 + Open Read-O&nly... 以唯讀模å¼é–‹å•Ÿ(&N)... + &Save All 全部儲存(&S) + Ctrl+S Ctrl+S + + + Save &As... å¦å­˜æ–°æª”(&A)... + Save As... å¦å­˜æ–°æª”... + Save changes made to this Qt translation source file into a new file. 將此檔存æˆå¦ä¸€å€‹æª”案。 - + &Release 釋出(&R) + Create a Qt message file suitable for released applications from the current message file. 以目å‰çš„訊æ¯æª”來建立é©ç”¨æ–¼é‡‹å‡ºæ‡‰ç”¨ç¨‹å¼çš„ Qt 訊æ¯æª”。 @@ -599,10 +685,12 @@ p, li { white-space: pre-wrap; } 列å°ç›®å‰ Qt 翻譯æºç¢¼æª”中所有的片語清單。 + Ctrl+P Ctrl+P + &Undo 復原(&U) @@ -611,66 +699,82 @@ p, li { white-space: pre-wrap; } 復原上次的編輯動作。 + Ctrl+Z Ctrl+Z + &Redo é‡åš(&R) + Redo an undone editing operation performed on the translation. é‡åšä¸Šæ¬¡å¾©åŽŸçš„動作。 + Ctrl+Y Ctrl+Y + Cu&t 剪下(&T) + Copy the selected translation text to the clipboard and deletes it. å°‡é¸å–的翻譯文字剪下。 + Ctrl+X Ctrl+X + &Copy 複製(&C) + Copy the selected translation text to the clipboard. 複製所é¸å–的文字到剪貼簿中。 + Ctrl+C Ctrl+C + &Paste 貼上(&P) + Paste the clipboard text into the translation. 將剪貼簿內容貼到翻譯å€ã€‚ + Ctrl+V Ctrl+V + Select &All 全部é¸å–(&A) + Select the whole translation text. é¸æ“‡æ•´å€‹ç¿»è­¯æ–‡å­—。 + Ctrl+A Ctrl+A @@ -679,26 +783,32 @@ p, li { white-space: pre-wrap; } 尋找(&F) + Search for some text in the translation source file. 在翻譯æºç¢¼æª”中尋找文字。 + Ctrl+F Ctrl+F + Find &Next 尋找下一個(&N) + Continue the search where it was left. 繼續尋找下一個。 + F3 F3 + &Prev Unfinished å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®(&P) @@ -707,10 +817,12 @@ p, li { white-space: pre-wrap; } 移到å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Ctrl+K Ctrl+K + &Next Unfinished 下一個未完æˆçš„æ¢ç›®(&N) @@ -720,9 +832,10 @@ p, li { white-space: pre-wrap; } Ctrl+L - Ctrl+L + Ctrl+L + P&rev å‰ä¸€å€‹(&R) @@ -731,10 +844,12 @@ p, li { white-space: pre-wrap; } 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Ctrl+Shift+K Ctrl+Shift+K + Ne&xt 下一個(&X) @@ -744,9 +859,10 @@ p, li { white-space: pre-wrap; } Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L + &Done and Next 完æˆä¸¦è·³åˆ°ä¸‹ä¸€å€‹(&D) @@ -759,14 +875,17 @@ p, li { white-space: pre-wrap; } 複製原始訊æ¯(&B) + Copies the source text into the translation field. 將原始訊æ¯è¤‡è£½åˆ°ç¿»è­¯æ¬„ä½ä¸­ã€‚ + Ctrl+B Ctrl+B + &Accelerators å¿«æ·éµ(&A) @@ -775,6 +894,7 @@ p, li { white-space: pre-wrap; } 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ã€‚ + &Ending Punctuation çµæŸçš„標點(&E) @@ -783,14 +903,17 @@ p, li { white-space: pre-wrap; } 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。 + &Phrase matches 片語翻譯建議(&P) + Toggle checking that phrase suggestions are used. 切æ›æ˜¯å¦è¦ä½¿ç”¨ç‰‡èªžç¿»è­¯å»ºè­°ã€‚ + Place &Marker Matches åƒæ•¸ç¬¦è™Ÿ(&M) @@ -803,10 +926,12 @@ p, li { white-space: pre-wrap; } 新增片語書(&N) + Create a new phrase book. 建立新的片語書。 + Ctrl+N Ctrl+N @@ -815,10 +940,12 @@ p, li { white-space: pre-wrap; } 開啟片語書(&O) + Open a phrase book to assist translation. 開啟片語書以å”助翻譯。 + Ctrl+H Ctrl+H @@ -827,18 +954,22 @@ p, li { white-space: pre-wrap; } åå‘排åº(&R) + Sort the items back in the same order as in the message file. ä¾è¨Šæ¯æª”中的順åºåå‘排列。 + &Display guesses 顯示猜測(&D) + Set whether or not to display translation guesses. 設定是å¦è¦é¡¯ç¤ºçŒœæ¸¬çš„翻譯。 + &Statistics 統計(&S) @@ -847,38 +978,47 @@ p, li { white-space: pre-wrap; } 設定是å¦è¦é¡¯ç¤ºç¿»è­¯çµ±è¨ˆã€‚ + &Manual 手冊(&M) + F1 F1 + About Qt Linguist 關於 Qt 語言家 + About Qt 關於 Qt + Display information about the Qt toolkit by Trolltech. 顯示關於 Qt 的資訊。 + &What's This? 這是什麼?(&W) + What's This? 這是什麼? + Enter What's This? mode. 進入「這是什麼?ã€æ¨¡å¼ã€‚ + Shift+F1 Shift+F1 @@ -887,6 +1027,7 @@ p, li { white-space: pre-wrap; } æœå°‹ä¸¦ç¿»è­¯(&S) + Replace the translation on all entries that matches the search source text. 在所有æ¢ç›®ä¸­æœå°‹ï¼Œä¸¦å–代符åˆè€…。 @@ -895,14 +1036,19 @@ p, li { white-space: pre-wrap; } 批次翻譯(&B) + Batch translate all entries using the information in the phrase books. 使用片語書中的資訊來批次翻譯所有的æ¢ç›®ã€‚ + + + Release As... 釋出為... + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. 以目å‰çš„訊æ¯æª”來建立é©ç”¨æ–¼é‡‹å‡ºæ‡‰ç”¨ç¨‹å¼çš„ Qt 訊æ¯æª”。檔å會自動由此檔的å‰é¢ä¸€éƒ¨ä»½ä¾†æ±ºå®šã€‚ @@ -912,55 +1058,71 @@ p, li { white-space: pre-wrap; } + Source text 原始訊æ¯æ–‡å­— + + Index 索引 + + Context 內文 + Items æ¢ç›® + This panel lists the source contexts. æ­¤é¢æ¿åˆ—出æºç¢¼æª”中的內容。 + Strings 字串 + Phrases and guesses 片語與猜測 + Sources and Forms 來æºèˆ‡è¡¨å–® + Warnings 警告 + MOD status bar: file(s) modified 已變更 + Loading... 載入中... + + Loading File - Qt Linguist 載入檔案中 ─ Qt 語言家 + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -969,6 +1131,7 @@ Close the open file(s) first? è¦å°‡é–‹å•Ÿçš„檔案先關閉嗎? + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -977,78 +1140,114 @@ Skip loading the first named file? è¦è·³éŽè¼‰å…¥ç¬¬ä¸€å€‹æª”案嗎? + %n translation unit(s) loaded. 載入 %n 個翻譯單ä½ã€‚ + Related files (%1);; é—œè¯æª”案(%1);; + Open Translation Files 開啟翻譯檔 + + File saved. 檔案已儲存。 + + + Release 釋出 + Qt message files for released applications (*.qm) All files (*) 釋出的應用程å¼ä½¿ç”¨çš„ Qt 訊æ¯æª” (*.qm) 所有檔案 (*) + + File created. 檔案已建立。 + + Printing... 列å°ä¸­... + Context: %1 內文:%1 + finished å·²å®Œæˆ + unresolved 未解決 + obsolete 已棄用 + + Printing... (page %1) 列å°ä¸­...(第 %1 é ï¼‰ + + Printing completed 列å°å·²å®Œæˆ + + Printing aborted 列å°å·²ä¸­æ­¢ + Search wrapped. æœå°‹æŠ˜å›žã€‚ + + + + + + + + + + Qt Linguist Qt 語言家 + + Cannot find the string '%1'. 無法找到字串 %1。 @@ -1063,244 +1262,311 @@ All files (*) + Search And Translate in '%1' - Qt Linguist 在 %1 å…§æœå°‹ä¸¦ç¿»è­¯ ─ Qt 語言家 + + + Translate - Qt Linguist 翻譯 ─ Qt 語言家 + Translated %n entry(s) 已翻譯 %n 個æ¢ç›® + No more occurrences of '%1'. Start over? 找ä¸åˆ°æ›´å¤šçš„ %1。è¦å¾žé ­é–‹å§‹å—Žï¼Ÿ + Create New Phrase Book 建立新的片語書 + Qt phrase books (*.qph) All files (*) Qt 片語書 (*.qph) 所有檔案 (*) + Phrase book created. 片語書已建立。 + Open Phrase Book 開啟片語書 + Qt phrase books (*.qph);;All files (*) Qt 片語書 (*.qph);;所有檔案 (*) + %n phrase(s) loaded. 已載入 %n 個片語。 + + + Add to phrase book 新增到片語書 + No appropriate phrasebook found. 找ä¸åˆ°åˆé©çš„片語書。 + Adding entry to phrasebook %1 新增項目到片語書 %1 + Select phrase book to add to é¸å–è¦æ–°å¢žåˆ°å“ªå€‹ç‰‡èªžæ›¸ + Unable to launch Qt Assistant (%1) 無法啟動 Qt å°å¹«æ‰‹ï¼ˆ%1) + Version %1 版本 %1 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - 此版本的 Qt 語言家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚<br/><br/>您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <tt>http://qtsoftware.com/company/model.html</tt>。 + 此版本的 Qt 語言家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚<br/><br/>您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <tt>http://qtsoftware.com/company/model.html</tt>。 This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 此程å¼ä»¥ Qt %1授權åŒæ„書授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt %1授權åŒæ„書授權給您。詳情請åƒç…§ LICENSE 檔。 This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt 語言家是一套新增 Qt 應用程å¼çš„翻譯的工具。</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + Do you want to save the modified files? 您è¦å„²å­˜å·²è®Šæ›´çš„檔案嗎? + Do you want to save '%1'? 您確定è¦å„²å­˜ %1 嗎? + Qt Linguist[*] Qt 語言家 [*] + %1[*] - Qt Linguist %1 [*] ─ Qt 語言家 + + No untranslated translation units left. 沒有任何未翻譯的翻譯單ä½ã€‚ + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Display the manual for %1. 顯示 %1 的手冊。 + Display information about %1. 顯示 %1 的資訊。 + &Save '%1' 儲存 '%1' (&S) + Save '%1' &As... å¦å­˜ '%1' 為(&A)... + Release '%1' 釋出 '%1' + Release '%1' As... 釋出 '%1' 為... + &Close '%1' 關閉 '%1'(&C) + + &Close 關閉(&C) + Save All 全部儲存 + + &Release All 全部釋出(&R) + Close All 全部關閉 + Translation File &Settings for '%1'... %1 的翻譯檔設定(&S)... + &Batch Translation of '%1'... %1 的批次翻譯(&B)... + Search And &Translate in '%1'... 在 %1 å…§æœå°‹ä¸¦ç¿»è­¯(&T)... + Search And &Translate... æœå°‹ä¸¦ç¿»è­¯(&T)... + + File 檔案 + + Edit 編輯 + + Translation 翻譯 + + Validation ç¢ºèª + + Help 說明 + Cannot read from phrase book '%1'. 無法從片語書 %1 中讀å–。 + Close this phrase book. 關閉片語書。 + Enables you to add, modify, or delete entries in this phrase book. å…許您從此片語書中新增ã€è®Šæ›´æˆ–移除片語。 + Print the entries in this phrase book. 列å°æ­¤ç‰‡èªžæ›¸ä¸­çš„æ¢ç›®ã€‚ + Cannot create phrase book '%1'. 無法建立片語書 %1。 + Do you want to save phrase book '%1'? 您è¦å„²å­˜ç‰‡èªžæ›¸ %1 嗎? + All 全部 + Open/Refresh Form &Preview é–‹å•Ÿ/刷新表單é è¦½(&P) + Form Preview Tool 表單é è¦½å·¥å…· + F5 F5 @@ -1321,42 +1587,54 @@ All files (*) 最近開啟的檔案(&C) + &Open... é–‹å•Ÿ(&O)... + &Print... 列å°(&P)... + &Find... 尋找(&F)... + &New Phrase Book... 新增片語書(&N)... + &Open Phrase Book... 開啟片語書(&O)... + &Reset Sorting é‡ç½®æŽ’åº(&R) + Display translation statistics. 顯示翻譯統計。 + &Search And Translate... æœå°‹ä¸¦ç¿»è­¯(&S)... + + &Batch Translation... 批次翻譯(&B)... + + Translation File &Settings... 翻譯檔案設定(&S)... @@ -1369,94 +1647,117 @@ All files (*) 編輯è¦é¡¯ç¤ºå“ªä¸€ç¨®èªžè¨€ã€‚ + &Add to Phrase Book 新增到片語書(&A) + Ctrl+T Ctrl+T + Previous unfinished item. å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Recently Opened &Files 最近開啟的檔案(&F) + Save 儲存 + Print a list of all the translation units in the current translation source file. 列å°ç›®å‰ç¿»è­¯æºç¢¼æª”中所有的起翻譯單ä½ã€‚ + Undo the last editing operation performed on the current translation. 復原上次å°ç›®å‰ç¿»è­¯åŸ·è¡Œçš„的編輯動作。 + Move to the previous unfinished item. 移到å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Next unfinished item. 下一個未完æˆçš„æ¢ç›®ã€‚ + Move to the next unfinished item. 移到下一個未完æˆçš„æ¢ç›®ã€‚ + Move to previous item. 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Move to the previous item. 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Next item. 下一個æ¢ç›®ã€‚ + Move to the next item. 移到下一個æ¢ç›®ã€‚ + Mark item as done and move to the next unfinished item. 標記此æ¢ç›®ç‚ºå®Œæˆï¼Œä¸¦ç§»åˆ°ä¸‹ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Mark this item as done and move to the next unfinished item. 標記此æ¢ç›®ç‚ºå®Œæˆï¼Œä¸¦ç§»åˆ°ä¸‹ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Copy from source text è¤‡è£½åŽŸå§‹è¨Šæ¯ + Toggle the validity check of accelerators. 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ã€‚ + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ï¼Œä¹Ÿå°±æ˜¯æª¢æŸ¥æºç¢¼ä¸­çš„å¿«æ·éµç¬¦è™Ÿæ•¸é‡èˆ‡ç¿»è­¯æ–‡å­—中是å¦ç›¸åŒã€‚若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of ending punctuation. 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。 + Close 關閉 + &Close All 全部關閉(&C) + Ctrl+W Ctrl+W @@ -1465,21 +1766,35 @@ All files (*) 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。若是ä¸ç›¸ç¬¦ï¼Œå‰‡æœƒåœ¨è­¦å‘Šè¦–窗中顯示訊æ¯ã€‚ + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. 切æ›æª¢æŸ¥æ˜¯å¦ä½¿ç”¨å»ºè­°çš„片語。若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of place markers. 切æ›æ˜¯å¦æª¢æŸ¥åƒæ•¸ç¬¦è™Ÿçš„正確性。 + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦æª¢æŸ¥åƒæ•¸ç¬¦è™Ÿçš„正確性。也就是æºç¢¼ä¸­çš„ %1,%2 等是å¦èˆ‡ç¿»è­¯æ–‡å­—中的相符。若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦æª¢æŸ¥çµæŸçš„標點。如果檢查çµæžœä¸æ­£ç¢ºï¼Œæœƒåœ¨è­¦å‘Šè¦–窗中顯示訊æ¯ã€‚ + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1520,71 +1835,87 @@ All files (*) 片語與猜測: - + German å¾·æ–‡ + Japanese 日文 + French 法文 + Polish 波蘭文 + Chinese 中文 + This whole panel allows you to view and edit the translation of some source text. 這整個é¢æ¿å¯ä»¥è®“您檢視與編輯æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯檔。 + Source text 原始訊æ¯æ–‡å­— + This area shows the source text. æ­¤å€åŸŸé¡¯ç¤ºåŽŸå§‹è¨Šæ¯æ–‡å­—。 + Source text (Plural) 原始訊æ¯æ–‡å­—(複數型) + This area shows the plural form of the source text. æ­¤å€åŸŸé¡¯ç¤ºåŽŸå§‹è¨Šæ¯æ–‡å­—的複數型。 + Developer comments 開發者æ示 + This area shows a comment that may guide you, and the context in which the text occurs. æ­¤å€åŸŸé¡¯ç¤ºè¨»è§£ï¼Œèªªæ˜Žæ­¤æ–‡å­—的內容å”助您翻譯。 + Here you can enter comments for your own use. They have no effect on the translated applications. 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æ‚¨è‡ªå·±çš„註解。它們ä¸æœƒå°æ‡‰ç”¨ç¨‹å¼çš„訊æ¯é€ æˆå½±éŸ¿ã€‚ + %1 translation (%2) %1 翻譯(%2) + This is where you can enter or modify the translation of the above source text. 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æˆ–變更æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯。 + %1 translation %1 翻譯 + %1 translator comments %1 翻譯註解 @@ -1605,6 +1936,7 @@ All files (*) 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æˆ–變更æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯。 + '%1' Line: %2 '%1' @@ -1634,19 +1966,22 @@ Line: %2 索引 - + Completion status for %1 %1 的完æˆç‹€æ…‹ + <file header> <檔案標頭> + <context comment> <內文註解> + <unnamed context> <未命å內文> @@ -1680,19 +2015,22 @@ Line: %2 PhraseBookBox - + %1[*] - Qt Linguist %1 [*] ─ Qt 語言家 + Qt Linguist Qt 語言家 + Cannot save phrase book '%1'. 無法儲存片語書 %1。 + Edit Phrase Book 編輯片語書 @@ -1701,26 +2039,32 @@ Line: %2 此視窗讓您å¯ä»¥æ–°å¢žã€è®Šæ›´èˆ‡åˆªé™¤ç‰‡èªžã€‚ + &Translation: 翻譯(&T): + This is the phrase in the target language corresponding to the source phrase. 這是跟原始訊æ¯ç›¸é—œçš„目標語言的片語。 + S&ource phrase: 原始訊æ¯ç‰‡èªž(&O): + This is a definition for the source phrase. 這是原始訊æ¯ç‰‡èªžçš„定義。 + This is the phrase in the source language. 這是原始語言的片語。 + &Definition: 定義(&D): @@ -1729,6 +2073,7 @@ Line: %2 新增片語(&N) + Click here to add the phrase to the phrase book. 點é¸é€™è£¡å°‡ç‰‡èªžæ–°å¢žåˆ°ç‰‡èªžæ›¸ä¸­ã€‚ @@ -1741,38 +2086,47 @@ Line: %2 點é¸é€™è£¡ä»¥å¾žç‰‡èªžæ›¸ä¸­ç§»é™¤ç‰‡èªžã€‚ + &Save 儲存(&S) + Click here to save the changes made. 點擊這裡以儲存變更。 + This window allows you to add, modify, or delete entries in a phrase book. 此視窗讓您å¯ä»¥æ–°å¢žã€è®Šæ›´èˆ‡åˆªé™¤ç‰‡èªžæ›¸ä¸­çš„æ¢ç›®ã€‚ + &New Entry æ–°æ¢ç›®(&N) + Click here to remove the entry from the phrase book. 點擊此處以從片語書中移除æ¢ç›®ã€‚ + &Remove Entry 移除æ¢ç›®(&R) + Settin&gs... 設定(&G)... + Close 關閉 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 @@ -1789,15 +2143,17 @@ Line: %2 PhraseModel - + Source phrase 原始片語 + Translation 翻譯 + Definition 定義 @@ -1805,19 +2161,22 @@ Line: %2 PhraseView - + Insert æ’å…¥ + Edit 編輯 + Guess (%1) 猜測(%1) + Guess 猜測 @@ -1825,70 +2184,90 @@ Line: %2 QObject - + Compiled Qt translations 已編譯的 Qt 翻譯 + Translation files (%1);; 翻譯檔(%1): + All files (*) 所有檔案(*) - + + + + + + + Qt Linguist Qt 語言家 - + C++ source files C++ 程å¼æª” - + Java source files Java 程å¼æª” - + GNU Gettext localization files GNU Gettext 地域化檔案 - + Qt Script source files Qt 文稿程å¼æª” - + Qt translation sources (format 1.1) Qt 翻譯æºç¢¼æª”(1.1 æ ¼å¼ï¼‰ + Qt translation sources (format 2.0) Qt 翻譯æºç¢¼æª”(2.0 æ ¼å¼ï¼‰ + + Qt translation sources (latest format) + + + Qt translation sources - Qt 翻譯æºç¢¼ + Qt 翻譯æºç¢¼ - + Qt Designer form files Qt 設計器表單檔 + Qt Jambi form files Qt Jambi 表單檔 - + XLIFF localization files XLIFF 地域化檔案 + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -1927,15 +2306,17 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> <i>沒有原始碼</i> + <i>File %1 not available</i> <i>沒有檔案 %1</i> + <i>File %1 not readable</i> <i>檔案 %1 無法讀å–</i> @@ -1962,6 +2343,7 @@ Line: %2 Statistics + Statistics 統計 @@ -1970,30 +2352,37 @@ Line: %2 關閉(&C) + Translation 翻譯 + Source ä¾†æº + 0 0 + Words: 單字: + Characters: 字元: + Characters (with spaces): 字元(å«ç©ºç™½ï¼‰ï¼š + Close 關閉 @@ -2467,7 +2856,7 @@ All files (*) 您è¦å„²å­˜ç‰‡èªžæ›¸ %1 嗎? - + This is the application's main window. @@ -2480,58 +2869,72 @@ All files (*) Qt 語言家 + This window allows you to search for some text in the translation source file. 此視窗讓您æœå°‹ç¿»è­¯æºç¢¼æª”中的一些文字。 + Type in the text to search for. 請輸入è¦æœå°‹çš„文字。 + Find &source text: 尋找原始訊æ¯(&S): + &Translate to: 翻譯為(&T): + Search options æœå°‹é¸é … + Texts such as 'TeX' and 'tex' are considered as different when checked. 勾é¸æ­¤é …目的話,TeX 與 tex 會被èªç‚ºæ˜¯å…©å€‹ä¸åŒçš„字串。 + Match &case 符åˆå¤§å°å¯«(&C) + Mark new translation as &finished 將新翻譯標記為完æˆ(&F) + Click here to find the next occurrence of the text you typed in. 點é¸é€™è£¡ä»¥å°‹æ‰¾ä¸‹ä¸€ç­†ç¬¦åˆçš„字串。 + Find Next 尋找下一個 + Translate 翻譯 + Translate All 全部翻譯 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 + Cancel å–消 @@ -2558,27 +2961,33 @@ All files (*) TranslationSettingsDialog - + Any Country 任何國家 + + Settings for '%1' - Qt Linguist %1 的設定 ─ Qt 語言家 + Source language 原始語言 + Language 語言 + Country/Region 國家/åœ°å€ + Target language 目標語言 diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts index 76a1956..b9c1adc 100644 --- a/translations/qt_ar.ts +++ b/translations/qt_ar.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True صحيح @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File نسخ أو تحريك ملÙÙ‘ @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) جميع الملÙّات (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open Ùتح @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +573,7 @@ to Q3MainWindow - + Line up تصÙÙŠÙ @@ -586,7 +586,7 @@ to Q3NetworkProtocol - + Operation stopped by the user أوقÙت العمليّة من طر٠المستعمل @@ -594,7 +594,7 @@ to Q3ProgressDialog - + Cancel إلغاء @@ -603,7 +603,7 @@ to Q3TabDialog - + OK مواÙقة @@ -632,7 +632,7 @@ to Q3TextEdit - + &Undo &تراجع @@ -671,7 +671,7 @@ to Q3TitleBar - + System @@ -739,7 +739,7 @@ to Q3ToolBar - + More... أكثر... @@ -747,7 +747,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +799,7 @@ to Q3Wizard - + &Cancel &إلغاء @@ -827,9 +827,9 @@ to QAbstractSocket - - - + + + Host not found @@ -872,7 +872,7 @@ to QAbstractSpinBox - + &Step up @@ -890,13 +890,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. RTL - + Executable '%1' requires Qt %2, found Qt %3. البرنامج '%1' يتطلّب Qt %2ØŒ تمّ إيجاد Qt %3. @@ -906,7 +906,7 @@ to خطأ: مكتبة Qt غير مواÙقة - + Activate @@ -942,7 +942,7 @@ to QCheckBox - + Uncheck @@ -960,7 +960,7 @@ to QColorDialog - + Hu&e: ال&صّبغة: @@ -1034,13 +1034,13 @@ to QComboBox - + Open Ùتح - + False خاطئ @@ -1058,7 +1058,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1079,12 +1079,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1102,8 +1102,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1118,7 +1118,7 @@ to - + Unable to fetch record %1 @@ -1136,7 +1136,7 @@ to QDateTimeEdit - + AM @@ -1159,7 +1159,7 @@ to QDial - + QDial @@ -1177,7 +1177,7 @@ to QDialog - + What's This? ما هذا؟ @@ -1190,9 +1190,9 @@ to QDialogButtonBox - + - + OK مواÙقة @@ -1315,7 +1315,7 @@ to QDirModel - + Name الإسم @@ -1345,7 +1345,7 @@ to QDockWidget - + Close إغلاق @@ -1376,7 +1376,7 @@ to QErrorMessage - + &Show this message again Ø£&عرض مجدّداهذاالبلاغ @@ -1404,13 +1404,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1433,8 +1438,8 @@ to QFileDialog - - + + All Files (*) جميع الملÙّات (*) @@ -1457,13 +1462,13 @@ to معاينة Ù…Ùصّلة - + File ملÙÙ‘ - + Open Ùتح @@ -1473,26 +1478,26 @@ to Ø­Ùظ تحت - + - + &Open &Ùتح - + &Save &Ø­Ùظ - + Recent Places - + &Rename ت&غيير الإسم @@ -1507,33 +1512,33 @@ to ع&رض الملÙّات المخÙية - + New Folder دليل جديد - + Find Directory إيجاد الدّليل - + Directories دلائل - + All Files (*.*) جميع الملÙّات (*.*) - - + + Directory: دليل: - + %1 already exists. Do you want to replace it? @@ -1564,14 +1569,14 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1597,7 +1602,7 @@ Do you want to delete it anyway? - + Show @@ -1613,19 +1618,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: Ø¥&سم الملÙÙ‘: @@ -1645,7 +1650,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1707,7 +1712,7 @@ Do you want to delete it anyway? - + My Computer @@ -1720,7 +1725,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1937,7 +1942,7 @@ Do you want to delete it anyway? QFontDialog - + &Font ال&خطّ @@ -1986,7 +1991,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found تمّ إيجاد المضي٠%1 @@ -1996,7 +2001,7 @@ Do you want to delete it anyway? تمّ إيجاد المضي٠- + Connected to host %1 @@ -2132,7 +2137,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error خطأ مجهول @@ -2140,11 +2145,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2170,13 +2175,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused رÙض الوصل - + Host %1 not found @@ -2189,12 +2194,12 @@ Do you want to delete it anyway? طول المحتوى خاطئ - + HTTPS connection requested but SSL support not compiled in - + @@ -2233,21 +2238,21 @@ Do you want to delete it anyway? وصل مغلق - - + + Unknown error خطأ مجهول - + Request aborted تمّ إبطال الطّلب - + No server set to connect to ليس هناك أيّ خادم للوصل @@ -2265,7 +2270,12 @@ Do you want to delete it anyway? صديرة استجابة الHTTP غير صالحة - + + Unknown authentication method + + + + @@ -2288,7 +2298,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2369,7 +2379,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2392,7 +2402,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2412,7 +2422,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2482,7 +2492,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2502,7 +2512,7 @@ Do you want to delete it anyway? - + Unknown error خطأ مجهول @@ -2510,7 +2520,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2533,7 +2543,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2541,7 +2551,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2572,7 +2582,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2587,8 +2597,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2608,7 +2618,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &تراجع @@ -2646,8 +2656,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2663,7 +2673,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2671,8 +2681,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2685,7 +2695,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2742,7 +2752,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2752,7 +2762,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2770,7 +2780,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2785,7 +2795,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2830,7 +2840,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2838,7 +2848,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2931,7 +2941,7 @@ Do you want to delete it anyway? QMenu - + Close إغلاق @@ -2988,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2996,22 +3006,22 @@ Do you want to delete it anyway? مواÙقة - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help مساعدة - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -3020,21 +3030,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3042,7 +3042,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3224,7 +3224,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3252,7 +3252,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3265,7 +3265,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3273,7 +3273,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3282,7 +3282,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3311,7 +3311,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3338,18 +3338,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3357,7 +3351,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3367,7 +3361,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3390,19 +3384,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3412,19 +3406,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3442,12 +3436,12 @@ Do you want to delete it anyway? QObject - + Home منزل - + Operation not supported on %1 @@ -3457,7 +3451,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3482,7 +3476,7 @@ Do you want to delete it anyway? - + No host name given @@ -3491,7 +3485,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name الإسم @@ -3504,7 +3498,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3524,7 +3518,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3537,12 +3531,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3550,7 +3544,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3666,7 +3660,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected موصل محليّا @@ -3683,7 +3677,7 @@ Do you want to delete it anyway? مجهول - + OK مواÙقة @@ -3700,7 +3694,7 @@ Do you want to delete it anyway? الطّابعة - + Print all طباعة الجميع @@ -3880,7 +3874,7 @@ Do you want to delete it anyway? - + Print @@ -4128,13 +4122,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4412,8 +4406,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4442,7 +4436,7 @@ Please choose a different file name. - + @@ -4462,6 +4456,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4470,7 +4469,7 @@ Please choose a different file name. QProgressDialog - + Cancel إلغاء @@ -4494,7 +4493,7 @@ Please choose a different file name. QRegExp - + no error occurred لم يحدث هناك أيّ خطأ @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4565,12 +4564,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4578,7 +4577,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4641,12 +4640,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4656,7 +4655,7 @@ Please choose a different file name. - + Right edge @@ -4666,7 +4665,7 @@ Please choose a different file name. - + Page left @@ -4677,7 +4676,7 @@ Please choose a different file name. - + Page right @@ -4688,7 +4687,7 @@ Please choose a different file name. - + Scroll left @@ -4698,7 +4697,7 @@ Please choose a different file name. - + Scroll right @@ -4726,7 +4725,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4737,7 +4736,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4747,8 +4746,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4826,7 +4825,7 @@ Please choose a different file name. QShortcut - + Space Ùراغ @@ -5407,7 +5406,7 @@ Please choose a different file name. QSql - + Delete حذ٠@@ -5464,7 +5463,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5523,7 +5522,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5553,7 +5552,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5579,7 +5578,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5587,7 +5586,7 @@ Please choose a different file name. QTextControl - + &Undo &تراجع @@ -5645,7 +5644,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5653,7 +5652,7 @@ Please choose a different file name. QUndoGroup - + Undo تراجع @@ -5666,7 +5665,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5674,7 +5673,7 @@ Please choose a different file name. QUndoStack - + Undo تراجع @@ -5745,7 +5744,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6155,7 +6154,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6231,6 +6230,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6299,11 +6303,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ما هذا؟ @@ -6311,7 +6325,7 @@ Please choose a different file name. QWidget - + * @@ -6319,7 +6333,7 @@ Please choose a different file name. QWizard - + < &Back < &رجوع @@ -6381,7 +6395,7 @@ Please choose a different file name. QWorkspace - + &Restore ا&ستعاد @@ -6451,7 +6465,7 @@ Please choose a different file name. QXml - + no error occurred لم يحدث هناك أيّ خطأ @@ -6569,8 +6583,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6754,7 +6768,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6764,12 +6778,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6819,7 +6833,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6830,7 +6844,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6845,17 +6859,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6886,17 +6900,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6906,7 +6920,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6916,7 +6930,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6926,7 +6940,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6936,7 +6950,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6946,7 +6960,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6971,7 +6985,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6981,7 +6995,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6991,12 +7005,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7006,7 +7020,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7016,7 +7030,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7026,33 +7040,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7066,7 +7080,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7081,27 +7095,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7116,7 +7130,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7151,17 +7165,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7171,12 +7185,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7186,17 +7200,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7217,7 +7231,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7499,7 +7513,7 @@ Please choose a different file name. - + empty @@ -7524,7 +7538,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7539,7 +7553,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7549,12 +7563,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7569,13 +7583,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7594,12 +7608,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7609,12 +7623,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7669,7 +7683,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7744,7 +7758,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 640ad40..4806231 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Das Audiogerät <b>%1</b> funktioniert nicht.<br/>Es wird stattdessen <b>%2</b> verwendet.</html> @@ -23,7 +22,7 @@ CloseButton - + Close Tab Schließen @@ -81,7 +80,7 @@ Die Audio- und Video-Unterstützung wurde abgeschaltet Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -95,24 +94,24 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Es sind nicht alle erforderlichen Codecs installiert. Um diesen Inhalt abzuspielen, muss der folgende Codec installiert werden: %0 - - + + - - - - + + + + Could not open media source. Die Medienquelle konnte nicht geöffnet werden. - + Invalid source type. Ungültiger Typ der Medienquelle. - + Could not locate media source. Die Medienquelle konnte nicht gefunden werden. @@ -146,7 +145,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3Accel - + %1, %2 not defined %1, %2 sind nicht definiert @@ -159,7 +158,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3DataTable - + True Wahr @@ -187,7 +186,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3FileDialog - + Copy or Move a File Datei kopieren oder verschieben @@ -212,7 +211,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa - + All Files (*) Alle Dateien (*) @@ -352,7 +351,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa - + Open Öffnen @@ -520,7 +519,7 @@ Datei konnte nicht gefunden werden. Q3LocalFs - + Could not read directory %1 @@ -570,7 +569,7 @@ nach Q3MainWindow - + Line up Ausrichten @@ -583,7 +582,7 @@ nach Q3NetworkProtocol - + Operation stopped by the user Operation von Benutzer angehalten @@ -591,7 +590,7 @@ nach Q3ProgressDialog - + Cancel Abbrechen @@ -600,7 +599,7 @@ nach Q3TabDialog - + OK OK @@ -629,7 +628,7 @@ nach Q3TextEdit - + &Undo &Rückgängig @@ -668,7 +667,7 @@ nach Q3TitleBar - + System System @@ -736,7 +735,7 @@ nach Q3ToolBar - + More... Mehr... @@ -744,7 +743,7 @@ nach Q3UrlOperator - + The protocol `%1' is not supported @@ -796,7 +795,7 @@ nach Q3Wizard - + &Cancel &Abbrechen @@ -824,9 +823,9 @@ nach QAbstractSocket - - - + + + Host not found Rechner konnte nicht gefunden werden @@ -869,7 +868,7 @@ nach QAbstractSpinBox - + &Step up &Inkrementieren @@ -887,13 +886,13 @@ nach QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden. @@ -903,7 +902,7 @@ nach Qt Bibliothek ist inkompatibel - + Activate Aktivieren @@ -939,7 +938,7 @@ nach QCheckBox - + Uncheck Löschen @@ -957,7 +956,7 @@ nach QColorDialog - + Hu&e: Farb&ton: @@ -1015,13 +1014,13 @@ nach QComboBox - + Open Öffnen - + False Falsch @@ -1039,7 +1038,7 @@ nach QCoreApplication - + %1: key is empty QSystemSemaphore %1: Ungültige Schlüsselangabe (leer) @@ -1060,12 +1059,12 @@ nach QDB2Driver - + Unable to connect Es kann keine Verbindung aufgebaut werden - + Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) @@ -1083,8 +1082,8 @@ nach QDB2Result - - + + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -1099,7 +1098,7 @@ nach Die Variable konnte nicht gebunden werden - + Unable to fetch record %1 Der Datensatz %1 konnte nicht abgeholt werden @@ -1117,7 +1116,7 @@ nach QDateTimeEdit - + AM AM @@ -1140,7 +1139,7 @@ nach QDial - + QDial QDial @@ -1158,7 +1157,7 @@ nach QDialog - + What's This? Direkthilfe @@ -1171,9 +1170,9 @@ nach QDialogButtonBox - + - + OK OK @@ -1296,7 +1295,7 @@ nach QDirModel - + Name Name @@ -1326,7 +1325,7 @@ nach QDockWidget - + Close Schließen @@ -1357,7 +1356,7 @@ nach QErrorMessage - + &Show this message again Diese Meldung noch einmal an&zeigen @@ -1385,13 +1384,18 @@ nach QFile - - + + Destination file exists Die Zieldatei existiert bereits - + + Cannot remove source file + + + + Cannot open %1 for input %1 konnte nicht zum Lesen geöffnet werden @@ -1414,8 +1418,8 @@ nach QFileDialog - - + + All Files (*) Alle Dateien (*) @@ -1438,13 +1442,13 @@ nach Details - + File Datei - + Open Öffnen @@ -1454,26 +1458,26 @@ nach Speichern unter - + - + &Open &Öffnen - + &Save S&peichern - + Recent Places Zuletzt besucht - + &Rename &Umbenennen @@ -1488,33 +1492,33 @@ nach &Versteckte Dateien anzeigen - + New Folder Neues Verzeichnis - + Find Directory Verzeichnis suchen - + Directories Verzeichnisse - + All Files (*.*) Alle Dateien (*.*) - - + + Directory: Verzeichnis: - + %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. @@ -1548,7 +1552,7 @@ Stellen Sie sicher, dass der Dateiname richtig ist. - + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1561,7 @@ Das Verzeichnis konnte nicht gefunden werden. Stellen Sie sicher, dass der Verzeichnisname richtig ist. - + '%1' is write protected. Do you want to delete it anyway? '%1' ist schreibgeschützt. @@ -1584,7 +1588,7 @@ Möchten sie die Datei trotzdem löschen? Unbekannt - + Show Anzeigen @@ -1600,19 +1604,19 @@ Möchten sie die Datei trotzdem löschen? &Neues Verzeichnis - + &Choose &Auswählen - + Remove Löschen - - + + File &name: Datei&name: @@ -1632,7 +1636,7 @@ Möchten sie die Datei trotzdem löschen? QFileSystemModel - + %1 TB %1 TB @@ -1694,7 +1698,7 @@ Möchten sie die Datei trotzdem löschen? Änderungsdatum - + My Computer Mein Computer @@ -1707,7 +1711,7 @@ Möchten sie die Datei trotzdem löschen? QFontDatabase - + Normal Normal @@ -1924,7 +1928,7 @@ Möchten sie die Datei trotzdem löschen? QFontDialog - + &Font &Schriftart @@ -1973,7 +1977,7 @@ Möchten sie die Datei trotzdem löschen? QFtp - + Host %1 found Rechner %1 gefunden @@ -1983,7 +1987,7 @@ Möchten sie die Datei trotzdem löschen? Rechner gefunden - + Connected to host %1 @@ -2119,7 +2123,7 @@ Möchten sie die Datei trotzdem löschen? QHostInfo - + Unknown error Unbekannter Fehler @@ -2127,11 +2131,11 @@ Möchten sie die Datei trotzdem löschen? QHostInfoAgent - + - + @@ -2157,13 +2161,13 @@ Möchten sie die Datei trotzdem löschen? QHttp - - + + Connection refused Verbindung verweigert - + Host %1 not found @@ -2215,21 +2219,21 @@ Möchten sie die Datei trotzdem löschen? Verbindung beendet - - + + Unknown error Unbekannter Fehler - + Request aborted Anfrage wurde abgebrochen - + No server set to connect to Für die Verbindung wurde kein Server-Rechner angegeben @@ -2247,7 +2251,12 @@ Möchten sie die Datei trotzdem löschen? Der Kopfteil der HTTP-Antwort ist ungültig - + + Unknown authentication method + + + + @@ -2295,12 +2304,12 @@ Möchten sie die Datei trotzdem löschen? Es wurde ein unbekanntes Protokoll angegeben - + Connection refused (or timed out) Verbindung verweigert oder Zeitlimit überschritten - + HTTPS connection requested but SSL support not compiled in Die angeforderte HTTPS-Verbindung kann nicht aufgebaut werden, da keine SSL-Unterstützung vorhanden ist @@ -2356,7 +2365,7 @@ Möchten sie die Datei trotzdem löschen? QIBaseDriver - + Error opening database Die Datenbankverbindung konnte nicht geöffnet werden @@ -2379,7 +2388,7 @@ Möchten sie die Datei trotzdem löschen? QIBaseResult - + Unable to create BLOB Es konnte kein BLOB erzeugt werden @@ -2399,7 +2408,7 @@ Möchten sie die Datei trotzdem löschen? Der BLOB konnte nicht gelesen werden - + Could not find array Das Feld konnte nicht gefunden werden @@ -2469,7 +2478,7 @@ Möchten sie die Datei trotzdem löschen? QIODevice - + Permission denied Zugriff verweigert @@ -2489,7 +2498,7 @@ Möchten sie die Datei trotzdem löschen? Kein freier Speicherplatz auf dem Gerät vorhanden - + Unknown error Unbekannter Fehler @@ -2497,7 +2506,7 @@ Möchten sie die Datei trotzdem löschen? QInputContext - + XIM XIM @@ -2520,7 +2529,7 @@ Möchten sie die Datei trotzdem löschen? QInputDialog - + Enter a value: Geben Sie einen Wert ein: @@ -2528,7 +2537,7 @@ Möchten sie die Datei trotzdem löschen? QLibrary - + Could not mmap '%1': %2 Operation mmap fehlgeschlagen für '%1': %2 @@ -2559,7 +2568,7 @@ Möchten sie die Datei trotzdem löschen? - + The shared library was not found. Die dynamische Bibliothek konnte nicht gefunden werden. @@ -2574,8 +2583,8 @@ Möchten sie die Datei trotzdem löschen? Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (Im Debug- und Release-Modus erstellte Bibliotheken können nicht zusammen verwendet werden.) - - + + Cannot load library %1: %2 Die Library %1 kann nicht geladen werden: %2 @@ -2595,7 +2604,7 @@ Möchten sie die Datei trotzdem löschen? QLineEdit - + Select All Alles auswählen @@ -2633,8 +2642,8 @@ Möchten sie die Datei trotzdem löschen? QLocalServer - - + + %1: Name error %1: Fehlerhafter Name @@ -2650,7 +2659,7 @@ Möchten sie die Datei trotzdem löschen? - + %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -2658,8 +2667,8 @@ Möchten sie die Datei trotzdem löschen? QLocalSocket - - + + %1: Connection refused %1: Der Aufbau einer Verbindung wurde verweigert @@ -2672,7 +2681,7 @@ Möchten sie die Datei trotzdem löschen? - + %1: Invalid name %1: Ungültiger Name @@ -2729,7 +2738,7 @@ Möchten sie die Datei trotzdem löschen? QMYSQLDriver - + Unable to open database ' Die Datenbankverbindung konnte nicht geöffnet werden ' @@ -2739,7 +2748,7 @@ Möchten sie die Datei trotzdem löschen? Es kann keine Verbindung aufgebaut werden - + Unable to begin transaction Es konnte keine Transaktion gestartet werden @@ -2757,7 +2766,7 @@ Möchten sie die Datei trotzdem löschen? QMYSQLResult - + Unable to fetch data Es konnten keine Daten abgeholt werden @@ -2772,7 +2781,7 @@ Möchten sie die Datei trotzdem löschen? Das Ergebnis konnte nicht gespeichert werden - + Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -2817,7 +2826,7 @@ Möchten sie die Datei trotzdem löschen? QMdiArea - + (Untitled) (Unbenannt) @@ -2825,7 +2834,7 @@ Möchten sie die Datei trotzdem löschen? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2918,7 +2927,7 @@ Möchten sie die Datei trotzdem löschen? QMenu - + Close Schließen @@ -2940,7 +2949,7 @@ Möchten sie die Datei trotzdem löschen? QMessageBox - + @@ -2948,22 +2957,26 @@ Möchten sie die Datei trotzdem löschen? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Ãœber Qt - + Help Hilfe - <p>This program uses Qt version %1.</p> - <p>Dieses Programm verwendet Qt-Version %1.</p> + <p>Dieses Programm verwendet Qt-Version %1.</p> - + Show Details... Details einblenden... @@ -2972,21 +2985,11 @@ Möchten sie die Datei trotzdem löschen? Hide Details... Details ausblenden... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM Eingabemethode auswählen @@ -2994,7 +2997,7 @@ Möchten sie die Datei trotzdem löschen? QMultiInputContextPlugin - + Multiple input method switcher Umschalter für Eingabemethoden @@ -3007,7 +3010,7 @@ Möchten sie die Datei trotzdem löschen? QNativeSocketEngine - + The remote host closed the connection Der entfernte Rechner hat die Verbindung geschlossen @@ -3140,7 +3143,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessCacheBackend - + Error opening %1 %1 konnte nicht geöffnet werden @@ -3148,7 +3151,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessFileBackend - + Request for opening non-local file %1 Anforderung zum Öffnen einer Datei über Netzwerk %1 @@ -3176,7 +3179,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessFtpBackend - + No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -3186,7 +3189,7 @@ Möchten sie die Datei trotzdem löschen? %1 kann nicht geöffnet werden: Es handelt sich um ein Verzeichnis - + Logging in to %1 failed: authentication required Die Anmeldung bei %1 schlug fehl: Es ist eine Authentifizierung erforderlich @@ -3204,7 +3207,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessHttpBackend - + No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -3217,7 +3220,7 @@ Möchten sie die Datei trotzdem löschen? Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2 - + Protocol "%1" is unknown Das Protokoll "%1" ist unbekannt @@ -3225,7 +3228,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkReplyImpl - + Operation canceled Operation abgebrochen @@ -3234,7 +3237,7 @@ Möchten sie die Datei trotzdem löschen? QOCIDriver - + Unable to logon Logon-Vorgang fehlgeschlagen @@ -3263,7 +3266,7 @@ Möchten sie die Datei trotzdem löschen? QOCIResult - + Unable to bind column for batch execute @@ -3290,18 +3293,16 @@ Möchten sie die Datei trotzdem löschen? Der Befehl konnte nicht initialisiert werden - - + Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute select statement - Die 'select'-Abfrage konnte nicht ausgeführt werden + Die 'select'-Abfrage konnte nicht ausgeführt werden - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -3309,7 +3310,7 @@ Möchten sie die Datei trotzdem löschen? QODBCDriver - + Unable to connect Es kann keine Verbindung aufgebaut werden @@ -3319,7 +3320,7 @@ Möchten sie die Datei trotzdem löschen? Es kann keine Verbindung aufgebaut werden weil der Treiber die benötigte Funktionalität nicht vollständig unterstützt - + Unable to disable autocommit 'autocommit' konnte nicht deaktiviert werden @@ -3342,19 +3343,19 @@ Möchten sie die Datei trotzdem löschen? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 'SQL_CURSOR_STATIC' konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden - + Unable to fetch next Der nächste Datensatz konnte nicht abgeholt werden @@ -3364,19 +3365,19 @@ Möchten sie die Datei trotzdem löschen? Der Befehl konnte nicht initialisiert werden - + Unable to bind variable Die Variable konnte nicht gebunden werden - - + + Unable to fetch last Der letzte Datensatz konnte nicht abgeholt werden - + Unable to fetch Es konnten keine Daten abgeholt werden @@ -3394,12 +3395,12 @@ Möchten sie die Datei trotzdem löschen? QObject - + Home Pos1 - + Operation not supported on %1 Diese Operation wird von %1 nicht unterstützt @@ -3409,7 +3410,7 @@ Möchten sie die Datei trotzdem löschen? Ungültiger URI: %1 - + Write error writing to %1: %2 Fehler beim Schreiben zur Datei %1: %2 @@ -3434,7 +3435,7 @@ Möchten sie die Datei trotzdem löschen? Protokollfehler: Ein leeres Datenpaket wurde empfangen - + No host name given Es wurde kein Hostname angegeben @@ -3443,7 +3444,7 @@ Möchten sie die Datei trotzdem löschen? QPPDOptionsModel - + Name Name @@ -3456,7 +3457,7 @@ Möchten sie die Datei trotzdem löschen? QPSQLDriver - + Unable to connect Es kann keine Verbindung aufgebaut werden @@ -3476,7 +3477,7 @@ Möchten sie die Datei trotzdem löschen? Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - + Unable to subscribe Die Registrierung schlug fehl @@ -3489,12 +3490,12 @@ Möchten sie die Datei trotzdem löschen? QPSQLResult - + Unable to create query Es konnte keine Abfrage erzeugt werden - + Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -3502,7 +3503,7 @@ Möchten sie die Datei trotzdem löschen? QPageSetupWidget - + Centimeters (cm) Zentimeter (cm) @@ -3618,7 +3619,7 @@ Möchten sie die Datei trotzdem löschen? QPrintDialog - + locally connected direkt verbunden @@ -3635,12 +3636,12 @@ Möchten sie die Datei trotzdem löschen? unbekannt - + OK OK - + Print all Alles drucken @@ -3805,7 +3806,7 @@ Möchten sie die Datei trotzdem löschen? Auswahl drucken - + Print @@ -4047,7 +4048,7 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPreviewDialog - + %1% %1% @@ -4147,7 +4148,7 @@ Bitte wählen Sie einen anderen Dateinamen. PostScript exportieren - + Page Setup Seite einrichten @@ -4320,8 +4321,8 @@ Bitte wählen Sie einen anderen Dateinamen. QProcess - - + + Could not open input redirection for reading Die Eingabeumleitung konnte nicht zum Lesen geöffnet werden @@ -4350,7 +4351,7 @@ Bitte wählen Sie einen anderen Dateinamen. Zeitüberschreitung - + @@ -4370,6 +4371,11 @@ Bitte wählen Sie einen anderen Dateinamen. Der Prozess ist abgestürzt + + No program defined + + + Process failed to start Das Starten des Prozesses schlug fehl @@ -4378,7 +4384,7 @@ Bitte wählen Sie einen anderen Dateinamen. QProgressDialog - + Cancel Abbrechen @@ -4402,7 +4408,7 @@ Bitte wählen Sie einen anderen Dateinamen. QRegExp - + no error occurred kein Fehler @@ -4450,7 +4456,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Driver - + Error to open database Die Datenbankverbindung konnte nicht geöffnet werden @@ -4473,12 +4479,12 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Result - + Unable to fetch results Das Ergebnis konnte nicht abgeholt werden - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -4486,7 +4492,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteDriver - + Error opening database Die Datenbankverbindung konnte nicht geöffnet werden @@ -4549,12 +4555,12 @@ Bitte wählen Sie einen anderen Dateinamen. QScrollBar - + Scroll here Hierher scrollen - + Left edge Linker Rand @@ -4564,7 +4570,7 @@ Bitte wählen Sie einen anderen Dateinamen. Anfang - + Right edge Rechter Rand @@ -4574,7 +4580,7 @@ Bitte wählen Sie einen anderen Dateinamen. Ende - + Page left Eine Seite nach links @@ -4585,7 +4591,7 @@ Bitte wählen Sie einen anderen Dateinamen. Eine Seite nach oben - + Page right Eine Seite nach rechts @@ -4596,7 +4602,7 @@ Bitte wählen Sie einen anderen Dateinamen. Eine Seite nach unten - + Scroll left Nach links scrollen @@ -4606,7 +4612,7 @@ Bitte wählen Sie einen anderen Dateinamen. Nach oben scrollen - + Scroll right Nach rechts scrollen @@ -4634,13 +4640,13 @@ Bitte wählen Sie einen anderen Dateinamen. QSharedMemory - + %1: create size is less then 0 %1: Die Größenangabe für die Erzeugung ist kleiner als Null - + %1: unable to lock %1: Sperrung fehlgeschlagen @@ -4650,8 +4656,8 @@ Bitte wählen Sie einen anderen Dateinamen. %1: Die Sperrung konnte nicht aufgehoben werden - - + + %1: permission denied %1: Zugriff verweigert @@ -4734,7 +4740,7 @@ Bitte wählen Sie einen anderen Dateinamen. QShortcut - + Space Leertaste @@ -5315,7 +5321,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSql - + Delete Löschen @@ -5372,7 +5378,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSslSocket - + Unable to write data: %1 Die Daten konnten nicht geschrieben werden: %1 @@ -5436,7 +5442,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + %1: out of resources %1: Keine Ressourcen mehr verfügbar @@ -5461,7 +5467,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTDSDriver - + Unable to open connection Die Datenbankverbindung konnte nicht geöffnet werden @@ -5487,7 +5493,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTcpServer - + Operation on socket is not supported Diese Socketoperation wird nicht unterstützt @@ -5495,7 +5501,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTextControl - + &Undo &Rückgängig @@ -5553,7 +5559,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUdpSocket - + This platform does not support IPv6 Diese Plattform unterstützt kein IPv6 @@ -5561,7 +5567,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoGroup - + Undo Rückgängig @@ -5574,7 +5580,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoModel - + <empty> <leer> @@ -5582,7 +5588,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoStack - + Undo Rückgängig @@ -5653,7 +5659,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWebFrame - + Request cancelled Anfrage wurde abgebrochen @@ -6064,7 +6070,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + JavaScript Alert - %1 JavaScript-Hinweis - %1 @@ -6140,6 +6146,11 @@ Bitte wählen Sie einen anderen Dateinamen. + Select all + + + + Select to the next character Bis zum folgenden Zeichen markieren @@ -6208,11 +6219,21 @@ Bitte wählen Sie einen anderen Dateinamen. Delete to the end of the word Bis zum Ende des Wortes löschen + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Direkthilfe @@ -6220,7 +6241,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWidget - + * * @@ -6228,7 +6249,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWizard - + Cancel Abbrechen @@ -6286,7 +6307,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWorkspace - + &Restore Wieder&herstellen @@ -6356,7 +6377,7 @@ Bitte wählen Sie einen anderen Dateinamen. QXml - + no error occurred kein Fehler @@ -6474,8 +6495,8 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlStream - - + + Extra content at end of document. Ãœberzähliger Inhalt nach Ende des Dokumentes. @@ -6659,38 +6680,38 @@ Bitte wählen Sie einen anderen Dateinamen. QtXmlPatterns - + At least one component must be present. Es muss mindestens eine Komponente vorhanden sein. - + No operand in an integer division, %1, can be %2. Bei der Ganzzahldivision %1 darf kein Operand %2 sein. - + %1 is not a valid value of type %2. %1 ist kein gültiger Wert des Typs %2. - + When casting to %1 from %2, the source value cannot be %3. Bei einer "cast"-Operation von %1 zu %2 darf der Wert nicht %3 sein. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Der effektive Boolesche Wert einer Sequenz aus zwei oder mehreren atomaren Werten kann nicht berechnet werden. - + Operator %1 is not available between atomic values of type %2 and %3. Der Operator %1 kann auf atomare Werte der Typen %2 und %3 nicht angewandt werden. - + It is not possible to cast from %1 to %2. Es kann keine "cast"-Operation von %1 zu %2 durchgeführt werden. @@ -6715,33 +6736,33 @@ Bitte wählen Sie einen anderen Dateinamen. Mit dem Typ %1 können keine Vergleichsoperationen durchgeführt werden. - + The data of a processing instruction cannot contain the string %1 Die Daten einer Processing-Anweisung dürfen nicht die Zeichenkette %1 enthalten - - + + %1 is an invalid %2 %1 ist kein gültiges %2 - + %1 is not a valid XML 1.0 character. %1 ist kein gültiges XML 1.0 Zeichen. - + The first argument to %1 cannot be of type %2. Das erste Argument von %1 kann nicht vom Typ %2 sein. - + %1 was called. %1 wurde gerufen. - + In the replacement string, %1 must be followed by at least one digit when not escaped. In der Ersetzung muss auf %1 eine Ziffer folgen, wenn es nicht durch ein Escape-Zeichen geschützt ist. @@ -6751,7 +6772,7 @@ Bitte wählen Sie einen anderen Dateinamen. In der Ersetzung kann %1 nur verwendet werden, um sich selbst oder %2 schützen, nicht jedoch für %3 - + %1 matches newline characters Der Ausdruck '%1' schließt Zeilenvorschübe ein @@ -6766,12 +6787,12 @@ Bitte wählen Sie einen anderen Dateinamen. %1 ist kein gültiger regulärer Ausdruck: %2 - + It will not be possible to retrieve %1. %1 kann nicht bestimmt werden. - + The default collection is undefined Für eine Kollektion ist keine Vorgabe definiert @@ -6781,12 +6802,12 @@ Bitte wählen Sie einen anderen Dateinamen. %1 kann nicht bestimmt werden - + The item %1 did not match the required type %2. Das Element %1 entspricht nicht dem erforderlichen Typ %2. - + %1 is an unknown schema type. %1 ist ein unbekannter Schema-Typ. @@ -6802,7 +6823,7 @@ Bitte wählen Sie einen anderen Dateinamen. Die Initialisierung der Variable %1 hängt von ihrem eigenem Wert ab - + The variable %1 is unused Die Variable %1 wird nicht verwendet @@ -6923,7 +6944,7 @@ Bitte wählen Sie einen anderen Dateinamen. %1 befindet sich nicht unter den Attributdeklarationen im Bereich. Schema-Import wird nicht unterstützt. - + empty leer @@ -6948,27 +6969,27 @@ Bitte wählen Sie einen anderen Dateinamen. kein oder mehrere - + The focus is undefined. Es ist kein Fokus definiert. - + An attribute by name %1 has already been created. Es wurde bereits ein Attribut mit dem Namen %1 erzeugt. - + Network timeout. Das Zeitlimit der Netzwerkoperation wurde überschritten. - + Element %1 can't be serialized because it appears outside the document element. Das Element %1 kann nicht serialisiert werden, da es außerhalb des Dokumentenelements erscheint. - + Year %1 is invalid because it begins with %2. %1 ist keine gültige Jahresangabe, da es mit %2 beginnt. @@ -7013,7 +7034,7 @@ Bitte wählen Sie einen anderen Dateinamen. Bei Vorhandensein eines %1-Begrenzers muss mindestens eine Komponente vorhanden sein. - + Dividing a value of type %1 by %2 (not-a-number) is not allowed. Die Division eines Werts des Typs %1 durch %2 (kein numerischer Wert) ist nicht zulässig. @@ -7029,12 +7050,12 @@ Bitte wählen Sie einen anderen Dateinamen. Die Multiplikation eines Werts des Typs %1 mit %2 oder %3 (positiv oder negativ unendlich) ist nicht zulässig. - + A value of type %1 cannot have an Effective Boolean Value. Ein Wert des Typs %1 kann keinen effektiven Booleschen Wert haben. - + Value %1 of type %2 exceeds maximum (%3). Der Wert %1 des Typs %2 überschreitet das Maximum (%3). @@ -7044,7 +7065,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Wert %1 des Typs %2 unterschreitet das Minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Die Stellenzahl eines Wertes des Typs %1 muss geradzahlig sein. Das ist bei %2 nicht der Fall. @@ -7054,7 +7075,7 @@ Bitte wählen Sie einen anderen Dateinamen. %1 ist kein gültiger Wert des Typs %2. - + Operator %1 cannot be used on type %2. Der Operator %1 kann nicht auf den Typ %2 angewandt werden. @@ -7064,7 +7085,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Operator %1 kann nicht auf atomare Werte der Typen %2 und %3 angewandt werden. - + The namespace URI in the name for a computed attribute cannot be %1. Der Namensraum-URI im Namen eines berechneten Attributes darf nicht %1 sein @@ -7074,7 +7095,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Name eines berechneten Attributes darf keinen Namensraum-URI %1 mit dem lokalen Namen %2 haben. - + Type error in cast, expected %1, received %2. Typfehler bei "cast"-Operation; es wurde %1 erwartet, aber %2 empfangen. @@ -7084,7 +7105,7 @@ Bitte wählen Sie einen anderen Dateinamen. Bei einer "cast"-Operation zum Typ %1 oder abgeleitetenTypen muss der Quellwert ein Zeichenketten-Literal oder ein Wert gleichen Typs sein. Der Typ %2 ist ungültig. - + A comment cannot contain %1 Ein Kommentar darf nicht'%1 enthalten @@ -7094,12 +7115,12 @@ Bitte wählen Sie einen anderen Dateinamen. Ein Kommentar darf nicht auf %1 enden. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Ein Attributknoten darf nicht als Kind eines Dokumentknotens erscheinen. Es erschien ein Attributknoten mit dem Namen %1. - + A library module cannot be evaluated directly. It must be imported from a main module. Ein Bibliotheksmodul kann nicht direkt ausgewertet werden, er muss von einem Hauptmodul importiert werden. @@ -7109,7 +7130,7 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert keine Vorlage mit dem Namen %1. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Werte des Typs %1 dürfen keine Prädikate sein. Für Prädikate sind nur numerische oder effektiv Boolesche Typen zulässig. @@ -7119,17 +7140,17 @@ Bitte wählen Sie einen anderen Dateinamen. Ein positionales Prädikat muss sich als einfacher, numerischer Wert auswerten lassen. - + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ist kein gültiger Zielname einer Processing-Anweisung, es muss ein %2 Wert wie zum Beispiel %3 sein. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Der letzte Schritt eines Pfades kann entweder nur Knoten oder nur atomare Werte enthalten. Sie dürfen nicht zusammen auftreten. - + No namespace binding exists for the prefix %1 Es existiert keine Namensraum-Bindung für den Präfix %1 @@ -7139,7 +7160,7 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert keine Namensraum-Bindung für den Präfix %1 in %2 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Das erste Argument von %1 darf nicht vom Typ %2 sein; es muss numerisch, xs:yearMonthDuration oder xs:dayTimeDuration sein. @@ -7154,7 +7175,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das zweite Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Wenn beide Werte mit Zeitzonen angegeben werden, müssen diese übereinstimmen. %1 und %2 sind daher unzulässig. @@ -7184,17 +7205,17 @@ Bitte wählen Sie einen anderen Dateinamen. Es kann kein Präfix angegeben werden, wenn das erste Argument leer oder eine leere Zeichenkette (kein Namensraum) ist. Es wurde der Präfix %1 angegeben. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Die Normalisierungsform %1 wird nicht unterstützt. Die unterstützten Normalisierungsformen sind %2, %3, %4 and %5, und "kein" (eine leere Zeichenkette steht für "keine Normalisierung"). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Eine Zeitzonen-Differenz muss im Bereich %1..%2 (einschließlich) liegen. %3 liegt außerhalb des Bereiches. - + Required cardinality is %1; got cardinality %2. Die erforderliche Kardinalität ist %1 (gegenwärtig %2). @@ -7349,12 +7370,12 @@ Bitte wählen Sie einen anderen Dateinamen. Attribute dürfen nicht auf andere Knoten folgen. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Es wird nur Unicode Codepoint Collation unterstützt (%1). %2 wird nicht unterstützt. - + An %1-attribute with value %2 has already been declared. Das Element hat bereits ein Attribut mit dem Namen %1 mit dem Wert %2. @@ -7399,7 +7420,7 @@ Bitte wählen Sie einen anderen Dateinamen. %2 ist kein gültiger Zielname einer Processing-Anweisung, da dieser nicht %1 sein darf (ungeachtet der Groß/Kleinschreibung). - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 hat nur %n Argument; die Angabe %2 ist daher ungültig. @@ -7415,7 +7436,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Der übergeordnete Knoten des zweiten Arguments der Funktion %1 muss ein Dokumentknoten sein, was bei %2 nicht der Fall ist. @@ -7461,7 +7482,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das Attributelement %1 kann nicht serialisiert werden, da es auf der höchsten Ebene erscheint. - + %1 is an unsupported encoding. Das Encoding %1 wird nicht unterstützt. @@ -7476,14 +7497,18 @@ Bitte wählen Sie einen anderen Dateinamen. Der Code-Punkt %1 aus %2 mit Encoding %3 ist kein gültiges XML-Zeichen. - + Ambiguous rule match. Mehrdeutige Regel. - In a namespace constructor, the value for a namespace value cannot be an empty string. - Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. + Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7501,12 +7526,12 @@ Bitte wählen Sie einen anderen Dateinamen. An %2 kann nur der Präfix %1 gebunden werden (und umgekehrt). - + Circularity detected Es wurde eine zirkuläre Abhängigkeit festgestellt. - + The parameter %1 is required, but no corresponding %2 is supplied. Es wurde kein entsprechendes %2 für den erforderlichen Parameter %1 angegeben. @@ -7516,12 +7541,12 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert kein entsprechendes %2 für den übergebenen Parameter %1. - + The URI cannot have a fragment Der URI darf kein Fragment enthalten. - + Element %1 is not allowed at this location. Das Element %1 darf nicht an dieser Stelle stehen. @@ -7576,7 +7601,7 @@ Bitte wählen Sie einen anderen Dateinamen. Im %1-Attribut des Elements %2 muss mindestens ein Modus angegeben werden. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. Das Element %2 kann nur die Standardattribute haben, nicht jedoch %1. @@ -7651,7 +7676,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das Element %1 kann keine Kindelemente haben. - + Element %1 cannot have a sequence constructor. Das Element %1 kann keinen Sequenzkonstruktor haben. diff --git a/translations/qt_es.ts b/translations/qt_es.ts index 294b009..f9299cb 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined La secuencia %1, %2 no está definida @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Verdadero @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copiar o mover un fichero @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Todos los ficheros (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Abrir @@ -527,7 +527,7 @@ Compruebe la ruta y el nombre del fichero. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ a Q3MainWindow - + Line up Alinear @@ -590,7 +590,7 @@ a Q3NetworkProtocol - + Operation stopped by the user Operación detenida por el usuario @@ -598,7 +598,7 @@ a Q3ProgressDialog - + Cancel Cancelar @@ -607,7 +607,7 @@ a Q3TabDialog - + OK Aceptar @@ -636,7 +636,7 @@ a Q3TextEdit - + &Undo &Deshacer @@ -675,7 +675,7 @@ a Q3TitleBar - + System Sistema @@ -743,7 +743,7 @@ a Q3ToolBar - + More... Más... @@ -751,7 +751,7 @@ a Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ a Q3Wizard - + &Cancel &Cancelar @@ -831,9 +831,9 @@ a QAbstractSocket - - - + + + Host not found Equipo no encontrado @@ -876,7 +876,7 @@ a QAbstractSpinBox - + &Step up &Aumentar @@ -894,12 +894,12 @@ a QApplication - + Activate Activar - + Executable '%1' requires Qt %2, found Qt %3. El ejecutable «%1» requiere Qt %2 (se encontró Qt %3). @@ -909,7 +909,7 @@ a Error: biblioteca Qt incompatible - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ a QCheckBox - + Uncheck Desmarcar @@ -964,7 +964,7 @@ a QColorDialog - + Hu&e: &Tono: @@ -1038,13 +1038,13 @@ a QComboBox - + Open Abrir - + False Falso @@ -1062,7 +1062,7 @@ a QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ a QDB2Driver - + Unable to connect Imposible establecer una conexión - + Unable to commit transaction Incapaz de enviar la transacción @@ -1106,8 +1106,8 @@ a QDB2Result - - + + Unable to execute statement Imposible ejecutar la instrucción @@ -1122,7 +1122,7 @@ a No es posible ligar la variable - + Unable to fetch record %1 Imposible obtener el registro %1 @@ -1140,7 +1140,7 @@ a QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ a QDial - + QDial QDial @@ -1181,7 +1181,7 @@ a QDialog - + What's This? ¿Qué es esto? @@ -1194,9 +1194,9 @@ a QDialogButtonBox - + - + OK Aceptar @@ -1319,7 +1319,7 @@ a QDirModel - + Name Nombre @@ -1355,7 +1355,7 @@ a QDockWidget - + Close Cerrar @@ -1386,7 +1386,7 @@ a QErrorMessage - + Debug Message: Mensaje de depuración: @@ -1414,13 +1414,18 @@ a QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1443,37 +1448,37 @@ a QFileDialog - - + + All Files (*) Todos los ficheros (*) - + Directories Directorios - + &Open &Abrir - + &Save &Guardar - + Open Abrir - + %1 already exists. Do you want to replace it? El fichero %1 ya existe. @@ -1494,7 +1499,7 @@ Verifique que el nombre del fichero es correcto. Mi equipo - + &Rename Cambia&r de nombre @@ -1540,7 +1545,7 @@ Verifique que el nombre del fichero es correcto. - + Directory: Directorio: @@ -1553,8 +1558,8 @@ Fichero no encontrado. Compruebe que el nombre del fichero es correcto - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1563,7 +1568,7 @@ Directorio no encontrado. Verique que el nombre del directorio es correcto. - + '%1' is write protected. Do you want to delete it anyway? «%1» está protegido contra escritura. @@ -1580,22 +1585,22 @@ Do you want to delete it anyway? No fue posible borrar el directorio. - + Recent Places - + All Files (*.*) Todos los ficheros (*.*) - + Save As Guardar como - + Drive Unidad @@ -1627,29 +1632,29 @@ Do you want to delete it anyway? Siguiente (histórico) - + New Folder Nueva carpeta - + &New Folder &Nueva carpeta - + &Choose &Seleccionar - + Remove Eliminar - - + + File &name: &Nombre de fichero: @@ -1669,7 +1674,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB %1 TiB @@ -1731,7 +1736,7 @@ All other platforms Última modificación - + My Computer Mi equipo @@ -1750,7 +1755,7 @@ All other platforms QFontDatabase - + Normal @@ -1967,7 +1972,7 @@ All other platforms QFontDialog - + &Font &Tipo de letra @@ -2016,8 +2021,8 @@ All other platforms QFtp - - + + Not connected No conectado @@ -2162,7 +2167,7 @@ All other platforms QHostInfo - + Unknown error Error desconocido @@ -2170,11 +2175,11 @@ All other platforms QHostInfoAgent - + - + @@ -2200,26 +2205,26 @@ All other platforms QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Error desconocido - + Request aborted Solicitud interrumpida - + No server set to connect to No se ha indicado ningún servidor al que conectarse @@ -2237,18 +2242,23 @@ All other platforms El servidor cerró la conexión inesperadamente - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Conexión rechazada - + Host %1 not found @@ -2269,7 +2279,7 @@ All other platforms Cabecera de respuesta HTTP no válida - + @@ -2318,7 +2328,7 @@ All other platforms Se precisa autenticación - + Connection refused (or timed out) @@ -2399,7 +2409,7 @@ All other platforms QIBaseDriver - + Error opening database Error al abrir la base de datos @@ -2422,7 +2432,7 @@ All other platforms QIBaseResult - + Unable to create BLOB Imposible crear un BLOB @@ -2442,7 +2452,7 @@ All other platforms Imposible leer el BLOB - + Could not find array No fue posible encontrar la tabla @@ -2512,7 +2522,7 @@ All other platforms QIODevice - + Permission denied Permiso denegado @@ -2532,7 +2542,7 @@ All other platforms No queda espacio en el dispositivo - + Unknown error Error desconocido @@ -2540,7 +2550,7 @@ All other platforms QInputContext - + XIM XIM @@ -2563,7 +2573,7 @@ All other platforms QInputDialog - + Enter a value: @@ -2583,7 +2593,7 @@ All other platforms QLibrary::resolve_sys: Símbolo «%1» no definido en %2 (%3) - + Could not mmap '%1': %2 No fu posible establecer la proyección en memoria de «%1»: %2 @@ -2614,7 +2624,7 @@ All other platforms - + The shared library was not found. No se ha encontrado la biblioteca compartida. @@ -2629,8 +2639,8 @@ All other platforms El complemento «%1» usa una biblioteca Qt incompatible. (No se pueden mezclar las bibliotecas «debug» y «release».) - - + + Cannot load library %1: %2 @@ -2650,7 +2660,7 @@ All other platforms QLineEdit - + &Undo &Deshacer @@ -2688,8 +2698,8 @@ All other platforms QLocalServer - - + + %1: Name error @@ -2705,7 +2715,7 @@ All other platforms - + %1: Unknown error %2 @@ -2713,8 +2723,8 @@ All other platforms QLocalSocket - - + + %1: Connection refused @@ -2727,7 +2737,7 @@ All other platforms - + %1: Invalid name @@ -2784,7 +2794,7 @@ All other platforms QMYSQLDriver - + Unable to open database ' Imposible abrir la base de datos ' @@ -2794,7 +2804,7 @@ All other platforms No es posible establecer una conexión - + Unable to begin transaction No es posible iniciar la transacción @@ -2812,7 +2822,7 @@ All other platforms QMYSQLResult - + Unable to fetch data No es posible obtener los datos @@ -2827,7 +2837,7 @@ All other platforms No es posible almacenar el resultado - + Unable to prepare statement No es posible preparar la instrucción @@ -2872,7 +2882,7 @@ All other platforms QMdiArea - + (Untitled) @@ -2880,7 +2890,7 @@ All other platforms QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2973,7 +2983,7 @@ All other platforms QMenu - + Close Cerrar @@ -3046,7 +3056,7 @@ All other platforms QMessageBox - + Help Ayuda @@ -3059,21 +3069,25 @@ All other platforms Aceptar - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Acerca de Qt - <p>This program uses Qt version %1.</p> - <p>Este programa utiliza la versión %1 de Qt.</p> + <p>Este programa utiliza la versión %1 de Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Acerca de Qt</h3>%1<p>Qt es un toolkit en C++ para desarrollo de aplicaciones multiplataforma.</p><p>Qt proporciona portabilidad del código entre MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux y todas las variantes comerciales de Unix importantes. Qt también está disponible para sistemas empotrados bajo el nombre Qtopia Core.</p><p>Qt es un producto de Trolltech. Visite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para obtener más información.</p> - + Show Details... Mostrar los detalles... @@ -3083,20 +3097,14 @@ All other platforms Ocultar los detalles... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> + <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> QMultiInputContext - + Select IM Seleccionar IM @@ -3104,7 +3112,7 @@ All other platforms QMultiInputContextPlugin - + Multiple input method switcher Seleccionador de varios métodos de entrada @@ -3117,7 +3125,7 @@ All other platforms QNativeSocketEngine - + The remote host closed the connection El equipo remoto ha cerrado la conexión @@ -3250,7 +3258,7 @@ All other platforms QNetworkAccessCacheBackend - + Error opening %1 @@ -3258,7 +3266,7 @@ All other platforms QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3286,7 +3294,7 @@ All other platforms QNetworkAccessFtpBackend - + No suitable proxy found @@ -3296,7 +3304,7 @@ All other platforms - + Logging in to %1 failed: authentication required @@ -3314,7 +3322,7 @@ All other platforms QNetworkAccessHttpBackend - + No suitable proxy found @@ -3327,7 +3335,7 @@ All other platforms - + Protocol "%1" is unknown @@ -3335,7 +3343,7 @@ All other platforms QNetworkReplyImpl - + Operation canceled @@ -3344,7 +3352,7 @@ All other platforms QOCIDriver - + Unable to logon No es posible abrir sesión @@ -3373,7 +3381,7 @@ All other platforms QOCIResult - + Unable to bind column for batch execute @@ -3400,18 +3408,16 @@ All other platforms No es posible preparar la instrucción - - + Unable to bind value No es posible ligar el valor - Unable to execute select statement - No es posible ejecutar la instrucción select + No es posible ejecutar la instrucción select - + Unable to execute statement No es posible ejecutar la instrucción @@ -3419,7 +3425,7 @@ All other platforms QODBCDriver - + Unable to connect No es posible establecer una conexión @@ -3429,7 +3435,7 @@ All other platforms No es posible conectarse - El controlador no ofrece todas las funciones necesarias - + Unable to disable autocommit No es posible inhabilitar el envío automático @@ -3452,19 +3458,19 @@ All other platforms QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: No es posible establecer «SQL_CURSOR_STATIC» como atributo de instrucción. Compruebe la configuración de su controlador ODBC - + Unable to execute statement No es posible ejecutar la instrucción - + Unable to fetch next No es posible obtener el siguiente @@ -3474,19 +3480,19 @@ All other platforms No es posible preparar la instrucción - + Unable to bind variable No es posible ligar la variable - - + + Unable to fetch last - + Unable to fetch @@ -3504,12 +3510,12 @@ All other platforms QObject - + Home Inicio - + Operation not supported on %1 @@ -3519,7 +3525,7 @@ All other platforms - + Write error writing to %1: %2 @@ -3544,7 +3550,7 @@ All other platforms - + No host name given @@ -3553,7 +3559,7 @@ All other platforms QPPDOptionsModel - + Name Nombre @@ -3566,7 +3572,7 @@ All other platforms QPSQLDriver - + Unable to connect No es posible establecer conexión @@ -3586,7 +3592,7 @@ All other platforms No fue posible anular la transacción - + Unable to subscribe @@ -3599,12 +3605,12 @@ All other platforms QPSQLResult - + Unable to create query No es posible crear la consulta - + Unable to prepare statement @@ -3612,7 +3618,7 @@ All other platforms QPageSetupWidget - + Centimeters (cm) @@ -3728,7 +3734,7 @@ All other platforms QPrintDialog - + locally connected conectado localmente @@ -3749,7 +3755,7 @@ All other platforms Imprimir en color si es posible - + Print all Imprimir todo @@ -3934,7 +3940,7 @@ All other platforms Sobre US Common #10 (105 x 241 mm) - + OK Aceptar @@ -3955,7 +3961,7 @@ All other platforms Fuente del papel: - + Print @@ -4257,13 +4263,13 @@ Elija un nombre de fichero diferente. QPrintPreviewDialog - + Page Setup - + %1% @@ -4545,8 +4551,8 @@ Elija un nombre de fichero diferente. QProcess - - + + Could not open input redirection for reading @@ -4575,7 +4581,7 @@ Elija un nombre de fichero diferente. - + @@ -4595,6 +4601,11 @@ Elija un nombre de fichero diferente. + + No program defined + + + Process failed to start @@ -4603,7 +4614,7 @@ Elija un nombre de fichero diferente. QProgressDialog - + Cancel Cancelar @@ -4627,7 +4638,7 @@ Elija un nombre de fichero diferente. QRegExp - + no error occurred no se ha producido ningún error @@ -4675,7 +4686,7 @@ Elija un nombre de fichero diferente. QSQLite2Driver - + Error to open database Error al abrir la base de datos @@ -4698,12 +4709,12 @@ Elija un nombre de fichero diferente. QSQLite2Result - + Unable to fetch results No es posible obtener los resultados - + Unable to execute statement No es posible ejecutar la instrucción @@ -4711,7 +4722,7 @@ Elija un nombre de fichero diferente. QSQLiteDriver - + Error opening database Error al abrir la base de datos @@ -4778,12 +4789,12 @@ Elija un nombre de fichero diferente. QScrollBar - + Scroll here Desplazar hasta aquí - + Left edge Borde izquierdo @@ -4793,7 +4804,7 @@ Elija un nombre de fichero diferente. Parte superior - + Right edge Borde derecho @@ -4803,7 +4814,7 @@ Elija un nombre de fichero diferente. Parte inferior - + Page left Una página a la izquierda @@ -4814,7 +4825,7 @@ Elija un nombre de fichero diferente. Una página hacia arriba - + Page right Una página a la derecha @@ -4825,7 +4836,7 @@ Elija un nombre de fichero diferente. Una página hacia abajo - + Scroll left Desplazar hacia la izquierda @@ -4835,7 +4846,7 @@ Elija un nombre de fichero diferente. Desplazar hacia arriba - + Scroll right Desplazar hacia la derecha @@ -4863,7 +4874,7 @@ Elija un nombre de fichero diferente. QSharedMemory - + %1: unable to set key on lock @@ -4874,7 +4885,7 @@ Elija un nombre de fichero diferente. - + %1: unable to lock @@ -4884,8 +4895,8 @@ Elija un nombre de fichero diferente. - - + + %1: permission denied @@ -4963,7 +4974,7 @@ Elija un nombre de fichero diferente. QShortcut - + Space Espacio @@ -5548,7 +5559,7 @@ Elija un nombre de fichero diferente. QSql - + Delete Borrar @@ -5605,7 +5616,7 @@ Elija un nombre de fichero diferente. QSslSocket - + Unable to write data: %1 No es posible escribir los datos: %1 @@ -5668,7 +5679,7 @@ Elija un nombre de fichero diferente. QSystemSemaphore - + %1: out of resources @@ -5698,7 +5709,7 @@ Elija un nombre de fichero diferente. QTDSDriver - + Unable to open connection No es posible abrir la conexión @@ -5728,7 +5739,7 @@ Elija un nombre de fichero diferente. Operación socket no admitida - + Operation on socket is not supported @@ -5736,7 +5747,7 @@ Elija un nombre de fichero diferente. QTextControl - + &Undo &Deshacer @@ -5794,7 +5805,7 @@ Elija un nombre de fichero diferente. QUdpSocket - + This platform does not support IPv6 La plataforma no contempla IPv6 @@ -5802,7 +5813,7 @@ Elija un nombre de fichero diferente. QUndoGroup - + Undo Deshacer @@ -5815,7 +5826,7 @@ Elija un nombre de fichero diferente. QUndoModel - + <empty> <vacío> @@ -5823,7 +5834,7 @@ Elija un nombre de fichero diferente. QUndoStack - + Undo Deshacer @@ -5894,7 +5905,7 @@ Elija un nombre de fichero diferente. QWebFrame - + Request cancelled @@ -6305,7 +6316,7 @@ Elija un nombre de fichero diferente. - + JavaScript Alert - %1 @@ -6381,6 +6392,11 @@ Elija un nombre de fichero diferente. + Select all + + + + Select to the next character @@ -6449,11 +6465,21 @@ Elija un nombre de fichero diferente. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ¿Qué es esto? @@ -6461,7 +6487,7 @@ Elija un nombre de fichero diferente. QWidget - + * * @@ -6469,7 +6495,7 @@ Elija un nombre de fichero diferente. QWizard - + Go Back Precedente @@ -6531,7 +6557,7 @@ Elija un nombre de fichero diferente. QWorkspace - + &Restore &Restaurar @@ -6601,7 +6627,7 @@ Elija un nombre de fichero diferente. QXml - + no error occurred no se ha producido ningún error @@ -6719,8 +6745,8 @@ Elija un nombre de fichero diferente. QXmlStream - - + + Extra content at end of document. Contenido extra al final del documento. @@ -6908,7 +6934,7 @@ Elija un nombre de fichero diferente. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6918,12 +6944,12 @@ Elija un nombre de fichero diferente. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6933,7 +6959,7 @@ Elija un nombre de fichero diferente. - + Year %1 is invalid because it begins with %2. @@ -6973,7 +6999,7 @@ Elija un nombre de fichero diferente. - + At least one component must be present. @@ -6984,7 +7010,7 @@ Elija un nombre de fichero diferente. - + No operand in an integer division, %1, can be %2. @@ -6999,17 +7025,17 @@ Elija un nombre de fichero diferente. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7040,17 +7066,17 @@ Elija un nombre de fichero diferente. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7060,7 +7086,7 @@ Elija un nombre de fichero diferente. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7070,7 +7096,7 @@ Elija un nombre de fichero diferente. - + Operator %1 cannot be used on type %2. @@ -7080,7 +7106,7 @@ Elija un nombre de fichero diferente. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7090,7 +7116,7 @@ Elija un nombre de fichero diferente. - + Type error in cast, expected %1, received %2. @@ -7100,7 +7126,7 @@ Elija un nombre de fichero diferente. - + No casting is possible with %1 as the target type. @@ -7125,7 +7151,7 @@ Elija un nombre de fichero diferente. - + A comment cannot contain %1 @@ -7135,7 +7161,7 @@ Elija un nombre de fichero diferente. - + No comparisons can be done involving the type %1. @@ -7145,12 +7171,12 @@ Elija un nombre de fichero diferente. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7160,7 +7186,7 @@ Elija un nombre de fichero diferente. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7170,7 +7196,7 @@ Elija un nombre de fichero diferente. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7180,33 +7206,33 @@ Elija un nombre de fichero diferente. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7222,7 +7248,7 @@ Elija un nombre de fichero diferente. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7237,27 +7263,27 @@ Elija un nombre de fichero diferente. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7272,7 +7298,7 @@ Elija un nombre de fichero diferente. - + %1 matches newline characters @@ -7307,17 +7333,17 @@ Elija un nombre de fichero diferente. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7327,12 +7353,12 @@ Elija un nombre de fichero diferente. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7342,17 +7368,17 @@ Elija un nombre de fichero diferente. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7373,7 +7399,7 @@ Elija un nombre de fichero diferente. - + The variable %1 is unused @@ -7655,7 +7681,7 @@ Elija un nombre de fichero diferente. - + empty @@ -7680,7 +7706,7 @@ Elija un nombre de fichero diferente. - + Required type is %1, but %2 was found. @@ -7695,7 +7721,7 @@ Elija un nombre de fichero diferente. - + It's not possible to add attributes after any other kind of node. @@ -7705,12 +7731,12 @@ Elija un nombre de fichero diferente. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7725,13 +7751,13 @@ Elija un nombre de fichero diferente. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7750,12 +7776,12 @@ Elija un nombre de fichero diferente. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7765,12 +7791,12 @@ Elija un nombre de fichero diferente. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7825,7 +7851,7 @@ Elija un nombre de fichero diferente. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7900,7 +7926,7 @@ Elija un nombre de fichero diferente. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 2408e8b..a035963 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Le dispositif audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> @@ -65,7 +64,7 @@ CloseButton - + Close Tab Fermer l'onglet @@ -189,7 +188,7 @@ Le support audio et vidéo est désactivé Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -234,24 +233,24 @@ have libgstreamer-plugins-base installed. Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0 - - + + - - - - + + + + Could not open media source. Impossible d'ouvrir le média source. - + Invalid source type. Type de source invalide. - + Could not locate media source. Impossible de localiser le média source. @@ -285,7 +284,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined La séquence %1, %2 n'est pas définie @@ -298,7 +297,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Vrai @@ -326,7 +325,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copie ou déplace un fichier @@ -351,7 +350,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Tous les fichiers (*) @@ -491,7 +490,7 @@ have libgstreamer-plugins-base installed. - + Open Ouvrir @@ -659,7 +658,7 @@ Vérifier le chemin et le nom du fichier. Q3LocalFs - + Could not read directory %1 @@ -709,7 +708,7 @@ en Q3MainWindow - + Line up Aligner @@ -722,7 +721,7 @@ en Q3NetworkProtocol - + Operation stopped by the user Opération interrompue par l'utilisateur @@ -730,7 +729,7 @@ en Q3ProgressDialog - + Cancel Annuler @@ -739,7 +738,7 @@ en Q3TabDialog - + OK OK @@ -768,7 +767,7 @@ en Q3TextEdit - + &Undo &Annuler @@ -807,7 +806,7 @@ en Q3TitleBar - + System Système @@ -875,7 +874,7 @@ en Q3ToolBar - + More... Reste... @@ -883,7 +882,7 @@ en Q3UrlOperator - + The protocol `%1' is not supported @@ -935,7 +934,7 @@ en Q3Wizard - + &Cancel &Annuler @@ -963,9 +962,9 @@ en QAbstractSocket - - - + + + Host not found Hôte introuvable @@ -1008,7 +1007,7 @@ en QAbstractSpinBox - + &Step up &Augmenter @@ -1026,13 +1025,13 @@ en QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. L'exécutable '%1' requiert Qt %2 (Qt %3 présent). @@ -1042,7 +1041,7 @@ en Erreur : bibliothèque Qt incompatible - + Activate Activer @@ -1078,7 +1077,7 @@ en QCheckBox - + Uncheck Décocher @@ -1096,7 +1095,7 @@ en QColorDialog - + Hu&e: &Teinte : @@ -1170,13 +1169,13 @@ en QComboBox - + Open Ouvrir - + False Faux @@ -1219,7 +1218,7 @@ en %1: erreur inconnue %2 - + %1: key is empty QSystemSemaphore %1: clé vide @@ -1240,12 +1239,12 @@ en QDB2Driver - + Unable to connect Incapable d'établir une connexion - + Unable to commit transaction Incapable de soumettre la transaction @@ -1263,8 +1262,8 @@ en QDB2Result - - + + Unable to execute statement Impossible d'exécuter la requête @@ -1279,7 +1278,7 @@ en Impossible d'attacher la variable - + Unable to fetch record %1 Impossible de récupérer l'enregistrement %1 @@ -1297,7 +1296,7 @@ en QDateTimeEdit - + AM AM @@ -1320,7 +1319,7 @@ en QDial - + QDial @@ -1338,7 +1337,7 @@ en QDialog - + What's This? Qu'est-ce que c'est ? @@ -1351,9 +1350,9 @@ en QDialogButtonBox - + - + OK OK @@ -1476,7 +1475,7 @@ en QDirModel - + Name Nom @@ -1506,7 +1505,7 @@ en QDockWidget - + Close Fermer @@ -1537,7 +1536,7 @@ en QErrorMessage - + &Show this message again &Afficher ce message de nouveau @@ -1565,13 +1564,18 @@ en QFile - - + + Destination file exists Le fichier destination existe - + + Cannot remove source file + + + + Cannot open %1 for input Impossible d'ouvrir %1 pour lecture @@ -1612,26 +1616,26 @@ en Affichage détaillé - + Open Ouvrir - + - + &Open &Ouvrir - + &Save &Enregistrer - + &Rename &Renommer @@ -1646,23 +1650,23 @@ en Afficher les fic&hiers cachés - + Directories Dossiers - + Recent Places Emplacements récents - - + + All Files (*) Tous les fichiers (*) - + %1 already exists. Do you want to replace it? Le fichier %1 existe déjà. Voulez-vous l'écraser ? @@ -1694,8 +1698,8 @@ Veuillez vérifier que le nom du fichier est correct. Fichiers de type : - - + + Directory: Dossier : @@ -1708,8 +1712,8 @@ Fichier introuvable. Veuillez vérifier que le nom du fichier est correct - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1718,7 +1722,7 @@ Dossier introuvable. Veuillez vérifier que le nom du dossier est correct. - + '%1' is write protected. Do you want to delete it anyway? '%1' est protégé en écriture. @@ -1735,17 +1739,17 @@ Voulez-vous quand même le supprimer? Impossible de supprimer le dossier. - + All Files (*.*) Tous les fichiers (*.*) - + Save As Enregistrer sous - + Drive Unité @@ -1777,29 +1781,29 @@ Voulez-vous quand même le supprimer? Successeur - + New Folder Nouveau dossier - + &New Folder &Nouveau dossier - + &Choose &Choisir - + Remove Supprimer - - + + File &name: &Nom de fichier : @@ -1819,7 +1823,7 @@ Voulez-vous quand même le supprimer? QFileSystemModel - + %1 TB %1 To @@ -1881,7 +1885,7 @@ Voulez-vous quand même le supprimer? Dernière modification - + My Computer Mon ordinateur @@ -1894,7 +1898,7 @@ Voulez-vous quand même le supprimer? QFontDatabase - + Normal @@ -2111,7 +2115,7 @@ Voulez-vous quand même le supprimer? QFontDialog - + &Font &Police @@ -2160,7 +2164,7 @@ Voulez-vous quand même le supprimer? QFtp - + Host %1 found Hôte %1 trouvé @@ -2170,7 +2174,7 @@ Voulez-vous quand même le supprimer? Hôte trouvé - + Connected to host %1 @@ -2306,7 +2310,7 @@ Voulez-vous quand même le supprimer? QHostInfo - + Unknown error Erreur inconnue @@ -2314,11 +2318,11 @@ Voulez-vous quand même le supprimer? QHostInfoAgent - + - + @@ -2344,13 +2348,13 @@ Voulez-vous quand même le supprimer? QHttp - - + + Connection refused Connexion refusée - + Host %1 not found @@ -2402,21 +2406,21 @@ Voulez-vous quand même le supprimer? Connexion arrêtée - - + + Unknown error Erreur inconnue - + Request aborted Requête interrompue - + No server set to connect to Aucun serveur spécifié @@ -2434,7 +2438,12 @@ Voulez-vous quand même le supprimer? Entête de réponse HTTP invalide - + + Unknown authentication method + + + + @@ -2482,12 +2491,12 @@ Voulez-vous quand même le supprimer? le handshake SSL a échoué - + Connection refused (or timed out) Connexion refusée (ou délai expiré) - + HTTPS connection requested but SSL support not compiled in Connexion HTTPS requise mais le support SSL n'est pas compilé @@ -2543,7 +2552,7 @@ Voulez-vous quand même le supprimer? QIBaseDriver - + Error opening database Erreur d'ouverture de la base de données @@ -2566,7 +2575,7 @@ Voulez-vous quand même le supprimer? QIBaseResult - + Unable to create BLOB Impossible de créer un BLOB @@ -2586,7 +2595,7 @@ Voulez-vous quand même le supprimer? Impossible de lire le BLOB - + Could not find array Impossible de trouver le tableau @@ -2656,7 +2665,7 @@ Voulez-vous quand même le supprimer? QIODevice - + Permission denied Accès refusé @@ -2676,7 +2685,7 @@ Voulez-vous quand même le supprimer? Aucun espace disponible sur le périphérique - + Unknown error Erreur inconnue @@ -2684,7 +2693,7 @@ Voulez-vous quand même le supprimer? QInputContext - + XIM XIM @@ -2707,7 +2716,7 @@ Voulez-vous quand même le supprimer? QInputDialog - + Enter a value: Entrer une valeur : @@ -2727,7 +2736,7 @@ Voulez-vous quand même le supprimer? QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) - + Could not mmap '%1': %2 Impossible d'établir la projection en mémoire de '%1' : %2 @@ -2758,7 +2767,7 @@ Voulez-vous quand même le supprimer? - + The shared library was not found. La bibliothèque partagée est introuvable. @@ -2773,8 +2782,8 @@ Voulez-vous quand même le supprimer? Le plugin '%1' utilise une bibliothèque Qt incompatible. (Il est impossible de mélanger des bibliothèques 'debug' et 'release'.) - - + + Cannot load library %1: %2 Impossible de charger la bibliothèque %1 : %2 @@ -2794,7 +2803,7 @@ Voulez-vous quand même le supprimer? QLineEdit - + Select All Tout sélectionner @@ -2832,8 +2841,8 @@ Voulez-vous quand même le supprimer? QLocalServer - - + + %1: Name error %1: Erreur de nom @@ -2849,7 +2858,7 @@ Voulez-vous quand même le supprimer? - + %1: Unknown error %2 %1: Erreur inconnue %2 @@ -2857,8 +2866,8 @@ Voulez-vous quand même le supprimer? QLocalSocket - - + + %1: Connection refused %1: Connexion refusée @@ -2871,7 +2880,7 @@ Voulez-vous quand même le supprimer? - + %1: Invalid name %1: Nom invalide @@ -2928,7 +2937,7 @@ Voulez-vous quand même le supprimer? QMYSQLDriver - + Unable to open database ' Impossible d'ouvrir la base de données ' @@ -2938,7 +2947,7 @@ Voulez-vous quand même le supprimer? Impossible d'établir une connexion - + Unable to begin transaction Impossible de démarrer la transaction @@ -2956,7 +2965,7 @@ Voulez-vous quand même le supprimer? QMYSQLResult - + Unable to fetch data Impossible de récuperer des données @@ -2971,7 +2980,7 @@ Voulez-vous quand même le supprimer? Impossible de stocker le résultat - + Unable to prepare statement Impossible de préparer l'instruction @@ -3016,7 +3025,7 @@ Voulez-vous quand même le supprimer? QMdiArea - + (Untitled) (Sans titre) @@ -3024,7 +3033,7 @@ Voulez-vous quand même le supprimer? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -3117,7 +3126,7 @@ Voulez-vous quand même le supprimer? QMenu - + Close Fermer @@ -3190,7 +3199,7 @@ Voulez-vous quand même le supprimer? QMessageBox - + @@ -3198,26 +3207,30 @@ Voulez-vous quand même le supprimer? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt À propos de Qt - + Help Aide - <p>This program uses Qt version %1.</p> - <p>Ce programme utilise la version %1 de Qt.</p> + <p>Ce programme utilise la version %1 de Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - + Show Details... Montrer les détails... @@ -3227,14 +3240,12 @@ Voulez-vous quand même le supprimer? Cacher les détails... - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> + <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> + <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -3244,7 +3255,7 @@ Voulez-vous quand même le supprimer? QMultiInputContext - + Select IM Sélectionner IM @@ -3252,7 +3263,7 @@ Voulez-vous quand même le supprimer? QMultiInputContextPlugin - + Multiple input method switcher Sélectionneur de méthode de saisie @@ -3265,7 +3276,7 @@ Voulez-vous quand même le supprimer? QNativeSocketEngine - + The remote host closed the connection L'hôte distant a fermé la connexion @@ -3398,7 +3409,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessCacheBackend - + Error opening %1 Erreur lors de l'ouverture de %1 @@ -3406,7 +3417,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessFileBackend - + Request for opening non-local file %1 Requête d'ouverture de fichier distant %1 @@ -3434,7 +3445,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessFtpBackend - + No suitable proxy found Aucun proxy trouvé @@ -3444,7 +3455,7 @@ Voulez-vous quand même le supprimer? Impossible d'ouvrir %1 : le chemin est un dossier - + Logging in to %1 failed: authentication required Connexion à %1 a échoué : authentification requise @@ -3462,7 +3473,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessHttpBackend - + No suitable proxy found Aucun proxy trouvé @@ -3475,7 +3486,7 @@ Voulez-vous quand même le supprimer? Erreur lors du téléchargement de %1 - le serveur a répondu: %2 - + Protocol "%1" is unknown Le protocole "%1" est inconnu @@ -3483,7 +3494,7 @@ Voulez-vous quand même le supprimer? QNetworkReplyImpl - + Operation canceled Opération annulée @@ -3492,7 +3503,7 @@ Voulez-vous quand même le supprimer? QOCIDriver - + Unable to logon Impossible d'ouvrir une session @@ -3521,7 +3532,7 @@ Voulez-vous quand même le supprimer? QOCIResult - + Unable to bind column for batch execute @@ -3548,18 +3559,16 @@ Voulez-vous quand même le supprimer? Impossible de préparer la requête - - + Unable to bind value Impossible d'attacher la valeur - Unable to execute select statement - Impossible d'exéctuer la requête select + Impossible d'exéctuer la requête select - + Unable to execute statement Impossible d'exéctuer la requête @@ -3567,7 +3576,7 @@ Voulez-vous quand même le supprimer? QODBCDriver - + Unable to connect Incapable d'établir une connexion @@ -3577,7 +3586,7 @@ Voulez-vous quand même le supprimer? Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires - + Unable to disable autocommit Impossible de désactiver l'autocommit @@ -3600,19 +3609,19 @@ Voulez-vous quand même le supprimer? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC - + Unable to execute statement Impossible d'exéctuer la requête - + Unable to fetch next Impossible de récupérer le suivant @@ -3622,19 +3631,19 @@ Voulez-vous quand même le supprimer? Impossible de préparer la requête - + Unable to bind variable Impossible d'attacher la variable - - + + Unable to fetch last Impossible de récupérer le dernier - + Unable to fetch Impossible de récupérer @@ -3652,12 +3661,12 @@ Voulez-vous quand même le supprimer? QObject - + Home Début - + Operation not supported on %1 Opération non supportée sur %1 @@ -3667,7 +3676,7 @@ Voulez-vous quand même le supprimer? URI invalide : %1 - + Write error writing to %1: %2 Erreur d'écriture sur %1 : %2 @@ -3692,7 +3701,7 @@ Voulez-vous quand même le supprimer? Erreur de protocole: paquet de taille 0 reçu - + No host name given Nom d'hôte manquant @@ -3701,7 +3710,7 @@ Voulez-vous quand même le supprimer? QPPDOptionsModel - + Name Nom @@ -3714,7 +3723,7 @@ Voulez-vous quand même le supprimer? QPSQLDriver - + Unable to connect Impossible d'établir une connexion @@ -3734,7 +3743,7 @@ Voulez-vous quand même le supprimer? Impossible d'annuler la transaction - + Unable to subscribe Impossible de s'inscrire @@ -3747,12 +3756,12 @@ Voulez-vous quand même le supprimer? QPSQLResult - + Unable to create query Impossible de créer la requête - + Unable to prepare statement Impossible de préparer la requête @@ -3760,7 +3769,7 @@ Voulez-vous quand même le supprimer? QPageSetupWidget - + Centimeters (cm) Centimètres (cm) @@ -3876,7 +3885,7 @@ Voulez-vous quand même le supprimer? QPrintDialog - + locally connected connecté en local @@ -3887,7 +3896,7 @@ Voulez-vous quand même le supprimer? inconnu - + OK OK @@ -3900,7 +3909,7 @@ Voulez-vous quand même le supprimer? Imprimer en couleur si possible - + Print all Imprimer tout @@ -4103,7 +4112,7 @@ Voulez-vous quand même le supprimer? Source du papier : - + Print @@ -4405,7 +4414,7 @@ Veuillez choisir un nom de fichier différent. QPrintPreviewDialog - + %1% %1% @@ -4505,7 +4514,7 @@ Veuillez choisir un nom de fichier différent. Exporter vers PostScript - + Page Setup Configuration de la page @@ -4693,8 +4702,8 @@ Veuillez choisir un nom de fichier différent. QProcess - - + + Could not open input redirection for reading Impossible d'ouvrir la redirection d'entrée en lecture @@ -4723,7 +4732,7 @@ Veuillez choisir un nom de fichier différent. Operation de processus a expiré - + @@ -4743,6 +4752,11 @@ Veuillez choisir un nom de fichier différent. Le processus à planté + + No program defined + + + Process failed to start Le processus n'a pas démarré @@ -4751,7 +4765,7 @@ Veuillez choisir un nom de fichier différent. QProgressDialog - + Cancel Annuler @@ -4775,7 +4789,7 @@ Veuillez choisir un nom de fichier différent. QRegExp - + no error occurred aucune erreur ne s'est produite @@ -4823,7 +4837,7 @@ Veuillez choisir un nom de fichier différent. QSQLite2Driver - + Error to open database Erreur à l'ouverture de la base de données @@ -4846,12 +4860,12 @@ Veuillez choisir un nom de fichier différent. QSQLite2Result - + Unable to fetch results Impossible de récupérer les résultats - + Unable to execute statement Impossible d'exécuter la requête @@ -4859,7 +4873,7 @@ Veuillez choisir un nom de fichier différent. QSQLiteDriver - + Error opening database Erreur lors de l'ouverture de la base de données @@ -4926,12 +4940,12 @@ Veuillez choisir un nom de fichier différent. QScrollBar - + Scroll here Défiler jusqu'ici - + Left edge Extrême gauche @@ -4941,7 +4955,7 @@ Veuillez choisir un nom de fichier différent. En haut - + Right edge Extrême droite @@ -4951,7 +4965,7 @@ Veuillez choisir un nom de fichier différent. En bas - + Page left Page précédente @@ -4962,7 +4976,7 @@ Veuillez choisir un nom de fichier différent. Page précédente - + Page right Page suivante @@ -4973,7 +4987,7 @@ Veuillez choisir un nom de fichier différent. Page suivante - + Scroll left Défiler vers la gauche @@ -4983,7 +4997,7 @@ Veuillez choisir un nom de fichier différent. Défiler vers le haut - + Scroll right Défiler vers la droite @@ -5011,7 +5025,7 @@ Veuillez choisir un nom de fichier différent. QSharedMemory - + %1: unable to set key on lock %1 : impossible d'affecter la clé au verrou @@ -5022,7 +5036,7 @@ Veuillez choisir un nom de fichier différent. - + %1: unable to lock %1 : impossible de vérrouiller @@ -5032,8 +5046,8 @@ Veuillez choisir un nom de fichier différent. %1 : impossible de déverrouiller - - + + %1: permission denied %1 : permission refusée @@ -5111,7 +5125,7 @@ Veuillez choisir un nom de fichier différent. QShortcut - + Space Espace @@ -5697,7 +5711,7 @@ Veuillez choisir un nom de fichier différent. QSql - + Delete Supprimer @@ -5754,7 +5768,7 @@ Veuillez choisir un nom de fichier différent. QSslSocket - + Unable to write data: %1 Impossible d'écrire les données : %1 @@ -5817,7 +5831,7 @@ Veuillez choisir un nom de fichier différent. QSystemSemaphore - + %1: out of resources %1: plus de ressources disponibles @@ -5847,7 +5861,7 @@ Veuillez choisir un nom de fichier différent. QTDSDriver - + Unable to open connection Impossible d'ouvrir la connexion @@ -5877,7 +5891,7 @@ Veuillez choisir un nom de fichier différent. Operation socket non supportée - + Operation on socket is not supported Opération sur le socket non supportée @@ -5885,7 +5899,7 @@ Veuillez choisir un nom de fichier différent. QTextControl - + &Undo &Annuler @@ -5943,7 +5957,7 @@ Veuillez choisir un nom de fichier différent. QUdpSocket - + This platform does not support IPv6 Cette plateforme ne supporte pas IPv6 @@ -5951,7 +5965,7 @@ Veuillez choisir un nom de fichier différent. QUndoGroup - + Undo Annuler @@ -5964,7 +5978,7 @@ Veuillez choisir un nom de fichier différent. QUndoModel - + <empty> <vide> @@ -5972,7 +5986,7 @@ Veuillez choisir un nom de fichier différent. QUndoStack - + Undo Annuler @@ -6043,7 +6057,7 @@ Veuillez choisir un nom de fichier différent. QWebFrame - + Request cancelled Requête annulée @@ -6459,7 +6473,7 @@ Veuillez choisir un nom de fichier différent. - + JavaScript Alert - %1 Alerte javascript - %1 @@ -6535,6 +6549,11 @@ Veuillez choisir un nom de fichier différent. + Select all + + + + Select to the next character Sélectionner le caractère suivant @@ -6603,11 +6622,21 @@ Veuillez choisir un nom de fichier différent. Delete to the end of the word Supprimer jusqu'à la fin du mot + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Qu'est-ce que c'est ? @@ -6615,7 +6644,7 @@ Veuillez choisir un nom de fichier différent. QWidget - + * * @@ -6623,7 +6652,7 @@ Veuillez choisir un nom de fichier différent. QWizard - + Go Back Précédent @@ -6685,7 +6714,7 @@ Veuillez choisir un nom de fichier différent. QWorkspace - + &Restore &Restaurer @@ -6755,7 +6784,7 @@ Veuillez choisir un nom de fichier différent. QXml - + no error occurred aucune erreur ne s'est produite @@ -6873,8 +6902,8 @@ Veuillez choisir un nom de fichier différent. QXmlStream - - + + Extra content at end of document. Conteny supplémentaire à la fin du document. @@ -7062,7 +7091,7 @@ Veuillez choisir un nom de fichier différent. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. Un attribute %1 avec la valeur %2 est déjà déclaré. @@ -7072,12 +7101,12 @@ Veuillez choisir un nom de fichier différent. Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. - + Network timeout. Le réseau ne répond pas. - + Element %1 can't be serialized because it appears outside the document element. L'élément %1 ne peut pas être sérialisé parce qu'il est hors de l'élément document. @@ -7086,7 +7115,7 @@ Veuillez choisir un nom de fichier différent. L'élément attribute %1 ne peut pas être sérialisé parce qu'il apparaît comme racine. - + Year %1 is invalid because it begins with %2. L'année %1 est invalide parce qu'elle commence par %2. @@ -7126,7 +7155,7 @@ Veuillez choisir un nom de fichier différent. Overflow : la date ne peut pas être représentée. - + At least one component must be present. Au moins un composant doit être présent. @@ -7137,7 +7166,7 @@ Veuillez choisir un nom de fichier différent. Au moins un composant doit apparaître après le délimiteur %1. - + No operand in an integer division, %1, can be %2. Pas d'opérande dans une division entière, %1, peut être %2. @@ -7152,17 +7181,17 @@ Veuillez choisir un nom de fichier différent. Le second opérande dans une division, %1, ne peut être nul (%2). - + %1 is not a valid value of type %2. %1 n'est pas une valeur valide du type %2. - + When casting to %1 from %2, the source value cannot be %3. En castant de %2 vers %1, la valeur source ne peut pas être %3. - + Integer division (%1) by zero (%2) is undefined. Division entière (%1) par zéro (%2) indéfinie. @@ -7193,17 +7222,17 @@ Veuillez choisir un nom de fichier différent. La multiplication d'une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite. - + A value of type %1 cannot have an Effective Boolean Value. Une valeur de type %1 ne peut pas avoir une Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques. - + Value %1 of type %2 exceeds maximum (%3). La valeur %1 de type %2 excède le maximum (%3). @@ -7213,7 +7242,7 @@ Veuillez choisir un nom de fichier différent. La valeur %1 de type %2 est inférieur au minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n'est pas conforme. @@ -7223,7 +7252,7 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas une valeur valide de type %2. - + Operator %1 cannot be used on type %2. L'opérateur %1 ne peut pas être utilisé pour le type %2. @@ -7233,7 +7262,7 @@ Veuillez choisir un nom de fichier différent. L'opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3. - + The namespace URI in the name for a computed attribute cannot be %1. L'URI de namespace dans le nom d'un attribut calculé ne peut pas être %1. @@ -7243,7 +7272,7 @@ Veuillez choisir un nom de fichier différent. Le nom d'un attribut calculé ne peut pas avoir l'URI de namespace %1 avec le nom local %2. - + Type error in cast, expected %1, received %2. Erreur de type lors du cast, attendu %1 mais reçu %2. @@ -7253,7 +7282,7 @@ Veuillez choisir un nom de fichier différent. En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé. - + No casting is possible with %1 as the target type. Aucun cast n'est possible avec %1 comme type de destination. @@ -7278,7 +7307,7 @@ Veuillez choisir un nom de fichier différent. Echec en castant de %1 ver %2 : %3 - + A comment cannot contain %1 Un commentaire ne peut pas contenir %1 @@ -7288,7 +7317,7 @@ Veuillez choisir un nom de fichier différent. Un commentaire ne peut pas finir par %1. - + No comparisons can be done involving the type %1. Aucune comparaison ne peut être faite avec le type %1. @@ -7298,12 +7327,12 @@ Veuillez choisir un nom de fichier différent. L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Un noeuds attribut ne peut être un fils d'un noeuds document. C'est pourquoi l'attribut %1 est mal placé. - + A library module cannot be evaluated directly. It must be imported from a main module. Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d'un module principal. @@ -7313,7 +7342,7 @@ Veuillez choisir un nom de fichier différent. Aucun template nommé %1 n'existe. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value. @@ -7323,7 +7352,7 @@ Veuillez choisir un nom de fichier différent. Un prédicat de position doit être évalué en une unique valeur numérique. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. @@ -7333,33 +7362,33 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux. - + The data of a processing instruction cannot contain the string %1 Les données d'une instruction de traitement ne peut contenir la chaîne %1 - + No namespace binding exists for the prefix %1 Aucun lien de namespace n'existe pour le préfixe %1 - + No namespace binding exists for the prefix %1 in %2 Aucun lien de namespace n'existe pour le préfixe %1 dans %2 - + %1 is an invalid %2 %1 est un ivalide %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 prend au maximum %n argument. %2 est donc invalide. @@ -7375,7 +7404,7 @@ Veuillez choisir un nom de fichier différent. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration. @@ -7390,27 +7419,27 @@ Veuillez choisir un nom de fichier différent. Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. - + %1 is not a valid XML 1.0 character. %1 n'est pas un caractère XML 1.0 valide. - + The first argument to %1 cannot be of type %2. Le premier argument de %1 ne peut être du type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents. - + %1 was called. %1 a été appelé. - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement. @@ -7425,7 +7454,7 @@ Veuillez choisir un nom de fichier différent. Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3 - + %1 matches newline characters %1 correspond à des caractères de saut de ligne @@ -7460,17 +7489,17 @@ Veuillez choisir un nom de fichier différent. Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié. - + It will not be possible to retrieve %1. Il sera impossible de récupérer %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n'est pas un document. - + The default collection is undefined I'l n'y a pas de collection par défaut @@ -7480,12 +7509,12 @@ Veuillez choisir un nom de fichier différent. %1 ne peut pas être récupéré - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Le forme de normalisation %1 n'est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Un décalage de zone doit être dans l'intervalle %1..%2 inclus. %3 est hors de l'intervalle. @@ -7494,17 +7523,17 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas un nombre complet de minutes. - + Required cardinality is %1; got cardinality %2. La cardinalité requise est %1; reçu %2. - + The item %1 did not match the required type %2. L'item %1 ne correspond pas au type requis %2. - + %1 is an unknown schema type. %1 est un type de schema inconnu. @@ -7525,7 +7554,7 @@ Veuillez choisir un nom de fichier différent. Aucun variable nommée %1 existe - + The variable %1 is unused La variable %1 est inutilisée @@ -7823,7 +7852,7 @@ Veuillez choisir un nom de fichier différent. Le nom d'une expression d'extension doit être dans un namespace. - + empty vide @@ -7848,7 +7877,7 @@ Veuillez choisir un nom de fichier différent. zéro ou plus - + Required type is %1, but %2 was found. Le type requis est %1, mais %2 a été reçu. @@ -7863,7 +7892,7 @@ Veuillez choisir un nom de fichier différent. Le focus est indéfini. - + It's not possible to add attributes after any other kind of node. Il est impossible d'ajouter des attributs après un autre type de noeuds. @@ -7873,7 +7902,7 @@ Veuillez choisir un nom de fichier différent. Un attribute de nom %1 a déjà été créé. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Seule le Unicode CodepointCollation est supporté (%1), %2 n'est pas supporté. @@ -7888,7 +7917,7 @@ Veuillez choisir un nom de fichier différent. L'attribut %1 ne peut pas être sérialisé car il apparaît à la racine. - + %1 is an unsupported encoding. %1 est un encodage non supporté. @@ -7903,14 +7932,18 @@ Veuillez choisir un nom de fichier différent. Le codepoint %1 dans %2 et utilisant l'encodage %3 est un caractère XML invalide. - + Ambiguous rule match. Corresonpdance aux règles ambigüe. - In a namespace constructor, the value for a namespace value cannot be an empty string. - Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. + Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7928,12 +7961,12 @@ Veuillez choisir un nom de fichier différent. Seul le préfixe %1 peut être lié à %2, et vice versa. - + Circularity detected Circularité détectée - + The parameter %1 is required, but no corresponding %2 is supplied. Le paramètre %1 est requis, mais aucun %2 correspondant n'est fourni. @@ -7943,12 +7976,12 @@ Veuillez choisir un nom de fichier différent. Le paramètre %1 est passé mais aucun %2 correspondant n'existe. - + The URI cannot have a fragment L'URI ne peut pas avoir de fragments - + Element %1 is not allowed at this location. L'élément %1 n'est pas autorisé à cet emplacement. @@ -8003,7 +8036,7 @@ Veuillez choisir un nom de fichier différent. Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. @@ -8078,7 +8111,7 @@ Veuillez choisir un nom de fichier différent. L'élément %1 ne peut pas avoir de fils. - + Element %1 cannot have a sequence constructor. L'élément %1 ne peut pas avoir un constructuer de séquence. diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index 45ddf03..ed8a3c3 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -1,10 +1,10 @@ - - + + QCLuceneResultWidget - + Search Results Ergebnisse @@ -32,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! Das "Collection File" ist noch nicht eingerichtet. @@ -111,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 Kann Datenbank nicht öffnen: '%1' '%2': %3 @@ -119,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! Der angegebene Namensraum existiert nicht! @@ -127,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! Kann Dokumentations-Datei nicht öffnen: %1: %2! @@ -135,7 +135,7 @@ QHelpGenerator - + Invalid help data! Ungültige Hilfe-Daten! @@ -180,7 +180,7 @@ Dokumentation erfolgreich generiert. - + Some tables already exist! Einige Tabellen existieren bereits! @@ -210,7 +210,7 @@ Kann Datei %1 nicht öffnen! Ãœberspringe sie. - + The filter %1 is already registered! Der Filter %1 is bereits registriert! @@ -243,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: Suche nach: @@ -286,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0 von 0 Treffern @@ -302,12 +302,12 @@ QObject - + Untitled Ohne Titel - + Unknown token. Unbekanntes Token. diff --git a/translations/qt_help_ja.ts b/translations/qt_help_ja.ts index 01ef482..5702cfd 100644 --- a/translations/qt_help_ja.ts +++ b/translations/qt_help_ja.ts @@ -1,9 +1,10 @@ - + + QCLuceneResultWidget - + Search Results @@ -31,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! @@ -110,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 @@ -118,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! @@ -126,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! @@ -134,7 +135,7 @@ QHelpGenerator - + Invalid help data! @@ -179,7 +180,7 @@ - + Some tables already exist! @@ -209,7 +210,7 @@ - + The filter %1 is already registered! @@ -242,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: @@ -285,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits @@ -301,12 +302,12 @@ QObject - + Untitled - + Unknown token. diff --git a/translations/qt_help_pl.ts b/translations/qt_help_pl.ts index 1b586bc..c85b46c 100644 --- a/translations/qt_help_pl.ts +++ b/translations/qt_help_pl.ts @@ -1,10 +1,10 @@ - - + + QCLuceneResultWidget - + Search Results Wyniki wyszukiwania @@ -32,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! Plik z kolekcjÄ… nie jest jeszcze ustawiony! @@ -115,7 +115,7 @@ Nie można otworzyć bazy danych! - + Cannot open database '%1' '%2': %3 Nie można otworzyć bazy danych '%1' '%2': %3 @@ -123,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! Podana przestrzeÅ„ nazw nie istnieje! @@ -131,7 +131,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! Nie można otworzyć pliku z dokumentacjÄ… %1: %2! @@ -147,7 +147,7 @@ QHelpGenerator - + Invalid help data! Niepoprawne dane pomocy! @@ -200,7 +200,7 @@ Dokumentacja zostaÅ‚a poprawnie wygenerowana. - + Some tables already exist! Niektóre tabele już istniejÄ…! @@ -230,7 +230,7 @@ Nie można otworzyć pliku %1! Zostaje on opuszczony. - + The filter %1 is already registered! Filtr %1 jest już zarejestrowany! @@ -263,7 +263,7 @@ QHelpSearchQueryWidget - + Search for: Wyszukaj: @@ -306,7 +306,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0 z 0 TrafieÅ„ @@ -322,7 +322,7 @@ QObject - + Untitled Nienazwany @@ -335,7 +335,7 @@ Nieznany znak w linii %1. Spodziewano siÄ™ "QtHelpProject"! - + Unknown token. Nieznany znak. diff --git a/translations/qt_help_tr_TR.ts b/translations/qt_help_tr_TR.ts new file mode 100644 index 0000000..7e2d8d1 --- /dev/null +++ b/translations/qt_help_tr_TR.ts @@ -0,0 +1,355 @@ + + + + + QCLuceneResultWidget + + + Search Results + + + + + Note: + + + + + The search results may not be complete since the documentation is still being indexed! + + + + + Your search did not match any documents. + + + + + (The reason for this might be that the documentation is still being indexed.) + + + + + QHelpCollectionHandler + + + The collection file is not set up yet! + + + + + Cannot load sqlite database driver! + + + + + + Cannot open collection file: %1 + + + + + Cannot create tables in file %1! + + + + + The specified collection file already exists! + + + + + Cannot create directory: %1 + + + + + Cannot copy collection file: %1 + + + + + Unknown filter! + + + + + Cannot register filter %1! + + + + + Cannot open documentation file %1! + + + + + Invalid documentation file! + + + + + The namespace %1 was not registered! + + + + + Namespace %1 already exists! + + + + + Cannot register namespace! + + + + + Cannot open database to optimize! + + + + + QHelpDBReader + + + Cannot open database '%1' '%2': %3 + + + + + QHelpEngineCore + + + The specified namespace does not exist! + + + + + QHelpEngineCorePrivate + + + Cannot open documentation file %1: %2! + + + + + QHelpGenerator + + + Invalid help data! + + + + + No output file name specified! + + + + + The file %1 cannot be overwritten! + + + + + Building up file structure... + + + + + Cannot open data base file %1! + + + + + Cannot register namespace %1! + + + + + Insert custom filters... + + + + + Insert help data for filter section (%1 of %2)... + + + + + Documentation successfully generated. + + + + + Some tables already exist! + + + + + Cannot create tables! + + + + + Cannot register virtual folder! + + + + + Insert files... + + + + + The file %1 does not exist! Skipping it. + + + + + Cannot open file %1! Skipping it. + + + + + The filter %1 is already registered! + + + + + Cannot register filter %1! + + + + + Insert indices... + + + + + Insert contents... + + + + + Cannot insert contents! + + + + + Cannot register contents! + + + + + QHelpSearchQueryWidget + + + Search for: + + + + + Search + + + + + Advanced search + + + + + words <B>similar</B> to: + + + + + <B>without</B> the words: + + + + + with <B>exact phrase</B>: + + + + + with <B>all</B> of the words: + + + + + with <B>at least one</B> of the words: + + + + + QHelpSearchResultWidget + + + 0 - 0 of 0 Hits + + + + + QHelpSearchResultWidgetPrivate + + + %1 - %2 of %3 Hits + + + + + QObject + + + Untitled + + + + + Unknown token. + + + + + Unknown token. Expected "QtHelpProject"! + + + + + Error in line %1: %2 + + + + + A virtual folder must not contain a '/' character! + + + + + A namespace must not contain a '/' character! + + + + + Missing namespace in QtHelpProject. + + + + + Missing virtual folder in QtHelpProject + + + + + Missing attribute in keyword at line %1. + + + + + The input file %1 could not be opened! + + + + diff --git a/translations/qt_help_untranslated.ts b/translations/qt_help_untranslated.ts index 01ef482..5702cfd 100644 --- a/translations/qt_help_untranslated.ts +++ b/translations/qt_help_untranslated.ts @@ -1,9 +1,10 @@ - + + QCLuceneResultWidget - + Search Results @@ -31,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! @@ -110,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 @@ -118,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! @@ -126,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! @@ -134,7 +135,7 @@ QHelpGenerator - + Invalid help data! @@ -179,7 +180,7 @@ - + Some tables already exist! @@ -209,7 +210,7 @@ - + The filter %1 is already registered! @@ -242,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: @@ -285,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits @@ -301,12 +302,12 @@ QObject - + Untitled - + Unknown token. diff --git a/translations/qt_help_zh_CN.ts b/translations/qt_help_zh_CN.ts index 0f2d3ed..cc100b7 100644 --- a/translations/qt_help_zh_CN.ts +++ b/translations/qt_help_zh_CN.ts @@ -1,11 +1,10 @@ - QCLuceneResultWidget - + Search Results æœç´¢ç»“æžœ @@ -33,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! 还没有设置收è—æ–‡ä»¶å‘¢ï¼ @@ -116,7 +115,7 @@ ä¸èƒ½æ‰“开数æ®åº“ï¼ - + Cannot open database '%1' '%2': %3 ä¸èƒ½æ‰“开数æ®åº““%1†“%2â€ï¼š%3 @@ -124,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! 指定的命å空间ä¸å­˜åœ¨ï¼ @@ -132,7 +131,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! ä¸èƒ½æ‰“开文档文件%1:%2ï¼ @@ -144,7 +143,7 @@ QHelpGenerator - + Invalid help data! 无效的帮助数æ®ï¼ @@ -179,7 +178,7 @@ 文档已ç»è¢«æˆåŠŸç”Ÿæˆã€‚ - + Some tables already exist! 一些表格已ç»å­˜åœ¨ï¼ @@ -209,7 +208,7 @@ ä¸èƒ½æ‰“开文件 %1ï¼æ­£åœ¨å¿½ç•¥å®ƒã€‚ - + The filter %1 is already registered! 过滤器 %1 å·²ç»è¢«æ³¨å†Œï¼ @@ -239,7 +238,7 @@ ä¸èƒ½æ³¨å†Œå†…å®¹ï¼ - + The file %1 cannot be overwritten! 文件 %1 ä¸èƒ½è¢«è¦†ç›–ï¼ @@ -252,7 +251,7 @@ QHelpSearchQueryWidget - + Search for: æœç´¢ï¼š @@ -295,7 +294,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 次点击中的 0 - 0 @@ -311,7 +310,7 @@ QObject - + Untitled 未命åçš„ @@ -324,7 +323,7 @@ 在行 %1 的未知标记。需è¦â€œQtHelpProjectâ€ï¼ - + A virtual folder must not contain a '/' character! 虚拟文件夹必须ä¸åŒ…å«â€œ/â€œå­—ç¬¦ï¼ diff --git a/translations/qt_help_zh_TW.ts b/translations/qt_help_zh_TW.ts index e2609d7..2e9340e 100644 --- a/translations/qt_help_zh_TW.ts +++ b/translations/qt_help_zh_TW.ts @@ -1,26 +1,30 @@ - - + + QCLuceneResultWidget - + Search Results æœå°‹çµæžœ + Note: 備註: + The search results may not be complete since the documentation is still being indexed! æœå°‹çµæžœå¯èƒ½ä¸å®Œæ•´ï¼Œå› ç‚ºæ–‡ä»¶ä»åœ¨å»ºç´¢å¼•ä¸­ï¼ + Your search did not match any documents. 您的æœå°‹å­—串沒有出ç¾åœ¨ä»»ä½•æ–‡ä»¶ä¸­ã€‚ + (The reason for this might be that the documentation is still being indexed.) (有å¯èƒ½æ˜¯å› ç‚ºæ–‡ä»¶ä»åœ¨å»ºç´¢å¼•ä¸­ã€‚) @@ -28,63 +32,78 @@ QHelpCollectionHandler - + The collection file is not set up yet! 收集檔尚未設定。 + Cannot load sqlite database driver! 無法載入 sqlite 資料庫驅動程å¼ï¼ + + Cannot open collection file: %1 無法開啟收集檔:%1 + Cannot create tables in file %1! 無法在檔案 %1 裡建立表格。 + The specified collection file already exists! 指定的收集檔已存在。 + Cannot create directory: %1 無法建立目錄:%1 + Cannot copy collection file: %1 無法複製收集檔:%1 + Unknown filter! 未知的éŽæ¿¾å™¨ï¼ + Cannot register filter %1! 無法註冊éŽæ¿¾å™¨ %1。 + Cannot open documentation file %1! 無法開啟文件檔 %1。 + Invalid documentation file! ä¸åˆæ³•çš„æ–‡ä»¶æª”ï¼ + The namespace %1 was not registered! 命å空間 %1 尚未註冊。 + Namespace %1 already exists! 命å空間 %1 已存在。 + Cannot register namespace! 無法註冊命å空間。 + Cannot open database to optimize! 無法開啟資料庫以進行最佳化。 @@ -96,7 +115,7 @@ 無法開啟資料庫。 - + Cannot open database '%1' '%2': %3 無法開啟資料庫 '%1' '%2':%3 @@ -104,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! 指定的命å空間ä¸å­˜åœ¨ã€‚ @@ -112,6 +131,7 @@ QHelpEngineCorePrivate + Cannot open documentation file %1: %2! 無法開啟文件檔 %1':%2ï¼ @@ -127,11 +147,12 @@ QHelpGenerator - + Invalid help data! ä¸åˆæ³•çš„說明資料。 + No output file name specified! 沒有指定輸出檔å。 @@ -140,6 +161,7 @@ 檔案 %1 已存在。 + Building up file structure... 建立檔案çµæ§‹ä¸­... @@ -148,42 +170,52 @@ 無法開啟資料庫。 + Cannot register namespace %1! 無法註冊命å空間 %1。 + Insert custom filters... æ’入自訂éŽæ¿¾å™¨... + Insert help data for filter section (%1 of %2)... æ’å…¥éŽæ¿¾å™¨å€æ®µçš„說明資料(%1 / %2)... + Documentation successfully generated. 文件已æˆåŠŸç”¢ç”Ÿã€‚ + Some tables already exist! 有些表格已存在。 + Cannot create tables! 無法建立表格。 + Cannot register virtual folder! 無法註冊虛擬資料夾。 + Insert files... æ’入檔案... + The file %1 does not exist! Skipping it. 檔案 %1 ä¸å­˜åœ¨ï¼å°‡å¿½ç•¥å®ƒã€‚ + Cannot open file %1! Skipping it. 無法開啟檔案 %1。將忽略它。 @@ -192,34 +224,42 @@ 無法將檔案資料æ’入資料庫。 + The filter %1 is already registered! éŽæ¿¾å™¨ %1 已註冊。 + Cannot register filter %1! 無法註冊éŽæ¿¾å™¨ %1。 + Insert indices... æ’入索引... + Insert contents... æ’入內容... + Cannot insert contents! 無法æ’入內容。 + Cannot register contents! 無法註冊內容。 + The file %1 cannot be overwritten! 檔案 %1 無法被覆寫。 + Cannot open data base file %1! 無法開啟資料庫檔案 %1。 @@ -227,35 +267,42 @@ QHelpSearchQueryWidget - + Search for: æœå°‹ï¼š + Search æœå°‹ + Advanced search 進階æœå°‹ + words <B>similar</B> to: <B>相似於</B>這些單字: + <B>without</B> the words: <B>ä¸å«</B>這些單字: + with <B>exact phrase</B>: <B>完全符åˆ</B>此片語: + with <B>all</B> of the words: 包å«<B>所有</B>單字: + with <B>at least one</B> of the words: <B>至少符åˆä¸€å€‹</B>單字: @@ -263,7 +310,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0/0 ç­†ç¬¦åˆ @@ -271,6 +318,7 @@ QHelpSearchResultWidgetPrivate + %1 - %2 of %3 Hits %1 - %2 / %3 ç­†ç¬¦åˆ @@ -278,7 +326,7 @@ QObject - + Untitled 未命å @@ -291,39 +339,47 @@ 第 %1 行有未知的符號。應該è¦æ˜¯ "QtHelpProject"。 - + A virtual folder must not contain a '/' character! 虛擬資料夾ä¸èƒ½å«æœ‰ / 字元。 + A namespace must not contain a '/' character! 命å空間ä¸èƒ½å«æœ‰ / 字元。 + Missing namespace in QtHelpProject. QtHelpProject 中沒有命å空間。 + Missing virtual folder in QtHelpProject QtHelpProject 中沒有虛擬資料夾。 + Missing attribute in keyword at line %1. 第 %1 行的關éµå­—中沒有屬性。 + The input file %1 could not be opened! 無法開啟輸入檔 %1。 + Unknown token. 未知的符號。 + Unknown token. Expected "QtHelpProject"! 未知的符號。應該為 "QtHelpProject"。 + Error in line %1: %2 第 %1 行發生錯誤:%2 diff --git a/translations/qt_iw.ts b/translations/qt_iw.ts index 3eea6dd..52ecc9a 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_iw.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True ×מת @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File העתק ×ו העבר קובץ @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) כל ×”×§×‘×¦×™× (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open פתח @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -570,7 +570,7 @@ to Q3MainWindow - + Line up סדר בשורה @@ -583,7 +583,7 @@ to Q3NetworkProtocol - + Operation stopped by the user הפעולה הופסקה על ידי המשתמש @@ -591,7 +591,7 @@ to Q3ProgressDialog - + Cancel ביטול @@ -600,7 +600,7 @@ to Q3TabDialog - + OK ×ישור @@ -629,7 +629,7 @@ to Q3TextEdit - + &Undo &בטל @@ -668,7 +668,7 @@ to Q3TitleBar - + System @@ -736,7 +736,7 @@ to Q3ToolBar - + More... @@ -744,7 +744,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -796,7 +796,7 @@ to Q3Wizard - + &Cancel @@ -824,9 +824,9 @@ to QAbstractSocket - - - + + + Host not found @@ -869,7 +869,7 @@ to QAbstractSpinBox - + &Step up @@ -887,13 +887,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. RTL - + Executable '%1' requires Qt %2, found Qt %3. @@ -903,7 +903,7 @@ to - + Activate @@ -939,7 +939,7 @@ to QCheckBox - + Uncheck @@ -957,7 +957,7 @@ to QColorDialog - + Hu&e: &גוון: @@ -1031,13 +1031,13 @@ to QComboBox - + Open פתח - + False שקר @@ -1055,7 +1055,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1076,12 +1076,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1099,8 +1099,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1115,7 +1115,7 @@ to - + Unable to fetch record %1 @@ -1133,7 +1133,7 @@ to QDateTimeEdit - + AM @@ -1156,7 +1156,7 @@ to QDial - + QDial @@ -1174,7 +1174,7 @@ to QDialog - + What's This? מה ×–×”? @@ -1187,9 +1187,9 @@ to QDialogButtonBox - + - + OK ×ישור @@ -1312,7 +1312,7 @@ to QDirModel - + Name ×©× @@ -1342,7 +1342,7 @@ to QDockWidget - + Close סגור @@ -1373,7 +1373,7 @@ to QErrorMessage - + &Show this message again &הצג הודעה זו שנית @@ -1401,13 +1401,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1430,8 +1435,8 @@ to QFileDialog - - + + All Files (*) כל ×”×§×‘×¦×™× (*) @@ -1454,13 +1459,13 @@ to תצוגת ×¤×¨×˜×™× - + File קובץ - + Open פתח @@ -1470,21 +1475,21 @@ to שמירה ×‘×©× - + - + &Open &פתח - + &Save &שמור - + &Rename ש&× ×” ×©× @@ -1499,27 +1504,27 @@ to הצג ×§×‘×¦×™× &×ž×•×¡×ª×¨×™× - + New Folder תיקיה חדשה - + Find Directory חפש ספריה - + Directories ספריות - + All Files (*.*) כל ×”×§×‘×¦×™× (*.*) - + %1 already exists. Do you want to replace it? @@ -1549,21 +1554,21 @@ Please verify the correct file name was given. - - + + Directory: - - + + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1579,7 +1584,7 @@ Do you want to delete it anyway? - + Recent Places @@ -1594,7 +1599,7 @@ Do you want to delete it anyway? - + Show @@ -1610,19 +1615,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: &×©× ×”×§×•×‘×¥: @@ -1642,7 +1647,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1704,7 +1709,7 @@ Do you want to delete it anyway? - + My Computer @@ -1717,7 +1722,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1934,7 +1939,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &גופן @@ -1983,7 +1988,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found המ×רח %1 × ×ž×¦× @@ -1993,7 +1998,7 @@ Do you want to delete it anyway? המ×רח × ×ž×¦× - + Connected to host %1 @@ -2120,7 +2125,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error @@ -2128,11 +2133,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2158,13 +2163,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused החיבור נדחה - + Host %1 not found @@ -2177,12 +2182,12 @@ Do you want to delete it anyway? ×ורך תוכן שגוי - + HTTPS connection requested but SSL support not compiled in - + @@ -2221,21 +2226,21 @@ Do you want to delete it anyway? החיבור נסגר - - + + Unknown error - + Request aborted - + No server set to connect to @@ -2253,7 +2258,12 @@ Do you want to delete it anyway? - + + Unknown authentication method + + + + @@ -2276,7 +2286,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2357,7 +2367,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2380,7 +2390,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2400,7 +2410,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2470,7 +2480,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2490,7 +2500,7 @@ Do you want to delete it anyway? - + Unknown error @@ -2498,7 +2508,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2521,7 +2531,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2529,7 +2539,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2560,7 +2570,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2575,8 +2585,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2596,7 +2606,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &בטל @@ -2634,8 +2644,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2651,7 +2661,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2659,8 +2669,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2673,7 +2683,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2730,7 +2740,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2740,7 +2750,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2758,7 +2768,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2773,7 +2783,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2818,7 +2828,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2826,7 +2836,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2919,7 +2929,7 @@ Do you want to delete it anyway? QMenu - + Close סגור @@ -2948,7 +2958,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2956,22 +2966,22 @@ Do you want to delete it anyway? ×ישור - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help עזרה - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -2980,21 +2990,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3002,7 +3002,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3015,7 +3015,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3148,7 +3148,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3156,7 +3156,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3184,7 +3184,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3194,7 +3194,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3212,7 +3212,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3225,7 +3225,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3233,7 +3233,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3242,7 +3242,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3271,7 +3271,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3298,18 +3298,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3317,7 +3311,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3327,7 +3321,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3350,19 +3344,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3372,19 +3366,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3402,12 +3396,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3417,7 +3411,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3442,7 +3436,7 @@ Do you want to delete it anyway? - + No host name given @@ -3451,7 +3445,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name ×©× @@ -3464,7 +3458,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3484,7 +3478,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3497,12 +3491,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3510,7 +3504,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3626,7 +3620,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected מחוברת מקומית @@ -3643,7 +3637,7 @@ Do you want to delete it anyway? ×œ× ×™×“×•×¢ - + OK ×ישור @@ -3660,7 +3654,7 @@ Do you want to delete it anyway? מדפסת - + Print all הדפס הכל @@ -3840,7 +3834,7 @@ Do you want to delete it anyway? - + Print @@ -4092,13 +4086,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4376,8 +4370,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4406,7 +4400,7 @@ Please choose a different file name. - + @@ -4426,6 +4420,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4434,7 +4433,7 @@ Please choose a different file name. QProgressDialog - + Cancel ביטול @@ -4458,7 +4457,7 @@ Please choose a different file name. QRegExp - + no error occurred ×œ× ×ירעה כל שגי××” @@ -4506,7 +4505,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4529,12 +4528,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4605,12 +4604,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4620,7 +4619,7 @@ Please choose a different file name. - + Right edge @@ -4630,7 +4629,7 @@ Please choose a different file name. - + Page left @@ -4641,7 +4640,7 @@ Please choose a different file name. - + Page right @@ -4652,7 +4651,7 @@ Please choose a different file name. - + Scroll left @@ -4662,7 +4661,7 @@ Please choose a different file name. - + Scroll right @@ -4690,7 +4689,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4701,7 +4700,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4711,8 +4710,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4790,7 +4789,7 @@ Please choose a different file name. QShortcut - + Space רווח @@ -5371,7 +5370,7 @@ Please choose a different file name. QSql - + Delete מחק @@ -5428,7 +5427,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5487,7 +5486,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5517,7 +5516,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5543,7 +5542,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5551,7 +5550,7 @@ Please choose a different file name. QTextControl - + &Undo &בטל @@ -5609,7 +5608,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5617,7 +5616,7 @@ Please choose a different file name. QUndoGroup - + Undo בטל @@ -5630,7 +5629,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5638,7 +5637,7 @@ Please choose a different file name. QUndoStack - + Undo בטל @@ -5709,7 +5708,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6119,7 +6118,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6195,6 +6194,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6263,11 +6267,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? מה ×–×”? @@ -6275,7 +6289,7 @@ Please choose a different file name. QWidget - + * @@ -6283,7 +6297,7 @@ Please choose a different file name. QWizard - + Cancel ביטול @@ -6341,7 +6355,7 @@ Please choose a different file name. QWorkspace - + &Restore ש&חזר @@ -6411,7 +6425,7 @@ Please choose a different file name. QXml - + no error occurred ×œ× ×ירעה כל שגי××” @@ -6529,8 +6543,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6714,7 +6728,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6724,12 +6738,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6739,7 +6753,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6790,7 +6804,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6805,17 +6819,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6846,17 +6860,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6866,7 +6880,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6876,7 +6890,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6886,7 +6900,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6896,7 +6910,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6906,7 +6920,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6931,7 +6945,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6941,7 +6955,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6951,12 +6965,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -6966,7 +6980,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -6976,7 +6990,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -6986,33 +7000,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7026,7 +7040,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7041,27 +7055,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7076,7 +7090,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7111,17 +7125,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7131,12 +7145,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7146,17 +7160,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7177,7 +7191,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7459,7 +7473,7 @@ Please choose a different file name. - + empty @@ -7484,7 +7498,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7499,7 +7513,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7509,12 +7523,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7529,13 +7543,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7554,12 +7568,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7569,12 +7583,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7629,7 +7643,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7704,7 +7718,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts index de76cf1..f3e7584 100644 --- a/translations/qt_ja_JP.ts +++ b/translations/qt_ja_JP.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 ã¯å®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“ @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True True @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + All Files (*.*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*.*) @@ -209,7 +209,7 @@ have libgstreamer-plugins-base installed. ディレクトリをé¸æŠž - + Copy or Move a File ファイルをコピーã¾ãŸã¯ç§»å‹• @@ -234,7 +234,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*) @@ -527,7 +527,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ to Q3MainWindow - + Line up 整列 @@ -590,7 +590,7 @@ to Q3NetworkProtocol - + Operation stopped by the user æ“作ãŒãƒ¦ãƒ¼ã‚¶ã«ã‚ˆã£ã¦åœæ­¢ã•ã‚Œã¾ã—㟠@@ -598,7 +598,7 @@ to Q3ProgressDialog - + Cancel キャンセル @@ -607,7 +607,7 @@ to Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ to Q3TextEdit - + &Undo å…ƒã«æˆ»ã™(&U) @@ -675,7 +675,7 @@ to Q3TitleBar - + System システム @@ -743,7 +743,7 @@ to Q3ToolBar - + More... ãã®ä»–... @@ -751,7 +751,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ to Q3Wizard - + &Cancel キャンセル(&C) @@ -831,9 +831,9 @@ to QAbstractSocket - - - + + + Host not found ホストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠@@ -876,7 +876,7 @@ to QAbstractSpinBox - + &Step up 上(&S) @@ -894,7 +894,7 @@ to QApplication - + Activate アクティブ㫠@@ -904,7 +904,7 @@ to メインウィンドウをアクティブã«ã™ã‚‹ - + Executable '%1' requires Qt %2, found Qt %3. 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã«ã¯ Qt %2 ãŒå¿…è¦ã§ã™ã€‚Qt %3 ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ @@ -914,7 +914,7 @@ to 互æ›æ€§ã®ãªã„Qtライブラリエラー - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ to QCheckBox - + Uncheck é¸æŠžè§£é™¤ @@ -964,7 +964,7 @@ to QColorDialog - + Hu&e: 色相(&E): @@ -1038,13 +1038,13 @@ to QComboBox - + Open オープン - + False False @@ -1062,7 +1062,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ to QDB2Driver - + Unable to connect 接続ã§ãã¾ã›ã‚“ - + Unable to commit transaction トランザクションをコミットã§ãã¾ã›ã‚“ @@ -1106,8 +1106,8 @@ to QDB2Result - - + + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -1122,7 +1122,7 @@ to 変数をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - + Unable to fetch record %1 レコード %1 をフェッãƒã§ãã¾ã›ã‚“ @@ -1140,7 +1140,7 @@ to QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ to QDial - + QDial @@ -1181,7 +1181,7 @@ to QDialog - + What's This? ヒント @@ -1194,9 +1194,9 @@ to QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ to QDirModel - + Name åå‰ @@ -1349,7 +1349,7 @@ to QDockWidget - + Close é–‰ã˜ã‚‹ @@ -1380,7 +1380,7 @@ to QErrorMessage - + Debug Message: デãƒãƒƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸: @@ -1408,13 +1408,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,44 +1442,44 @@ to QFileDialog - - + + All Files (*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*) - + Directories ディレクトリ - - + + Directory: ディレクトリ: - - + + File &name: ファイルå: - + &Open オープン(&O) - + &Save ä¿å­˜(&S) - + Open オープン @@ -1491,7 +1496,7 @@ Please verify the correct file name was given æ­£ã—ã„ファイルåãŒå…¥åŠ›ã•ã‚ŒãŸã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„ - + %1 already exists. Do you want to replace it? %1ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚ @@ -1513,7 +1518,7 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. @@ -1526,7 +1531,7 @@ Please verify the correct directory name was given. ソート - + &Rename åå‰ã®å¤‰æ›´(&R) @@ -1603,7 +1608,7 @@ Please verify the correct directory name was given. ファイルã®ç¨®é¡ž: - + Drive ドライブ @@ -1619,7 +1624,7 @@ Please verify the correct directory name was given. ä¸æ˜Ž - + All Files (*.*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*.*) @@ -1637,7 +1642,7 @@ Please verify the correct directory name was given. ディレクトリをé¸æŠž - + '%1' is write protected. Do you want to delete it anyway? '%1' ã¯æ›¸ãè¾¼ã¿ãŒç¦æ­¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -1654,7 +1659,7 @@ Do you want to delete it anyway? ディレクトリを削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ - + Find Directory ディレクトリã®æ¤œç´¢ @@ -1669,18 +1674,18 @@ Do you want to delete it anyway? - + &Choose - + New Folder æ–°ã—ã„フォルダ - + Recent Places @@ -1691,7 +1696,7 @@ Do you want to delete it anyway? 進む - + Remove @@ -1699,7 +1704,7 @@ Do you want to delete it anyway? QFileSystemModel - + Name åå‰ @@ -1761,7 +1766,7 @@ Do you want to delete it anyway? - + My Computer マイ コンピュータ @@ -1774,7 +1779,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1991,7 +1996,7 @@ Do you want to delete it anyway? QFontDialog - + &Font フォント(&F) @@ -2040,8 +2045,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected 未接続ã§ã™ @@ -2186,7 +2191,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ @@ -2194,11 +2199,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2224,26 +2229,26 @@ Do you want to delete it anyway? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ - + Request aborted è¦æ±‚ãŒä¸­æ­¢ã•ã‚Œã¾ã—㟠- + No server set to connect to 接続ãŒè¨­å®šã•ã‚Œã¦ã„るサーãƒãŒã‚ã‚Šã¾ã›ã‚“ @@ -2261,18 +2266,23 @@ Do you want to delete it anyway? サーãƒã®æŽ¥ç¶šãŒäºˆæœŸã›ãšé–‰ã˜ã‚‰ã‚Œã¾ã—㟠- + + Unknown authentication method + + + + Error writing response to device - + Connection refused 接続ãŒæ‹’å¦ã•ã‚Œã¾ã—㟠- + Host %1 not found @@ -2293,7 +2303,7 @@ Do you want to delete it anyway? 無効ãªHTTP応答ヘッダã§ã™ - + @@ -2342,7 +2352,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2423,7 +2433,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -2446,7 +2456,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB ãƒã‚¤ãƒŠãƒªãƒ©ãƒ¼ã‚¸ã‚ªãƒ–ジェクトを作æˆã§ãã¾ã›ã‚“ @@ -2466,7 +2476,7 @@ Do you want to delete it anyway? ãƒã‚¤ãƒŠãƒªãƒ©ãƒ¼ã‚¸ã‚ªãƒ–ジェクトを読ã¿è¾¼ã‚ã¾ã›ã‚“ - + Could not find array é…列ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠@@ -2536,7 +2546,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied 許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ @@ -2556,7 +2566,7 @@ Do you want to delete it anyway? デãƒã‚¤ã‚¹ã®æ®‹ã‚Šå®¹é‡ãŒã‚ã‚Šã¾ã›ã‚“ - + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ @@ -2564,7 +2574,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2587,7 +2597,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2595,7 +2605,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 '%1' をメモリã«ãƒžãƒƒãƒ”ングã§ãã¾ã›ã‚“ã§ã—ãŸ: %2 @@ -2638,7 +2648,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2653,8 +2663,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2674,7 +2684,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo å…ƒã«æˆ»ã™(&U) @@ -2712,8 +2722,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2729,7 +2739,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2737,8 +2747,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2751,7 +2761,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2808,7 +2818,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' データベースをオープンã§ãã¾ã›ã‚“ ' @@ -2818,7 +2828,7 @@ Do you want to delete it anyway? 接続ã§ãã¾ã›ã‚“ - + Unable to begin transaction トランザクションを開始ã§ãã¾ã›ã‚“ @@ -2836,7 +2846,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data データをフェッãƒã§ãã¾ã›ã‚“ @@ -2851,7 +2861,7 @@ Do you want to delete it anyway? 実行çµæžœã‚’記録ã§ãã¾ã›ã‚“ - + Unable to prepare statement プリペアステートメントを使ãˆã¾ã›ã‚“ @@ -2896,7 +2906,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2904,7 +2914,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2997,7 +3007,7 @@ Do you want to delete it anyway? QMenu - + Close é–‰ã˜ã‚‹ @@ -3026,7 +3036,7 @@ Do you want to delete it anyway? QMessageBox - + Help ヘルプ @@ -3046,28 +3056,21 @@ Do you want to delete it anyway? <p>Qtã¯Trolltechã®å•†å“ã§ã™ã€‚詳細ã¯<tt>http://qtsoftware.com/qt/</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt version %1.</p> - <p>ã“ã®ãƒ—ログラム㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> + <p>ã“ã®ãƒ—ログラム㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>ã“ã®ãƒ—ログラム㯠Qt オープンソース版ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> + <p>ã“ã®ãƒ—ログラム㯠Qt オープンソース版ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> <p>Qt オープンソース版ã¯ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºç”¨ã§ã™ã€‚ソースコードを公開ã—ãªã„商用アプリケーションを開発ã™ã‚‹ã«ã¯å•†ç”¨ç‰ˆã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚</p><p>Qtã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«ã¤ã„ã¦ã¯<tt>http://qtsoftware.com/company/model.html</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - + About Qt Qt ã«ã¤ã„㦠- + Show Details... 詳細を表示... @@ -3076,11 +3079,16 @@ Do you want to delete it anyway? Hide Details... 詳細を隠ã™... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext - + Select IM 入力メソッドをé¸æŠž @@ -3088,7 +3096,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 複数ã®å…¥åŠ›ãƒ¡ã‚½ãƒƒãƒ‰ã‚’切り替㈠@@ -3101,7 +3109,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + Unable to initialize non-blocking socket ノンブロッキングソケットをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ @@ -3234,7 +3242,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3242,7 +3250,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3270,7 +3278,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3280,7 +3288,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3298,7 +3306,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3311,7 +3319,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3319,7 +3327,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3328,7 +3336,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to initialize QOCIDriver åˆæœŸåŒ–ã§ãã¾ã›ã‚“ @@ -3357,7 +3365,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3384,18 +3392,16 @@ Do you want to delete it anyway? プリペアステートメントを使ãˆã¾ã›ã‚“ - - + Unable to bind value 値をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - Unable to execute select statement - SELECT ステートメントを実行ã§ãã¾ã›ã‚“ + SELECT ステートメントを実行ã§ãã¾ã›ã‚“ - + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -3403,7 +3409,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect 接続ã§ãã¾ã›ã‚“ @@ -3413,7 +3419,7 @@ Do you want to delete it anyway? 接続ã§ãã¾ã›ã‚“ - ドライãƒã¯å…¨ã¦ã®å¿…è¦ãªæ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ - + Unable to disable autocommit オートコミットを無効ã«ã§ãã¾ã›ã‚“ @@ -3436,13 +3442,13 @@ Do you want to delete it anyway? QODBCResult - - + + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ - + Unable to fetch next 次ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’フェッãƒã§ãã¾ã›ã‚“ @@ -3452,12 +3458,12 @@ Do you want to delete it anyway? プリペアステートメントを使ãˆã¾ã›ã‚“ - + Unable to bind variable 変数をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ステートメントã®å±žæ€§ã¨ã—㦠'SQL_CURSOR_STATUS' を設定ã§ãã¾ã›ã‚“。ODBC ドライãƒã®æ§‹æˆã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。 @@ -3465,12 +3471,12 @@ Do you want to delete it anyway? - + Unable to fetch last - + Unable to fetch @@ -3496,12 +3502,12 @@ Do you want to delete it anyway? True - + Home ホーム - + Operation not supported on %1 @@ -3511,7 +3517,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3536,7 +3542,7 @@ Do you want to delete it anyway? - + No host name given @@ -3545,7 +3551,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name åå‰ @@ -3558,7 +3564,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect 接続ã§ãã¾ã›ã‚“ @@ -3578,7 +3584,7 @@ Do you want to delete it anyway? トランザクションをロールãƒãƒƒã‚¯ã§ãã¾ã›ã‚“ã§ã—㟠- + Unable to subscribe @@ -3591,12 +3597,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query クエリーを作æˆã§ãã¾ã›ã‚“ - + Unable to prepare statement プリペアステートメントを使ãˆã¾ã›ã‚“ @@ -3604,7 +3610,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3732,7 +3738,7 @@ Do you want to delete it anyway? 給紙装置: - + OK OK @@ -3749,7 +3755,7 @@ Do you want to delete it anyway? 横 - + locally connected ローカルã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ @@ -3778,7 +3784,7 @@ Do you want to delete it anyway? å‚ç…§... - + Print all ã™ã¹ã¦å°åˆ· @@ -3998,7 +4004,7 @@ Do you want to delete it anyway? 両é¢å°åˆ· - + Print @@ -4248,13 +4254,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4536,8 +4542,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4566,7 +4572,7 @@ Please choose a different file name. - + @@ -4586,6 +4592,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4594,7 +4605,7 @@ Please choose a different file name. QProgressDialog - + Cancel キャンセル @@ -4618,7 +4629,7 @@ Please choose a different file name. QRegExp - + no error occurred エラーã¯ç™ºç”Ÿã—ã¾ã›ã‚“ã§ã—㟠@@ -4666,7 +4677,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -4689,12 +4700,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results 実行çµæžœã‚’フェッãƒã§ãã¾ã›ã‚“ - + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -4702,7 +4713,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -4769,12 +4780,12 @@ Please choose a different file name. QScrollBar - + Scroll here ã“ã“ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« - + Left edge 左端 @@ -4784,7 +4795,7 @@ Please choose a different file name. 上端 - + Right edge å³ç«¯ @@ -4794,7 +4805,7 @@ Please choose a different file name. 下端 - + Page left 1ページ左ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4805,7 +4816,7 @@ Please choose a different file name. 1ページ戻る - + Page right 1ページå³ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4816,7 +4827,7 @@ Please choose a different file name. 1ページ進む - + Scroll left å·¦ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4826,7 +4837,7 @@ Please choose a different file name. 上ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« - + Scroll right å³ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4854,7 +4865,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4865,7 +4876,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4875,8 +4886,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4954,7 +4965,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5540,7 +5551,7 @@ Please choose a different file name. QSql - + Delete 削除 @@ -5597,7 +5608,7 @@ Please choose a different file name. QSslSocket - + Error creating SSL context (%1) @@ -5656,7 +5667,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5686,7 +5697,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection 接続をオープンã§ãã¾ã›ã‚“ @@ -5716,7 +5727,7 @@ Please choose a different file name. ソケットæ“作ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ - + Operation on socket is not supported @@ -5724,7 +5735,7 @@ Please choose a different file name. QTextControl - + &Undo å…ƒã«æˆ»ã™(&U) @@ -5782,7 +5793,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 ã“ã®ãƒ—ラットフォーム㯠IPv6 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ @@ -5790,7 +5801,7 @@ Please choose a different file name. QUndoGroup - + Undo å…ƒã«æˆ»ã™ @@ -5803,7 +5814,7 @@ Please choose a different file name. QUndoModel - + <empty> <空> @@ -5811,7 +5822,7 @@ Please choose a different file name. QUndoStack - + Undo å…ƒã«æˆ»ã™ @@ -5882,7 +5893,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6292,7 +6303,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6368,6 +6379,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6436,11 +6452,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ヒント @@ -6448,7 +6474,7 @@ Please choose a different file name. QWidget - + * * @@ -6456,7 +6482,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6514,7 +6540,7 @@ Please choose a different file name. QWorkspace - + &Restore å…ƒã«æˆ»ã™(&R) @@ -6584,7 +6610,7 @@ Please choose a different file name. QXml - + no error occurred エラーã¯ç™ºç”Ÿã—ã¾ã›ã‚“ã§ã—㟠@@ -6702,8 +6728,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6887,7 +6913,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6897,12 +6923,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6912,7 +6938,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6952,7 +6978,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6963,7 +6989,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6978,17 +7004,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7019,17 +7045,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7039,7 +7065,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7049,7 +7075,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7059,7 +7085,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7069,7 +7095,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7079,7 +7105,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7104,7 +7130,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7114,7 +7140,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7124,12 +7150,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7139,7 +7165,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7149,7 +7175,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7159,33 +7185,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7199,7 +7225,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7214,27 +7240,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7249,7 +7275,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7284,17 +7310,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7304,12 +7330,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7319,17 +7345,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7350,7 +7376,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7632,7 +7658,7 @@ Please choose a different file name. - + empty @@ -7657,7 +7683,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7672,7 +7698,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7682,12 +7708,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7702,13 +7728,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7727,12 +7753,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7742,12 +7768,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7802,7 +7828,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7877,7 +7903,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts index b7b9cb7..efc8401 100644 --- a/translations/qt_pl.ts +++ b/translations/qt_pl.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>UrzÄ…dzenie dźwiÄ™kowe <b>%1</b> nie dziaÅ‚a.<br/>Przywracanie do <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab Zamknij kartÄ™ @@ -80,7 +80,7 @@ ObsÅ‚uga dźwiÄ™ku i wideo zostaÅ‚a wyÅ‚Ä…czona Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -96,24 +96,24 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższego kodeka: %0 - - + + - - - - + + + + Could not open media source. Nie można otworzyć źródÅ‚a mediów. - + Invalid source type. Niepoprawny typ źródÅ‚a. - + Could not locate media source. Nie można znaleźć źródÅ‚a mediów. @@ -147,7 +147,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3Accel - + %1, %2 not defined %1, %2 nie okreÅ›lone @@ -160,7 +160,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3DataTable - + Delete Skasuj @@ -188,7 +188,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3FileDialog - + %1 File not found. Check path and filename. @@ -205,7 +205,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. - + All Files (*) Wszystkie pliki (*) @@ -360,7 +360,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. - + Open Otwórz @@ -521,7 +521,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. Q3LocalFs - + Could not create directory %1 Nie można utworzyć katalogu @@ -571,7 +571,7 @@ na Q3MainWindow - + Customize... Ustawienia użytkownika... @@ -584,7 +584,7 @@ na Q3NetworkProtocol - + Operation stopped by the user Operacja zatrzymana przez użytkownika @@ -592,7 +592,7 @@ na Q3ProgressDialog - + Cancel Anuluj @@ -601,7 +601,7 @@ na Q3TabDialog - + Apply Zatwierdź @@ -630,7 +630,7 @@ na Q3TextEdit - + Clear Wyczyść @@ -669,7 +669,7 @@ na Q3TitleBar - + Close Zamknij okno @@ -737,7 +737,7 @@ na Q3ToolBar - + More... WiÄ™cej... @@ -745,7 +745,7 @@ na Q3UrlOperator - + (unknown) (nieznany) @@ -797,7 +797,7 @@ na Q3Wizard - + < &Back < &Wstecz @@ -825,9 +825,9 @@ na QAbstractSocket - - - + + + Connection refused PoÅ‚Ä…czenie odrzucone @@ -870,7 +870,7 @@ na QAbstractSpinBox - + Step &down Krok w &dół @@ -888,7 +888,7 @@ na QApplication - + Activate Uaktywnij @@ -898,7 +898,7 @@ na Uaktywnia główne okno programu - + Executable '%1' requires Qt %2, found Qt %3. Program '%1' wymaga do uruchomienia Qt %2, znaleziono Qt %3. @@ -908,7 +908,7 @@ na Niekompatybilność biblioteki Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -940,7 +940,7 @@ na QCheckBox - + Check Zaznacz @@ -958,7 +958,7 @@ na QColorDialog - + &Add to Custom Colors &Dodaj do wÅ‚asnych kolorów @@ -1016,13 +1016,13 @@ na QComboBox - + Open Otwórz - + False FaÅ‚sz @@ -1065,7 +1065,7 @@ na %1: nieznany bÅ‚Ä…d %2 - + %1: key is empty QSystemSemaphore %1: klucz jest pusty @@ -1086,12 +1086,12 @@ na QDB2Driver - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia - + Unable to commit transaction Nie można dokonać transakcji @@ -1109,8 +1109,8 @@ na QDB2Result - - + + Unable to execute statement Nie można wykonać polecenia @@ -1125,7 +1125,7 @@ na Nie można powiÄ…zać zmiennej - + Unable to fetch record %1 Nie można pobrać rekordu %1 @@ -1143,7 +1143,7 @@ na QDateTimeEdit - + am am @@ -1166,7 +1166,7 @@ na QDial - + QDial QDial @@ -1184,7 +1184,7 @@ na QDialog - + What's This? Co to jest? @@ -1197,7 +1197,7 @@ na QDialogButtonBox - + Abort Przerwij @@ -1267,7 +1267,7 @@ na Ni&e dla wszystkich - + OK @@ -1322,7 +1322,7 @@ na QDirModel - + Date Modified Data modyfikacji @@ -1352,7 +1352,7 @@ na QDockWidget - + Close Zamknij @@ -1383,7 +1383,7 @@ na QErrorMessage - + Debug Message: Komunikat dla programisty: @@ -1411,13 +1411,18 @@ na QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1440,22 +1445,22 @@ na QFileDialog - + %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz zamienić? - + '%1' is write protected. Do you want to delete it anyway? '%1' jest zabezpieczony przed zapisem. Czy na pewno chcesz go skasować? - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1464,7 +1469,7 @@ Katalog nie znaleziony. Sprawdź podanÄ… nazwÄ™ katalogu. - + %1 File not found. Please verify the correct file name was given. @@ -1473,12 +1478,12 @@ Plik nie znaleziony. ProszÄ™ o sprawdzenie podanej nazwy pliku. - + Are sure you want to delete '%1'? Czy na pewno chcesz skasować '%1'? - + Recent Places @@ -1489,12 +1494,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Powrót - + Could not delete directory. Nie można skasować katalogu. - + &Delete &Skasuj @@ -1505,18 +1510,18 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Szczegóły - + Directories Katalogi - - + + Directory: Katalog: - + Drive UrzÄ…dzenie @@ -1546,7 +1551,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + &Open &Otwórz @@ -1558,18 +1563,18 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Katalog wyżej - + &Rename &ZmieÅ„ nazwÄ™ - + &Save &Zachowaj - + Show &hidden files Pokaż &ukryte pliki @@ -1594,7 +1599,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Znajdź katalog - + All Files (*.*) Wszystkie pliki (*.*) @@ -1610,35 +1615,35 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Do przodu - + New Folder Nowy katalog - + &New Folder &Nowy katalog - + &Choose &Wybierz - + Remove UsuÅ„ - - + + All Files (*) Wszystkie pliki (*) - - + + File &name: Nazwa &pliku: @@ -1658,7 +1663,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFileSystemModel - + %1 TB %1 TB @@ -1720,7 +1725,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Data modyfikacji - + My Computer Mój komputer @@ -1733,7 +1738,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFontDatabase - + Normal Normalny @@ -1952,7 +1957,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFontDialog - + Effects Efekty @@ -2001,8 +2006,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFtp - - + + Changing directory failed: %1 Zmiana katalogu zakoÅ„czona bÅ‚Ä™dem: @@ -2147,7 +2152,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHostInfo - + Unknown error Nieznany bÅ‚Ä…d @@ -2155,11 +2160,11 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHostInfoAgent - + - + @@ -2185,7 +2190,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHttp - + Connected to host PodÅ‚Ä…czony do hosta @@ -2195,7 +2200,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. PodÅ‚Ä…czony do hosta %1 - + Connection closed PoÅ‚Ä…czenie zakoÅ„czone @@ -2217,7 +2222,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Host %1 znaleziony - + Host %1 not found @@ -2237,7 +2242,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Komenda HTTP zakoÅ„czona bÅ‚Ä™dem - + @@ -2245,7 +2250,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Niepoprawne ciaÅ‚o HTTP - + Invalid HTTP response header Niepoprawny nagłówek odpowiedzi HTTP @@ -2257,38 +2262,43 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Brak serwera do podÅ‚Ä…czenia - + Request aborted Komenda przerwana - + Server closed connection unexpectedly Serwer niespodziewanie zakoÅ„czyÅ‚ poÅ‚Ä…czenie - - + + Unknown error Nieznany bÅ‚Ä…d - + HTTPS connection requested but SSL support not compiled in Zażądano poÅ‚Ä…czenia HTTPS lecz obsÅ‚uga SSL nie jest wkompilowana - + Wrong content length BÅ‚Ä™dna dÅ‚ugość zawartoÅ›ci - + + Unknown authentication method + + + + Proxy authentication required Wymagana autoryzacja poÅ›rednika @@ -2328,7 +2338,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. NawiÄ…zanie sesji SSL nie powiodÅ‚o siÄ™ - + Connection refused (or timed out) PoÅ‚Ä…czenie odrzucone (przekroczony czas poÅ‚Ä…czenia) @@ -2384,7 +2394,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIBaseDriver - + Could not start transaction Nie można rozpocząć transakcji @@ -2407,7 +2417,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIBaseResult - + Could not allocate statement Nie można zaallokować polecenia @@ -2469,17 +2479,17 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można dokonać transakcji - + Unable to create BLOB Nie można utworzyć obiektu typu BLOB - + Unable to execute query Nie można wykonać zapytania - + Unable to open BLOB Nie można otworzyć obiektu typu BLOB @@ -2497,7 +2507,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIODevice - + No space left on device Brak wolnego miejsca na urzÄ…dzeniu @@ -2517,7 +2527,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Zbyt wiele otwartych plików - + Unknown error Nieznany bÅ‚Ä…d @@ -2525,7 +2535,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QInputContext - + Mac OS X input method Metoda wprowadzania Mac OS X @@ -2548,7 +2558,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QInputDialog - + Enter a value: Podaj wartość: @@ -2556,7 +2566,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLibrary - + Could not mmap '%1': %2 Nie można wykonać przypisania '%1': %2 @@ -2587,7 +2597,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + The shared library was not found. Biblioteka współdzielona niedostÄ™pna. @@ -2602,8 +2612,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Wtyczka "%1" używa innej wersji biblioteki Qt. (Nie można Å‚Ä…czyć bibliotek zwykÅ‚ych i debugowych.) - - + + Cannot load library %1: %2 Nie można zaÅ‚adować biblioteki %1: %2 @@ -2623,7 +2633,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLineEdit - + &Copy S&kopiuj @@ -2661,8 +2671,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLocalServer - - + + %1: Name error %1: BÅ‚Ä…d nazwy @@ -2678,7 +2688,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + %1: Unknown error %2 %1: Nieznany bÅ‚Ä…d %2 @@ -2686,8 +2696,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLocalSocket - - + + %1: Connection refused %1: Odmowa poÅ‚Ä…czenia @@ -2700,7 +2710,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + %1: Invalid name %1: Niepoprawna nazwa @@ -2757,7 +2767,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMYSQLDriver - + Unable to begin transaction Nie można rozpocząć transakcji @@ -2767,7 +2777,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można potwierdzić transakcji - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia @@ -2777,7 +2787,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można otworzyć bazy danych ' - + Unable to rollback transaction Nie można wycofać transakcji @@ -2785,7 +2795,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMYSQLResult - + Unable to bind outvalues Nie można powiÄ…zać wartoÅ›ci zewnÄ™trznych @@ -2796,22 +2806,22 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można powiÄ…zać wartoÅ›ci - + Unable to execute query Nie można wykonać zapytania - + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch data Nie można pobrać danych - + Unable to prepare statement Nie można przygotować polecenia @@ -2822,12 +2832,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można skasować polecenia - + Unable to store result Nie można zachować wyników - + Unable to store statement results Nie można zachować wyników polecenia @@ -2845,7 +2855,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMdiArea - + (Untitled) (Nienazwany) @@ -2853,7 +2863,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2946,7 +2956,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMenu - + Close Zamknij @@ -2968,27 +2978,24 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMessageBox - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p> Ten program używa Qt Open Source Edition w wersji %1.</p><p>Qt Open Source Edition jest przeznaczone do pisania aplikacji z otwartym kodem źródÅ‚owym. W przypadku aplikacji zamkniÄ™tych (bez kodu źródÅ‚owego) wymagana jest licencja komercyjna Qt.</p><p>Strona <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> opisuje sposób licencjonowania Qt.</p> + <p> Ten program używa Qt Open Source Edition w wersji %1.</p><p>Qt Open Source Edition jest przeznaczone do pisania aplikacji z otwartym kodem źródÅ‚owym. W przypadku aplikacji zamkniÄ™tych (bez kodu źródÅ‚owego) wymagana jest licencja komercyjna Qt.</p><p>Strona <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> opisuje sposób licencjonowania Qt.</p> - <p>This program uses Qt version %1.</p> - <p> Ten program używa Qt w wersji %1.</p> + <p> Ten program używa Qt w wersji %1.</p> - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>Informacje o Qt</h3>%1<p>Qt jest bibliotekÄ… C++ do tworzenia przenoÅ›nego oprogramowania.</p><p>Qt umożliwia pisanie przenoÅ›nego kodu zarówno dla MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux jak i dla wszystkich głównych komercyjnych wariantów Unix'ów. Qt jest również dostÄ™pne dla urzÄ…dzeÅ„ specjalizowanych i przenoÅ›nych jako Qt dla Embedded Linux lub jako Qt dla Windows CE.</p><p>Producentem Qt jest Nokia. WiÄ™cej informacji na stronie <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> + <h3>Informacje o Qt</h3>%1<p>Qt jest bibliotekÄ… C++ do tworzenia przenoÅ›nego oprogramowania.</p><p>Qt umożliwia pisanie przenoÅ›nego kodu zarówno dla MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux jak i dla wszystkich głównych komercyjnych wariantów Unix'ów. Qt jest również dostÄ™pne dla urzÄ…dzeÅ„ specjalizowanych i przenoÅ›nych jako Qt dla Embedded Linux lub jako Qt dla Windows CE.</p><p>Producentem Qt jest Nokia. WiÄ™cej informacji na stronie <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + About Qt Informacje o Qt - + Help Pomoc @@ -3006,7 +3013,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + Show Details... Pokaż szczegóły... @@ -3014,7 +3026,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMultiInputContext - + Select IM Wybierz metodÄ™ wprowadzania @@ -3022,7 +3034,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMultiInputContextPlugin - + Multiple input method switcher PrzeÅ‚Ä…cznik metody wprowadzania @@ -3035,7 +3047,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNativeSocketEngine - + Another socket is already listening on the same port Inne gniazdo nasÅ‚uchuje już na tym porcie @@ -3168,7 +3180,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessCacheBackend - + Error opening %1 BÅ‚Ä…d otwierania %1 @@ -3176,7 +3188,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessFileBackend - + Request for opening non-local file %1 Żądanie otwarcia zdalnego pliku %1 @@ -3204,7 +3216,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessFtpBackend - + No suitable proxy found Nie odnaleziono odpowiedniego poÅ›rednika @@ -3214,7 +3226,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można otworzyć %1: jest to katalog - + Logging in to %1 failed: authentication required BÅ‚Ä…d podczas logowania do %1: wymagana autoryzacja @@ -3232,7 +3244,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessHttpBackend - + No suitable proxy found Nie odnaleziono odpowiedniego poÅ›rednika @@ -3245,7 +3257,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. BÅ‚Ä…d podczas pobierania %1 - odpowiedź serwera: %2 - + Protocol "%1" is unknown Protokół "%1" nie jest znany @@ -3253,7 +3265,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkReplyImpl - + Operation canceled Operacja anulowana @@ -3262,7 +3274,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QOCIDriver - + Unable to initialize QOCIDriver Nie można dokonać inicjalizacji @@ -3291,7 +3303,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QOCIResult - + Unable to bind column for batch execute @@ -3318,18 +3330,16 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można przygotować polecenia - - + Unable to bind value Nie można powiÄ…zać wartoÅ›ci - Unable to execute select statement - Nie można wykonać polecenia select + Nie można wykonać polecenia select - + Unable to execute statement Nie można wykonać polecenia @@ -3337,12 +3347,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QODBCDriver - + Unable to commit transaction Nie można potwierdzić transakcji - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia @@ -3352,7 +3362,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można nawiÄ…zać poÅ‚Ä…czenia - sterownik nie obsÅ‚uguje caÅ‚ej potrzebnej funkcjonalnoÅ›ci - + Unable to disable autocommit Nie można wyÅ‚Ä…czyć trybu automatycznego dokonywania transakcji @@ -3370,24 +3380,24 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Nie można ustawić 'SQL_CURSOR_STATIC' jako atrybutu polecenia. ProszÄ™ sprawdzić konfiguracje sterownika ODBC - + Unable to bind variable Nie można powiÄ…zać zmiennej - - + + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch next Nie można pobrać kolejnych danych @@ -3399,12 +3409,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + Unable to fetch last Nie można pobrać ostatnich danych - + Unable to fetch Nie można pobrać @@ -3422,12 +3432,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QObject - + Home Strona startowa - + Operation not supported on %1 Operacja nieobsÅ‚ugiwana na %1 @@ -3437,7 +3447,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Niepoprawny URI: %1 - + Write error writing to %1: %2 BÅ‚Ä…d w trakcie zapisywania do %1: %2 @@ -3462,7 +3472,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. BÅ‚Ä…d protokoÅ‚u: otrzymano pakiet o zerowym rozmiarze - + No host name given Nie podano nazwy hosta @@ -3471,7 +3481,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPPDOptionsModel - + Name Nazwa @@ -3484,7 +3494,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPSQLDriver - + Could not begin transaction Nie można rozpocząć transakcji @@ -3504,7 +3514,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można nawiÄ…zać poÅ‚Ä…czenia - + Unable to subscribe Nie można wykonać subskrypcji @@ -3517,12 +3527,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPSQLResult - + Unable to create query Nie można utworzyć zapytania - + Unable to prepare statement Nie można przygotować wyrażenia @@ -3530,7 +3540,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPageSetupWidget - + Centimeters (cm) Centymetry (cm) @@ -3646,7 +3656,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPrintDialog - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3696,7 +3706,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. A9 (37 x 52 mm) - + Aliases: %1 Aliasy: %1 @@ -3772,7 +3782,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. podÅ‚Ä…czony lokalnie - + OK OK @@ -3828,7 +3838,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. US Common #10 Envelope (105 x 241 mm) - + Print @@ -4075,7 +4085,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QPrintPreviewDialog - + %1% %1% @@ -4175,7 +4185,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + Page Setup Ustawienia strony @@ -4348,8 +4358,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QProcess - - + + Could not open input redirection for reading @@ -4378,7 +4388,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + @@ -4398,6 +4408,11 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. + + No program defined + + + Process failed to start @@ -4406,7 +4421,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QProgressDialog - + Cancel Anuluj @@ -4430,7 +4445,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QRegExp - + bad char class syntax niepoprawna skÅ‚adnia klasy znakowej @@ -4478,7 +4493,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLite2Driver - + Error to open database Nie można otworzyć bazy danych @@ -4501,12 +4516,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLite2Result - + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch results Nie można pobrać wyników @@ -4514,7 +4529,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLiteDriver - + Error closing database BÅ‚Ä…d zamykania bazy danych @@ -4577,12 +4592,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QScrollBar - + Bottom W dół - + Left edge Lewa krawÄ™dź @@ -4597,23 +4612,23 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Linia w górÄ™ - + Page down Strona w dół - + Page left Strona w lewo - + Page right Strona w prawo - + Page up Strona do góry @@ -4624,37 +4639,37 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Pozycja - + Right edge Prawa krawÄ™dź - + Scroll down PrzewiÅ„ w dół - + Scroll here PrzewiÅ„ tutaj - + Scroll left PrzewiÅ„ w lewo - + Scroll right PrzewiÅ„ w prawo - + Scroll up PrzewiÅ„ do góry - + Top Do góry @@ -4662,13 +4677,13 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSharedMemory - + %1: create size is less then 0 %1: rozmiar przy tworzeniu mniejszy od 0 - + %1: unable to lock %1: nie można zablokować @@ -4678,8 +4693,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. %1: nie można odblokować - - + + %1: permission denied %1: brak dostÄ™pu @@ -4762,7 +4777,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QShortcut - + + + @@ -5343,7 +5358,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSql - + Cancel Anuluj @@ -5400,7 +5415,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSslSocket - + Unable to write data: %1 Nie można zapisać danych: %1 @@ -5459,7 +5474,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSystemSemaphore - + %1: out of resources %1: zasoby wyczerpane @@ -5489,7 +5504,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTDSDriver - + Unable to open connection Nie można otworzyć poÅ‚Ä…czenia @@ -5515,7 +5530,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTcpServer - + Operation on socket is not supported Operacja na gnieździe nieobsÅ‚ugiwana @@ -5523,7 +5538,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTextControl - + &Copy S&kopiuj @@ -5581,7 +5596,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUdpSocket - + This platform does not support IPv6 Ta platforma nie obsÅ‚uguje IPv6 @@ -5589,7 +5604,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoGroup - + Redo Przywróć @@ -5602,7 +5617,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoModel - + <empty> <pusty> @@ -5610,7 +5625,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoStack - + Redo Przywróć @@ -5681,7 +5696,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWebFrame - + Request cancelled ProÅ›ba anulowana @@ -6093,7 +6108,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + JavaScript Alert - %1 @@ -6169,6 +6184,11 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. + Select all + + + + Select to the next character @@ -6237,11 +6257,21 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Co to jest? @@ -6249,7 +6279,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWidget - + * * @@ -6257,7 +6287,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWizard - + Go Back Wróć @@ -6319,7 +6349,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWorkspace - + %1 - [%2] %1 - [%2] @@ -6389,7 +6419,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QXml - + encoding declaration or standalone declaration expected while reading the XML declaration oczekiwano deklaracji "encoding" lub "standalone" podczas odczytywania deklaracji XML @@ -6507,8 +6537,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QXmlStream - - + + Extra content at end of document. Dodatkowa treść na koÅ„cu dokumentu. @@ -6692,12 +6722,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QtXmlPatterns - + Network timeout. Przekroczony czas poÅ‚Ä…czenia. - + Element %1 can't be serialized because it appears outside the document element. Element %1 nie może być zserializowany ponieważ pojawiÅ‚ siÄ™ poza elementem "document". @@ -6707,7 +6737,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Atrybut %1 nie może być zserializowany ponieważ pojawiÅ‚ siÄ™ na najwyższym poziomie. - + Year %1 is invalid because it begins with %2. Rok %1 jest niepoprawny ponieważ rozpoczyna siÄ™: %2. @@ -6747,7 +6777,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. PrzepeÅ‚nienie: Data nie może być wyrażona. - + At least one component must be present. Przynajmniej jeden komponent musi być obecny. @@ -6758,22 +6788,22 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przynajmniej jeden komponent musi wystÄ…pić po nawiasie %1. - + No operand in an integer division, %1, can be %2. Å»aden skÅ‚adnik dzielenia %1 nie może być %2. - + %1 is not a valid value of type %2. %1 nie jest poprawnÄ… wartoÅ›ciÄ… dla typu %2. - + When casting to %1 from %2, the source value cannot be %3. W rzutowaniu %1 na %2 wartość źródÅ‚owa nie może być %3. - + Dividing a value of type %1 by %2 (not-a-number) is not allowed. Dzielenie wartoÅ›ci typu %1 przez %2 (typ nienumeryczny) jest niedozwolone. @@ -6789,17 +6819,17 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Mnożenie wartoÅ›ci typu %1 przez %2 lub %3 (plus lub minus nieskoÅ„czoność) jest niedozwolone. - + A value of type %1 cannot have an Effective Boolean Value. Wartość typu %1 nie może posiadać efektywnej wartoÅ›ci boolowskiej (EBV). - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Efektywna wartość boolowska (EBV) nie może być obliczona dla sekwencji zawierajÄ…cej dwie lub wiÄ™cej wartoÅ›ci atomowe. - + Value %1 of type %2 exceeds maximum (%3). Wartość %1 typu %2 przekracza maksimum (%3). @@ -6809,7 +6839,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wartość %1 typu %2 jest poniżej minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Wartość typu %1 musi zawierać parzystÄ… liczbÄ™ cyfr. Wartość %2 nie zawiera. @@ -6819,7 +6849,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wartość %1 nie jest poprawna jako wartość typu %2. - + Operator %1 cannot be used on type %2. Operator %1 nie może być użyty dla typu %2. @@ -6829,7 +6859,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Operator %1 nie może być użyty dla atomowych wartoÅ›ci typu %2 i %3. - + The namespace URI in the name for a computed attribute cannot be %1. PrzestrzeÅ„ nazw URI nie może być %1 w nazwie dla obliczonego atrybutu. @@ -6839,7 +6869,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Nazwa dla wyliczonego atrybutu nie może mieć przestrzeni nazw URI %1 z lokalnÄ… nazwÄ… %2. - + Type error in cast, expected %1, received %2. BÅ‚Ä…d typów w rzutowaniu: spodziewano siÄ™ %1, otrzymano %2. @@ -6849,7 +6879,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Podczas rzutowania na %1 lub na typ pochodny, wartość źródÅ‚owa musi być tego samego typu lub musi być zapisem tekstowym. Typ %2 nie jest dozwolony. - + It is not possible to cast from %1 to %2. Nie można zrzutować %1 na %2. @@ -6869,7 +6899,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. BÅ‚Ä…d podczas rzutowania %1 na %2: %3 - + A comment cannot contain %1 Komentarz nie może zawierać %1 @@ -6879,7 +6909,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Komentarz nie może koÅ„czyć siÄ™: %1. - + No comparisons can be done involving the type %1. Å»adne porównania nie mogÄ… być wykonane dla typu %1. @@ -6889,12 +6919,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Operator %1 jest niedostÄ™pny pomiÄ™dzy atomowymi wartoÅ›ciami %2 i %3. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. WÄ™zeÅ‚ "attribute" nie może być dzieckiem wÄ™zÅ‚a "document". Dlatego atrybut %1 jest w zÅ‚ym miejscu. - + A library module cannot be evaluated directly. It must be imported from a main module. ModuÅ‚ biblioteki nie może być bezpoÅ›rednio oceniony. On musi być zaimportowany z głównego moduÅ‚u. @@ -6904,7 +6934,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Szablon o nazwie %1 nie istnieje. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Wartość typu %1 nie może być predykatem. Predykat musi być typu liczbowego lub EfektywnÄ… Wartość LogicznÄ…. @@ -6914,38 +6944,38 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wynikiem predykatu pozycyjnego musi być pojedyÅ„cza wartość liczbowa. - + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 nie jest poprawnÄ… nazwÄ… docelowÄ… w instrukcji przetwarzania. Nazwa musi być wartoÅ›ciÄ… %2, np. %3. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Ostatni krok w Å›cieżce musi zawierać albo wezÅ‚y albo wartoÅ›ci atomowe. Nie może zawierać obu jednoczeÅ›nie. - + The data of a processing instruction cannot contain the string %1 Dane instrukcji przetwarzania nie mogÄ… zawierać ciÄ…gu %1 - + No namespace binding exists for the prefix %1 Å»adna przestrzeÅ„ nazw nie jest powiÄ…zana z przedrostkiem %1 - + No namespace binding exists for the prefix %1 in %2 Å»adna przestrzeÅ„ nazw nie jest powiÄ…zana z przedrostkiem %1 w %2 - + %1 is an invalid %2 %1 jest niepoprawnym %2 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Pierwszy argument w %1 nie może być typu %2. Musi on być typu liczbowego: xs:yearMonthDuration lub xs:dayTimeDuration. @@ -6960,27 +6990,27 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Drugi argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5. - + %1 is not a valid XML 1.0 character. %1 nie jest poprawnym znakiem XML 1.0. - + The first argument to %1 cannot be of type %2. Pierwszy argument dla %1 nie może być typu %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. JeÅ›li oba argumenty majÄ… przesuniÄ™cia strefowe, muszÄ… one być takie same. %1 i %2 nie sÄ… takie same. - + %1 was called. WywoÅ‚ano %1. - + %1 must be followed by %2 or %3, not at the end of the replacement string. Po %1 musi nastÄ™powac %2 lub %3, lecz nie na koÅ„cu zastÄ™pczego ciÄ…gu. @@ -6995,7 +7025,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. W zastÄ™pczym ciÄ…gu %1 może być użyte tylko do zabezpieczenia samej siebie lub %2, nigdy %3 - + %1 matches newline characters %1 dopasowaÅ‚o znak nowej linii @@ -7030,12 +7060,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. JeÅ›li pierwszy argument jest pustÄ… sekwencjÄ… lub zerowej dÅ‚ugoÅ›ci ciÄ…giem (przy braku przestrzeni nazw), przedrostek nie może wystÄ…pić. WystÄ…piÅ‚ przedrostek %1. - + It will not be possible to retrieve %1. Nie bÄ™dzie można odzyskać %1. - + The default collection is undefined DomyÅ›lna kolekcja jest niezdefiniowana @@ -7045,27 +7075,27 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. %1 nie może być odzyskane - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Znormalizowana forma %1 nie jest obsÅ‚ugiwana. ObsÅ‚ugiwanymi formami sÄ…: %2, %3, %4 i %5 oraz pusta forma (brak normalizacji). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. PrzesuniÄ™cie strefowe musi być w zakresie %1..%2 wÅ‚Ä…cznie. %3 jest poza tym zakresem. - + Required cardinality is %1; got cardinality %2. Wymagana liczność wynosi %1; otrzymano %2. - + The item %1 did not match the required type %2. Element %1 nie zostaÅ‚ dopasowany do wymaganego typu %2. - + %1 is an unknown schema type. %1 jest nieznanym typem schematu. @@ -7081,7 +7111,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Inicjalizacja zmiennej %1 zależy od niej samej - + The variable %1 is unused Zmienna %1 jest nieużywana @@ -7355,7 +7385,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Nazwa dodatkowego wyrażenia musi znajdować sie w przestrzeni nazw. - + empty pusty @@ -7380,7 +7410,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. zero lub wiÄ™cej - + Required type is %1, but %2 was found. Odnaleziono typ %2, lecz wymaganym typem jest %1. @@ -7395,7 +7425,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Focus jest niezdefiniowany. - + It's not possible to add attributes after any other kind of node. Dodanie atrybutu poza wÄ™zÅ‚ami nie jest możliwe. @@ -7405,12 +7435,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Atrybut o nazwie %1 zostaÅ‚ już utworzony. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. ObsÅ‚ugiwane jest jedynie "Unicode Codepoint Collation" (%1), %2 nie jest obsÅ‚ugiwane. - + An %1-attribute with value %2 has already been declared. Atrybut %1 o wartoÅ›ci %2 zostaÅ‚ już zadeklarowany. @@ -7455,7 +7485,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i maÅ‚ych liter. Dlatego nazwa %2 jest niepoprawna. - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 przyjmuje co najwyżej %n argument. %2 jest dlatego niepoprawne. @@ -7473,7 +7503,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Głównym wÄ™zÅ‚em drugiego argumentu w funkcji %1 musi być wÄ™zeÅ‚ "document". %2 nie jest wÄ™zÅ‚em "document". @@ -7504,7 +7534,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Importy modułów muszÄ… pojawić siÄ™ przed deklaracjami funkcji, zmiennych i opcji. - + %1 is an unsupported encoding. NieobsÅ‚ugiwane kodowanie %1. @@ -7519,14 +7549,18 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + Ambiguous rule match. Dopasowano niejednoznacznÄ… reguÅ‚Ä™. - In a namespace constructor, the value for a namespace value cannot be an empty string. - W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciÄ…giem. + W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciÄ…giem. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7544,12 +7578,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Tylko przedrostek %1 może być powiÄ…zany z %2 i vice versa. - + Circularity detected Wykryto cykl - + The parameter %1 is required, but no corresponding %2 is supplied. Wymagany jest parametr %1 lecz żaden odpowiadajÄ…cy mu %2 nie zostaÅ‚ dostarczony. @@ -7559,12 +7593,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przekazany jest parametr %1 lecz żaden odpowiadajÄ…cy mu %2 nie istnieje. - + The URI cannot have a fragment URI nie może posiadać fragmentu - + Element %1 is not allowed at this location. Element %1 jest niedozwolony w tym miejscu. @@ -7619,7 +7653,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przynajmniej jeden tryb musi być okreÅ›lony w atrybucie %1 elementu %2. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. W elemencie %2 nie może wystÄ…pić atrybut %1. WystÄ…pić mogÄ… jedynie standardowe atrybuty. @@ -7694,7 +7728,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Element %1 nie może posiadać potomków. - + Element %1 cannot have a sequence constructor. Element %1 nie może posiadać sekwencyjnego konstruktora. diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts index c04456a..5a93718 100644 --- a/translations/qt_pt.ts +++ b/translations/qt_pt.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 indefinido @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Verdadeiro @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copiar ou Mover um Ficheiro @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Todos os Ficheiros (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Abrir @@ -527,7 +527,7 @@ Verifique a localização e o nome. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ para Q3MainWindow - + Line up Alinhar @@ -590,7 +590,7 @@ para Q3NetworkProtocol - + Operation stopped by the user Operação interrompida pelo utilizador @@ -598,7 +598,7 @@ para Q3ProgressDialog - + Cancel Cancelar @@ -607,7 +607,7 @@ para Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ para Q3TextEdit - + &Undo &Desfazer @@ -675,7 +675,7 @@ para Q3TitleBar - + System Sistema @@ -743,7 +743,7 @@ para Q3ToolBar - + More... Mais... @@ -751,7 +751,7 @@ para Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ para Q3Wizard - + &Cancel &Cancelar @@ -831,9 +831,9 @@ para QAbstractSocket - - - + + + Host not found Máquina desconhecida @@ -876,7 +876,7 @@ para QAbstractSpinBox - + &Step up &Passo acima @@ -894,12 +894,12 @@ para QApplication - + Activate Activar - + Executable '%1' requires Qt %2, found Qt %3. O executável '%1' requere Qt %2, Qt %3 encontrado. @@ -909,7 +909,7 @@ para Erro de Incompatibilidade da Biblioteca Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ para QCheckBox - + Uncheck Desactivar @@ -964,7 +964,7 @@ para QColorDialog - + Hu&e: C&or: @@ -1038,13 +1038,13 @@ para QComboBox - + Open Abrir - + False Falso @@ -1062,7 +1062,7 @@ para QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ para QDB2Driver - + Unable to connect Ligação não possível - + Unable to commit transaction Finalização de transacção não possível @@ -1106,8 +1106,8 @@ para QDB2Result - - + + Unable to execute statement Execução não possível @@ -1122,7 +1122,7 @@ para Ligação de variável não possível - + Unable to fetch record %1 Obtenção do registo %1 não possível @@ -1140,7 +1140,7 @@ para QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ para QDial - + QDial @@ -1181,7 +1181,7 @@ para QDialog - + What's This? O Que é Isto? @@ -1194,9 +1194,9 @@ para QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ para QDirModel - + Name Nome @@ -1349,7 +1349,7 @@ para QDockWidget - + Close Fechar @@ -1380,7 +1380,7 @@ para QErrorMessage - + Debug Message: Mensagem Depuração: @@ -1408,13 +1408,18 @@ para QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,37 +1442,37 @@ para QFileDialog - - + + All Files (*) Todos os Ficheiros (*) - + Directories Pastas - + &Open &Abrir - + &Save &Gravar - + Open Abrir - + %1 already exists. Do you want to replace it? %1 já existe. @@ -1488,7 +1493,7 @@ Por favor verifique o nome do ficheiro. O Meu Computador - + &Rename &Mudar o Nome @@ -1534,7 +1539,7 @@ Por favor verifique o nome do ficheiro. - + Directory: Pasta: @@ -1547,8 +1552,8 @@ Ficheiro não encontrado. Por favor verifique o nome do ficheiro - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1562,7 @@ Pasta não encontrada. Por favor verifique o nome da pasta. - + '%1' is write protected. Do you want to delete it anyway? '%1' está protegido contra escrita. @@ -1574,22 +1579,22 @@ Deseja apagar de qualquer forma? Não foi possível apagar a pasta. - + Recent Places - + All Files (*.*) Todos os Ficheiros (*.*) - + Save As Gravar Como - + Drive Unidade @@ -1621,29 +1626,29 @@ Deseja apagar de qualquer forma? Seguinte - + New Folder Nova Pasta - + &New Folder - + &Choose - + Remove - - + + File &name: &Nome do Ficheiro: @@ -1663,7 +1668,7 @@ Deseja apagar de qualquer forma? QFileSystemModel - + %1 TB @@ -1725,7 +1730,7 @@ Deseja apagar de qualquer forma? Data de Modificação - + My Computer O Meu Computador @@ -1738,7 +1743,7 @@ Deseja apagar de qualquer forma? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Deseja apagar de qualquer forma? QFontDialog - + &Font &Tipo de Letra @@ -2004,8 +2009,8 @@ Deseja apagar de qualquer forma? QFtp - - + + Not connected Desligado @@ -2150,7 +2155,7 @@ Deseja apagar de qualquer forma? QHostInfo - + Unknown error Erro desconhecido @@ -2158,11 +2163,11 @@ Deseja apagar de qualquer forma? QHostInfoAgent - + - + @@ -2188,26 +2193,26 @@ Deseja apagar de qualquer forma? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Erro desconhecido - + Request aborted Pedido abortado - + No server set to connect to Nenhum servidor para ligar @@ -2225,18 +2230,23 @@ Deseja apagar de qualquer forma? O servidor fechou a ligação inesperadamente - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Ligação recusada - + Host %1 not found @@ -2257,7 +2267,7 @@ Deseja apagar de qualquer forma? Cabeçalho de resposta HTTP inválido - + @@ -2306,7 +2316,7 @@ Deseja apagar de qualquer forma? - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Deseja apagar de qualquer forma? QIBaseDriver - + Error opening database Erro ao abrir a base de dados @@ -2410,7 +2420,7 @@ Deseja apagar de qualquer forma? QIBaseResult - + Unable to create BLOB Não foi possível criar o BLOB @@ -2430,7 +2440,7 @@ Deseja apagar de qualquer forma? Não foi possível ler o BLOB - + Could not find array Não foi possível encontrar o array @@ -2500,7 +2510,7 @@ Deseja apagar de qualquer forma? QIODevice - + Permission denied Permissão negada @@ -2520,7 +2530,7 @@ Deseja apagar de qualquer forma? Dispositivo sem espaço livre - + Unknown error Erro desconhecido @@ -2528,7 +2538,7 @@ Deseja apagar de qualquer forma? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Deseja apagar de qualquer forma? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Deseja apagar de qualquer forma? QLibrary::resolve_sys: Símbolo "%1" indefinido em %2 (%3) - + Could not mmap '%1': %2 Não foi possivel mapear '%1': %2 @@ -2602,7 +2612,7 @@ Deseja apagar de qualquer forma? - + The shared library was not found. @@ -2617,8 +2627,8 @@ Deseja apagar de qualquer forma? - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Deseja apagar de qualquer forma? QLineEdit - + &Undo &Desfazer @@ -2676,8 +2686,8 @@ Deseja apagar de qualquer forma? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Deseja apagar de qualquer forma? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Deseja apagar de qualquer forma? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Deseja apagar de qualquer forma? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Deseja apagar de qualquer forma? QMYSQLDriver - + Unable to open database ' Não foi possível abrir a base de dados ' @@ -2782,7 +2792,7 @@ Deseja apagar de qualquer forma? Não foi possível estabelecer a ligação - + Unable to begin transaction Não foi possível iniciar a transacção @@ -2800,7 +2810,7 @@ Deseja apagar de qualquer forma? QMYSQLResult - + Unable to fetch data Não foi possível obter dados @@ -2815,7 +2825,7 @@ Deseja apagar de qualquer forma? Não foi possível guardar o resultado - + Unable to prepare statement Não foi possível preparar a expressão @@ -2860,7 +2870,7 @@ Deseja apagar de qualquer forma? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Deseja apagar de qualquer forma? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Deseja apagar de qualquer forma? QMenu - + Close Fechar @@ -3034,7 +3044,7 @@ Deseja apagar de qualquer forma? QMessageBox - + Help Ajuda @@ -3047,21 +3057,25 @@ Deseja apagar de qualquer forma? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Acerca do Qt - <p>This program uses Qt version %1.</p> - <p>Este programa usa Qt versão %1.</p> + <p>Este programa usa Qt versão %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Acerca do Qt</h3>%1<p>Qt é um conjunto de ferramentas para desenvolvimento de aplicações multiplataforma.</p>O Qt oferece portabilidade de código fonte único em MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux e todas as principais variantes comerciais de Unix. O Qt está igualmente disponível para dispositivos embebidos como Qtopia Core.</p><p>O Qt é um produto Trolltech. Veja <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para mais informação.</p> - + Show Details... Mostrar Detalhes... @@ -3071,20 +3085,14 @@ Deseja apagar de qualquer forma? Não Mostrar Detalhes... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> + <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> QMultiInputContext - + Select IM Seleccione Método de Entrada @@ -3092,7 +3100,7 @@ Deseja apagar de qualquer forma? QMultiInputContextPlugin - + Multiple input method switcher Seleccionador de método de entrada @@ -3105,7 +3113,7 @@ Deseja apagar de qualquer forma? QNativeSocketEngine - + The remote host closed the connection A máquina remota fechou a ligação @@ -3238,7 +3246,7 @@ Deseja apagar de qualquer forma? QNetworkAccessCacheBackend - + Error opening %1 @@ -3246,7 +3254,7 @@ Deseja apagar de qualquer forma? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3274,7 +3282,7 @@ Deseja apagar de qualquer forma? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3284,7 +3292,7 @@ Deseja apagar de qualquer forma? - + Logging in to %1 failed: authentication required @@ -3302,7 +3310,7 @@ Deseja apagar de qualquer forma? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3315,7 +3323,7 @@ Deseja apagar de qualquer forma? - + Protocol "%1" is unknown @@ -3323,7 +3331,7 @@ Deseja apagar de qualquer forma? QNetworkReplyImpl - + Operation canceled @@ -3332,7 +3340,7 @@ Deseja apagar de qualquer forma? QOCIDriver - + Unable to logon Não foi possível autenticar @@ -3361,7 +3369,7 @@ Deseja apagar de qualquer forma? QOCIResult - + Unable to bind column for batch execute @@ -3388,18 +3396,16 @@ Deseja apagar de qualquer forma? Não foi possível preparar a expressão - - + Unable to bind value Não foi possível fazer o ligamento do valor - Unable to execute select statement - Não foi possível executar a expressão select + Não foi possível executar a expressão select - + Unable to execute statement Não foi possível executar a expressão @@ -3407,7 +3413,7 @@ Deseja apagar de qualquer forma? QODBCDriver - + Unable to connect Não foi possível ligar @@ -3417,7 +3423,7 @@ Deseja apagar de qualquer forma? Não foi possível ligar - O 'driver' não suporta todas as funcionalidades necessárias - + Unable to disable autocommit Não foi possível desactivar finalização automática @@ -3440,19 +3446,19 @@ Deseja apagar de qualquer forma? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Não foi possível definir 'SQL_CURSOR_STATIC' como atributo da expressão. Por favor verifique a configuração do seu 'driver' ODBC - + Unable to execute statement Não foi possível executar a expressão - + Unable to fetch next Não foi possível obter o seguinte @@ -3462,19 +3468,19 @@ Deseja apagar de qualquer forma? Não foi possível preparar a expressão - + Unable to bind variable Não foi possível fazer o ligamento da variável - - + + Unable to fetch last - + Unable to fetch @@ -3492,12 +3498,12 @@ Deseja apagar de qualquer forma? QObject - + Home Início - + Operation not supported on %1 @@ -3507,7 +3513,7 @@ Deseja apagar de qualquer forma? - + Write error writing to %1: %2 @@ -3532,7 +3538,7 @@ Deseja apagar de qualquer forma? - + No host name given @@ -3541,7 +3547,7 @@ Deseja apagar de qualquer forma? QPPDOptionsModel - + Name Nome @@ -3554,7 +3560,7 @@ Deseja apagar de qualquer forma? QPSQLDriver - + Unable to connect Não foi possível ligar @@ -3574,7 +3580,7 @@ Deseja apagar de qualquer forma? Não foi possível anular a transacção - + Unable to subscribe @@ -3587,12 +3593,12 @@ Deseja apagar de qualquer forma? QPSQLResult - + Unable to create query Não foi possível criar a 'query' - + Unable to prepare statement @@ -3600,7 +3606,7 @@ Deseja apagar de qualquer forma? QPageSetupWidget - + Centimeters (cm) @@ -3716,7 +3722,7 @@ Deseja apagar de qualquer forma? QPrintDialog - + locally connected ligado localmente @@ -3741,7 +3747,7 @@ Deseja apagar de qualquer forma? Paisagem - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3891,7 +3897,7 @@ Deseja apagar de qualquer forma? Envelope #10 Comum EUA (105 x 241 mm) - + OK OK @@ -3912,7 +3918,7 @@ Deseja apagar de qualquer forma? Fonte papel: - + Print @@ -4244,13 +4250,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4532,8 +4538,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4562,7 +4568,7 @@ Please choose a different file name. - + @@ -4582,6 +4588,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4590,7 +4601,7 @@ Please choose a different file name. QProgressDialog - + Cancel Cancelar @@ -4614,7 +4625,7 @@ Please choose a different file name. QRegExp - + no error occurred sem erros @@ -4662,7 +4673,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Erro ao abrir base de dados @@ -4685,12 +4696,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Não foi possível obter os resultados - + Unable to execute statement Não foi possível executar a expressão @@ -4698,7 +4709,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Erro ao abrir a base de dados @@ -4765,12 +4776,12 @@ Please choose a different file name. QScrollBar - + Scroll here Deslizar aqui - + Left edge Borda esquerda @@ -4780,7 +4791,7 @@ Please choose a different file name. Topo - + Right edge Borda direita @@ -4790,7 +4801,7 @@ Please choose a different file name. Fundo - + Page left Página para esquerda @@ -4801,7 +4812,7 @@ Please choose a different file name. Página para cima - + Page right Página para direita @@ -4812,7 +4823,7 @@ Please choose a different file name. Página para baixo - + Scroll left Deslizar para esquerda @@ -4822,7 +4833,7 @@ Please choose a different file name. Deslizar para cima - + Scroll right Deslizar para a direita @@ -4850,7 +4861,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4861,7 +4872,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4871,8 +4882,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4950,7 +4961,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5535,7 +5546,7 @@ Please choose a different file name. QSql - + Delete Apagar @@ -5592,7 +5603,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5651,7 +5662,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5681,7 +5692,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Não foi possível estabelecer a ligação @@ -5711,7 +5722,7 @@ Please choose a different file name. Operação de 'socket' não suportada - + Operation on socket is not supported @@ -5719,7 +5730,7 @@ Please choose a different file name. QTextControl - + &Undo &Desfazer @@ -5777,7 +5788,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Esta plataforma não suporta IPv6 @@ -5785,7 +5796,7 @@ Please choose a different file name. QUndoGroup - + Undo Desfazer @@ -5798,7 +5809,7 @@ Please choose a different file name. QUndoModel - + <empty> <vazio> @@ -5806,7 +5817,7 @@ Please choose a different file name. QUndoStack - + Undo Desfazer @@ -5877,7 +5888,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6288,7 +6299,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6364,6 +6375,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6432,11 +6448,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? O Que é Isto? @@ -6444,7 +6470,7 @@ Please choose a different file name. QWidget - + * * @@ -6452,7 +6478,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6514,7 +6540,7 @@ Please choose a different file name. QWorkspace - + &Restore &Restaurar @@ -6584,7 +6610,7 @@ Please choose a different file name. QXml - + no error occurred não ocorreu nenhum erro @@ -6702,8 +6728,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6887,7 +6913,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6897,12 +6923,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6912,7 +6938,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6952,7 +6978,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6963,7 +6989,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6978,17 +7004,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7019,17 +7045,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7039,7 +7065,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7049,7 +7075,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7059,7 +7085,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7069,7 +7095,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7079,7 +7105,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7104,7 +7130,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7114,7 +7140,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7124,12 +7150,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7139,7 +7165,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7149,7 +7175,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7159,33 +7185,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7201,7 +7227,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7216,27 +7242,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7251,7 +7277,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7286,17 +7312,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7306,12 +7332,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7321,17 +7347,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7352,7 +7378,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7634,7 +7660,7 @@ Please choose a different file name. - + empty @@ -7659,7 +7685,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7674,7 +7700,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7684,12 +7710,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7704,13 +7730,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7729,12 +7755,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7744,12 +7770,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7804,7 +7830,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7879,7 +7905,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 3d05b71..1db3e46 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True True @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Копировать или перемеÑтить файл @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Ð’Ñе файлы (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open Открыть @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +573,7 @@ to Q3MainWindow - + Line up ВыровнÑÑ‚ÑŒ @@ -586,7 +586,7 @@ to Q3NetworkProtocol - + Operation stopped by the user ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð° пользователем @@ -594,7 +594,7 @@ to Q3ProgressDialog - + Cancel Отмена @@ -603,7 +603,7 @@ to Q3TabDialog - + OK OK @@ -632,7 +632,7 @@ to Q3TextEdit - + &Undo &Отменить @@ -671,7 +671,7 @@ to Q3TitleBar - + System @@ -739,7 +739,7 @@ to Q3ToolBar - + More... Больше... @@ -747,7 +747,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +799,7 @@ to Q3Wizard - + &Cancel &Отмена @@ -827,9 +827,9 @@ to QAbstractSocket - - - + + + Host not found @@ -872,7 +872,7 @@ to QAbstractSpinBox - + &Step up @@ -890,13 +890,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Программный модуль '%1' требует Qt %2, найдена верÑÐ¸Ñ %3. @@ -906,7 +906,7 @@ to Ошибка ÑовмеÑтимоÑти библиотеки Qt - + Activate @@ -942,7 +942,7 @@ to QCheckBox - + Uncheck @@ -960,7 +960,7 @@ to QColorDialog - + Hu&e: &Тон: @@ -1034,13 +1034,13 @@ to QComboBox - + Open Открыть - + False False @@ -1058,7 +1058,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1079,12 +1079,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1102,8 +1102,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1118,7 +1118,7 @@ to - + Unable to fetch record %1 @@ -1136,7 +1136,7 @@ to QDateTimeEdit - + AM @@ -1159,7 +1159,7 @@ to QDial - + QDial @@ -1177,7 +1177,7 @@ to QDialog - + What's This? Что Ñто? @@ -1190,9 +1190,9 @@ to QDialogButtonBox - + - + OK OK @@ -1315,7 +1315,7 @@ to QDirModel - + Name Ð˜Ð¼Ñ @@ -1345,7 +1345,7 @@ to QDockWidget - + Close Закрыть @@ -1376,7 +1376,7 @@ to QErrorMessage - + &Show this message again &Показывать Ñто Ñообщение в дальнейшем @@ -1404,13 +1404,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1433,8 +1438,8 @@ to QFileDialog - - + + All Files (*) Ð’Ñе файлы (*) @@ -1457,13 +1462,13 @@ to Детальный вид - + File Файл - + Open Открыть @@ -1473,26 +1478,26 @@ to Сохранить как - + - + &Open &Открыть - + &Save &Сохранить - + Recent Places - + &Rename &Переименовать @@ -1507,33 +1512,33 @@ to Показать &Ñкрытые файлы - + New Folder Ðовый каталог - + Find Directory Ðайти каталог - + Directories Каталоги - + All Files (*.*) Ð’Ñе файлы (*.*) - - + + Directory: Каталог: - + %1 already exists. Do you want to replace it? @@ -1564,14 +1569,14 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1597,7 +1602,7 @@ Do you want to delete it anyway? - + Show @@ -1613,19 +1618,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: &Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°: @@ -1645,7 +1650,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1707,7 +1712,7 @@ Do you want to delete it anyway? - + My Computer @@ -1720,7 +1725,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1937,7 +1942,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &Шрифт @@ -1986,7 +1991,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found Обнаружен узел %1 @@ -1996,7 +2001,7 @@ Do you want to delete it anyway? Узел обнаружен - + Connected to host %1 @@ -2132,7 +2137,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° @@ -2140,11 +2145,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2170,13 +2175,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused Отказано в Ñоединении - + Host %1 not found @@ -2189,12 +2194,12 @@ Do you want to delete it anyway? ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° данных - + HTTPS connection requested but SSL support not compiled in - + @@ -2233,21 +2238,21 @@ Do you want to delete it anyway? Соединение разорвано - - + + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° - + Request aborted Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½ - + No server set to connect to Ðе выбран Ñервер Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ @@ -2265,7 +2270,12 @@ Do you want to delete it anyway? Получен некорректный HTTP-заголовок - + + Unknown authentication method + + + + @@ -2288,7 +2298,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2369,7 +2379,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2392,7 +2402,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2412,7 +2422,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2482,7 +2492,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2502,7 +2512,7 @@ Do you want to delete it anyway? - + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° @@ -2510,7 +2520,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2533,7 +2543,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2541,7 +2551,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2572,7 +2582,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2587,8 +2597,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2608,7 +2618,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &Отменить @@ -2646,8 +2656,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2663,7 +2673,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2671,8 +2681,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2685,7 +2695,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2742,7 +2752,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2752,7 +2762,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2770,7 +2780,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2785,7 +2795,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2830,7 +2840,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2838,7 +2848,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2931,7 +2941,7 @@ Do you want to delete it anyway? QMenu - + Close Закрыть @@ -2988,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2996,22 +3006,22 @@ Do you want to delete it anyway? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help Справка - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -3020,21 +3030,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3042,7 +3042,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3224,7 +3224,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3252,7 +3252,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3265,7 +3265,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3273,7 +3273,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3282,7 +3282,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3311,7 +3311,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3338,18 +3338,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3357,7 +3351,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3367,7 +3361,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3390,19 +3384,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3412,19 +3406,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3442,12 +3436,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3457,7 +3451,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3482,7 +3476,7 @@ Do you want to delete it anyway? - + No host name given @@ -3491,7 +3485,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name Ð˜Ð¼Ñ @@ -3504,7 +3498,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3524,7 +3518,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3537,12 +3531,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3550,7 +3544,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3666,7 +3660,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected локальный @@ -3683,7 +3677,7 @@ Do you want to delete it anyway? неизвеÑтно - + OK OK @@ -3700,7 +3694,7 @@ Do you want to delete it anyway? Принтер - + Print all Печатать вÑе @@ -3880,7 +3874,7 @@ Do you want to delete it anyway? - + Print @@ -4128,13 +4122,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4412,8 +4406,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4442,7 +4436,7 @@ Please choose a different file name. - + @@ -4462,6 +4456,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4470,7 +4469,7 @@ Please choose a different file name. QProgressDialog - + Cancel Отмена @@ -4494,7 +4493,7 @@ Please choose a different file name. QRegExp - + no error occurred ошибки отÑутÑтвуют @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4565,12 +4564,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4578,7 +4577,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4641,12 +4640,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4656,7 +4655,7 @@ Please choose a different file name. - + Right edge @@ -4666,7 +4665,7 @@ Please choose a different file name. - + Page left @@ -4677,7 +4676,7 @@ Please choose a different file name. - + Page right @@ -4688,7 +4687,7 @@ Please choose a different file name. - + Scroll left @@ -4698,7 +4697,7 @@ Please choose a different file name. - + Scroll right @@ -4726,7 +4725,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4737,7 +4736,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4747,8 +4746,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4826,7 +4825,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5407,7 +5406,7 @@ Please choose a different file name. QSql - + Delete Удалить @@ -5464,7 +5463,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5523,7 +5522,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5553,7 +5552,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5579,7 +5578,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5587,7 +5586,7 @@ Please choose a different file name. QTextControl - + &Undo &Отменить @@ -5645,7 +5644,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5653,7 +5652,7 @@ Please choose a different file name. QUndoGroup - + Undo Отменить @@ -5666,7 +5665,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5674,7 +5673,7 @@ Please choose a different file name. QUndoStack - + Undo Отменить @@ -5745,7 +5744,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6155,7 +6154,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6231,6 +6230,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6299,11 +6303,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Что Ñто? @@ -6311,7 +6325,7 @@ Please choose a different file name. QWidget - + * @@ -6319,7 +6333,7 @@ Please choose a different file name. QWizard - + < &Back < &Ðазад @@ -6381,7 +6395,7 @@ Please choose a different file name. QWorkspace - + &Restore &ВоÑÑтановить @@ -6451,7 +6465,7 @@ Please choose a different file name. QXml - + no error occurred ошибки отÑутÑтвуют @@ -6569,8 +6583,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6754,7 +6768,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6764,12 +6778,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6819,7 +6833,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6830,7 +6844,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6845,17 +6859,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6886,17 +6900,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6906,7 +6920,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6916,7 +6930,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6926,7 +6940,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6936,7 +6950,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6946,7 +6960,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6971,7 +6985,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6981,7 +6995,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6991,12 +7005,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7006,7 +7020,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7016,7 +7030,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7026,33 +7040,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7066,7 +7080,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7081,27 +7095,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7116,7 +7130,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7151,17 +7165,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7171,12 +7185,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7186,17 +7200,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7217,7 +7231,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7499,7 +7513,7 @@ Please choose a different file name. - + empty @@ -7524,7 +7538,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7539,7 +7553,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7549,12 +7563,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7569,13 +7583,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7594,12 +7608,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7609,12 +7623,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7669,7 +7683,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7744,7 +7758,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts index f681d1b..5045022 100644 --- a/translations/qt_sk.ts +++ b/translations/qt_sk.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 nie je definované @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Pravda @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File KopírovaÅ¥ alebo presunúť súbor @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) VÅ¡etky súbory (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open OtvoriÅ¥ @@ -527,7 +527,7 @@ Overte cestu a meno súboru. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ na Q3MainWindow - + Line up VyrovnaÅ¥ @@ -590,7 +590,7 @@ na Q3NetworkProtocol - + Operation stopped by the user Operácia zastavená užívateľom @@ -598,7 +598,7 @@ na Q3ProgressDialog - + Cancel Storno @@ -607,7 +607,7 @@ na Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ na Q3TextEdit - + &Undo V&rátiÅ¥ späť @@ -675,7 +675,7 @@ na Q3TitleBar - + System Systém @@ -743,7 +743,7 @@ na Q3ToolBar - + More... Viac... @@ -751,7 +751,7 @@ na Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ na Q3Wizard - + &Cancel S&torno @@ -831,9 +831,9 @@ na QAbstractSocket - - - + + + Host not found PoÄítaÄ nenájdený @@ -876,7 +876,7 @@ na QAbstractSpinBox - + &Step up Krok na&hor @@ -894,13 +894,13 @@ na QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Program '%1' vyžaduje Qt %2, nájdené Qt %3. @@ -910,7 +910,7 @@ na Chyba kompatibility knižnice Qt - + Activate AktivovaÅ¥ @@ -946,7 +946,7 @@ na QCheckBox - + Uncheck OdÅ¡krtnúť @@ -964,7 +964,7 @@ na QColorDialog - + Hu&e: Od&tieň: @@ -1038,13 +1038,13 @@ na QComboBox - + Open OtvoriÅ¥ - + False Nepravda @@ -1062,7 +1062,7 @@ na QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ na QDB2Driver - + Unable to connect Nedá sa pripojiÅ¥ - + Unable to commit transaction Transakcia sa nedá potvrdiÅ¥ @@ -1106,8 +1106,8 @@ na QDB2Result - - + + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -1122,7 +1122,7 @@ na Premenná sa nedá naviazaÅ¥ - + Unable to fetch record %1 Záznam %1 sa nedá získaÅ¥ @@ -1140,7 +1140,7 @@ na QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ na QDial - + QDial QDial @@ -1181,7 +1181,7 @@ na QDialog - + What's This? ÄŒo je to? @@ -1194,9 +1194,9 @@ na QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ na QDirModel - + Name Meno @@ -1349,7 +1349,7 @@ na QDockWidget - + Close ZavrieÅ¥ @@ -1380,7 +1380,7 @@ na QErrorMessage - + &Show this message again &ZobraziÅ¥ túto správu aj nabudúce @@ -1408,13 +1408,18 @@ na QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,8 +1442,8 @@ na QFileDialog - - + + All Files (*) VÅ¡etky súbory (*) @@ -1467,26 +1472,26 @@ na Detaily - + Open OtvoriÅ¥ - + - + &Open &OtvoriÅ¥ - + &Save &UložiÅ¥ - + &Rename P&remenovaÅ¥ @@ -1501,12 +1506,12 @@ na ZobraziÅ¥ &skryté súbory - + Directories PrieÄinky - + %1 already exists. Do you want to replace it? %1 už existuje. @@ -1522,7 +1527,7 @@ Súbor nenájdený. Prosím overte správnosÅ¥ zadaného mena súboru. - + Recent Places @@ -1550,8 +1555,8 @@ Prosím overte správnosÅ¥ zadaného mena súboru. Súbory typu: - - + + Directory: PrieÄinok: @@ -1564,8 +1569,8 @@ Súbor nenájdený. Prosím overte správnosÅ¥ zadaného mena súboru - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1574,7 +1579,7 @@ PrieÄinok nenájdený. Prosím overte správnosÅ¥ zadaného mena prieÄinku. - + '%1' is write protected. Do you want to delete it anyway? '%1' je chránený proti zápisu. @@ -1591,17 +1596,17 @@ Chcete ho aj tak zmazaÅ¥? PrieÄinok sa nedá zmazaÅ¥. - + All Files (*.*) VÅ¡etky súbory (*.*) - + Save As UložiÅ¥ ako - + Drive Oddiel @@ -1632,19 +1637,19 @@ Chcete ho aj tak zmazaÅ¥? &Nový prieÄinok - + &Choose &ZvoliÅ¥ - - + + File &name: Me&no súboru: - + New Folder Nový prieÄinok @@ -1655,7 +1660,7 @@ Chcete ho aj tak zmazaÅ¥? Dopredu - + Remove OdstrániÅ¥ @@ -1663,7 +1668,7 @@ Chcete ho aj tak zmazaÅ¥? QFileSystemModel - + %1 TB %1 TB @@ -1725,7 +1730,7 @@ Chcete ho aj tak zmazaÅ¥? Dátum zmeny - + My Computer Môj poÄítaÄ @@ -1738,7 +1743,7 @@ Chcete ho aj tak zmazaÅ¥? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Chcete ho aj tak zmazaÅ¥? QFontDialog - + &Font &Písmo @@ -2004,7 +2009,7 @@ Chcete ho aj tak zmazaÅ¥? QFtp - + Host %1 found PoÄítaÄ %1 nenájdený @@ -2014,7 +2019,7 @@ Chcete ho aj tak zmazaÅ¥? PoÄítaÄ nájdený - + Connected to host %1 @@ -2150,7 +2155,7 @@ Chcete ho aj tak zmazaÅ¥? QHostInfo - + Unknown error Neznáma chyba @@ -2158,11 +2163,11 @@ Chcete ho aj tak zmazaÅ¥? QHostInfoAgent - + - + @@ -2188,13 +2193,13 @@ Chcete ho aj tak zmazaÅ¥? QHttp - - + + Connection refused Spojenie odmietnuté - + Host %1 not found @@ -2207,12 +2212,12 @@ Chcete ho aj tak zmazaÅ¥? Neplatná dĺžka obsahu - + HTTPS connection requested but SSL support not compiled in - + @@ -2246,21 +2251,21 @@ Chcete ho aj tak zmazaÅ¥? Spojenie uzavreté - - + + Unknown error Neznáma chyba - + Request aborted Požiadavka preruÅ¡ená - + No server set to connect to Nenastavený server na pripojenie @@ -2278,7 +2283,12 @@ Chcete ho aj tak zmazaÅ¥? Neplatná hlaviÄka odpovede HTTP - + + Unknown authentication method + + + + @@ -2306,7 +2316,7 @@ Chcete ho aj tak zmazaÅ¥? Vyžaduje sa overenie - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Chcete ho aj tak zmazaÅ¥? QIBaseDriver - + Error opening database Chyba pri otváraní databázy @@ -2410,7 +2420,7 @@ Chcete ho aj tak zmazaÅ¥? QIBaseResult - + Unable to create BLOB BLOB sa nedá vytvoriÅ¥ @@ -2430,7 +2440,7 @@ Chcete ho aj tak zmazaÅ¥? BLOB sa nedá ÄítaÅ¥ - + Could not find array Pole sa nedá nájsÅ¥ @@ -2500,7 +2510,7 @@ Chcete ho aj tak zmazaÅ¥? QIODevice - + Permission denied Prístup zamietnutý @@ -2520,7 +2530,7 @@ Chcete ho aj tak zmazaÅ¥? Na zariadení nie je voľné miesto - + Unknown error Neznáma chyba @@ -2528,7 +2538,7 @@ Chcete ho aj tak zmazaÅ¥? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Chcete ho aj tak zmazaÅ¥? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Chcete ho aj tak zmazaÅ¥? QLibrary::resolve_sys: Symbol "%1" nie je definovaný v %2 (%3) - + Could not mmap '%1': %2 Nedá sa mmap '%1': %2 @@ -2602,7 +2612,7 @@ Chcete ho aj tak zmazaÅ¥? - + The shared library was not found. Zdieľaná knižnica nebola nájdená. @@ -2617,8 +2627,8 @@ Chcete ho aj tak zmazaÅ¥? Modul '%1' používa nekompatibilnú Qt knižnicu. (Nedajú sa mieÅ¡aÅ¥ debug a release knižnice.) - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Chcete ho aj tak zmazaÅ¥? QLineEdit - + &Undo V&rátiÅ¥ späť @@ -2676,8 +2686,8 @@ Chcete ho aj tak zmazaÅ¥? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Chcete ho aj tak zmazaÅ¥? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Chcete ho aj tak zmazaÅ¥? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Chcete ho aj tak zmazaÅ¥? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Chcete ho aj tak zmazaÅ¥? QMYSQLDriver - + Unable to open database ' Databáza sa nedá otvoriÅ¥ ' @@ -2782,7 +2792,7 @@ Chcete ho aj tak zmazaÅ¥? Nedá sa pripojiÅ¥ - + Unable to begin transaction Transakcia sa nedá spustiÅ¥ @@ -2800,7 +2810,7 @@ Chcete ho aj tak zmazaÅ¥? QMYSQLResult - + Unable to fetch data Dáta sa nedajú získaÅ¥ @@ -2815,7 +2825,7 @@ Chcete ho aj tak zmazaÅ¥? Výsledok sa nedá uložiÅ¥ - + Unable to prepare statement Príkaz sa nedá pripraviÅ¥ @@ -2860,7 +2870,7 @@ Chcete ho aj tak zmazaÅ¥? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Chcete ho aj tak zmazaÅ¥? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Chcete ho aj tak zmazaÅ¥? QMenu - + Close ZavrieÅ¥ @@ -3034,7 +3044,7 @@ Chcete ho aj tak zmazaÅ¥? QMessageBox - + @@ -3042,26 +3052,30 @@ Chcete ho aj tak zmazaÅ¥? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Informácie o Qt - + Help Pomocník - <p>This program uses Qt version %1.</p> - <p>Tento program používa Qt verziu %1.</p> + <p>Tento program používa Qt verziu %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Informácie o Qt<h3>%1<p>Qt je C++ nástroj pre vývoj viac-platformových aplikácií.</p><p>Qt poskytuje jedno zdrojový prenos medzi MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux a vÅ¡etkými významnými komerÄnými variantmi Unix. Qt je tiež dostupná pre vložené zariadenia ako Qtopia Core.</p><p>Qt je produkt spoloÄnosti Trolltech. Pozrite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pre viac informácií.</p> - + Show Details... ZobraziÅ¥ detaily... @@ -3071,20 +3085,14 @@ Chcete ho aj tak zmazaÅ¥? SkryÅ¥ detaily... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> + <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> QMultiInputContext - + Select IM VybraÅ¥ IM @@ -3092,7 +3100,7 @@ Chcete ho aj tak zmazaÅ¥? QMultiInputContextPlugin - + Multiple input method switcher PrepínaÄ metódy viacnásobného vstupu @@ -3105,7 +3113,7 @@ Chcete ho aj tak zmazaÅ¥? QNativeSocketEngine - + The remote host closed the connection Vzdialený poÄítaÄ uzavrel spojenie @@ -3238,7 +3246,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessCacheBackend - + Error opening %1 @@ -3246,7 +3254,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3274,7 +3282,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3284,7 +3292,7 @@ Chcete ho aj tak zmazaÅ¥? - + Logging in to %1 failed: authentication required @@ -3302,7 +3310,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3315,7 +3323,7 @@ Chcete ho aj tak zmazaÅ¥? - + Protocol "%1" is unknown @@ -3323,7 +3331,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkReplyImpl - + Operation canceled @@ -3332,7 +3340,7 @@ Chcete ho aj tak zmazaÅ¥? QOCIDriver - + Unable to logon Nedá sa prihlásiÅ¥ @@ -3361,7 +3369,7 @@ Chcete ho aj tak zmazaÅ¥? QOCIResult - + Unable to bind column for batch execute @@ -3388,18 +3396,16 @@ Chcete ho aj tak zmazaÅ¥? Príkaz sa nedá pripraviÅ¥ - - + Unable to bind value Hodnota sa nedá previazaÅ¥ - Unable to execute select statement - Príkaz select sa nedá vykonaÅ¥ + Príkaz select sa nedá vykonaÅ¥ - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -3407,7 +3413,7 @@ Chcete ho aj tak zmazaÅ¥? QODBCDriver - + Unable to connect Nedá sa pripojiÅ¥ @@ -3417,7 +3423,7 @@ Chcete ho aj tak zmazaÅ¥? Nedá sa pripojiÅ¥ - ovládaÄ neposkytuje vÅ¡etku požadovanú funkcionalitu - + Unable to disable autocommit Nedá sa zakázaÅ¥ automatické potvrdzovanie @@ -3440,19 +3446,19 @@ Chcete ho aj tak zmazaÅ¥? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Pre príkaz sa nedá nastaviÅ¥ atribút 'SQL_CURSOR_STATIC'. Prosím skontrolujte konfiguráciu ovládaÄa ODBC - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ - + Unable to fetch next Nedá sa získaÅ¥ Äaľší záznam @@ -3462,19 +3468,19 @@ Chcete ho aj tak zmazaÅ¥? Príkaz sa nedá pripraviÅ¥ - + Unable to bind variable Premenná sa nedá previazaÅ¥ - - + + Unable to fetch last - + Unable to fetch @@ -3492,12 +3498,12 @@ Chcete ho aj tak zmazaÅ¥? QObject - + Home Domov - + Operation not supported on %1 @@ -3507,7 +3513,7 @@ Chcete ho aj tak zmazaÅ¥? - + Write error writing to %1: %2 @@ -3532,7 +3538,7 @@ Chcete ho aj tak zmazaÅ¥? - + No host name given @@ -3541,7 +3547,7 @@ Chcete ho aj tak zmazaÅ¥? QPPDOptionsModel - + Name Meno @@ -3554,7 +3560,7 @@ Chcete ho aj tak zmazaÅ¥? QPSQLDriver - + Unable to connect Nedá sa pripojiÅ¥ @@ -3574,7 +3580,7 @@ Chcete ho aj tak zmazaÅ¥? Transakcia sa nedá vrátiÅ¥ späť - + Unable to subscribe @@ -3587,12 +3593,12 @@ Chcete ho aj tak zmazaÅ¥? QPSQLResult - + Unable to create query Nedá sa vytvoriÅ¥ hľadanie - + Unable to prepare statement @@ -3600,7 +3606,7 @@ Chcete ho aj tak zmazaÅ¥? QPageSetupWidget - + Centimeters (cm) @@ -3716,7 +3722,7 @@ Chcete ho aj tak zmazaÅ¥? QPrintDialog - + locally connected lokálne pripojená @@ -3733,7 +3739,7 @@ Chcete ho aj tak zmazaÅ¥? neznáme - + OK OK @@ -3746,7 +3752,7 @@ Chcete ho aj tak zmazaÅ¥? TlaÄiÅ¥ farebne ak je to dostupné - + Print all TlaÄiÅ¥ vÅ¡etko @@ -3943,7 +3949,7 @@ Chcete ho aj tak zmazaÅ¥? Zdroj papiera: - + Print @@ -4245,13 +4251,13 @@ Prosím zvoľte iné meno súboru. QPrintPreviewDialog - + Page Setup - + %1% @@ -4533,8 +4539,8 @@ Prosím zvoľte iné meno súboru. QProcess - - + + Could not open input redirection for reading @@ -4563,7 +4569,7 @@ Prosím zvoľte iné meno súboru. - + @@ -4583,6 +4589,11 @@ Prosím zvoľte iné meno súboru. + + No program defined + + + Process failed to start @@ -4591,7 +4602,7 @@ Prosím zvoľte iné meno súboru. QProgressDialog - + Cancel Storno @@ -4615,7 +4626,7 @@ Prosím zvoľte iné meno súboru. QRegExp - + no error occurred nevyskytli sa žiadne chyby @@ -4663,7 +4674,7 @@ Prosím zvoľte iné meno súboru. QSQLite2Driver - + Error to open database Chyba pri otváraní databázy @@ -4686,12 +4697,12 @@ Prosím zvoľte iné meno súboru. QSQLite2Result - + Unable to fetch results Výsledky sa nedajú získaÅ¥ - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -4699,7 +4710,7 @@ Prosím zvoľte iné meno súboru. QSQLiteDriver - + Error opening database Chyba pri otváraní databázy @@ -4766,12 +4777,12 @@ Prosím zvoľte iné meno súboru. QScrollBar - + Scroll here Posunúť sem - + Left edge Ľavá hrana @@ -4781,7 +4792,7 @@ Prosím zvoľte iné meno súboru. Vrch - + Right edge Pravá hrana @@ -4791,7 +4802,7 @@ Prosím zvoľte iné meno súboru. Spodok - + Page left Strana naľavo @@ -4802,7 +4813,7 @@ Prosím zvoľte iné meno súboru. Strana nahor - + Page right Strana napravo @@ -4813,7 +4824,7 @@ Prosím zvoľte iné meno súboru. Strana nadol - + Scroll left Posunúť naľavo @@ -4823,7 +4834,7 @@ Prosím zvoľte iné meno súboru. Posunúť nahor - + Scroll right Posunúť napravo @@ -4851,7 +4862,7 @@ Prosím zvoľte iné meno súboru. QSharedMemory - + %1: unable to set key on lock @@ -4862,7 +4873,7 @@ Prosím zvoľte iné meno súboru. - + %1: unable to lock @@ -4872,8 +4883,8 @@ Prosím zvoľte iné meno súboru. - - + + %1: permission denied @@ -4951,7 +4962,7 @@ Prosím zvoľte iné meno súboru. QShortcut - + Space Medzera @@ -5536,7 +5547,7 @@ Prosím zvoľte iné meno súboru. QSql - + Delete OdstrániÅ¥ @@ -5593,7 +5604,7 @@ Prosím zvoľte iné meno súboru. QSslSocket - + Error creating SSL context (%1) Chyba pri vytváraní SSL kontextu (%1) @@ -5656,7 +5667,7 @@ Prosím zvoľte iné meno súboru. QSystemSemaphore - + %1: out of resources @@ -5686,7 +5697,7 @@ Prosím zvoľte iné meno súboru. QTDSDriver - + Unable to open connection Nedá sa otvoriÅ¥ spojenie @@ -5716,7 +5727,7 @@ Prosím zvoľte iné meno súboru. Nepodporovaná operácia so soketom - + Operation on socket is not supported @@ -5724,7 +5735,7 @@ Prosím zvoľte iné meno súboru. QTextControl - + &Undo V&rátiÅ¥ späť @@ -5782,7 +5793,7 @@ Prosím zvoľte iné meno súboru. QUdpSocket - + This platform does not support IPv6 Táto platforma nepodporuje IPv6 @@ -5790,7 +5801,7 @@ Prosím zvoľte iné meno súboru. QUndoGroup - + Undo VrátiÅ¥ späť @@ -5803,7 +5814,7 @@ Prosím zvoľte iné meno súboru. QUndoModel - + <empty> <prázdne> @@ -5811,7 +5822,7 @@ Prosím zvoľte iné meno súboru. QUndoStack - + Undo VrátiÅ¥ späť @@ -5882,7 +5893,7 @@ Prosím zvoľte iné meno súboru. QWebFrame - + Request cancelled @@ -6292,7 +6303,7 @@ Prosím zvoľte iné meno súboru. - + JavaScript Alert - %1 @@ -6368,6 +6379,11 @@ Prosím zvoľte iné meno súboru. + Select all + + + + Select to the next character @@ -6436,11 +6452,21 @@ Prosím zvoľte iné meno súboru. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ÄŒo je to? @@ -6448,7 +6474,7 @@ Prosím zvoľte iné meno súboru. QWidget - + * * @@ -6456,7 +6482,7 @@ Prosím zvoľte iné meno súboru. QWizard - + Go Back VrátiÅ¥ sa späť @@ -6518,7 +6544,7 @@ Prosím zvoľte iné meno súboru. QWorkspace - + &Restore &ObnoviÅ¥ @@ -6588,7 +6614,7 @@ Prosím zvoľte iné meno súboru. QXml - + no error occurred nevyskytla sa žiadna chyba @@ -6706,8 +6732,8 @@ Prosím zvoľte iné meno súboru. QXmlStream - - + + Extra content at end of document. Obsah naviac na konci dokumentu. @@ -6895,7 +6921,7 @@ Prosím zvoľte iné meno súboru. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6905,12 +6931,12 @@ Prosím zvoľte iné meno súboru. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6920,7 +6946,7 @@ Prosím zvoľte iné meno súboru. - + Year %1 is invalid because it begins with %2. @@ -6960,7 +6986,7 @@ Prosím zvoľte iné meno súboru. - + At least one component must be present. @@ -6971,7 +6997,7 @@ Prosím zvoľte iné meno súboru. - + No operand in an integer division, %1, can be %2. @@ -6986,17 +7012,17 @@ Prosím zvoľte iné meno súboru. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7027,17 +7053,17 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7047,7 +7073,7 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7057,7 +7083,7 @@ Prosím zvoľte iné meno súboru. - + Operator %1 cannot be used on type %2. @@ -7067,7 +7093,7 @@ Prosím zvoľte iné meno súboru. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7077,7 +7103,7 @@ Prosím zvoľte iné meno súboru. - + Type error in cast, expected %1, received %2. @@ -7087,7 +7113,7 @@ Prosím zvoľte iné meno súboru. - + No casting is possible with %1 as the target type. @@ -7112,7 +7138,7 @@ Prosím zvoľte iné meno súboru. - + A comment cannot contain %1 @@ -7122,7 +7148,7 @@ Prosím zvoľte iné meno súboru. - + No comparisons can be done involving the type %1. @@ -7132,12 +7158,12 @@ Prosím zvoľte iné meno súboru. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7147,7 +7173,7 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7157,7 +7183,7 @@ Prosím zvoľte iné meno súboru. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7167,33 +7193,33 @@ Prosím zvoľte iné meno súboru. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7207,7 +7233,7 @@ Prosím zvoľte iné meno súboru. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7222,27 +7248,27 @@ Prosím zvoľte iné meno súboru. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7257,7 +7283,7 @@ Prosím zvoľte iné meno súboru. - + %1 matches newline characters @@ -7292,17 +7318,17 @@ Prosím zvoľte iné meno súboru. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7312,12 +7338,12 @@ Prosím zvoľte iné meno súboru. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7327,17 +7353,17 @@ Prosím zvoľte iné meno súboru. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7358,7 +7384,7 @@ Prosím zvoľte iné meno súboru. - + The variable %1 is unused @@ -7640,7 +7666,7 @@ Prosím zvoľte iné meno súboru. - + empty @@ -7665,7 +7691,7 @@ Prosím zvoľte iné meno súboru. - + Required type is %1, but %2 was found. @@ -7680,7 +7706,7 @@ Prosím zvoľte iné meno súboru. - + It's not possible to add attributes after any other kind of node. @@ -7690,12 +7716,12 @@ Prosím zvoľte iné meno súboru. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7710,13 +7736,13 @@ Prosím zvoľte iné meno súboru. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7735,12 +7761,12 @@ Prosím zvoľte iné meno súboru. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7750,12 +7776,12 @@ Prosím zvoľte iné meno súboru. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7810,7 +7836,7 @@ Prosím zvoľte iné meno súboru. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7885,7 +7911,7 @@ Prosím zvoľte iné meno súboru. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts index f27480d..1b75722 100644 --- a/translations/qt_sv.ts +++ b/translations/qt_sv.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 är inte definierad @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Sant @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Kopiera eller ta bort en fil @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Alla filer (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Öppna @@ -527,7 +527,7 @@ Kontrollera sökväg och filnamn. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ till Q3MainWindow - + Line up Rada upp @@ -590,7 +590,7 @@ till Q3NetworkProtocol - + Operation stopped by the user Ã…tgärden stoppades av användaren @@ -598,7 +598,7 @@ till Q3ProgressDialog - + Cancel Avbryt @@ -607,7 +607,7 @@ till Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ till Q3TextEdit - + &Undo &Ã…ngra @@ -675,7 +675,7 @@ till Q3TitleBar - + System System @@ -743,7 +743,7 @@ till Q3ToolBar - + More... Mer... @@ -751,7 +751,7 @@ till Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ till Q3Wizard - + &Cancel &Avbryt @@ -831,9 +831,9 @@ till QAbstractSocket - - - + + + Host not found Värden hittades inte @@ -876,7 +876,7 @@ till QAbstractSpinBox - + &Step up &Stega uppÃ¥t @@ -894,12 +894,12 @@ till QApplication - + Activate Aktivera - + Executable '%1' requires Qt %2, found Qt %3. Binären \"%1\" kräver Qt %2, hittade Qt %3. @@ -909,7 +909,7 @@ till Inkompatibelt Qt-biblioteksfel - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ till QCheckBox - + Uncheck Avkryssa @@ -964,7 +964,7 @@ till QColorDialog - + Hu&e: Nya&ns: @@ -1038,13 +1038,13 @@ till QComboBox - + Open Öppna - + False Falskt @@ -1062,7 +1062,7 @@ till QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ till QDB2Driver - + Unable to connect Kunde inte ansluta - + Unable to commit transaction Kunde inte verkställa transaktion @@ -1106,8 +1106,8 @@ till QDB2Result - - + + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -1122,7 +1122,7 @@ till Kunde inte binda variabel - + Unable to fetch record %1 Kunde inte hämta posten %1 @@ -1140,7 +1140,7 @@ till QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ till QDial - + QDial @@ -1181,7 +1181,7 @@ till QDialog - + What's This? Vad är det här? @@ -1194,9 +1194,9 @@ till QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ till QDirModel - + Name Namn @@ -1349,7 +1349,7 @@ till QDockWidget - + Close Stäng @@ -1380,7 +1380,7 @@ till QErrorMessage - + Debug Message: Felsökningsmeddelande: @@ -1408,13 +1408,18 @@ till QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,37 +1442,37 @@ till QFileDialog - - + + All Files (*) Alla filer (*) - + Directories Kataloger - + &Open &Öppna - + &Save &Spara - + Open Öppna - + %1 already exists. Do you want to replace it? %1 finns redan. @@ -1488,7 +1493,7 @@ Kontrollera att det korrekta filnamnet angavs. Min dator - + &Rename &Byt namn @@ -1534,7 +1539,7 @@ Kontrollera att det korrekta filnamnet angavs. - + Directory: Katalog: @@ -1547,8 +1552,8 @@ Filen hittades inte. Kontrollera att det korrekta filnamnet angavs - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1562,7 @@ Katalogen hittades inte. Kontrollera att det korrekta katalognamnet angavs. - + '%1' is write protected. Do you want to delete it anyway? \"%1\" är skrivskyddad. @@ -1574,22 +1579,22 @@ Vill du ta bort den ändÃ¥? Kunde inte ta bort katalogen. - + Recent Places - + All Files (*.*) Alla filer (*.*) - + Save As Spara som - + Drive Enhet @@ -1621,29 +1626,29 @@ Vill du ta bort den ändÃ¥? FramÃ¥t - + New Folder Ny mapp - + &New Folder - + &Choose - + Remove - - + + File &name: Fil&namn: @@ -1663,7 +1668,7 @@ Vill du ta bort den ändÃ¥? QFileSystemModel - + %1 TB @@ -1725,7 +1730,7 @@ Vill du ta bort den ändÃ¥? Ändringsdatum - + My Computer Min dator @@ -1738,7 +1743,7 @@ Vill du ta bort den ändÃ¥? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Vill du ta bort den ändÃ¥? QFontDialog - + &Font &Typsnitt @@ -2004,8 +2009,8 @@ Vill du ta bort den ändÃ¥? QFtp - - + + Not connected Inte ansluten @@ -2150,7 +2155,7 @@ Vill du ta bort den ändÃ¥? QHostInfo - + Unknown error Okänt fel @@ -2158,11 +2163,11 @@ Vill du ta bort den ändÃ¥? QHostInfoAgent - + - + @@ -2188,26 +2193,26 @@ Vill du ta bort den ändÃ¥? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Okänt fel - + Request aborted Begäran avbröts - + No server set to connect to Ingen server inställd att ansluta till @@ -2225,18 +2230,23 @@ Vill du ta bort den ändÃ¥? Servern stängde oväntat anslutningen - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Anslutningen nekades - + Host %1 not found @@ -2257,7 +2267,7 @@ Vill du ta bort den ändÃ¥? Ogiltig HTTP-svarshuvud - + @@ -2306,7 +2316,7 @@ Vill du ta bort den ändÃ¥? - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Vill du ta bort den ändÃ¥? QIBaseDriver - + Error opening database Fel vid öppning av databas @@ -2410,7 +2420,7 @@ Vill du ta bort den ändÃ¥? QIBaseResult - + Unable to create BLOB Kunde inte skapa BLOB @@ -2430,7 +2440,7 @@ Vill du ta bort den ändÃ¥? Kunde inte läsa BLOB - + Could not find array Kunde inte hitta kedja @@ -2500,7 +2510,7 @@ Vill du ta bort den ändÃ¥? QIODevice - + Permission denied Ã…tkomst nekad @@ -2520,7 +2530,7 @@ Vill du ta bort den ändÃ¥? Inget ledigt utrymme pÃ¥ enheten - + Unknown error Okänt fel @@ -2528,7 +2538,7 @@ Vill du ta bort den ändÃ¥? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Vill du ta bort den ändÃ¥? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Vill du ta bort den ändÃ¥? QLibrary::resolve_sys: Symbolen "%1" är inte definierad i %2 (%3) - + Could not mmap '%1': %2 @@ -2587,7 +2597,7 @@ Vill du ta bort den ändÃ¥? - + The shared library was not found. @@ -2617,8 +2627,8 @@ Vill du ta bort den ändÃ¥? Okänt fel - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Vill du ta bort den ändÃ¥? QLineEdit - + &Undo &Ã…ngra @@ -2676,8 +2686,8 @@ Vill du ta bort den ändÃ¥? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Vill du ta bort den ändÃ¥? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Vill du ta bort den ändÃ¥? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Vill du ta bort den ändÃ¥? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Vill du ta bort den ändÃ¥? QMYSQLDriver - + Unable to open database ' Kunde inte öppna databasen \" @@ -2782,7 +2792,7 @@ Vill du ta bort den ändÃ¥? Kunde inte ansluta - + Unable to begin transaction Kunde inte pÃ¥börja transaktion @@ -2800,7 +2810,7 @@ Vill du ta bort den ändÃ¥? QMYSQLResult - + Unable to fetch data Kunde inte hämta data @@ -2815,7 +2825,7 @@ Vill du ta bort den ändÃ¥? Kunde inte lagra resultat - + Unable to prepare statement Kunde inte förbereda frÃ¥gesats @@ -2860,7 +2870,7 @@ Vill du ta bort den ändÃ¥? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Vill du ta bort den ändÃ¥? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Vill du ta bort den ändÃ¥? QMenu - + Close Stäng @@ -2990,7 +3000,7 @@ Vill du ta bort den ändÃ¥? QMessageBox - + Help Hjälp @@ -3003,21 +3013,25 @@ Vill du ta bort den ändÃ¥? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Om Qt - <p>This program uses Qt version %1.</p> - <p>Detta program använder Qt version %1.</p> + <p>Detta program använder Qt version %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Om Qt</h3>%1<p>Qt är ett C++-verktygssamling för utveckling av krossplattformsprogram.</p><p>Qt tillhandahÃ¥ller portabilitet för samma källkod mellan MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, och alla andra stora kommersiella Unix-varianter. Qt finns ocksÃ¥ tillgängligt för inbäddade enheter som Qtopia Core.</p><p>Qt är en produkt frÃ¥n Trolltech. Se <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> för mer information.</p> - + Show Details... Visa detaljer... @@ -3026,21 +3040,11 @@ Vill du ta bort den ändÃ¥? Hide Details... Dölj detaljer,,, - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM Välj inmatningsmetod @@ -3048,7 +3052,7 @@ Vill du ta bort den ändÃ¥? QMultiInputContextPlugin - + Multiple input method switcher Växlare för flera inmatningsmetoder @@ -3061,7 +3065,7 @@ Vill du ta bort den ändÃ¥? QNativeSocketEngine - + The remote host closed the connection Fjärrvärden stängde anslutningen @@ -3194,7 +3198,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessCacheBackend - + Error opening %1 @@ -3202,7 +3206,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3230,7 +3234,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3240,7 +3244,7 @@ Vill du ta bort den ändÃ¥? - + Logging in to %1 failed: authentication required @@ -3258,7 +3262,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3271,7 +3275,7 @@ Vill du ta bort den ändÃ¥? - + Protocol "%1" is unknown @@ -3279,7 +3283,7 @@ Vill du ta bort den ändÃ¥? QNetworkReplyImpl - + Operation canceled @@ -3288,7 +3292,7 @@ Vill du ta bort den ändÃ¥? QOCIDriver - + Unable to logon Kunde inte logga in @@ -3317,7 +3321,7 @@ Vill du ta bort den ändÃ¥? QOCIResult - + Unable to bind column for batch execute @@ -3344,18 +3348,16 @@ Vill du ta bort den ändÃ¥? Kunde inte förbereda frÃ¥gesats - - + Unable to bind value Kunde inte binda värde - Unable to execute select statement - Kunde inte köra \"select\"-frÃ¥gesats + Kunde inte köra \"select\"-frÃ¥gesats - + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -3363,7 +3365,7 @@ Vill du ta bort den ändÃ¥? QODBCDriver - + Unable to connect Kunde inte ansluta @@ -3373,7 +3375,7 @@ Vill du ta bort den ändÃ¥? Kunde inte ansluta - Drivrutinen har inte stöd för all nödvändig funktionalitet - + Unable to disable autocommit Kunde inte inaktivera automatisk verkställning @@ -3396,19 +3398,19 @@ Vill du ta bort den ändÃ¥? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Kunde inte ställa in \"SQL_CURSOR_STATIC\" som frÃ¥gesatsattribut. Kontrollera konfigurationen för din ODBC-drivrutin - + Unable to execute statement Kunde inte köra frÃ¥gesats - + Unable to fetch next Kunde inte hämta nästa @@ -3418,19 +3420,19 @@ Vill du ta bort den ändÃ¥? Kunde inte förbereda frÃ¥gesats - + Unable to bind variable Kunde inte binda variabel - - + + Unable to fetch last - + Unable to fetch @@ -3448,12 +3450,12 @@ Vill du ta bort den ändÃ¥? QObject - + Home Home - + Operation not supported on %1 @@ -3463,7 +3465,7 @@ Vill du ta bort den ändÃ¥? - + Write error writing to %1: %2 @@ -3488,7 +3490,7 @@ Vill du ta bort den ändÃ¥? - + No host name given @@ -3497,7 +3499,7 @@ Vill du ta bort den ändÃ¥? QPPDOptionsModel - + Name Namn @@ -3510,7 +3512,7 @@ Vill du ta bort den ändÃ¥? QPSQLDriver - + Unable to connect Kunde inte ansluta @@ -3530,7 +3532,7 @@ Vill du ta bort den ändÃ¥? Kunde inte rulla tillbaka transaktion - + Unable to subscribe @@ -3543,12 +3545,12 @@ Vill du ta bort den ändÃ¥? QPSQLResult - + Unable to create query Kunde inte skapa frÃ¥ga - + Unable to prepare statement Kunde inte förbereda frÃ¥gesats @@ -3556,7 +3558,7 @@ Vill du ta bort den ändÃ¥? QPageSetupWidget - + Centimeters (cm) @@ -3672,7 +3674,7 @@ Vill du ta bort den ändÃ¥? QPrintDialog - + locally connected lokalt ansluten @@ -3697,7 +3699,7 @@ Vill du ta bort den ändÃ¥? Liggande - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3847,7 +3849,7 @@ Vill du ta bort den ändÃ¥? US Common #10 Envelope (105 x 241 mm) - + OK OK @@ -3868,7 +3870,7 @@ Vill du ta bort den ändÃ¥? Papperskälla: - + Print @@ -4200,13 +4202,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4488,8 +4490,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4518,7 +4520,7 @@ Please choose a different file name. - + @@ -4538,6 +4540,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4546,7 +4553,7 @@ Please choose a different file name. QProgressDialog - + Cancel Avbryt @@ -4570,7 +4577,7 @@ Please choose a different file name. QRegExp - + no error occurred inga fel inträffade @@ -4618,7 +4625,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Fel vid öppning av databas @@ -4641,12 +4648,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Kunde inte hämta resultat - + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -4654,7 +4661,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Fel vid öppning av databas @@ -4721,12 +4728,12 @@ Please choose a different file name. QScrollBar - + Scroll here Rulla här - + Left edge Vänsterkant @@ -4736,7 +4743,7 @@ Please choose a different file name. Överkant - + Right edge Högerkant @@ -4746,7 +4753,7 @@ Please choose a different file name. Nederkant - + Page left Sida vänster @@ -4757,7 +4764,7 @@ Please choose a different file name. Sida uppÃ¥t - + Page right Sida höger @@ -4768,7 +4775,7 @@ Please choose a different file name. Sida nedÃ¥t - + Scroll left Rulla vänster @@ -4778,7 +4785,7 @@ Please choose a different file name. Rulla uppÃ¥t - + Scroll right Rulla höger @@ -4806,7 +4813,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4817,7 +4824,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4827,8 +4834,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4906,7 +4913,7 @@ Please choose a different file name. QShortcut - + Space Mellanslag @@ -5491,7 +5498,7 @@ Please choose a different file name. QSql - + Delete Ta bort @@ -5548,7 +5555,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5607,7 +5614,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5637,7 +5644,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Kunde inte öppna anslutning @@ -5667,7 +5674,7 @@ Please choose a different file name. UttagsÃ¥tgärd stöds inte - + Operation on socket is not supported @@ -5675,7 +5682,7 @@ Please choose a different file name. QTextControl - + &Undo &Ã…ngra @@ -5733,7 +5740,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Denna plattform saknar stöd för IPv6 @@ -5741,7 +5748,7 @@ Please choose a different file name. QUndoGroup - + Undo Ã…ngra @@ -5754,7 +5761,7 @@ Please choose a different file name. QUndoModel - + <empty> <tom> @@ -5762,7 +5769,7 @@ Please choose a different file name. QUndoStack - + Undo Ã…ngra @@ -5833,7 +5840,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6243,7 +6250,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6319,6 +6326,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6387,11 +6399,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Vad är det här? @@ -6399,7 +6421,7 @@ Please choose a different file name. QWidget - + * * @@ -6407,7 +6429,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6465,7 +6487,7 @@ Please choose a different file name. QWorkspace - + &Restore Ã…te&rställ @@ -6535,7 +6557,7 @@ Please choose a different file name. QXml - + no error occurred inga fel inträffade @@ -6653,8 +6675,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6838,7 +6860,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6848,12 +6870,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6863,7 +6885,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6903,7 +6925,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6914,7 +6936,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6929,17 +6951,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6970,17 +6992,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6990,7 +7012,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7000,7 +7022,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7010,7 +7032,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7020,7 +7042,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7030,7 +7052,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7055,7 +7077,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7065,7 +7087,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7075,12 +7097,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7090,7 +7112,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7100,7 +7122,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7110,33 +7132,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7150,7 +7172,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7165,27 +7187,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7200,7 +7222,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7235,17 +7257,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7255,12 +7277,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7270,17 +7292,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7301,7 +7323,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7583,7 +7605,7 @@ Please choose a different file name. - + empty @@ -7608,7 +7630,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7623,7 +7645,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7633,12 +7655,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7653,13 +7675,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7678,12 +7700,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7693,12 +7715,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7753,7 +7775,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7828,7 +7850,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index c16a645..d6a7d80 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -96,7 +96,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -109,24 +109,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -160,7 +160,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 не визначено @@ -173,7 +173,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Так @@ -201,7 +201,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Копіювати або переÑунути файл @@ -226,7 +226,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Ð’ÑÑ– файли (*) @@ -366,7 +366,7 @@ have libgstreamer-plugins-base installed. - + Open Відкрити @@ -534,7 +534,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -583,7 +583,7 @@ to Q3MainWindow - + Line up ВирівнÑти @@ -596,7 +596,7 @@ to Q3NetworkProtocol - + Operation stopped by the user Дію зупинено кориÑтувачем @@ -604,7 +604,7 @@ to Q3ProgressDialog - + Cancel СкаÑувати @@ -613,7 +613,7 @@ to Q3TabDialog - + OK Гаразд @@ -642,7 +642,7 @@ to Q3TextEdit - + &Undo &Повернути @@ -681,7 +681,7 @@ to Q3TitleBar - + System СиÑтема @@ -749,7 +749,7 @@ to Q3ToolBar - + More... Додатково... @@ -757,7 +757,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -809,7 +809,7 @@ to Q3Wizard - + &Cancel &СкаÑувати @@ -837,9 +837,9 @@ to QAbstractSocket - - - + + + Host not found Вузол не знайдено @@ -882,7 +882,7 @@ to QAbstractSpinBox - + &Step up &Крок вгору @@ -900,12 +900,12 @@ to QApplication - + Activate Ðктивувати - + Executable '%1' requires Qt %2, found Qt %3. Програма "%1" потребує Qt %2, але знайдено Qt %3. @@ -915,7 +915,7 @@ to Помилка неÑуміÑноÑÑ‚Ñ– бібліотеки Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -952,7 +952,7 @@ to QCheckBox - + Uncheck ЗнÑти позначку @@ -970,7 +970,7 @@ to QColorDialog - + Hu&e: Від&тінок: @@ -1044,13 +1044,13 @@ to QComboBox - + Open Відкрити - + False ÐÑ– @@ -1068,7 +1068,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1089,12 +1089,12 @@ to QDB2Driver - + Unable to connect Ðеможливо з'єднатиÑÑ - + Unable to commit transaction Ðеможливо завершити транзакцію @@ -1112,8 +1112,8 @@ to QDB2Result - - + + Unable to execute statement Ðеможливо виконати оператор @@ -1128,7 +1128,7 @@ to Ðеможливо прив'Ñзати змінну - + Unable to fetch record %1 Ðеможливо вибрати Ð·Ð°Ð¿Ð¸Ñ %1 @@ -1146,7 +1146,7 @@ to QDateTimeEdit - + AM AM @@ -1169,7 +1169,7 @@ to QDial - + QDial QDial @@ -1187,7 +1187,7 @@ to QDialog - + What's This? Що це? @@ -1200,9 +1200,9 @@ to QDialogButtonBox - + - + OK Гаразд @@ -1325,7 +1325,7 @@ to QDirModel - + Name Ім'Ñ @@ -1355,7 +1355,7 @@ to QDockWidget - + Close Закрити @@ -1386,7 +1386,7 @@ to QErrorMessage - + Debug Message: ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ: @@ -1414,13 +1414,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1443,37 +1448,37 @@ to QFileDialog - - + + All Files (*) Ð’ÑÑ– файли (*) - + Directories Каталоги - + &Open &Відкрити - + &Save &Зберегти - + Open Відкрити - + %1 already exists. Do you want to replace it? %1 вже Ñ–Ñнує. @@ -1494,7 +1499,7 @@ Please verify the correct file name was given. Мій комп'ютер - + &Rename &Перейменувати @@ -1540,7 +1545,7 @@ Please verify the correct file name was given. - + Directory: Каталог: @@ -1553,8 +1558,8 @@ Please verify the correct file name was given ПереконайтеÑÑ, що введено правильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1563,7 +1568,7 @@ Please verify the correct directory name was given. ПереконайтеÑÑ, що введено правильне ім'Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ. - + '%1' is write protected. Do you want to delete it anyway? "%1" захищено від запиÑу. @@ -1580,22 +1585,22 @@ Do you want to delete it anyway? Ðеможливо вилучити каталог. - + Recent Places - + All Files (*.*) Ð’ÑÑ– файли (*.*) - + Save As Зберегти, Ñк - + Drive ДиÑк @@ -1631,17 +1636,17 @@ Do you want to delete it anyway? Вперед - + New Folder Ðова тека - + &New Folder &Ðова тека - + &Choose &Вибрати @@ -1651,13 +1656,13 @@ Do you want to delete it anyway? Зберегти, &Ñк: - + Remove Вилучити - - + + File &name: &Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ: @@ -1677,7 +1682,7 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ @@ -1714,7 +1719,7 @@ Do you want to delete it anyway? Дата зміни - + My Computer Мій комп'ютер @@ -1752,7 +1757,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1969,7 +1974,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &Шрифт @@ -2018,8 +2023,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected Ðе з'єднано @@ -2161,7 +2166,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error Ðевідома помилка @@ -2169,11 +2174,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2199,26 +2204,26 @@ Do you want to delete it anyway? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Ðевідома помилка - + Request aborted Запит перервано - + No server set to connect to Ðе вказано Ñервер Ð´Ð»Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -2236,18 +2241,23 @@ Do you want to delete it anyway? Сервер неÑподівано закрив з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Відмовлено у зв'Ñзку - + Host %1 not found @@ -2268,7 +2278,7 @@ Do you want to delete it anyway? Ðеправильний заголовок відповіді HTTP - + @@ -2317,7 +2327,7 @@ Do you want to delete it anyway? ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова - + Connection refused (or timed out) @@ -2398,7 +2408,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database Ðеможливо відкрити базу даних @@ -2421,7 +2431,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB Ðеможливо Ñтворити BLOB @@ -2441,7 +2451,7 @@ Do you want to delete it anyway? Ðеможливо прочитати BLOB - + Could not find array Ðеможливо знайти маÑив @@ -2511,7 +2521,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied Відмовлено у доÑтупі @@ -2531,7 +2541,7 @@ Do you want to delete it anyway? Ðа приÑтрої не лишилоÑÑŒ міÑÑ†Ñ - + Unknown error Ðевідома помилка @@ -2539,7 +2549,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2562,7 +2572,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2582,7 +2592,7 @@ Do you want to delete it anyway? QLibrary::resolve_sys: Ñимвол "%1" не Ñ” визначеним в %2 (%3) - + Could not mmap '%1': %2 Помилка Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ mmap "%1": %2 @@ -2613,7 +2623,7 @@ Do you want to delete it anyway? - + The shared library was not found. Спільну бібліотеку не знайдено. @@ -2628,8 +2638,8 @@ Do you want to delete it anyway? Додаток "%1" викориÑтовує неÑуміÑну бібліотеку Qt. (Ðе дозволÑєтьÑÑ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ñ‚Ð¸ верÑÑ–ÑŽ бібліотеки Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ– верÑÑ–ÑŽ випуÑку.) - - + + Cannot load library %1: %2 @@ -2649,7 +2659,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &Повернути @@ -2687,8 +2697,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2704,7 +2714,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2712,8 +2722,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2726,7 +2736,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2783,7 +2793,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' Ðеможливо відкрити базу даних @@ -2793,7 +2803,7 @@ Do you want to delete it anyway? Ðеможливо з'єднатиÑÑ - + Unable to begin transaction Ðеможливо почати транзакцію @@ -2811,7 +2821,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data Ðеможливо вибрати дані @@ -2826,7 +2836,7 @@ Do you want to delete it anyway? Ðеможливо запиÑати результат - + Unable to prepare statement Ðеможливо підготувати оператор @@ -2871,7 +2881,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2879,7 +2889,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2972,7 +2982,7 @@ Do you want to delete it anyway? QMenu - + Close Закрити @@ -3045,7 +3055,7 @@ Do you want to delete it anyway? QMessageBox - + Help Довідка @@ -3058,21 +3068,25 @@ Do you want to delete it anyway? Гаразд - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Про Qt - <p>This program uses Qt version %1.</p> - <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt верÑÑ–Ñ— %1.</p> + <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt верÑÑ–Ñ— %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Про Qt</h3>%1<p>Qt - це інÑтрументарій C++ Ð´Ð»Ñ Ð¼Ñ–Ð¶Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¾Ð²Ð¾Ñ— розробки.</p><p>Qt забезпечує мобільніÑÑ‚ÑŒ єдиних джерельних текÑтів між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та вÑіма оÑновними комерційними верÑÑ–Ñми Unix. Qt Ñ–Ñнує також Ð´Ð»Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ… приÑтроїв, таких, Ñк Qtopia Core.</p><p>Qt - це продукт компанії Trolltech. Більше інформації можна знайти на <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + Show Details... Показати подробиці... @@ -3082,20 +3096,14 @@ Do you want to delete it anyway? Сховати подробиці... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> + <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> QMultiInputContext - + Select IM Вибрати метод вводу @@ -3103,7 +3111,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher Перемикач методів вводу @@ -3116,7 +3124,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection Віддалений вузол закрив з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -3249,7 +3257,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3257,7 +3265,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3285,7 +3293,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3295,7 +3303,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3313,7 +3321,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3326,7 +3334,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3334,7 +3342,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3343,7 +3351,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon Ðеможливо зайти @@ -3372,7 +3380,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3399,18 +3407,16 @@ Do you want to delete it anyway? Ðеможливо підготувати оператор - - + Unable to bind value Ðеможливо прив'Ñзати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ - Unable to execute select statement - Ðеможливо виконати оператор Ð²Ð¸Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ + Ðеможливо виконати оператор Ð²Ð¸Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ - + Unable to execute statement Ðеможливо виконати оператор @@ -3418,7 +3424,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect Ðеможливо з'єднатиÑÑ @@ -3428,7 +3434,7 @@ Do you want to delete it anyway? Ðеможливо з'єднатиÑÑ - драйвер не підтримує вÑÑ–Ñ… потрібних функцій - + Unable to disable autocommit Ðеможливо вимкнути Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ–Ð¹ @@ -3451,19 +3457,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: неможливо вÑтановити 'SQL_CURSOR_STATIC', Ñк атрибут оператора. Будь лаÑка, перевірте Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° ODBC - + Unable to execute statement Ðеможливо виконати оператор - + Unable to fetch next Ðеможливо вибрати наÑтупний @@ -3473,19 +3479,19 @@ Do you want to delete it anyway? Ðеможливо підготувати оператор - + Unable to bind variable Ðеможливо прив'Ñзати змінну - - + + Unable to fetch last - + Unable to fetch @@ -3503,12 +3509,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3518,7 +3524,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3543,7 +3549,7 @@ Do you want to delete it anyway? - + No host name given @@ -3552,7 +3558,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name Ім'Ñ @@ -3565,7 +3571,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect Ðеможливо з'єднатиÑÑ @@ -3585,7 +3591,7 @@ Do you want to delete it anyway? Ðеможливо відкотити транзакцію - + Unable to subscribe @@ -3598,12 +3604,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query Ðеможливо Ñтворити запит - + Unable to prepare statement Ðеможливо підготувати оператор @@ -3611,7 +3617,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3727,7 +3733,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected локальне з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -3752,7 +3758,7 @@ Do you want to delete it anyway? Ðльбомне - + A0 (841 x 1189 mm) A0 (841 x 1189 мм) @@ -3902,7 +3908,7 @@ Do you want to delete it anyway? US Common #10 Envelope (105 x 241 мм) - + OK Гаразд @@ -3923,7 +3929,7 @@ Do you want to delete it anyway? Джерело паперу: - + Print @@ -4255,13 +4261,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4543,8 +4549,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4573,7 +4579,7 @@ Please choose a different file name. - + @@ -4593,6 +4599,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4601,7 +4612,7 @@ Please choose a different file name. QProgressDialog - + Cancel СкаÑувати @@ -4625,7 +4636,7 @@ Please choose a different file name. QRegExp - + no error occurred без помилок @@ -4673,7 +4684,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Помилка Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даних @@ -4696,12 +4707,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Ðеможливо витÑгнути результат - + Unable to execute statement Ðеможливо виконати оператор @@ -4709,7 +4720,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Ðеможливо відкрити базу даних @@ -4776,12 +4787,12 @@ Please choose a different file name. QScrollBar - + Scroll here Прокрутити Ñюди - + Left edge Лівий край @@ -4791,7 +4802,7 @@ Please choose a different file name. Верх - + Right edge Правий край @@ -4801,7 +4812,7 @@ Please choose a different file name. Ðиз - + Page left Сторінка ліворуч @@ -4812,7 +4823,7 @@ Please choose a different file name. Сторінка вгору - + Page right Сторінка праворуч @@ -4823,7 +4834,7 @@ Please choose a different file name. Сторінка додолу - + Scroll left Прокрутити ліворуч @@ -4833,7 +4844,7 @@ Please choose a different file name. Прокрутити вгору - + Scroll right Прокрутити праворуч @@ -4861,7 +4872,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4872,7 +4883,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4882,8 +4893,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4961,7 +4972,7 @@ Please choose a different file name. QShortcut - + Space Прогалина @@ -5546,7 +5557,7 @@ Please choose a different file name. QSql - + Delete Вилучити @@ -5603,7 +5614,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 Ðеможливо запиÑати дані: %1 @@ -5666,7 +5677,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5696,7 +5707,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Ðеможливо відкрити з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -5726,7 +5737,7 @@ Please choose a different file name. Дії з Ñокетами не підтримуютьÑÑ - + Operation on socket is not supported @@ -5734,7 +5745,7 @@ Please choose a different file name. QTextControl - + &Undo &Повернути @@ -5792,7 +5803,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Ð¦Ñ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð° не підтримує IPv6 @@ -5800,7 +5811,7 @@ Please choose a different file name. QUndoGroup - + Undo Повернути @@ -5813,7 +5824,7 @@ Please choose a different file name. QUndoModel - + <empty> <порожньо> @@ -5821,7 +5832,7 @@ Please choose a different file name. QUndoStack - + Undo Повернути @@ -5892,7 +5903,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6304,7 +6315,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6380,6 +6391,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6448,11 +6464,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Що це? @@ -6460,7 +6486,7 @@ Please choose a different file name. QWidget - + * * @@ -6468,7 +6494,7 @@ Please choose a different file name. QWizard - + Go Back Піти назад @@ -6530,7 +6556,7 @@ Please choose a different file name. QWorkspace - + &Restore &Відновити @@ -6600,7 +6626,7 @@ Please choose a different file name. QXml - + no error occurred без помилок @@ -6718,8 +6744,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. Ðадлишковий вміÑÑ‚ в кінці документу. @@ -6911,7 +6937,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6921,12 +6947,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6936,7 +6962,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6976,7 +7002,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6987,7 +7013,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -7002,17 +7028,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7043,17 +7069,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7063,7 +7089,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7073,7 +7099,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7083,7 +7109,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7093,7 +7119,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7103,7 +7129,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7128,7 +7154,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7138,7 +7164,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7148,12 +7174,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7163,7 +7189,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7173,7 +7199,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7183,33 +7209,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7227,7 +7253,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7242,27 +7268,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7277,7 +7303,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7312,17 +7338,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7332,12 +7358,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7347,17 +7373,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7378,7 +7404,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7660,7 +7686,7 @@ Please choose a different file name. - + empty @@ -7685,7 +7711,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7700,7 +7726,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7710,12 +7736,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7730,13 +7756,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7755,12 +7781,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7770,12 +7796,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7830,7 +7856,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7905,7 +7931,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_untranslated.ts b/translations/qt_untranslated.ts index cbedeba..083a56f 100644 --- a/translations/qt_untranslated.ts +++ b/translations/qt_untranslated.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -78,7 +78,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -91,24 +91,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -142,7 +142,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -155,7 +155,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True @@ -183,7 +183,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File @@ -208,7 +208,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) @@ -348,7 +348,7 @@ have libgstreamer-plugins-base installed. - + Open @@ -514,7 +514,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -556,7 +556,7 @@ to Q3MainWindow - + Line up @@ -569,7 +569,7 @@ to Q3NetworkProtocol - + Operation stopped by the user @@ -577,7 +577,7 @@ to Q3ProgressDialog - + Cancel @@ -586,7 +586,7 @@ to Q3TabDialog - + OK @@ -615,7 +615,7 @@ to Q3TextEdit - + &Undo @@ -654,7 +654,7 @@ to Q3TitleBar - + System @@ -722,7 +722,7 @@ to Q3ToolBar - + More... @@ -730,7 +730,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -782,7 +782,7 @@ to Q3Wizard - + &Cancel @@ -810,9 +810,9 @@ to QAbstractSocket - - - + + + Host not found @@ -855,7 +855,7 @@ to QAbstractSpinBox - + &Step up @@ -873,12 +873,12 @@ to QApplication - + Activate - + Executable '%1' requires Qt %2, found Qt %3. @@ -888,7 +888,7 @@ to - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. @@ -925,7 +925,7 @@ to QCheckBox - + Uncheck @@ -943,7 +943,7 @@ to QColorDialog - + Hu&e: @@ -1001,13 +1001,13 @@ to QComboBox - + Open - + False @@ -1025,7 +1025,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1046,12 +1046,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1069,8 +1069,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1085,7 +1085,7 @@ to - + Unable to fetch record %1 @@ -1103,7 +1103,7 @@ to QDateTimeEdit - + AM @@ -1126,7 +1126,7 @@ to QDial - + QDial @@ -1144,7 +1144,7 @@ to QDialog - + What's This? @@ -1157,9 +1157,9 @@ to QDialogButtonBox - + - + OK @@ -1282,7 +1282,7 @@ to QDirModel - + Name @@ -1312,7 +1312,7 @@ to QDockWidget - + Close @@ -1343,7 +1343,7 @@ to QErrorMessage - + Debug Message: @@ -1371,13 +1371,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1400,37 +1405,37 @@ to QFileDialog - - + + All Files (*) - + Directories - + &Open - + &Save - + Open - + %1 already exists. Do you want to replace it? @@ -1448,7 +1453,7 @@ Please verify the correct file name was given. - + &Rename @@ -1494,20 +1499,20 @@ Please verify the correct file name was given. - + Directory: - - + + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1523,22 +1528,22 @@ Do you want to delete it anyway? - + Recent Places - + All Files (*.*) - + Save As - + Drive @@ -1570,29 +1575,29 @@ Do you want to delete it anyway? - + New Folder - + &New Folder - + &Choose - + Remove - - + + File &name: @@ -1612,7 +1617,7 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename @@ -1649,7 +1654,7 @@ Do you want to delete it anyway? - + My Computer @@ -1687,7 +1692,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1904,7 +1909,7 @@ Do you want to delete it anyway? QFontDialog - + &Font @@ -1953,8 +1958,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected @@ -2090,7 +2095,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error @@ -2098,11 +2103,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2128,21 +2133,21 @@ Do you want to delete it anyway? QHttp - - - + + + Unknown error - + Request aborted - + No server set to connect to @@ -2160,18 +2165,23 @@ Do you want to delete it anyway? - + + Unknown authentication method + + + + Error writing response to device - + Connection refused - + Host %1 not found @@ -2192,7 +2202,7 @@ Do you want to delete it anyway? - + @@ -2241,7 +2251,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2271,7 +2281,7 @@ Do you want to delete it anyway? - + HTTPS connection requested but SSL support not compiled in @@ -2327,7 +2337,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2350,7 +2360,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2370,7 +2380,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2440,7 +2450,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2460,7 +2470,7 @@ Do you want to delete it anyway? - + Unknown error @@ -2468,7 +2478,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2491,7 +2501,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2499,7 +2509,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2530,7 +2540,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2545,8 +2555,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2566,7 +2576,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo @@ -2604,8 +2614,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2621,7 +2631,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2629,8 +2639,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2643,7 +2653,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2700,7 +2710,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2710,7 +2720,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2728,7 +2738,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2743,7 +2753,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2788,7 +2798,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2796,7 +2806,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] @@ -2889,7 +2899,7 @@ Do you want to delete it anyway? QMenu - + Close @@ -2911,7 +2921,7 @@ Do you want to delete it anyway? QMessageBox - + Help @@ -2924,17 +2934,17 @@ Do you want to delete it anyway? - - About Qt + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - <p>This program uses Qt version %1.</p> + + About Qt - + Show Details... @@ -2943,21 +2953,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -2965,7 +2965,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -2978,7 +2978,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3111,7 +3111,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3119,7 +3119,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3147,7 +3147,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3157,7 +3157,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3175,7 +3175,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3205,7 +3205,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3261,18 +3261,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3280,7 +3274,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3290,7 +3284,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3313,19 +3307,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3335,19 +3329,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3365,12 +3359,12 @@ Do you want to delete it anyway? QObject - + Home - + Operation not supported on %1 @@ -3380,7 +3374,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3405,7 +3399,7 @@ Do you want to delete it anyway? - + No host name given @@ -3414,7 +3408,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name @@ -3427,7 +3421,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3447,7 +3441,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3460,12 +3454,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3473,7 +3467,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3589,7 +3583,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected @@ -3606,7 +3600,7 @@ Do you want to delete it anyway? - + A0 (841 x 1189 mm) @@ -3756,12 +3750,12 @@ Do you want to delete it anyway? - + OK - + Print @@ -4015,13 +4009,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4288,8 +4282,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4318,7 +4312,7 @@ Please choose a different file name. - + @@ -4338,6 +4332,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4346,7 +4345,7 @@ Please choose a different file name. QProgressDialog - + Cancel @@ -4370,7 +4369,7 @@ Please choose a different file name. QRegExp - + no error occurred @@ -4418,7 +4417,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4441,12 +4440,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4454,7 +4453,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4517,12 +4516,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4532,7 +4531,7 @@ Please choose a different file name. - + Right edge @@ -4542,7 +4541,7 @@ Please choose a different file name. - + Page left @@ -4553,7 +4552,7 @@ Please choose a different file name. - + Page right @@ -4564,7 +4563,7 @@ Please choose a different file name. - + Scroll left @@ -4574,7 +4573,7 @@ Please choose a different file name. - + Scroll right @@ -4602,7 +4601,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4613,7 +4612,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4623,8 +4622,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4702,7 +4701,7 @@ Please choose a different file name. QShortcut - + Space @@ -5283,7 +5282,7 @@ Please choose a different file name. QSql - + Delete @@ -5340,7 +5339,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5399,7 +5398,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5429,7 +5428,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5455,7 +5454,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5463,7 +5462,7 @@ Please choose a different file name. QTextControl - + &Undo @@ -5521,7 +5520,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5529,7 +5528,7 @@ Please choose a different file name. QUndoGroup - + Undo @@ -5542,7 +5541,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5550,7 +5549,7 @@ Please choose a different file name. QUndoStack - + Undo @@ -5621,7 +5620,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6031,7 +6030,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6107,6 +6106,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6175,11 +6179,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? @@ -6187,7 +6201,7 @@ Please choose a different file name. QWidget - + * @@ -6195,7 +6209,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6253,7 +6267,7 @@ Please choose a different file name. QWorkspace - + &Restore @@ -6323,7 +6337,7 @@ Please choose a different file name. QXml - + no error occurred @@ -6441,8 +6455,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6626,7 +6640,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6636,17 +6650,17 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. - + Year %1 is invalid because it begins with %2. @@ -6686,7 +6700,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6697,7 +6711,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6712,17 +6726,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6753,17 +6767,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6773,7 +6787,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6783,7 +6797,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6793,7 +6807,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6803,7 +6817,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6813,7 +6827,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6838,7 +6852,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6848,7 +6862,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6858,12 +6872,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -6873,7 +6887,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -6883,7 +6897,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -6893,33 +6907,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -6933,7 +6947,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -6948,27 +6962,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -6983,7 +6997,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7018,17 +7032,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7038,12 +7052,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7053,17 +7067,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7084,7 +7098,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7366,7 +7380,7 @@ Please choose a different file name. - + empty @@ -7391,7 +7405,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7406,7 +7420,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7416,7 +7430,7 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. @@ -7426,7 +7440,7 @@ Please choose a different file name. - + %1 is an unsupported encoding. @@ -7441,13 +7455,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7466,12 +7480,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7481,12 +7495,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7541,7 +7555,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7616,7 +7630,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index 14ec1cd..061919d 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>音频回放设备 <b>%1</b> 没有工作。<br/>回滚到 <b>%2</b>。</html> @@ -23,7 +22,7 @@ CloseButton - + Close Tab 关闭标签页 @@ -81,7 +80,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -97,24 +96,24 @@ have libgstreamer-plugins-base installed. 缺少一个需è¦çš„解ç å™¨ã€‚您需è¦å®‰è£…如下解ç å™¨æ¥æ’­æ”¾è¿™ä¸ªå†…容:%0 - - + + - - - - + + + + Could not open media source. ä¸èƒ½æ‰“开媒体æºã€‚ - + Invalid source type. 无效的æºç±»åž‹ã€‚ - + Could not locate media source. ä¸èƒ½å®šä½åª’体æºã€‚ @@ -148,7 +147,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1,%2未定义 @@ -161,7 +160,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True 真 @@ -189,7 +188,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File å¤åˆ¶æˆ–者移动一个文件 @@ -214,7 +213,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) 所有文件 (*) @@ -354,7 +353,7 @@ have libgstreamer-plugins-base installed. - + Open 打开 @@ -523,7 +522,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +572,7 @@ to Q3MainWindow - + Line up 排列 @@ -586,7 +585,7 @@ to Q3NetworkProtocol - + Operation stopped by the user æ“作被用户åœæ­¢ @@ -594,7 +593,7 @@ to Q3ProgressDialog - + Cancel å–消 @@ -603,7 +602,7 @@ to Q3TabDialog - + OK 确认 @@ -632,7 +631,7 @@ to Q3TextEdit - + &Undo 撤消(&U) @@ -671,7 +670,7 @@ to Q3TitleBar - + System 系统 @@ -739,7 +738,7 @@ to Q3ToolBar - + More... 更多... @@ -747,7 +746,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +798,7 @@ to Q3Wizard - + &Cancel å–消(&C) @@ -827,9 +826,9 @@ to QAbstractSocket - - - + + + Host not found 主机未找到 @@ -872,7 +871,7 @@ to QAbstractSpinBox - + &Step up 增加(&S) @@ -890,12 +889,12 @@ to QApplication - + Activate 激活 - + Executable '%1' requires Qt %2, found Qt %3. 执行“%1â€éœ€è¦Qt %2,åªæ‰¾åˆ°äº†Qt %3。 @@ -905,7 +904,7 @@ to ä¸å…¼å®¹çš„Qt错误 - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -942,7 +941,7 @@ to QCheckBox - + Uncheck å–消选中 @@ -960,7 +959,7 @@ to QColorDialog - + Hu&e: 色调(&E): @@ -1022,13 +1021,13 @@ to QComboBox - + Open 打开 - + False å‡ @@ -1071,7 +1070,7 @@ to %1:未知错误 %2 - + %1: key is empty QSystemSemaphore %1:键是空的 @@ -1092,12 +1091,12 @@ to QDB2Driver - + Unable to connect ä¸èƒ½è¿žæŽ¥ - + Unable to commit transaction ä¸èƒ½æ交事务 @@ -1115,8 +1114,8 @@ to QDB2Result - - + + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -1131,7 +1130,7 @@ to ä¸èƒ½å¸®å®šå˜é‡ - + Unable to fetch record %1 ä¸èƒ½èŽ·å–记录%1 @@ -1149,7 +1148,7 @@ to QDateTimeEdit - + AM AM @@ -1172,7 +1171,7 @@ to QDial - + QDial QDial @@ -1190,7 +1189,7 @@ to QDialog - + What's This? 这是什么? @@ -1203,9 +1202,9 @@ to QDialogButtonBox - + - + OK 确定 @@ -1328,7 +1327,7 @@ to QDirModel - + Name å称 @@ -1358,7 +1357,7 @@ to QDockWidget - + Close 关闭 @@ -1389,7 +1388,7 @@ to QErrorMessage - + Debug Message: 调试消æ¯ï¼š @@ -1417,13 +1416,18 @@ to QFile - - + + Destination file exists 目标文件已存在 - + + Cannot remove source file + + + + Cannot open %1 for input 无法输入 %1 @@ -1446,37 +1450,37 @@ to QFileDialog - - + + All Files (*) 所有文件 (*) - + Directories 目录 - + &Open 打开(&O) - + &Save ä¿å­˜(&S) - + Open 打开 - + %1 already exists. Do you want to replace it? %1å·²ç»å­˜åœ¨ã€‚ @@ -1497,7 +1501,7 @@ Please verify the correct file name was given. 我的计算机 - + &Rename é‡å‘½å(&R) @@ -1543,13 +1547,13 @@ Please verify the correct file name was given. - + Directory: 目录: - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1558,7 +1562,7 @@ Please verify the correct directory name was given. 请核实已给定正确目录å。 - + '%1' is write protected. Do you want to delete it anyway? “%1“是写ä¿æŠ¤çš„。 @@ -1575,17 +1579,17 @@ Do you want to delete it anyway? ä¸èƒ½åˆ é™¤ç›®å½•ã€‚ - + Recent Places 最近的地方 - + Save As å¦å­˜ä¸º - + Drive 驱动器 @@ -1617,29 +1621,29 @@ Do you want to delete it anyway? å‰è¿› - + New Folder 新建文件夹 - + &New Folder 新建文件夹(&N) - + &Choose 选择(&C) - + Remove 移除 - - + + File &name: 文件å称(&N): @@ -1656,7 +1660,7 @@ Do you want to delete it anyway? 创建新文件夹 - + All Files (*.*) 所有文件 (*.*) @@ -1664,7 +1668,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB %1 TB @@ -1726,7 +1730,7 @@ Do you want to delete it anyway? 日期被修改 - + My Computer 我的计算机 @@ -1739,7 +1743,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal 普通 @@ -1956,7 +1960,7 @@ Do you want to delete it anyway? QFontDialog - + &Font 字体(&F) @@ -2005,8 +2009,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected 没有连接 @@ -2151,7 +2155,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error 未知的错误 @@ -2159,11 +2163,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2189,21 +2193,21 @@ Do you want to delete it anyway? QHttp - - - + + + Unknown error 未知的错误 - + Request aborted 请求被放弃了 - + No server set to connect to 没有设置è¦è¿žæŽ¥çš„æœåŠ¡å™¨ @@ -2221,18 +2225,23 @@ Do you want to delete it anyway? æœåŠ¡å™¨å¼‚常地关闭了连接 - + + Unknown authentication method + + + + Error writing response to device å‘设备中进行写回å¤æ—¶å‘生错误 - + Connection refused è¿žæŽ¥è¢«æ‹’ç» - + Host %1 not found @@ -2253,7 +2262,7 @@ Do you want to delete it anyway? 无效的HTTPå“应头 - + @@ -2302,7 +2311,7 @@ Do you want to delete it anyway? 需è¦è®¤è¯ - + Connection refused (or timed out) 连接被拒ç»(或者超时) @@ -2332,7 +2341,7 @@ Do you want to delete it anyway? SSL æ¡æ‰‹å¤±è´¥ - + HTTPS connection requested but SSL support not compiled in HTTPS è¿žæŽ¥éœ€è¦ SSLï¼Œä½†å®ƒæ²¡æœ‰è¢«ç¼–è¯‘è¿›æ¥ @@ -2388,7 +2397,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database 打开数æ®åº“错误 @@ -2411,7 +2420,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB ä¸èƒ½åˆ›å»ºBLOB @@ -2431,7 +2440,7 @@ Do you want to delete it anyway? ä¸èƒ½è¯»å–BLOB - + Could not find array ä¸èƒ½æ‰¾åˆ°æ•°ç»„ @@ -2501,7 +2510,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied æƒé™è¢«æ‹’ç» @@ -2521,7 +2530,7 @@ Do you want to delete it anyway? 设备上没有空间了 - + Unknown error 未知的错误 @@ -2529,7 +2538,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2552,7 +2561,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: 输入一个值: @@ -2572,7 +2581,7 @@ Do you want to delete it anyway? QLibrary::resolve_sys: 符å·â€œ%1â€åœ¨%2(%3)没有被定义 - + Could not mmap '%1': %2 ä¸èƒ½æ˜ å°„â€%1“:%2 @@ -2603,7 +2612,7 @@ Do you want to delete it anyway? - + The shared library was not found. 共享库没有被找到。 @@ -2618,8 +2627,8 @@ Do you want to delete it anyway? æ’件“%1“使用了ä¸å…¼å®¹çš„Qt库。(ä¸èƒ½æ··åˆä½¿ç”¨åº“的调试版本和å‘布版本。) - - + + Cannot load library %1: %2 无法加载库%1:%2 @@ -2639,7 +2648,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo 撤消(&U) @@ -2677,8 +2686,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error %1: å称错误 @@ -2694,7 +2703,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 %1:未知错误 %2 @@ -2702,8 +2711,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused %1ï¼šè¿žæŽ¥è¢«æ‹’ç» @@ -2716,7 +2725,7 @@ Do you want to delete it anyway? - + %1: Invalid name %1:无效å称 @@ -2773,7 +2782,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' ä¸èƒ½æ‰“开数æ®åº“ @@ -2783,7 +2792,7 @@ Do you want to delete it anyway? ä¸èƒ½è¿žæŽ¥ - + Unable to begin transaction ä¸èƒ½å¼€å§‹äº‹åŠ¡ @@ -2801,7 +2810,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data ä¸èƒ½èŽ·å–æ•°æ® @@ -2816,7 +2825,7 @@ Do you want to delete it anyway? ä¸èƒ½å­˜å‚¨ç»“æžœ - + Unable to prepare statement ä¸èƒ½å‡†å¤‡è¯­å¥ @@ -2861,7 +2870,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) (未命åçš„) @@ -2869,7 +2878,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2962,7 +2971,7 @@ Do you want to delete it anyway? QMenu - + Close 关闭 @@ -3035,7 +3044,7 @@ Do you want to delete it anyway? QMessageBox - + Help 帮助 @@ -3048,17 +3057,21 @@ Do you want to delete it anyway? 确定 - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt 关于Qt - <p>This program uses Qt version %1.</p> - <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> + <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> - + Show Details... 显示细节…… @@ -3068,14 +3081,12 @@ Do you want to delete it anyway? éšè—细节…… - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>这个程åºä½¿ç”¨äº†Qt %1å¼€æºç‰ˆæœ¬ã€‚</p><p>Qtå¼€æºç‰ˆæœ¬åªç”¨äºŽå¼€æºåº”用程åºçš„å¼€å‘。如果è¦å¼€å‘ç§æœ‰ï¼ˆé—­æºï¼‰è½¯ä»¶ï¼Œä½ éœ€è¦ä¸€ä¸ªå•†ä¸šçš„Qtå议。</p><p>有关Qtå议的概览,请å‚考<a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> + <p>这个程åºä½¿ç”¨äº†Qt %1å¼€æºç‰ˆæœ¬ã€‚</p><p>Qtå¼€æºç‰ˆæœ¬åªç”¨äºŽå¼€æºåº”用程åºçš„å¼€å‘。如果è¦å¼€å‘ç§æœ‰ï¼ˆé—­æºï¼‰è½¯ä»¶ï¼Œä½ éœ€è¦ä¸€ä¸ªå•†ä¸šçš„Qtå议。</p><p>有关Qtå议的概览,请å‚考<a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -3085,7 +3096,7 @@ Do you want to delete it anyway? QMultiInputContext - + Select IM 选择输入法 @@ -3093,7 +3104,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 多输入法切æ¢å™¨ @@ -3106,7 +3117,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection 远端主机关闭了这个连接 @@ -3239,7 +3250,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 打开%1å‘生错误 @@ -3247,7 +3258,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 正在打开éžæœ¬åœ°æ–‡ä»¶ %1 的请求 @@ -3275,7 +3286,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found 未找到åˆé€‚çš„ä»£ç† @@ -3285,7 +3296,7 @@ Do you want to delete it anyway? æ— æ³•è¯»å– %1:是一个目录 - + Logging in to %1 failed: authentication required 登入 %1 失败:需è¦éªŒè¯ @@ -3303,7 +3314,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found 未找到åˆé€‚çš„ä»£ç† @@ -3316,7 +3327,7 @@ Do you want to delete it anyway? 下载 %1 错误 - æœåŠ¡å™¨å›žå¤ï¼š%2 - + Protocol "%1" is unknown å议“%1â€æ˜¯æœªçŸ¥çš„ @@ -3324,7 +3335,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled æ“作被å–消 @@ -3333,7 +3344,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon ä¸èƒ½ç™»å½• @@ -3362,7 +3373,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3389,18 +3400,16 @@ Do you want to delete it anyway? ä¸èƒ½å‡†å¤‡è¯­å¥ - - + Unable to bind value ä¸èƒ½ç»‘定值 - Unable to execute select statement - ä¸èƒ½æ‰§è¡Œé€‰æ‹©è¯­å¥ + ä¸èƒ½æ‰§è¡Œé€‰æ‹©è¯­å¥ - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -3408,7 +3417,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect ä¸èƒ½è¿žæŽ¥ @@ -3418,7 +3427,7 @@ Do you want to delete it anyway? ä¸èƒ½è¿žæŽ¥â€”驱动程åºä¸æ”¯æŒæ‰€æœ‰åŠŸèƒ½ - + Unable to disable autocommit ä¸èƒ½ç¦æ­¢è‡ªåŠ¨æ交 @@ -3441,19 +3450,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ä¸èƒ½æŠŠâ€œSQL_CURSOR_STATICâ€è®¾ç½®ä¸ºè¯­å¥å±žæ€§ã€‚请检查你的ODBC驱动程åºè®¾ç½®ã€‚ - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ - + Unable to fetch next ä¸èƒ½èŽ·å–下一个 @@ -3463,19 +3472,19 @@ Do you want to delete it anyway? ä¸èƒ½å‡†å¤‡è¯­å¥ - + Unable to bind variable ä¸èƒ½å¸®å®šå˜é‡ - - + + Unable to fetch last ä¸èƒ½èŽ·å–最åŽä¸€ä¸ª - + Unable to fetch ä¸èƒ½èŽ·å– @@ -3493,12 +3502,12 @@ Do you want to delete it anyway? QObject - + Home 家 - + Operation not supported on %1 在 %1 上ä¸è¢«æ”¯æŒçš„æ“作 @@ -3508,7 +3517,7 @@ Do you want to delete it anyway? 无效的 URI:%1 - + Write error writing to %1: %2 写入 %1 错误:%2 @@ -3533,7 +3542,7 @@ Do you want to delete it anyway? å议错误:收到了大å°ä¸º 0 的包 - + No host name given 未指定主机å @@ -3542,7 +3551,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name å称 @@ -3555,7 +3564,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect ä¸èƒ½è¿žæŽ¥ @@ -3575,7 +3584,7 @@ Do you want to delete it anyway? ä¸èƒ½å›žæ»šäº‹åŠ¡ - + Unable to subscribe ä¸èƒ½è®¢é˜… @@ -3588,12 +3597,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query ä¸èƒ½åˆ›å»ºæŸ¥è¯¢ - + Unable to prepare statement ä¸èƒ½å‡†å¤‡è¯­å¥ @@ -3601,7 +3610,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) 厘米 (cm) @@ -3717,7 +3726,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected 本地已ç»è¿žæŽ¥çš„ @@ -3734,7 +3743,7 @@ Do you want to delete it anyway? 未知的 - + Print all 打å°å…¨éƒ¨ @@ -3899,12 +3908,12 @@ Do you want to delete it anyway? 美国普通10å·ä¿¡å° (105 x 241 毫米) - + OK 确定 - + Print @@ -4146,13 +4155,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup 页é¢è®¾ç½® - + %1% %1% @@ -4419,8 +4428,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading 无法打开用于读å–的输入é‡å®šå‘ @@ -4449,7 +4458,7 @@ Please choose a different file name. 进程处ç†è¶…æ—¶ - + @@ -4469,6 +4478,11 @@ Please choose a different file name. 进程已崩溃 + + No program defined + + + Process failed to start å¯åŠ¨è¿›ç¨‹å¤±è´¥ @@ -4477,7 +4491,7 @@ Please choose a different file name. QProgressDialog - + Cancel 撤消 @@ -4501,7 +4515,7 @@ Please choose a different file name. QRegExp - + no error occurred 没有错误å‘生 @@ -4549,7 +4563,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database 打开数æ®åº“错误 @@ -4572,12 +4586,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results ä¸èƒ½èŽ·å–结果 - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -4585,7 +4599,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database 打开数æ®åº“错误 @@ -4648,12 +4662,12 @@ Please choose a different file name. QScrollBar - + Scroll here 滚动到这里 - + Left edge 左边缘 @@ -4663,7 +4677,7 @@ Please choose a different file name. 顶部 - + Right edge å³è¾¹ç¼˜ @@ -4673,7 +4687,7 @@ Please choose a different file name. 底部 - + Page left 左一页 @@ -4684,7 +4698,7 @@ Please choose a different file name. 上一页 - + Page right å³ä¸€é¡µ @@ -4695,7 +4709,7 @@ Please choose a different file name. 下一页 - + Scroll left å‘左滚动 @@ -4705,7 +4719,7 @@ Please choose a different file name. å‘上滚动 - + Scroll right å‘å³æ»šåŠ¨ @@ -4733,7 +4747,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock %1:无法设置é”定的键 @@ -4744,7 +4758,7 @@ Please choose a different file name. - + %1: unable to lock %1:无法é”定 @@ -4754,8 +4768,8 @@ Please choose a different file name. %1:无法å–消é”定 - - + + %1: permission denied %1:æƒé™è¢«æ‹’ç» @@ -4833,7 +4847,7 @@ Please choose a different file name. QShortcut - + Space 空格 @@ -5418,7 +5432,7 @@ Please choose a different file name. QSql - + Delete 删除 @@ -5475,7 +5489,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 ä¸èƒ½å†™å…¥æ•°æ®ï¼š%1 @@ -5534,7 +5548,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources %1:资æºè€—尽了 @@ -5564,7 +5578,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection ä¸èƒ½æ‰“开连接 @@ -5590,7 +5604,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported socketæ“作ä¸è¢«æ”¯æŒ @@ -5598,7 +5612,7 @@ Please choose a different file name. QTextControl - + &Undo 撤消(&U) @@ -5656,7 +5670,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 这个平å°ä¸æ”¯æŒIPv6 @@ -5664,7 +5678,7 @@ Please choose a different file name. QUndoGroup - + Undo 撤销 @@ -5677,7 +5691,7 @@ Please choose a different file name. QUndoModel - + <empty> <空白> @@ -5685,7 +5699,7 @@ Please choose a different file name. QUndoStack - + Undo 撤销 @@ -5756,7 +5770,7 @@ Please choose a different file name. QWebFrame - + Request cancelled 请求被å–消了 @@ -6166,7 +6180,7 @@ Please choose a different file name. - + JavaScript Alert - %1 JavaScript警告 - %1 @@ -6242,6 +6256,11 @@ Please choose a different file name. + Select all + + + + Select to the next character 选中到下一个字符 @@ -6310,11 +6329,21 @@ Please choose a different file name. Delete to the end of the word 删除到å•è¯å°¾ + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? 这是什么? @@ -6322,7 +6351,7 @@ Please choose a different file name. QWidget - + * * @@ -6330,7 +6359,7 @@ Please choose a different file name. QWizard - + Go Back 返回 @@ -6392,7 +6421,7 @@ Please choose a different file name. QWorkspace - + &Restore æ¢å¤(&R) @@ -6462,7 +6491,7 @@ Please choose a different file name. QXml - + no error occurred 没有错误å‘生 @@ -6580,8 +6609,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. 文档末尾有é¢å¤–内容。 @@ -6765,7 +6794,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. 带有值 %2 çš„ %1 属性已ç»å£°æ˜Žè¿‡äº†ã€‚ @@ -6775,12 +6804,12 @@ Please choose a different file name. 一个 %1 属性必须带有一个有效的 %2 作为值,但 %3 å´ä¸æ˜¯ã€‚ - + Network timeout. 网络超时。 - + Element %1 can't be serialized because it appears outside the document element. 元素 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在文档元素之外。 @@ -6789,7 +6818,7 @@ Please choose a different file name. 属性元素 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在最顶层。 - + Year %1 is invalid because it begins with %2. %1 年是无效的,因为应该从 %2 开始。 @@ -6829,7 +6858,7 @@ Please choose a different file name. 溢出:数æ®æ— æ³•è¢«å‘ˆçŽ°ã€‚ - + At least one component must be present. 至少有一个组件被呈现。 @@ -6840,7 +6869,7 @@ Please choose a different file name. 至少一个时间组件必须出现在这个 %1 ç•Œé™ä¹‹åŽã€‚ - + No operand in an integer division, %1, can be %2. 在整数除法中没有æ“作数,%1,å¯ä»¥æ˜¯ %2。 @@ -6855,17 +6884,17 @@ Please choose a different file name. 除法中的第二个æ“作数,%1,ä¸èƒ½æ˜¯é›¶(%2)。 - + %1 is not a valid value of type %2. %1 ä¸æ˜¯ç±»åž‹ä¸º %2 的有效值。 - + When casting to %1 from %2, the source value cannot be %3. 当从 %2 抛出到 %1 时,æºå€¼ä¸èƒ½æ˜¯ %3。 - + Integer division (%1) by zero (%2) is undefined. 整数除法(%1)除零(%2)是未定义的。 @@ -6896,17 +6925,17 @@ Please choose a different file name. 一个类型为 %1 的值乘以 %2 或者 %3(正负无穷)是ä¸å…许的。 - + A value of type %1 cannot have an Effective Boolean Value. 一个类型为 %1 的值ä¸èƒ½æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„布尔值(Effective Boolean Value)。 - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. 有效的布尔值(Effective Boolean Value)ä¸èƒ½è¢«ç”¨äºŽè®¡ç®—一个包å«ä¸¤ä¸ªæˆ–者更多原å­å€¼çš„åºåˆ—。 - + Value %1 of type %2 exceeds maximum (%3). 类型为 %2 的值 %1 超过了最大值(%3)。 @@ -6916,7 +6945,7 @@ Please choose a different file name. 类型为 %2 的值 %1 超过了最å°å€¼(%3)。 - + A value of type %1 must contain an even number of digits. The value %2 does not. 类型为 %1 的值必须包å«å¶æ•°ä¸ªæ•°å­—。值 %2 ä¸æ˜¯è¿™æ ·çš„。 @@ -6926,7 +6955,7 @@ Please choose a different file name. %1 ä¸æ˜¯ç±»åž‹ä¸º %2 的有效值。 - + Operator %1 cannot be used on type %2. æ“作符 %1 ä¸èƒ½è¢«ç”¨äºŽç±»åž‹ %2。 @@ -6936,7 +6965,7 @@ Please choose a different file name. æ“作符 %1 ä¸èƒ½è¢«ç”¨äºŽç±»åž‹ä¸º %2 å’Œ %3 的原å­å€¼ã€‚ - + The namespace URI in the name for a computed attribute cannot be %1. 一个被计算的属性的å称中的命å空间 URI ä¸èƒ½æ˜¯ %1。 @@ -6946,7 +6975,7 @@ Please choose a different file name. 一个被计算的属性的å称ä¸èƒ½ä½¿ç”¨å¸¦æœ‰æœ¬åœ°å称 %2 的命å空间 URI %1。 - + Type error in cast, expected %1, received %2. 抛出类型错误,期望的是 %1,收到的是 %2。 @@ -6956,7 +6985,7 @@ Please choose a different file name. 当抛出到 %1 或者它的派生类时,æºç±»åž‹å¿…须是åŒä¸€ç±»åž‹ï¼Œæˆ–者它必须是一个字符串类型。类型 %2 是ä¸è¢«å…许的。 - + No casting is possible with %1 as the target type. 无法以 %1 为目标类型进行抛出。 @@ -6981,7 +7010,7 @@ Please choose a different file name. 从 %2 抛出到 %1 失败:%3 - + A comment cannot contain %1 注释ä¸èƒ½åŒ…å« %1 @@ -6991,7 +7020,7 @@ Please choose a different file name. 注释ä¸èƒ½ä»¥ %1 结尾。 - + No comparisons can be done involving the type %1. 对于类型 %1 ä¸èƒ½è¿›è¡Œæ¯”较。 @@ -7001,12 +7030,12 @@ Please choose a different file name. 在类型 %2 å’Œ %3 的原å­å€¼ä¹‹é—´ï¼Œæ“作符 %1 是ä¸å¯ç”¨çš„。 - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. 一个属性节点ä¸èƒ½æ˜¯ä¸€ä¸ªæ–‡æ¡£èŠ‚点的å­èŠ‚点。因此,这个属性 %1 所在ä½ç½®æ˜¯ä¸åˆé€‚的。 - + A library module cannot be evaluated directly. It must be imported from a main module. 一个库模å—ä¸èƒ½è¢«ç›´æŽ¥è¯„估。它必须从一个主模å—中导入。 @@ -7016,7 +7045,7 @@ Please choose a different file name. 没有å为 %1 的模æ¿å­˜åœ¨ã€‚ - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. 类型为 %1 的值ä¸èƒ½è¢«åˆ¤æ–­ã€‚一个判断必须是数值类型或者一个有效的布尔值(Effective Boolean Value)类型。 @@ -7026,7 +7055,7 @@ Please choose a different file name. 一个定ä½åˆ¤æ–­å¿…须评估一个å•ä¸€æ•°å€¼ã€‚ - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. 一个处ç†æŒ‡ä»¤ä¸­çš„目标å称ä¸èƒ½æ˜¯ä»»ä½•å¤§å°å†™æ··åˆçš„ %1。因此,%2 是无效的。 @@ -7036,33 +7065,33 @@ Please choose a different file name. %1 ä¸æ˜¯å¤„ç†æŒ‡ä»¤çš„有效目标å称。它必须是值 %2,例如 %3。 - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. 一个路径中的最åŽä¸€æ­¥å¿…须包å«èŠ‚点或者原å­å€¼ã€‚它ä¸èƒ½æ˜¯ä¸¤è€…的一个组åˆã€‚ - + The data of a processing instruction cannot contain the string %1 处ç†æŒ‡ä»¤çš„æ•°æ®ä¸èƒ½åŒ…å«å­—符串 %1 - + No namespace binding exists for the prefix %1 对于å‰ç¼€ %1,没有存在绑定的命å空间。 - + No namespace binding exists for the prefix %1 in %2 对于 %2 中的å‰ç¼€ %1,没有存在绑定的命å空间。 - + %1 is an invalid %2 %1 是一个无效的 %2。 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 最多å¯ä»¥æœ‰ %n 个å‚数。因此 %2 是无效的。 @@ -7076,7 +7105,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. %1 的第一个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。它必须是数字类型的,xs:yearMonthDuration 或者 xs:dayTimeDuration。 @@ -7091,27 +7120,27 @@ Please choose a different file name. %1 的第二个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。它必须是类型 %3ã€%4 或者 %5 的。 - + %1 is not a valid XML 1.0 character. %1 ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ XML 1.0 字符。 - + The first argument to %1 cannot be of type %2. %1 的第一个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。 - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. 如果两个值都有区å移(zone offset),它们必须拥有相åŒçš„区å移。%1 å’Œ %2 的区å移是ä¸åŒçš„。 - + %1 was called. %1 被调用了。 - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 必须被 %2 或者 %3 è·Ÿéšï¼Œä¸èƒ½åœ¨æ›¿æ¢å­—符串的末尾。 @@ -7126,7 +7155,7 @@ Please choose a different file name. 在这个替æ¢å­—符串中,%1 åªèƒ½è¢«ç”¨äºŽè½¬ä¹‰å®ƒæœ¬èº«æˆ–者 %2,而ä¸æ˜¯ %3 - + %1 matches newline characters %1 匹é…了æ¢è¡Œç¬¦ @@ -7161,17 +7190,17 @@ Please choose a different file name. 如果第一个å‚数是空åºåˆ—或者零长度字符串(无命å空间),那么就ä¸èƒ½æŒ‡å®šå‰ç¼€ã€‚å‰ç¼€ %1 被指定了。 - + It will not be possible to retrieve %1. å°†ä¸èƒ½èŽ·å– %1。 - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. 函数 %1 的第二个å‚数的根节点必须是一个文档节点。%2 ä¸æ˜¯ä¸€ä¸ªæ–‡æ¡£èŠ‚点。 - + The default collection is undefined 默认收集(collection)是未定义的 @@ -7181,12 +7210,12 @@ Please choose a different file name. æ— æ³•èŽ·å– %1 - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). ä¸æ”¯æŒæ­£è§„化(normalization)è¡¨å• %1。被支æŒçš„表å•æ˜¯ %2ã€%3ã€%4 å’Œ %5,以åŠæ— ï¼Œä¾‹å¦‚空字符串(无正规化)。 - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. 区å移(zone offset)必须在 %1...%2 范围之内。%3 是在范围之外的。 @@ -7196,17 +7225,17 @@ Please choose a different file name. %1 ä¸æ˜¯åˆ†é’Ÿçš„整数。 - + Required cardinality is %1; got cardinality %2. 所需è¦çš„表间关系是 %1;得到的表间关系å´æ˜¯ %2。 - + The item %1 did not match the required type %2. 项 %1 和所需的类型 %2 ä¸åŒ¹é…。 - + %1 is an unknown schema type. %1 是一个未知的方案类型。 @@ -7227,7 +7256,7 @@ Please choose a different file name. 没有å称为 %1 çš„å˜é‡å­˜åœ¨ã€‚ - + The variable %1 is unused å˜é‡ %1 没有被使用 @@ -7525,7 +7554,7 @@ Please choose a different file name. 一个扩展表达å¼çš„å称必须在一个命å空间中。 - + empty 空白 @@ -7550,7 +7579,7 @@ Please choose a different file name. 零或者更多 - + Required type is %1, but %2 was found. 需è¦çš„类型是 %1,但是找到的是 %2。 @@ -7565,7 +7594,7 @@ Please choose a different file name. 焦点未定义。 - + It's not possible to add attributes after any other kind of node. ä¸èƒ½åœ¨ä»»ä½•å…¶å®ƒç±»åž‹èŠ‚点åŽæ·»åŠ å±žæ€§ã€‚ @@ -7575,7 +7604,7 @@ Please choose a different file name. 一个å称为 %1 的属性已ç»è¢«åˆ›å»ºã€‚ - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. åªæ”¯æŒ Unicode 代ç ç‚¹æ ¡éªŒ(Unicode Codepoint Collation)(%1)。%2 是ä¸è¢«æ”¯æŒçš„。 @@ -7585,7 +7614,7 @@ Please choose a different file name. 属性 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在最顶层。 - + %1 is an unsupported encoding. %1 是ä¸è¢«æ”¯æŒçš„ç¼–ç ã€‚ @@ -7600,14 +7629,18 @@ Please choose a different file name. 在使用编ç %3çš„%2中出现的代ç ç‚¹%1ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„XML字符。 - + Ambiguous rule match. å«ç³Šè§„则匹é…。 - In a namespace constructor, the value for a namespace value cannot be an empty string. - 在一个命å空间构造中,命å空间的值ä¸èƒ½ä¸ºç©ºå­—符串。 + 在一个命å空间构造中,命å空间的值ä¸èƒ½ä¸ºç©ºå­—符串。 + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7625,12 +7658,12 @@ Please choose a different file name. åªæœ‰å‰ç¼€%1å¯ä»¥ç»‘定到%2,å之也一样 - + Circularity detected 检测到环 - + The parameter %1 is required, but no corresponding %2 is supplied. 需è¦å‚æ•°%1,但是没有æ供对应的%2。 @@ -7640,12 +7673,12 @@ Please choose a different file name. å‚æ•°%1已传递,但没有相应的%2存在。 - + The URI cannot have a fragment URIä¸èƒ½æœ‰ç‰‡æ®µ - + Element %1 is not allowed at this location. 元素%1ä¸èƒ½åœ¨è¿™ä¸ªä½ç½®ã€‚ @@ -7700,7 +7733,7 @@ Please choose a different file name. 在元素%2çš„%1属性中至少è¦æŒ‡å®šä¸€ä¸ªæ¨¡å¼ã€‚ - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. 属性%1ä¸èƒ½å‡ºçŽ°åœ¨å…ƒç´ %2上。åªæœ‰æ ‡å‡†å±žæ€§å¯ä»¥å‡ºçŽ°ã€‚ @@ -7775,7 +7808,7 @@ Please choose a different file name. 元素%1ä¸èƒ½æœ‰å­å…ƒç´ ã€‚ - + Element %1 cannot have a sequence constructor. 元素%1ä¸èƒ½æœ‰é¡ºåºæž„造。 diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts index 5fccebf..9fb871b 100644 --- a/translations/qt_zh_TW.ts +++ b/translations/qt_zh_TW.ts @@ -1,18 +1,20 @@ - - + + AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>音效播放è£ç½® <b>%1</b> 未能é‹ä½œã€‚<br/>改用é è¨­è£ç½® <b>%2</b>。</html> + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>音效播放è£ç½® <b>%1</b> å·²å¯ä½¿ç”¨ï¼Œå› ç‚ºæœ‰è¼ƒé«˜å„ªå…ˆæ¬Šï¼Œå› æ­¤å°‡åˆ‡æ›åˆ°è©²è£ç½®ã€‚</html> + Revert back to device '%1' 回復到è£ç½® %1 @@ -20,7 +22,7 @@ CloseButton - + Close Tab é—œé–‰åˆ†é  @@ -39,27 +41,32 @@ Phonon:: - + Notifications 通知 + Music 音樂 + Video å½±åƒ + Communication 通訊 + Games éŠæˆ² + Accessibility 輔助è£ç½® @@ -67,13 +74,14 @@ Phonon::Gstreamer::Backend - + Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. 警告:您å¯èƒ½æ²’æœ‰å®‰è£ gstreamer0.10-plugins-good。 有些影åƒçš„功能將被關閉。 + Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled 警告:您å¯èƒ½æ²’æœ‰å®‰è£ GStreamer 外掛程å¼ã€‚ 所有音效與影åƒæ”¯æ´å°‡è¢«é—œé–‰ã€‚ @@ -82,7 +90,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -93,26 +101,39 @@ have libgstreamer-plugins-base installed. libgstreamer-plugins-base 套件。 + A required codec is missing. You need to install the following codec(s) to play this content: %0 找ä¸åˆ°éœ€è¦çš„編解碼器。您需è¦å®‰è£ä»¥ä¸‹çš„套件來播放此內容:%0 + + + + + + + + Could not open media source. 無法開啟媒體來æºã€‚ + Invalid source type. ä¸åˆæ³•çš„來æºåž‹æ…‹ã€‚ + Could not locate media source. 無法定ä½åª’體來æºã€‚ + Could not open audio device. The device is already in use. 無法開啟音效è£ç½®ã€‚è£ç½®å·²åœ¨ä½¿ç”¨ä¸­ã€‚ + Could not decode media source. 無法解碼媒體來æºã€‚ @@ -120,10 +141,15 @@ libgstreamer-plugins-base 套件。 Phonon::VolumeSlider + + Volume: %1% 音é‡ï¼š%1% + + + Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% 使用此滑動器來調整音é‡ã€‚最左邊的ä½ç½®ç‚º 0%,最å³é‚Šçš„為 %1%。 @@ -131,11 +157,12 @@ libgstreamer-plugins-base 套件。 Q3Accel - + %1, %2 not defined %1,%2 未定義 + Ambiguous %1 not handled ä¸æ˜Žç¢ºçš„ %1 å°šæœªè™•ç† @@ -143,23 +170,27 @@ libgstreamer-plugins-base 套件。 Q3DataTable - + True 真 + False å‡ + Insert æ’å…¥ + Update æ›´æ–° + Delete 刪除 @@ -167,242 +198,313 @@ libgstreamer-plugins-base 套件。 Q3FileDialog - + Copy or Move a File 複製或移動檔案 + Read: %1 讀å–:%1 + + Write: %1 寫入:%1 + + Cancel å–消 - + + + + All Files (*) 所有檔案 (*) + Name å稱 + Size å¤§å° + Type åž‹æ…‹ + Date 日期 + Attributes 屬性 + + &OK 確定(&O) + Look &in: 尋找於(&I): + + + File &name: 檔å(&N): + File &type: 檔案型態(&T): + Back 返回 + One directory up 往上一層目錄 + Create New Folder 建立新資料夾 + List View 列表檢視 + Detail View 詳細檢視 + Preview File Info é è¦½æª”案資訊 + Preview File Contents é è¦½æª”案內容 + Read-write å¯è®€å¯« + Read-only 唯讀 + Write-only 唯寫 + Inaccessible ç„¡æ³•å­˜å– + Symlink to File åˆ°æª”æ¡ˆçš„ç¬¦è™Ÿé€£çµ + Symlink to Directory åˆ°ç›®éŒ„çš„ç¬¦è™Ÿé€£çµ + Symlink to Special åˆ°ç‰¹æ®Šç¯€é»žçš„ç¬¦è™Ÿé€£çµ + File 檔案 + Dir 目錄 + Special 特殊節點 - + + + Open é–‹å•Ÿ - + + Save As å¦å­˜æ–°æª” + + + &Open é–‹å•Ÿ(&O) + + &Save 儲存(&S) + &Rename é‡æ–°å‘½å(&R) + &Delete 刪除(&D) + R&eload é‡æ–°è¼‰å…¥(&E) + Sort by &Name ä¾å稱排åº(&N) + Sort by &Size ä¾å¤§å°æŽ’åº(&S) + Sort by &Date ä¾æ—¥æœŸæŽ’åº(&D) + &Unsorted 未排åº(&U) + Sort æŽ’åº + Show &hidden files 顯示隱è—檔(&H) + the file 此檔案 + the directory 此目錄 + the symlink æ­¤ç¬¦è™Ÿé€£çµ + Delete %1 刪除 %1 + <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>您確定è¦åˆªé™¤ %1 "%2" 嗎?</qt> + &Yes 是(&Y) + &No å¦(&N) + New Folder 1 新資料夾 1 + New Folder 新資料夾 + New Folder %1 新資料夾 %1 + Find Directory 尋找目錄 + + Directories 目錄 + Directory: 目錄: + + Error 錯誤 + %1 File not found. Check path and filename. @@ -411,14 +513,17 @@ Check path and filename. 請檢查路徑與檔å。 + All Files (*.*) 所有檔案 (*.*) + Open é–‹å•Ÿ + Select a Directory è«‹é¸æ“‡ä¸€å€‹ç›®éŒ„ @@ -426,24 +531,29 @@ Check path and filename. Q3LocalFs + + Could not read directory %1 無法讀å–目錄 %1 + Could not create directory %1 無法建立目錄 %1 + Could not remove file or directory %1 無法移除目錄 %1 + Could not rename %1 to @@ -454,12 +564,14 @@ to %2 + Could not open %1 無法開啟 %1 + Could not write %1 無法寫入 @@ -469,11 +581,12 @@ to Q3MainWindow - + Line up 排列 + Customize... 自訂... @@ -481,7 +594,7 @@ to Q3NetworkProtocol - + Operation stopped by the user 使用者已中止æ“作 @@ -489,6 +602,8 @@ to Q3ProgressDialog + + Cancel å–消 @@ -496,22 +611,28 @@ to Q3TabDialog + + OK 確定 + Apply 套用 + Help 說明 + Defaults é è¨­ + Cancel å–消 @@ -519,31 +640,38 @@ to Q3TextEdit - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + &Paste 貼上(&P) + Clear 清除 + + Select All 全部é¸æ“‡ @@ -551,55 +679,67 @@ to Q3TitleBar - + System 系統 + Restore up å‘上æ¢å¾© + Minimize 最å°åŒ– + Restore down å‘下æ¢å¾© + Maximize 最大化 + Close 關閉 + Contains commands to manipulate the window 包å«è¦æ“作此視窗的指令 + Puts a minimized back to normal 將最å°åŒ–è¦–çª—æ”¾å›žåŽŸå¤§å° + Moves the window out of the way 把視窗移開 + Puts a maximized window back to normal å°‡æœ€å¤§åŒ–è¦–çª—æ”¾å›žåŽŸå¤§å° + Makes the window full screen å°‡è¦–çª—æ”¾å¤§åˆ°å…¨ç•«é¢ + Closes the window 關閉視窗 + Displays the name of the window and contains controls to manipulate it 顯示視窗å稱,並包å«æ“作它的控制元件 @@ -607,7 +747,7 @@ to Q3ToolBar - + More... 更多... @@ -615,38 +755,51 @@ to Q3UrlOperator + + + The protocol `%1' is not supported å”定 %1 æœªæ”¯æ´ + The protocol `%1' does not support listing directories å”定 %1 未支æ´åˆ—出目錄 + The protocol `%1' does not support creating new directories å”定 %1 未支æ´å»ºç«‹æ–°ç›®éŒ„ + The protocol `%1' does not support removing files or directories å”定 %1 未支æ´ç§»é™¤æª”案或目錄 + The protocol `%1' does not support renaming files or directories å”定 %1 未支æ´é‡æ–°å‘½å檔案或目錄 + The protocol `%1' does not support getting files å”定 %1 未支æ´å–得檔案 + The protocol `%1' does not support putting files å”定 %1 未支æ´å¯«å…¥æª”案 + + The protocol `%1' does not support copying or moving files or directories å”定 %1 未支æ´è¤‡è£½æˆ–移動檔案或目錄 + + (unknown) (未知) @@ -654,23 +807,27 @@ to Q3Wizard - + &Cancel å–消(&C) + < &Back <返回(&B) + &Next > 下一個(&N)> + &Finish 完æˆ(&F) + &Help 說明(&H) @@ -678,31 +835,44 @@ to QAbstractSocket + + + + Host not found 找ä¸åˆ°ä¸»æ©Ÿ - + + + Connection refused 連線被拒 + Connection timed out 連線逾時 + + + Operation on socket is not supported Socket çš„æ“ä½œæœªè¢«æ”¯æ´ + Socket operation timed out Socket æ“作逾時 + Socket is not connected Socket 未連線 + Network unreachable 無法使用網路 @@ -710,15 +880,17 @@ to QAbstractSpinBox - + &Step up 單步å‘上(&S) + Step &down 單步å‘下(&D) + &Select All 全部é¸æ“‡(&S) @@ -726,27 +898,28 @@ to QApplication - + Activate å•Ÿå‹• - + Executable '%1' requires Qt %2, found Qt %3. 執行檔 %1 éœ€è¦ Qt %2,但åªæ‰¾åˆ° Qt %3。 + Incompatible Qt Library Error Qt 函å¼åº«ä¸ç›¸å®¹çš„錯誤 - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Activates the program's main window 啟動程å¼çš„主視窗 @@ -754,18 +927,22 @@ to QAxSelect + Select ActiveX Control é¸æ“‡ ActiveX 控制 + OK 確定 + &Cancel å–消(&C) + COM &Object: COM 物件(&O) @@ -773,15 +950,17 @@ to QCheckBox - + Uncheck å–æ¶ˆå‹¾é¸ + Check å‹¾é¸ + Toggle åˆ‡æ› @@ -789,43 +968,52 @@ to QColorDialog - + Hu&e: 色調(&E): + &Sat: 飽和度(&S): + &Val: 亮度(&V): + &Red: ç´…(&R): + &Green: 綠(&G): + Bl&ue: è—(&U): + A&lpha channel: Alpha 色頻(&L): + Select Color é¸æ“‡é¡è‰² + &Basic colors 基本é¡è‰²(&B) + &Custom colors 自訂é¡è‰²(&C) @@ -842,6 +1030,7 @@ to å–消 + &Add to Custom Colors 新增到自訂é¡è‰²(&A) @@ -853,20 +1042,23 @@ to QComboBox + + Open é–‹å•Ÿ - + False å‡ + True 真 - + Close 關閉 @@ -899,17 +1091,19 @@ to %1:未知的錯誤 %2 - + %1: key is empty QSystemSemaphore %1:éµå€¼æ˜¯ç©ºçš„ + %1: unable to make key QSystemSemaphore %1:無法產生éµå€¼ + %1: ftok failed QSystemSemaphore %1:ftok 失敗 @@ -918,19 +1112,22 @@ to QDB2Driver - + Unable to connect 無法連接 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 + Unable to set autocommit 無法設定自動æ交 @@ -938,26 +1135,33 @@ to QDB2Result + + Unable to execute statement 無法執行敘述 + Unable to prepare statement 無法準備敘述 + Unable to bind variable 無法çµåˆè®Šæ•¸ + Unable to fetch record %1 無法抓å–紀錄 %1 + Unable to fetch next 無法抓å–下一筆 + Unable to fetch first 無法抓å–第一筆 @@ -965,19 +1169,22 @@ to QDateTimeEdit - + AM AM + am am + PM PM + pm pm @@ -985,15 +1192,17 @@ to QDial - + QDial QDial + SpeedoMeter SpeedoMeter + SliderHandle SliderHandle @@ -1001,11 +1210,12 @@ to QDialog - + What's This? 這是什麼? + Done å®Œæˆ @@ -1013,100 +1223,124 @@ to QDialogButtonBox - + + + OK 確定 - + Save 儲存 + &Save 儲存(&S) + Open é–‹å•Ÿ + Cancel å–消 + &Cancel å–消(&C) + Close 關閉 + &Close 關閉(&C) + Apply 套用 + Reset é‡ç½® + Help 說明 + Don't Save ä¸è¦å„²å­˜ + Discard 丟棄 + &Yes 是(&Y) + Yes to &All 全部回答是(&A) + &No å¦(&N) + N&o to All 全部回答å¦(&O) + Save All 全部儲存 + Abort 中止 + Retry é‡è©¦ + Ignore 忽略 + Restore Defaults 回復é è¨­å€¼ + Close without Saving 關閉而ä¸å„²å­˜ + &OK 確定(&O) @@ -1114,25 +1348,29 @@ to QDirModel - + Name å稱 + Size å¤§å° + Kind Match OS X Finder 種類 + Type All other platforms åž‹æ…‹ + Date Modified 變更日期 @@ -1140,15 +1378,17 @@ to QDockWidget - + Close 關閉 + Dock 嵌入 + Float 飄浮 @@ -1156,10 +1396,12 @@ to QDoubleSpinBox + More 更多 + Less 較少 @@ -1167,23 +1409,27 @@ to QErrorMessage - + Debug Message: 除錯訊æ¯ï¼š + Warning: 警告: + Fatal Error: åš´é‡éŒ¯èª¤ï¼š + &Show this message again å†åº¦é¡¯ç¤ºæ­¤è¨Šæ¯(&S) + &OK 確定(&O) @@ -1191,22 +1437,33 @@ to QFile + + Destination file exists 目標檔已存在 + + Cannot remove source file + + + + Cannot open %1 for input 無法開啟 %1 以輸入 + Cannot open for output 無法開啟 %1 以輸出 + Failure to write block 寫入å€å¡Šæ™‚失敗 + Cannot create %1 for output 無法建立 %1 以輸出 @@ -1214,32 +1471,44 @@ to QFileDialog + + All Files (*) 所有檔案 (*) + Directories 目錄 + + + + &Open é–‹å•Ÿ(&O) + + &Save 儲存(&S) + Open é–‹å•Ÿ + %1 already exists. Do you want to replace it? %1 已存在 您è¦å–代它嗎? + %1 File not found. Please verify the correct file name was given. @@ -1248,43 +1517,58 @@ Please verify the correct file name was given. 請檢查檔å是å¦æ­£ç¢ºã€‚ - + My Computer 我的電腦 + &Rename é‡æ–°å‘½å(&R) + &Delete 刪除(&D) + Show &hidden files 顯示隱è—檔(&H) + + Back 返回 + + Parent Directory 父目錄 + + List View 列表檢視 + + Detail View 詳細檢視 + + Files of type: 檔案型態: + + Directory: 目錄: @@ -1297,6 +1581,8 @@ Please verify the correct file name was given 請檢查檔å是å¦æ­£ç¢ºã€‚ + + %1 Directory not found. Please verify the correct directory name was given. @@ -1305,84 +1591,105 @@ Please verify the correct directory name was given. 請檢查目錄å稱是å¦æ­£ç¢ºã€‚ + '%1' is write protected. Do you want to delete it anyway? %1 有寫入ä¿è­·ã€‚ 您確定è¦åˆªé™¤å®ƒå—Žï¼Ÿ + Are sure you want to delete '%1'? 您確定è¦åˆªé™¤ %1 嗎? + Could not delete directory. 無法刪除目錄。 + Recent Places 最近的地方 - + All Files (*.*) 所有檔案 (*.*) + Save As å¦å­˜æ–°æª” - + Drive ç£ç¢Ÿ + + File 檔案 + Unknown 未知 + Find Directory 尋找目錄 + Show 顯示 + + Forward å¾€å‰ - + New Folder 新資料夾 + &New Folder 新增資料夾(&N) + + &Choose é¸æ“‡(&C) - + Remove 移除 + + File &name: 檔å(&N): + + Look in: 尋找於: + + Create New Folder 建立新資料夾 @@ -1390,62 +1697,74 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename ä¸åˆæ³•çš„檔å + <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>無法使用å稱 "%1"。</b><p>請使用其它å稱,字元數少一點,或是ä¸è¦æœ‰æ¨™é»žç¬¦è™Ÿã€‚ + Name å稱 + Size å¤§å° + Kind Match OS X Finder 種類 + Type All other platforms åž‹æ…‹ + Date Modified 變更日期 - + My Computer 我的電腦 + Computer 電腦 + %1 TB %1 TB + %1 GB %1 GB + %1 MB %1 MB + %1 KB %1 KB + %1 bytes %1 ä½å…ƒçµ„ @@ -1453,166 +1772,216 @@ Do you want to delete it anyway? QFontDatabase + + Normal 正常 + + + Bold ç²—é«” + + Demi Bold åŠç²—é«” + + + Black 黑體 + Demi åŠé«” + + Light 輕體 + + Italic 斜體 + + Oblique 傾斜體 + Any 任何 + Latin æ‹‰ä¸ + Greek 希臘 + Cyrillic 斯拉夫 + Armenian 亞美尼亞 + Hebrew 希伯來 + Arabic 阿拉伯 + Syriac 敘利亞 + Thaana Thaana + Devanagari Devanagari + Bengali 孟加拉 + Gurmukhi Gurmukhi + Gujarati Gujarati + Oriya Oriya + Tamil å¦ç±³çˆ¾ + Telugu Telugu + Kannada åŽé”é‚£ + Malayalam 馬來語 + Sinhala 錫蘭 + Thai 泰語 + Lao 寮國 + Tibetan è¥¿è— + Myanmar 緬甸 + Georgian 喬治亞 + Khmer 高棉 + Simplified Chinese 簡體中文 + Traditional Chinese ç¹é«”中文 + Japanese 日語 + Korean 韓語 + Vietnamese è¶Šå— + Symbol 符號 + Ogham æ­ç”˜ + Runic ç›§æ© @@ -1620,39 +1989,48 @@ Do you want to delete it anyway? QFontDialog - + &Font å­—åž‹(&F) + Font st&yle 字型樣å¼(&Y) + &Size 大å°(&S) + Effects 效果 + Stri&keout 刪除線(&K) + &Underline 底線(&U) + Sample 範例 + Wr&iting System 寫入系統(&I) + + Select Font é¸æ“‡å­—åž‹ @@ -1660,116 +2038,145 @@ Do you want to delete it anyway? QFtp - + + Not connected 未連線 - + + Host %1 not found 找ä¸åˆ°ä¸»æ©Ÿ %1 - + + Connection refused to host %1 連線到主機 %1 被拒 + Connection timed out to host %1 連線到主機 %1 逾時 + + + Connected to host %1 已連接到主機 %1 + + Connection refused for data connection 資料連線被拒 + + + + Unknown error 未知的錯誤 - + + Connecting to host failed: %1 連線到主機失敗: %1 - + + Login failed: %1 登入失敗: %1 - + + Listing directory failed: %1 列出目錄時失敗: %1 - + + Changing directory failed: %1 變更目錄時失敗: %1 - + + Downloading file failed: %1 下載檔案時失敗: %1 - + + Uploading file failed: %1 上傳檔案時失敗: %1 - + + Removing file failed: %1 移除檔案時失敗: %1 - + + Creating directory failed: %1 建立目錄時失敗: %1 - + + Removing directory failed: %1 移除目錄時失敗: %1 + + + Connection closed 連線已關閉 + Host %1 found 找到主機 %1 + Connection to %1 closed 到 %1 的連線已關閉 + Host found 找到主機 + Connected to host 已連線到主機 @@ -1777,7 +2184,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error 未知的錯誤 @@ -1785,14 +2192,29 @@ Do you want to delete it anyway? QHostInfoAgent + + + + + + + + Host not found 找ä¸åˆ°ä¸»æ©Ÿ + + + + Unknown address type 未知的ä½å€åž‹æ…‹ + + + Unknown error 未知的錯誤 @@ -1800,116 +2222,155 @@ Do you want to delete it anyway? QHttp + + + + Unknown error 未知的錯誤 + + Request aborted è¦æ±‚中止 - + + No server set to connect to 沒有設定è¦é€£ç·šåˆ°å“ªå€‹ä¼ºæœå™¨ - + + Wrong content length 錯誤的內容長度 - + + Server closed connection unexpectedly 伺æœå™¨ç„¡é è­¦é—œé–‰é€£ç·š + + Unknown authentication method + + + + Error writing response to device 寫入回應到è£ç½®æ™‚發生錯誤 - + + Connection refused 連線被拒 - + + + Host %1 not found 找ä¸åˆ°ä¸»æ©Ÿ %1 - + + + + HTTP request failed HTTP è¦æ±‚失敗 - + + Invalid HTTP response header ä¸åˆæ³•çš„ HTTP 回覆標頭 + + + + Invalid HTTP chunked body ä¸åˆæ³•çš„ HTTP å€å¡Šä¸»é«” - + Host %1 found 找到主機 %1 + Connected to host %1 已連接到主機 %1 + Connection to %1 closed 到 %1 的連線已關閉 + Host found 找到主機 + Connected to host 已連線到主機 - + + Connection closed 連線已關閉 + Proxy authentication required 代ç†ä¼ºæœå™¨éœ€è¦èªè­‰ + Authentication required 需è¦èªè­‰ + Connection refused (or timed out) 連線被拒(或連線逾時) - + Proxy requires authentication 代ç†ä¼ºæœå™¨éœ€è¦èªè­‰ + Host requires authentication 主機需è¦èªè­‰ + Data corrupted 資料已æ毀 + Unknown protocol specified 指定了未知的å”定 + SSL handshake failed SSL æºé€šå¤±æ•— + HTTPS connection requested but SSL support not compiled in HTTPS 連線需è¦çš„ SSL 支æ´ä¸¦æœªç·¨è­¯é€²ä¾† @@ -1917,38 +2378,47 @@ Do you want to delete it anyway? QHttpSocketEngine + Did not receive HTTP response from proxy 未從代ç†ä¼ºæœå™¨æŽ¥æ”¶åˆ° HTTP 回應 + Error parsing authentication request from proxy 剖æžå¾žä»£ç†ä¼ºæœå™¨å‚³ä¾†çš„èªè­‰è¦æ±‚時發生錯誤 + Authentication required 需è¦èªè­‰ + Proxy denied connection 代ç†ä¼ºæœå™¨æ‹’絕連線 + Error communicating with HTTP proxy 與 HTTP 代ç†ä¼ºæœå™¨è¯ç¹«æ™‚發生錯誤 + Proxy server not found 找ä¸åˆ°ä»£ç†ä¼ºæœå™¨ + Proxy connection refused 代ç†ä¼ºæœå™¨é€£ç·šè¢«æ‹’ + Proxy server connection timed out 代ç†ä¼ºæœå™¨é€£ç·šé€¾æ™‚ + Proxy connection closed prematurely 代ç†ä¼ºæœå™¨é€£ç·šå·²ä¸æ­£å¸¸é—œé–‰ @@ -1956,19 +2426,22 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database 開啟資料庫發生錯誤 + Could not start transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -1976,70 +2449,89 @@ Do you want to delete it anyway? QIBaseResult + Unable to create BLOB 無法建立 BLOB + Unable to write BLOB 無法寫入 BLOB + Unable to open BLOB 無法開啟 BLOB + Unable to read BLOB ç„¡æ³•è®€å– BLOB + + Could not find array 找ä¸åˆ°é™£åˆ— + Could not get array data 無法å–得陣列資料 + Could not get query info 無法å–得查詢資訊 + Could not start transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Could not allocate statement 無法é…置敘述 + Could not prepare statement 無法準備敘述 + + Could not describe input statement 無法æ述輸入敘述 + Could not describe statement 無法æ述敘述 + Unable to close statement 無法關閉敘述 + Unable to execute query 無法執行查詢 + Could not fetch next item 無法抓å–下一個項目 + Could not get statement info 無法å–得敘述資訊 @@ -2047,24 +2539,27 @@ Do you want to delete it anyway? QIODevice - + Permission denied 權é™ä¸è¶³ + Too many open files é–‹å•ŸéŽå¤šæª”案 + No such file or directory 找ä¸åˆ°è©²æª”案或目錄 + No space left on device è£ç½®ä¸Šå·²ç„¡ç©ºé–“ - + Unknown error 未知的錯誤 @@ -2072,19 +2567,22 @@ Do you want to delete it anyway? QInputContext - + XIM XIM + XIM input method XIM 輸入法 + Windows input method Windows 輸入法 + Mac OS X input method Mac OS X 輸入法 @@ -2092,7 +2590,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: 請輸入值: @@ -2112,55 +2610,66 @@ Do you want to delete it anyway? QLibrary::resolve_sys: 符號 "%1" 未定義於 %2 (%3) - + Could not mmap '%1': %2 無法 mmap '%1':%2 + Plugin verification data mismatch in '%1' 在 %1 中的外掛程å¼ç¢ºèªè³‡æ–™ä¸ç¬¦åˆ + Could not unmap '%1': %2 無法 unmap '%1':%2 + The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ï¼ˆ%2.%3.%4)ã€%5】 + The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ã€‚é æœŸå»ºæ§‹é‘° %2,å»å¾—到 %3 + Unknown error 未知的錯誤 - + + The shared library was not found. 找ä¸åˆ°åˆ†äº«å‡½å¼åº« + The file '%1' is not a valid Qt plugin. 檔案 %1 ä¸æ˜¯åˆæ³•çš„ Qt 外掛程å¼ã€‚ + The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ã€‚(ä¸èƒ½å°‡é™¤éŒ¯èˆ‡é‡‹å‡ºç‰ˆçš„函å¼åº«æ··åœ¨ä¸€èµ·ã€‚) - + + Cannot load library %1: %2 無法載入函å¼åº« %1:%2 - + + Cannot unload library %1: %2 無法å¸è¼‰å‡½å¼åº« %1:%2 - + + Cannot resolve symbol "%1" in %2: %3 無法å解 %2 內的符號 %1:%3 @@ -2168,31 +2677,37 @@ Do you want to delete it anyway? QLineEdit - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + &Paste 貼上(&P) + Delete 刪除 + Select All 全部é¸æ“‡ @@ -2200,20 +2715,24 @@ Do you want to delete it anyway? QLocalServer - + + %1: Name error %1:å稱錯誤 + %1: Permission denied %1:存å–被拒 + %1: Address in use %1:ä½å€ä½¿ç”¨ä¸­ - + + %1: Unknown error %2 %1:未知的錯誤 %2 @@ -2221,54 +2740,70 @@ Do you want to delete it anyway? QLocalSocket - + + %1: Connection refused %1:連線被拒 - + + %1: Remote closed %1:é ç«¯å·²é—œé–‰ + + + + %1: Invalid name %1:ä¸åˆæ³•çš„å稱 - + + %1: Socket access error %1:Socket ä½å€éŒ¯èª¤ - + + %1: Socket resource error %1:Socket 資æºéŒ¯èª¤ - + + %1: Socket operation timed out %1:Socket æ“作逾時 - + + %1: Datagram too large %1:資料包éŽå¤§ + + + %1: Connection error %1:連線錯誤 - + + %1: The socket operation is not supported %1:socket æ“ä½œæœªæ”¯æ´ + %1: Unknown error %1:未知的錯誤 - + + %1: Unknown error %2 %1:未知的錯誤 %2 @@ -2276,23 +2811,27 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' 無法開啟資料庫 + Unable to connect 無法連線 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -2300,46 +2839,59 @@ Do you want to delete it anyway? QMYSQLResult + Unable to fetch data 無法抓å–資料 + Unable to execute query 無法執行查詢 + Unable to store result 無法儲存çµæžœ + + Unable to prepare statement 無法準備敘述 + Unable to reset statement 無法é‡ç½®æ•˜è¿° + Unable to bind value 無法çµåˆæ•¸å€¼ + Unable to execute statement 無法執行敘述 + + Unable to bind outvalues 無法çµåˆè¼¸å‡ºå€¼ + Unable to store statement results 無法儲存敘述çµæžœ + Unable to execute next query 無法執行下一個查詢 + Unable to store next result 無法儲存下一個çµæžœ @@ -2347,7 +2899,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) (未命å) @@ -2355,75 +2907,92 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] + Close 關閉 + Minimize 最å°åŒ– + Restore Down å‘下æ¢å¾© + &Restore 回復(&R) + &Move 移動(&M) + &Size 大å°(&S) + Mi&nimize 最å°åŒ–(&N) + Ma&ximize 最大化(&X) + Stay on &Top 留在頂端(&T) + &Close 關閉(&C) + - [%1] - [%1] + Maximize 最大化 + Unshade å–消é®è”½ + Shade é®è”½ + Restore 回復 + Help 說明 + Menu é¸å–® @@ -2431,14 +3000,21 @@ Do you want to delete it anyway? QMenu + + Close 關閉 + + Open é–‹å•Ÿ + + + Execute 執行 @@ -2497,40 +3073,53 @@ Do you want to delete it anyway? QMessageBox + Help 說明 + + + + OK 確定 + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt 關於 Qt <p>This program uses Qt version %1.</p> - <p> 這個程å¼ä½¿ç”¨ Qt 版本 %1</p> + <p> 這個程å¼ä½¿ç”¨ Qt 版本 %1</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt 也å¯ä»¥ç”¨ Qtopia Core 用於嵌入å¼ç³»çµ±ã€‚</p><p>Qt 為 Trolltech 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + Show Details... 顯示詳情... + Hide Details... éš±è—詳情... <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>這個程å¼ä½¿ç”¨äº† Qt 開放æºç¢¼ç‰ˆæœ¬ %1。</p><p>Qt 開放æºç¢¼ç‰ˆæœ¬æ˜¯å°ˆé–€ç‚ºäº†é–‹ç™¼é–‹æ”¾æºç¢¼æ‡‰ç”¨ç¨‹å¼ä½¿ç”¨çš„版本。若是您è¦é–‹ç™¼å°ˆåˆ©ç§æœ‰ï¼ˆå°é–‰ï¼‰è»Ÿé«”ï¼Œæ‚¨éœ€è¦ Qt 的商業授權。</p><p>Qt 的授權概è¦è«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> + <p>這個程å¼ä½¿ç”¨äº† Qt 開放æºç¢¼ç‰ˆæœ¬ %1。</p><p>Qt 開放æºç¢¼ç‰ˆæœ¬æ˜¯å°ˆé–€ç‚ºäº†é–‹ç™¼é–‹æ”¾æºç¢¼æ‡‰ç”¨ç¨‹å¼ä½¿ç”¨çš„版本。若是您è¦é–‹ç™¼å°ˆåˆ©ç§æœ‰ï¼ˆå°é–‰ï¼‰è»Ÿé«”ï¼Œæ‚¨éœ€è¦ Qt 的商業授權。</p><p>Qt 的授權概è¦è«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -2540,7 +3129,7 @@ Do you want to delete it anyway? QMultiInputContext - + Select IM é¸æ“‡è¼¸å…¥æ³• @@ -2548,11 +3137,12 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 多é‡è¼¸å…¥æ³•åˆ‡æ›å™¨ + Multiple input method switcher that uses the context menu of the text widgets 使用文字元件中的內文é¸å–®çš„多é‡è¼¸å…¥æ³•åˆ‡æ›å™¨ @@ -2560,107 +3150,132 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection é ç«¯ä¸»æ©Ÿé—œé–‰äº†é€£ç·š + Network operation timed out 網路æ“作逾時 + Out of resources 資æºä¸è¶³ + Unsupported socket operation 未支æ´çš„ socket æ“作 + Protocol type not supported å”å®šåž‹æ…‹æœªæ”¯æ´ + Invalid socket descriptor ä¸åˆæ³•çš„ socket æè¿°å­ + Network unreachable 無法使用網路 + Permission denied 權é™ä¸è¶³ + Connection timed out 連線逾時 + Connection refused 連線被拒 + The bound address is already in use çµåˆçš„ä½å€å·²ç¶“在使用中 + The address is not available 無法å–å¾—ä½å€ + The address is protected æ­¤ä½å€å·²è¢«ä¿è­· + Unable to send a message 無法é€å‡ºè¨Šæ¯ + Unable to receive a message ç„¡æ³•æŽ¥æ”¶è¨Šæ¯ + Unable to write 無法寫入 + Network error 網路錯誤 + Another socket is already listening on the same port å¦ä¸€å€‹ socket 已經在監è½åŒä¸€å€‹é€£æŽ¥åŸ  + Unable to initialize non-blocking socket 無法åˆå§‹åŒ–éžé˜»æ“‹æ€§ socket + Unable to initialize broadcast socket 無法åˆå§‹åŒ–廣播 socket + Attempt to use IPv6 socket on a platform with no IPv6 support 試圖在沒有 IPv6 支æ´çš„å¹³å°ä¸Šä½¿ç”¨ IPv6 socket + Host unreachable 無法連線到主機 + Datagram was too large to send 資料éŽå¤§ç„¡æ³•é€å‡º + Operation on non-socket å°éž socket æ“作 + Unknown error 未知的錯誤 + The proxy type is invalid for this operation 代ç†ä¼ºæœå™¨åž‹æ…‹ç„¡æ³•æ”¯æ´æ­¤æ“作 @@ -2668,7 +3283,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 é–‹å•Ÿ %1 發生錯誤 @@ -2676,23 +3291,27 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 è¦æ±‚é–‹å•Ÿéžæœ¬åœ°ç«¯æª”案 %1 + Error opening %1: %2 é–‹å•Ÿ %1 發生錯誤:%2 + Write error writing to %1: %2 寫入 %1 時發生錯誤:%2 + Cannot open %1: Path is a directory 無法開啟 %1:此路徑是一個目錄 + Read error reading from %1: %2 從 %1 讀å–錯誤:%2 @@ -2700,23 +3319,27 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found 找ä¸åˆ°åˆé©çš„代ç†ä¼ºæœå™¨ + Cannot open %1: is a directory 無法開啟 %1:是一個目錄 + Logging in to %1 failed: authentication required 登入 %1 失敗:需è¦èªè­‰ + Error while downloading %1: %2 下載 %1 時發生錯誤:%2 + Error while uploading %1: %2 上傳 %1 時發生錯誤:%2 @@ -2724,7 +3347,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found 找ä¸åˆ°åˆé©çš„代ç†ä¼ºæœå™¨ @@ -2732,11 +3355,12 @@ Do you want to delete it anyway? QNetworkReply + Error downloading %1 - server replied: %2 下載 %1 時發生錯誤─伺æœå™¨å›žæ‡‰ï¼š%2 - + Protocol "%1" is unknown 未知的å”定 %1 @@ -2744,6 +3368,8 @@ Do you want to delete it anyway? QNetworkReplyImpl + + Operation canceled å–消æ“作 @@ -2751,24 +3377,28 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon 無法登入 + Unable to initialize QOCIDriver 無法åˆå§‹åŒ– + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -2776,34 +3406,43 @@ Do you want to delete it anyway? QOCIResult + + + Unable to bind column for batch execute 無法çµåˆæ¬„ä½ä»¥åšæ‰¹æ¬¡åŸ·è¡Œ + Unable to execute batch statement 無法執行批次敘述 + Unable to goto next 無法跳到下一個 + Unable to alloc statement 無法é…置敘述 + Unable to prepare statement 無法準備敘述 + Unable to bind value 無法çµåˆæ•¸å€¼ Unable to execute select statement - 無法執行é¸å–的敘述 + 無法執行é¸å–的敘述 + Unable to execute statement 無法執行敘述 @@ -2811,27 +3450,32 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect 無法連接 + Unable to connect - Driver doesn't support all needed functionality 無法連接─驅動程å¼ç„¡æ³•æ”¯æ´æ‰€æœ‰éœ€è¦çš„功能 + Unable to disable autocommit 無法關閉自動æ交功能 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 + Unable to enable autocommit 無法開啟自動æ交功能 @@ -2839,38 +3483,51 @@ Do you want to delete it anyway? QODBCResult + + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 無法設定 SQL_CURSOR_STATIC åšç‚ºæ•˜è¿°å±¬æ€§ã€‚請檢查您的 ODBC 驅動程å¼çš„設定 + + Unable to execute statement 無法執行敘述 + Unable to fetch next 無法抓å–下一筆 + Unable to prepare statement 無法準備敘述 + Unable to bind variable 無法çµåˆè®Šæ•¸ + + + Unable to fetch last 無法抓å–最後一筆 + Unable to fetch ç„¡æ³•æŠ“å– + Unable to fetch first 無法抓å–第一筆 + Unable to fetch previous 無法抓å–å‰ä¸€ç­† @@ -2878,41 +3535,48 @@ Do you want to delete it anyway? QObject - + Home é¦–é  - + Operation not supported on %1 在 %1 上ä¸æ”¯æ´æ­¤æ“作 + Invalid URI: %1 ä¸åˆæ³•çš„網å€ï¼š%1 - + Write error writing to %1: %2 寫入 %1 時發生錯誤:%2 + Read error reading from %1: %2 從 %1 讀å–錯誤:%2 + Socket error on %1: %2 %1 上發生 socket 錯誤:%2 + Remote host closed the connection prematurely on %1 æ–¼ %1 上é ç«¯ä¸»æ©Ÿé—œé–‰äº†ä¸æ­£å¸¸çš„連線 + Protocol error: packet of size 0 received å”定錯誤:接收到大å°ç‚º 0 çš„å°åŒ… + + No host name given 未指定主機 @@ -2920,11 +3584,12 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name å稱 + Value 值 @@ -2932,27 +3597,32 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect 無法連線 + Could not begin transaction 無法開始事務 + Could not commit transaction 無法æ交事務 + Could not rollback transaction 無法å轉事務 + Unable to subscribe 無法訂閱 + Unable to unsubscribe 無法å–消訂閱 @@ -2960,10 +3630,12 @@ Do you want to delete it anyway? QPSQLResult + Unable to create query 無法建立查詢 + Unable to prepare statement 無法準備敘述 @@ -2971,83 +3643,102 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) 公分 + Millimeters (mm) 公厘 + Inches (in) è‹±å‹ + Points (pt) 點 + Form 表單 + Paper 紙張 + Page size: 紙張大å°ï¼š + Width: 寬度: + Height: 高度: + Paper source: 紙張來æºï¼š + Orientation æ–¹å‘ + Portrait ç¸±å‘ + Landscape æ©«å‘ + Reverse landscape ååºæ©«å‘ + Reverse portrait ååºç¸±å‘ + Margins é‚Šç·£ + top margin 上緣 + left margin 左緣 + right margin å³ç·£ + bottom margin 下緣 @@ -3055,11 +3746,12 @@ Do you want to delete it anyway? QPluginLoader - + Unknown error 未知的錯誤 + The plugin was not loaded. 外掛程å¼æœªè¼‰å…¥ã€‚ @@ -3067,15 +3759,19 @@ Do you want to delete it anyway? QPrintDialog - + locally connected 本地連接 + + Aliases: %1 別å:%1 + + unknown 未知 @@ -3088,128 +3784,157 @@ Do you want to delete it anyway? æ©«å‘ - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) + A1 (594 x 841 mm) A1 (594 x 841 mm) + A2 (420 x 594 mm) A2 (420 x 594 mm) + A3 (297 x 420 mm) A3 (297 x 420 mm) + A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm, 8.26 x 11.7 英å‹) + A5 (148 x 210 mm) A5 (148 x 210 mm) + A6 (105 x 148 mm) A6 (105 x 148 mm) + A7 (74 x 105 mm) A7 (74 x 105 mm) + A8 (52 x 74 mm) A8 (52 x 74 mm) + A9 (37 x 52 mm) A9 (37 x 52 mm) + B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) + B1 (707 x 1000 mm) B1 (707 x 1000 mm) + B2 (500 x 707 mm) B2 (500 x 707 mm) + B3 (353 x 500 mm) B3 (353 x 500 mm) + B4 (250 x 353 mm) B4 (250 x 353 mm) + B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm, 6.93 x 9.84 英å‹) + B6 (125 x 176 mm) B6 (125 x 176 mm) + B7 (88 x 125 mm) B7 (88 x 125 mm) + B8 (62 x 88 mm) B8 (62 x 88 mm) + B9 (44 x 62 mm) B9 (44 x 62 mm) + B10 (31 x 44 mm) B10 (31 x 44 mm) + C5E (163 x 229 mm) C5E (163 x 229 mm) + DLE (110 x 220 mm) DLE (110 x 220 mm) + Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7.5 x 10 英å‹, 191 x 254 mm) + Folio (210 x 330 mm) å°é–‹ (210 x 330 mm) + Ledger (432 x 279 mm) Ledger (432 x 279 mm) + Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8.5 x 14 英å‹, 216 x 356 mm) + Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8.5 x 11 英å‹, 216 x 279 mm) + Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) + US Common #10 Envelope (105 x 241 mm) US 常用 10 è™Ÿä¿¡å° (105x241 mm) - + OK 確定 @@ -3230,6 +3955,9 @@ Do you want to delete it anyway? 紙張來æºï¼š + + + Print åˆ—å° @@ -3242,6 +3970,7 @@ Do you want to delete it anyway? å°è¡¨æ©Ÿ + Print To File ... 列å°åˆ°æª”案... @@ -3274,11 +4003,12 @@ Do you want to delete it anyway? 列å°åˆ°æª”案 - + Print range 列å°ç¯„åœ + Print all å…¨éƒ¨åˆ—å° @@ -3323,190 +4053,234 @@ Do you want to delete it anyway? é›™é¢åˆ—å° - + File %1 is not writable. Please choose a different file name. 檔案 %1 無法寫入。 è«‹é¸æ“‡å…¶å®ƒæª”å。 + %1 already exists. Do you want to overwrite it? %1 已存在。 您è¦è¦†å¯«å®ƒå—Žï¼Ÿ + File exists 檔案已存在 + <qt>Do you want to overwrite it?</qt> <qt>您è¦è¦†å¯«å®ƒå—Žï¼Ÿ</qt> + Print selection 列å°é¸æ“‡å€ + %1 is a directory. Please choose a different file name. %1 是一個目錄。 è«‹é¸æ“‡å…¶ä»–檔å。 + A0 A0 + A1 A1 + A2 A2 + A3 A3 + A4 A4 + A5 A5 + A6 A6 + A7 A7 + A8 A8 + A9 A9 + B0 B0 + B1 B1 + B2 B2 + B3 B3 + B4 B4 + B5 B5 + B6 B6 + B7 B7 + B8 B8 + B9 B9 + B10 B10 + C5E C5E + DLE DLE + Executive Executive + Folio Folio + Ledger Ledger + Legal Legal + Letter Letter + Tabloid Tabloid + US Common #10 Envelope US Common #10 Envelope + Custom 自訂 + + &Options >> æ“作 (&O) >> + &Print 列å°(&P) + &Options << æ“作 (&O) << + Print to File (PDF) 列å°åˆ°æª”案(PDF) + Print to File (Postscript) 列å°åˆ°æª”案(Postscript) + Local file 本地端檔案 + Write %1 file 寫入 %1 檔案 - + The 'From' value cannot be greater than the 'To' value. 起始數值ä¸èƒ½å¤§æ–¼çµæŸæ•¸å€¼ @@ -3514,87 +4288,108 @@ Please choose a different file name. QPrintPreviewDialog + + Page Setup é é¢è¨­å®š - + %1% %1% + Print Preview 列å°é è¦½ + Next page ä¸‹ä¸€é  + Previous page å‰ä¸€é  + First page ç¬¬ä¸€é  + Last page æœ€å¾Œä¸€é  + Fit width 符åˆå¯¬åº¦ + Fit page 符åˆé é¢ + Zoom in 放大 + Zoom out ç¸®å° + Portrait ç¸±å‘ + Landscape æ©«å‘ + Show single page 顯示單一é é¢ + Show facing pages 顯示å°é¢ + Show overview of all pages 顯示所有é é¢é è¦½ + Print åˆ—å° + Page setup 列å°è¨­å®š + Close 關閉 + Export to PDF 匯出到 PDF 檔 + Export to PostScript 匯出到 PostScript 檔 @@ -3617,14 +4412,17 @@ Please choose a different file name. QPrintPropertiesWidget + Form 表單 + Page é é¢ + Advanced 進階 @@ -3632,78 +4430,97 @@ Please choose a different file name. QPrintSettingsOutput + Form 表單 + Copies 份數 + Print range 列å°ç¯„åœ + Print all å…¨éƒ¨åˆ—å° + Pages from 指定é é¢ï¼šå¾ž + to 到 + Selection é¸æ“‡å€ + Output Settings 輸出設定 + Copies: 份數: + Collate æ ¡å° + Reverse åå‘ + Options é¸é … + Color Mode é¡è‰²æ¨¡å¼ + Color é¡è‰² + Grayscale ç°éšŽ + Duplex Printing é›™å·¥åˆ—å° + None ç„¡ + Long side é•·é‚Š + Short side 短邊 @@ -3711,38 +4528,47 @@ Please choose a different file name. QPrintWidget + Form 表單 + Printer å°è¡¨æ©Ÿ + &Name: å稱(&N): + P&roperties 屬性(&R) + Location: ä½ç½®ï¼š + Preview é è¦½ + Type: 型態: + Output &file: 輸出檔案(&F): + ... ... @@ -3750,37 +4576,62 @@ Please choose a different file name. QProcess - + + Could not open input redirection for reading 無法開啟輸入導å‘ä»¥è®€å– - + + Could not open output redirection for writing 無法開啟輸出導å‘以寫入 + Resource error (fork failure): %1 資æºéŒ¯èª¤ï¼ˆfork 失敗):%1 + + + + + + + + + Process operation timed out 行程æ“作逾時 + + + + Error reading from process 從行程讀å–時發生錯誤 - + + + Error writing to process 寫入行程時發生錯誤 + Process crashed 行程已崩潰 + + No program defined + + + + Process failed to start 啟動行程失敗 @@ -3788,7 +4639,7 @@ Please choose a different file name. QProgressDialog - + Cancel å–消 @@ -3796,6 +4647,7 @@ Please choose a different file name. QPushButton + Open é–‹å•Ÿ @@ -3803,6 +4655,7 @@ Please choose a different file name. QRadioButton + Check å‹¾é¸ @@ -3810,39 +4663,47 @@ Please choose a different file name. QRegExp - + no error occurred 沒有發生錯誤 + disabled feature used 使用已關閉的功能 + bad char class syntax 錯誤的字元類別語法 + bad lookahead syntax 錯誤的 lookahead 語法 + bad repetition syntax 錯誤的é‡è¦†èªžæ³• + invalid octal value ä¸åˆæ³•çš„八進ä½å€¼ + missing left delim 少了左方的å€éš”符 + unexpected end 未é æœŸé‡åˆ°çµå°¾ + met internal limit é‡åˆ°å…§éƒ¨é™åˆ¶ @@ -3850,19 +4711,22 @@ Please choose a different file name. QSQLite2Driver - + Error to open database 開啟資料庫時發生錯誤 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback Transaction 無法å轉事務 @@ -3870,10 +4734,12 @@ Please choose a different file name. QSQLite2Result + Unable to fetch results 無法抓å–çµæžœ + Unable to execute statement 無法執行敘述 @@ -3881,19 +4747,22 @@ Please choose a different file name. QSQLiteDriver - + Error opening database 開啟資料庫發生錯誤 + Error closing database 關閉資料庫發生錯誤 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 @@ -3902,6 +4771,7 @@ Please choose a different file name. 無法å轉事務 + Unable to rollback transaction 無法å轉事務 @@ -3909,26 +4779,34 @@ Please choose a different file name. QSQLiteResult + + + Unable to fetch row 無法抓å–列 + Unable to execute statement 無法執行敘述 + Unable to reset statement 無法é‡ç½®æ•˜è¿° + Unable to bind parameters 無法çµåˆåƒæ•¸ + Parameter count mismatch åƒæ•¸æ•¸é‡ä¸ç¬¦åˆ + No query 沒有查詢 @@ -3936,69 +4814,84 @@ Please choose a different file name. QScrollBar - + Scroll here 在此æ²è»¸ + Left edge 左邊緣 + Top 頂端 + Right edge å³é‚Šç·£ + Bottom 底端 + Page left é é¢å·¦æ–¹ - + + Page up é é¢ä¸Šæ–¹ + Page right é é¢å³æ–¹ - + + Page down é é¢ä¸‹æ–¹ + Scroll left 往左æ²è»¸ + Scroll up 往上æ²è»¸ + Scroll right å¾€å³æ²è»¸ + Scroll down 往下æ²è»¸ + Line up å°ä¸ŠæŽ’列 + Position ä½ç½® + Line down å°ä¸‹æŽ’列 @@ -4006,81 +4899,99 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock %1:無法設定éµå€¼ + %1: create size is less then 0 %1:建立大å°å°æ–¼ 0 - + + %1: unable to lock %1:無法鎖定 + %1: unable to unlock %1:無法解除鎖定 - + + %1: permission denied %1:存å–被拒 + + %1: already exists %1:已存在 - + + %1: doesn't exists %1:ä¸å­˜åœ¨ - + + %1: out of resources %1:資æºä¸è¶³ - + + %1: unknown error %2 %1:未知的錯誤 %2 + %1: key is empty %1:éµå€¼æ˜¯ç©ºçš„ + %1: unix key file doesn't exists %1:unix éµå€¼æª”ä¸å­˜åœ¨ + %1: ftok failed %1:ftok 失敗 - + + %1: unable to make key %1:無法產生éµå€¼ + %1: system-imposed size restrictions %1:系統大å°é™åˆ¶ + %1: not attached %1:未附加 + %1: invalid size %1:ä¸åˆæ³•çš„å¤§å° + %1: key error %1:éµå€¼éŒ¯èª¤ + %1: size query failed %1:大å°æŸ¥è©¢å¤±æ•— @@ -4088,371 +4999,466 @@ Please choose a different file name. QShortcut - + Space ç©ºç™½éµ + Esc Esc + Tab Tab + Backtab Backtab + Backspace Backspace + Return Return + Enter Enter + Ins Ins + Del Del + Pause Pause + Print Print + SysReq SysReq + Home Home + End End + Left å·¦éµ + Up ä¸Šéµ + Right å³éµ + Down ä¸‹éµ + PgUp PgUp + PgDown PgDown + CapsLock 大寫鎖定 + NumLock 數字鎖定 + ScrollLock æ²è»¸éŽ–定 + Menu é¸å–® + Help 說明 + Back 返回 + Forward å¾€å‰ + Stop åœæ­¢ + Refresh 刷新 + Volume Down 音é‡é™ä½Ž + Volume Mute éœéŸ³ + Volume Up 音é‡æ高 + Bass Boost é‡ä½ŽéŸ³ + Bass Up Bass Up + Bass Down Bass Down + Treble Up Treble Up + Treble Down Treble Down + Media Play 媒體播放 + Media Stop 媒體åœæ­¢ + Media Previous 媒體å‰ä¸€é¦– + Media Next 媒體下一首 + Media Record 媒體錄音 + Favorites 我的最愛 + Search æœå°‹ + Standby 待命 + Open URL é–‹å•Ÿç¶²å€ + Launch Mail å•Ÿå‹•éƒµä»¶ç¨‹å¼ + Launch Media å•Ÿå‹•åª’é«”ç¨‹å¼ + Launch (0) 啟動(0) + Launch (1) 啟動(1) + Launch (2) 啟動(2) + Launch (3) 啟動(3) + Launch (4) 啟動(4) + Launch (5) 啟動(5) + Launch (6) 啟動(6) + Launch (7) 啟動(7) + Launch (8) 啟動(8) + Launch (9) 啟動(9) + Launch (A) 啟動(A) + Launch (B) 啟動(B) + Launch (C) 啟動(C) + Launch (D) 啟動(D) + Launch (E) 啟動(E) + Launch (F) 啟動(F) + Print Screen 列å°èž¢å¹• + Page Up å¾€ä¸Šä¸€é  + Page Down å¾€ä¸‹ä¸€é  + Caps Lock 大寫鎖定 + Num Lock 數字鎖定 + Number Lock 數字鎖定 + Scroll Lock æ²è»¸éŽ–定 + Insert æ’å…¥ + Delete 刪除 + Escape Escape + System Request 系統è¦æ±‚ SysRq + Select é¸æ“‡ + Yes 是 + No å¦ + Context1 內文1 + Context2 內文2 + Context3 內文3 + Context4 內文4 + Call å‘¼å« + Hangup 掛斷 + Flip å轉 + + Ctrl Ctrl + + Shift Shift + + Alt Alt + + Meta Meta + + + + F%1 F%1 + Home Page é¦–é  @@ -4460,23 +5466,27 @@ Please choose a different file name. QSlider - + Page left é é¢å·¦æ–¹ + Page up é é¢ä¸Šæ–¹ + Position ä½ç½® + Page right é é¢å³æ–¹ + Page down é é¢ä¸‹æ–¹ @@ -4484,54 +5494,67 @@ Please choose a different file name. QSocks5SocketEngine + Connection to proxy refused 代ç†ä¼ºæœå™¨é€£ç·šè¢«æ‹’ + Connection to proxy closed prematurely 代ç†ä¼ºæœå™¨é€£ç·šå·²ä¸æ­£å¸¸é—œé–‰ + Proxy host not found 找ä¸åˆ°ä»£ç†ä¼ºæœå™¨ + Connection to proxy timed out 代ç†ä¼ºæœå™¨é€£ç·šé€¾æ™‚ + Proxy authentication failed 代ç†ä¼ºæœå™¨èªè­‰å¤±æ•— + Proxy authentication failed: %1 代ç†ä¼ºæœå™¨èªè­‰å¤±æ•—:%1 + SOCKS version 5 protocol error SOCKS 5 çš„å”定錯誤 + General SOCKSv5 server failure 一般的 SOCKSv5 伺æœå™¨éŒ¯èª¤ + Connection not allowed by SOCKSv5 server 連線未被 SOCKSv5 伺æœå™¨å…許 + TTL expired TTL 逾時 + SOCKSv5 command not supported SOCKSv5 æŒ‡ä»¤æœªè¢«æ”¯æ´ + Address type not supported ä½å€åž‹æ…‹æœªè¢«æ”¯æ´ + Unknown SOCKSv5 proxy error code 0x%1 未知的 SOCKSv5 代ç†ä¼ºæœå™¨éŒ¯èª¤ä»£ç¢¼ 0x%1 @@ -4540,6 +5563,7 @@ Please choose a different file name. 連接到 socks 伺æœå™¨æ™‚發生 socks5 逾時錯誤 + Network operation timed out 網路æ“作逾時 @@ -4547,10 +5571,12 @@ Please choose a different file name. QSpinBox + More 更多 + Less 較少 @@ -4558,43 +5584,56 @@ Please choose a different file name. QSql - + Delete 刪除 + Delete this record? è¦åˆªé™¤é€™ç­†ç´€éŒ„嗎? + + + Yes 是 + + + No å¦ + Insert æ’å…¥ + Update æ›´æ–° + Save edits? è¦å„²å­˜ç·¨è¼¯éŽçš„內容嗎? + Cancel å–消 + Confirm ç¢ºèª + Cancel your edits? è¦å–消編輯嗎? @@ -4602,43 +5641,52 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 無法寫入資料:%1 + Error while reading: %1 讀å–時發生錯誤:%1 + Error during SSL handshake: %1 SSL åŒæ­¥æ™‚發生錯誤:%1 + Error creating SSL context (%1) 建立 SSL 內文時發生錯誤(%1) + Invalid or empty cipher list (%1) ä¸åˆæ³•æˆ–空白的加密清單(%1) + Error creating SSL session, %1 建立 SSL 工作階段時發生錯誤:%1 + Error creating SSL session: %1 建立 SSL 工作階段時發生錯誤:%1 + Cannot provide a certificate with no key, %1 沒有金鑰無法æ供憑證:%1 + Error loading local certificate, %1 載入本地憑證時發生錯誤:%1 + Error loading private key, %1 載入ç§é‘°æ™‚發生錯誤:%1 @@ -4647,6 +5695,7 @@ Please choose a different file name. ç§é‘°èˆ‡å…¬é‘°ä¸ç¬¦ï¼š%1 + Private key does not certificate public key, %1 ç§å¯†é‡‘鑰無法èªè­‰å…¬é–‹é‡‘鑰,%1 @@ -4654,25 +5703,30 @@ Please choose a different file name. QSystemSemaphore - + + %1: out of resources %1:資æºä¸è¶³ - + + %1: permission denied %1:存å–被拒 + %1: already exists %1:已存在 + %1: does not exist %1:ä¸å­˜åœ¨ - + + %1: unknown error %2 %1:未知的錯誤 %2 @@ -4680,11 +5734,12 @@ Please choose a different file name. QTDSDriver - + Unable to open connection 無法開啟連線 + Unable to use database 無法使用資料庫 @@ -4692,10 +5747,12 @@ Please choose a different file name. QTabBar + Scroll Left 往左æ²è»¸ + Scroll Right å¾€å³æ²è»¸ @@ -4707,7 +5764,7 @@ Please choose a different file name. 未支æ´çš„ socket æ“作 - + Operation on socket is not supported Socket çš„æ“ä½œæœªè¢«æ”¯æ´ @@ -4715,35 +5772,42 @@ Please choose a different file name. QTextControl - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + Copy &Link Location 複製連çµä½å€(&L) + &Paste 貼上(&P) + Delete 刪除 + Select All 全部é¸æ“‡ @@ -4751,10 +5815,14 @@ Please choose a different file name. QToolButton + + Press 按下 + + Open é–‹å•Ÿ @@ -4762,7 +5830,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 此平å°ä¸æ”¯æ´ IPv6 @@ -4770,11 +5838,12 @@ Please choose a different file name. QUndoGroup - + Undo 復原 + Redo é‡åš @@ -4782,7 +5851,7 @@ Please choose a different file name. QUndoModel - + <empty> <空白> @@ -4790,11 +5859,12 @@ Please choose a different file name. QUndoStack - + Undo 復原 + Redo é‡åš @@ -4802,47 +5872,57 @@ Please choose a different file name. QUnicodeControlCharacterMenu - + LRM Left-to-right mark LRM 左到å³æ¨™è¨˜ + RLM Right-to-left mark RLM å³åˆ°å·¦æ¨™è¨˜ + ZWJ Zero width joiner ZWJ 零寬度連接器 + ZWNJ Zero width non-joiner ZWNJ 零寬度éžé€£æŽ¥å™¨ + ZWSP Zero width space ZWSP 零寬度空白 + LRE Start of left-to-right embedding LRE 左到å³åµŒå…¥èµ·é»ž + RLE Start of right-to-left embedding RLE å³åˆ°å·¦åµŒå…¥èµ·é»ž + LRO Start of left-to-right override LRO 左到å³è¦†å¯«èµ·é»ž + RLO Start of right-to-left override RLO å³åˆ°å·¦è¦†å¯«èµ·é»ž + PDF Pop directional formatting PDF 彈出方å‘æ ¼å¼ + Insert Unicode control character æ’å…¥è¬åœ‹ç¢¼æŽ§åˆ¶å­—å…ƒ @@ -4850,27 +5930,32 @@ Please choose a different file name. QWebFrame - + Request cancelled 請求已å–消 + Request blocked 請求已被阻擋 + Cannot show URL ç„¡æ³•é¡¯ç¤ºç¶²å€ + Frame load interruped by policy change å½±åƒè¼‰å…¥å› æ”¿ç­–變更而中斷 + Cannot show mimetype 無法顯示 MIME åž‹æ…‹ + File does not exist 檔案ä¸å­˜åœ¨ @@ -4878,316 +5963,376 @@ Please choose a different file name. QWebPage - + Bad HTTP request ä¸è‰¯çš„ HTTP 請求 - + Submit default label for Submit buttons in forms on web pages æ交 + Submit Submit (input element) alt text for <input> elements with no alt, title, or value æ交 + Reset default label for Reset buttons in forms on web pages é‡ç½® + This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' 這是å¯æœå°‹çš„索引。請輸入關éµå­—:  + Choose File title for file button used in HTML forms é¸æ“‡æª”案 + No file selected text to display in file button used in HTML forms when no file is selected 未é¸å–任何檔案 + Open in New Window Open in New Window context menu item 在新視窗開啟 + Save Link... Download Linked File context menu item 儲存連çµ... + Copy Link Copy Link context menu item è¤‡è£½é€£çµ + Open Image Open Image in New Window context menu item é–‹å•Ÿå½±åƒ + Save Image Download Image context menu item å„²å­˜å½±åƒ + Copy Image Copy Link context menu item è¤‡è£½å½±åƒ + Open Frame Open Frame in New Window context menu item 開啟框架 + Copy Copy context menu item 複製 + Go Back Back context menu item 往回 + Go Forward Forward context menu item å¾€å‰ + Stop Stop context menu item åœæ­¢ + Reload Reload context menu item é‡æ–°è¼‰å…¥ + Cut Cut context menu item 剪下 + Paste Paste context menu item 貼上 + No Guesses Found No Guesses Found context menu item 找ä¸åˆ°å¯èƒ½çš„內容 + Ignore Ignore Spelling context menu item 忽略 + Add To Dictionary Learn Spelling context menu item 新增到字典 + Search The Web Search The Web context menu item æœå°‹ç«™å° + Look Up In Dictionary Look Up in Dictionary context menu item 在字典裡æœå°‹ + Open Link Open Link context menu item é–‹å•Ÿé€£çµ + Ignore Ignore Grammar context menu item 忽略 + Spelling Spelling and Grammar context sub-menu item 拼字 + Show Spelling and Grammar menu item title 顯示拼字與文法 + Hide Spelling and Grammar menu item title éš±è—拼字與文法 + Check Spelling Check spelling context menu item 檢查拼字 + Check Spelling While Typing Check spelling while typing context menu item 打字時立å³æª¢æŸ¥æ‹¼å­— + Check Grammar With Spelling Check grammar with spelling context menu item 檢查拼字與文法 + Fonts Font context sub-menu item å­—åž‹ + Bold Bold context menu item ç²—é«” + Italic Italic context menu item 斜體 + Underline Underline context menu item 底線 + Outline Outline context menu item 外框線 + Direction Writing direction context sub-menu item æ–¹å‘ + Text Direction Text direction context sub-menu item æ–‡å­—æ–¹å‘ + Default Default writing direction context menu item é è¨­ + LTR Left to Right context menu item å·¦åˆ°å³ + RTL Right to Left context menu item å³åˆ°å·¦ + Inspect Inspect Element context menu item 查驗 + No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed 沒有最近的æœå°‹ + Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title 最近的æœå°‹ + Clear recent searches menu item in Recent Searches menu that empties menu's contents 清除最近的æœå°‹ + Unknown Unknown filesize FTP directory listing item 未知 + %1 (%2x%3 pixels) Title string for images %1(%2x%3 åƒç´ ï¼‰ - + Web Inspector - %2 網站查驗器─%2 - + Scroll here 在此æ²è»¸ + Left edge 左邊緣 + Top 頂端 + Right edge å³é‚Šç·£ + Bottom 底端 + Page left é é¢å·¦æ–¹ + Page up é é¢ä¸Šæ–¹ + Page right é é¢å³æ–¹ + Page down é é¢ä¸‹æ–¹ + Scroll left 往左æ²è»¸ + Scroll up 往上æ²è»¸ + Scroll right å¾€å³æ²è»¸ + Scroll down 往下æ²è»¸ - + %n file(s) number of chosen file @@ -5195,127 +6340,170 @@ Please choose a different file name. - + JavaScript Alert - %1 JavaScript 警告 ─ %1 + JavaScript Confirm - %1 JavaScript ç¢ºèª â”€ %1 + JavaScript Prompt - %1 JavaScript æ示 ─ %1 + Move the cursor to the next character 移動游標到下一個字元 + Move the cursor to the previous character 移動游標到å‰ä¸€å€‹å­—å…ƒ + Move the cursor to the next word 移動游標到下一個單字 + Move the cursor to the previous word 移動游標到å‰ä¸€å€‹å–®å­— + Move the cursor to the next line 移動游標到下一行 + Move the cursor to the previous line 移動游標到å‰ä¸€è¡Œ + Move the cursor to the start of the line 移動游標到這一行的起頭 + Move the cursor to the end of the line 移動游標到這一行的çµå°¾ + Move the cursor to the start of the block 移動游標到這一個å€å¡Šçš„èµ·é ­ + Move the cursor to the end of the block 移動游標到這一個å€å¡Šçš„çµå°¾ + Move the cursor to the start of the document 移動游標到這一個文件的起頭 + Move the cursor to the end of the document 移動游標到這一個文件的çµå°¾ + + Select all + + + + Select to the next character é¸æ“‡åˆ°ä¸‹ä¸€å€‹å­—å…ƒ + Select to the previous character é¸æ“‡åˆ°å‰ä¸€å€‹å­—å…ƒ + Select to the next word é¸æ“‡åˆ°ä¸‹ä¸€å€‹å–®å­— + Select to the previous word é¸æ“‡åˆ°å‰ä¸€å€‹å–®å­— + Select to the next line é¸æ“‡åˆ°ä¸‹ä¸€è¡Œ + Select to the previous line é¸æ“‡åˆ°å‰ä¸€è¡Œ + Select to the start of the line é¸æ“‡åˆ°é€™ä¸€è¡Œçš„èµ·é ­ + Select to the end of the line é¸æ“‡åˆ°é€™ä¸€è¡Œçš„çµå°¾ + Select to the start of the block é¸æ“‡åˆ°é€™ä¸€å€‹å€å¡Šçš„èµ·é ­ + Select to the end of the block é¸æ“‡åˆ°é€™ä¸€å€‹å€å¡Šçš„çµå°¾ + Select to the start of the document é¸æ“‡åˆ°é€™ä¸€å€‹æ–‡ä»¶çš„èµ·é ­ + Select to the end of the document é¸æ“‡åˆ°é€™ä¸€å€‹æ–‡ä»¶çš„çµå°¾ + Delete to the start of the word 刪除到此單字的起頭 + Delete to the end of the word 刪除到此單字的çµå°¾ + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? 這是什麼? @@ -5323,7 +6511,7 @@ Please choose a different file name. QWidget - + * + @@ -5331,19 +6519,22 @@ Please choose a different file name. QWizard - + Go Back 往回 + Continue 繼續 + Commit æ交 + Done å®Œæˆ @@ -5352,30 +6543,37 @@ Please choose a different file name. 離開 + Help 說明 + < &Back <返回(&B) + &Finish 完æˆ(&F) + Cancel å–消 + &Help 說明(&H) + &Next 下一個(&N) + &Next > 下一個(&N)> @@ -5383,55 +6581,69 @@ Please choose a different file name. QWorkspace - + &Restore 回復(&R) + &Move 移動(&M) + &Size 大å°(&S) + Mi&nimize 最å°åŒ–(&N) + Ma&ximize 最大化(&X) + &Close 關閉(&C) + Stay on &Top 留在頂端(&T) + + Sh&ade é®è”½(&A) + + %1 - [%2] %1 - [%2] + Minimize 最å°åŒ– + Restore Down å‘下æ¢å¾© + Close 關閉 + &Unshade å–消é®è”½(&U) @@ -5439,95 +6651,117 @@ Please choose a different file name. QXml - + no error occurred 沒有發生錯誤 + error triggered by consumer 用戶觸發的錯誤 + unexpected end of file 未é æœŸé‡åˆ°æª”案çµå°¾ + more than one document type definition 定義了一個以上的文件型態 + error occurred while parsing element 剖æžå…ƒç´ æ™‚發生錯誤 + tag mismatch 標籤ä¸å°ç¨± + error occurred while parsing content 剖æžå…§å®¹æ™‚發生錯誤 + unexpected character éžé æœŸçš„å­—å…ƒ + invalid name for processing instruction 處ç†æŒ‡ä»¤æ™‚çš„ä¸åˆæ³•å稱 + version expected while reading the XML declaration è®€å– XML 宣告時應有版本號 + wrong value for standalone declaration ç¨ç«‹å®£å‘Šæ™‚的值錯誤 + encoding declaration or standalone declaration expected while reading the XML declaration è®€å– XML 宣告時應有編碼宣告或ç¨ç«‹å®£å‘Š + standalone declaration expected while reading the XML declaration è®€å– XML 宣告時應有讀立宣告 + error occurred while parsing document type definition 剖æžæ–‡ä»¶åž‹æ…‹å®šç¾©æ™‚發生錯誤 + letter is expected é æœŸæ‡‰ç‚ºå­—æ¯ + error occurred while parsing comment 剖æžè¨»è§£æ™‚發生錯誤 + error occurred while parsing reference 剖æžåƒè€ƒæ™‚發生錯誤 + internal general entity reference not allowed in DTD 在 DTD 中ä¸å…許內部產生的實體åƒè€ƒ + external parsed general entity reference not allowed in attribute value 在屬性值中ä¸å…許使用外部剖æžçš„實體åƒè€ƒ + external parsed general entity reference not allowed in DTD 在 DTD 中ä¸å…許使用外部剖æžçš„實體åƒè€ƒ + unparsed entity reference in wrong context 在錯誤的內文中有未剖æžçš„實體åƒè€ƒ + recursive entities éžè¿´çš„實體 + error in the text declaration of an external entity 在外部實體中的文字宣告有錯誤 @@ -5535,47 +6769,58 @@ Please choose a different file name. QXmlStream - + + Extra content at end of document. 文件尾端有多餘的內容。 + Invalid entity value. ä¸åˆæ³•çš„實體值 + Invalid XML character. ä¸åˆæ³•çš„ XML 字元。 + Sequence ']]>' not allowed in content. 在內文中ä¸å…許有åºåˆ— "]]>"。 + Namespace prefix '%1' not declared 命å空間的å‰ç½®å­—串 %1 未宣告 + Attribute redefined. 屬性é‡å®šç¾©ã€‚ + Unexpected character '%1' in public id literal. 在公開代碼字元中é‡åˆ°éžé æœŸçš„å­—å…ƒ %1。 + Invalid XML version string. ä¸åˆæ³•çš„ XML 版本字串。 + Unsupported XML version. 未支æ´çš„ XML 版本。 + %1 is an invalid encoding name. %1 為ä¸åˆæ³•çš„編碼å稱。 + Encoding %1 is unsupported 編碼 %1 ä¸æ”¯æ´ã€‚ @@ -5584,100 +6829,128 @@ Please choose a different file name. ä¸åˆæ³•çš„ XML 編碼å稱。 + Standalone accepts only yes or no. ç¨ç«‹å¯¦é«”åªæŽ¥å— yes 或 no。 + Invalid attribute in XML declaration. XML 宣告中有ä¸åˆæ³•çš„屬性。 + Premature end of document. 文件çµå°¾ä¸æ­£ç¢ºã€‚ + Invalid document. ä¸åˆæ³•çš„文件。 + Expected é æœŸæ‡‰ç‚º + , but got ' ,但是看到的是 + Unexpected ' éžé æœŸ + Expected character data. é æœŸçš„字元資料。 + Recursive entity detected. åµæ¸¬åˆ°éžè¿´å¯¦é«”。 + Start tag expected. é æœŸæ‡‰æœ‰é–‹å§‹æ¨™ç±¤ã€‚ + XML declaration not at start of document. XML 宣告沒有在文件開始處。 + NDATA in parameter entity declaration. 在åƒæ•¸å¯¦é«”宣告有 NDATA。 + %1 is an invalid processing instruction name. %1 是ä¸åˆæ³•çš„處ç†æŒ‡ä»¤å稱。 + Invalid processing instruction name. ä¸åˆæ³•çš„處ç†æŒ‡ä»¤å稱。 + + + + Illegal namespace declaration. ä¸åˆæ³•çš„命å空間宣告。 - + Invalid XML name. ä¸åˆæ³•çš„ XML å稱。 + Opening and ending tag mismatch. 開啟與çµæŸçš„標籤ä¸å°ç¨±ã€‚ + Reference to unparsed entity '%1'. åƒè€ƒåˆ°æœªå‰–æžçš„實體 %1。 + + + Entity '%1' not declared. 實體 %1 未宣告。 + Reference to external entity '%1' in attribute value. 在屬性值中åƒè€ƒåˆ°å¤–部實體 %1。 + Invalid character reference. ä¸åˆæ³•çš„å­—å…ƒåƒè€ƒã€‚ + + Encountered incorrectly encoded content. é‡åˆ°ä¸æ­£ç¢ºçš„編碼內容。 + The standalone pseudo attribute must appear after the encoding. ç¨ç«‹çš„虛擬屬性必須在編碼之後出ç¾ã€‚ - + %1 is an invalid PUBLIC identifier. %1 為ä¸åˆæ³•çš„ PUBLIC 識別å­ã€‚ @@ -5685,21 +6958,22 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. 已宣告屬性 %1 的值為 %2。 + An %1-attribute must have a valid %2 as value, which %3 isn't. 屬性 %1 必須以åˆæ³•çš„ %2 為值,而 %3 是ä¸åˆæ³•çš„。 - + Network timeout. 網路逾時。 - + Element %1 can't be serialized because it appears outside the document element. 元素 %1 無法åºåˆ—化,因為似乎是在文件元素之外。 @@ -5708,425 +6982,482 @@ Please choose a different file name. 屬性元素 %1 無法åºåˆ—化,因為似乎是在頂層。 - + Year %1 is invalid because it begins with %2. 年份 %1 ä¸åˆæ³•ï¼Œå› ç‚ºæ˜¯å¾ž %2 開始的。 + Day %1 is outside the range %2..%3. 日期 %1 已超出 %2 到 %3 的範åœã€‚ + Month %1 is outside the range %2..%3. 月份 %1 已超出 %2 到 %3 的範åœã€‚ + Overflow: Can't represent date %1. 溢ä½ï¼šç„¡æ³•è¡¨ç¤ºæ—¥æœŸ %1。 + Day %1 is invalid for month %2. 月份 %2 中沒有日期 %1。 + Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; 時間 24:%1:%2.%3 ä¸åˆæ³•ã€‚å°æ™‚為 24 則分ã€ç§’與毫秒都必須是 0。 + Time %1:%2:%3.%4 is invalid. 時間 %1:%2:%3.%4 ä¸åˆæ³•ã€‚ + Overflow: Date can't be represented. 溢ä½ï¼šç„¡æ³•è¡¨ç¤ºæ—¥æœŸã€‚ + + At least one component must be present. 必須表é”至少一個組件。 + At least one time component must appear after the %1-delimiter. 在分隔符 %1 後必須至少有一個時間組件。 - + No operand in an integer division, %1, can be %2. 整數除法沒有é‹ä½œå°è±¡ï¼Œ%1,å¯ä»¥æ˜¯ %2 + The first operand in an integer division, %1, cannot be infinity (%2). 整數除法的第一個é‹ç®—å°è±¡ %1 ä¸èƒ½æ˜¯ç„¡é™å¤§ï¼ˆ%2)。 + The second operand in a division, %1, cannot be zero (%2). 整數除法的第二個é‹ç®—å°è±¡ %1 ä¸èƒ½æ˜¯é›¶ï¼ˆ%2)。 - + %1 is not a valid value of type %2. %1 ä¸æ˜¯åˆæ³•çš„ %2 型態的值。 - + When casting to %1 from %2, the source value cannot be %3. 從 %2 轉æ›åž‹æ…‹ç‚º %1 的時候,來æºæ•¸å€¼ä¸èƒ½æ˜¯ %3。 - + Integer division (%1) by zero (%2) is undefined. 整數除法 %1 除以零(%2)的行為未定義。 + Division (%1) by zero (%2) is undefined. 除法 %1 除以零(%2)的行為未定義。 + Modulus division (%1) by zero (%2) is undefined. 餘數除法 %1 除以零(%2)的行為未定義。 + + Dividing a value of type %1 by %2 (not-a-number) is not allowed. 將型態 %1 除以 %2(éžæ•¸å€¼ï¼‰æ˜¯ä¸å…許的。 + Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. 將型態 %1 除以 %2 或 %3(正或負零)是ä¸å…許的。 + Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. 將型態 %1 乘以 %2 或 %3(正或負無é™å¤§ï¼‰æ˜¯ä¸å…許的。 - + A value of type %1 cannot have an Effective Boolean Value. åž‹æ…‹ %1 ä¸èƒ½æœ‰å¯¦éš›å¸ƒæž—值。 - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. 實際布林值(Effective Boolean)無法用在兩個或兩個以上的原數值(atomic value)的計算。 - + Value %1 of type %2 exceeds maximum (%3). åž‹æ…‹ %2 的數值 %1 已超éŽæœ€å¤§å€¼ï¼ˆ%3)。 + Value %1 of type %2 is below minimum (%3). åž‹æ…‹ %2 的數值 %1 已低éŽæœ€å°å€¼ï¼ˆ%3)。 - + A value of type %1 must contain an even number of digits. The value %2 does not. åž‹æ…‹ %1 的值必須包å«å¶æ•¸å€‹æ•¸å­—。數值 %2 未符åˆæ­¤æ¢ä»¶ã€‚ + %1 is not valid as a value of type %2. %1 ä¸æ˜¯åˆæ³•çš„ %2 型態的值。 - + Operator %1 cannot be used on type %2. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2。 + Operator %1 cannot be used on atomic values of type %2 and %3. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2 與 %3 的原數值。 - + The namespace URI in the name for a computed attribute cannot be %1. 在已計算屬性的å稱的命å空間網å€ä¸èƒ½æ˜¯ %1。 + The name for a computed attribute cannot have the namespace URI %1 with the local name %2. 在已計算屬性的å稱ä¸èƒ½åŒæ™‚有命åç©ºé–“ç¶²å€ %1 與本地端å稱 %2。 - + Type error in cast, expected %1, received %2. 轉æ›åž‹æ…‹éŒ¯èª¤ï¼Œæ‡‰ç‚º %1 但接收到 %2。 + When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. 轉æ›ç‚ºåž‹æ…‹ %1 或其è¡ç”Ÿåž‹æ…‹æ™‚,來æºæ•¸å€¼å¿…須是相åŒåž‹æ…‹ï¼Œæˆ–者是字串。型態 %2 是ä¸è¢«å…許的。 - + No casting is possible with %1 as the target type. ä¸èƒ½è½‰æ›åˆ° %1 型態。 + It is not possible to cast from %1 to %2. ä¸èƒ½å¾ž %1 轉æ›åˆ° %2。 + Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. 無法轉æ›åˆ° %1 因為它是一個抽象型態,ä¸èƒ½è¢«å¯¦é«”化。 + It's not possible to cast the value %1 of type %2 to %3 無法轉æ›åž‹æ…‹ %2 的數值 %1 到 %3 + Failure when casting from %1 to %2: %3 從 %1 轉æ›åˆ° %2 時失敗:%3 - + A comment cannot contain %1 註解ä¸èƒ½åŒ…å« %1 + A comment cannot end with a %1. 註解ä¸èƒ½ä»¥ %1 åšçµå°¾ - + No comparisons can be done involving the type %1. 包å«åž‹æ…‹ %1 時ä¸èƒ½åšæ¯”較。 + Operator %1 is not available between atomic values of type %2 and %3. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2 與 %3 的原數值。 - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. 屬性點ä¸èƒ½åšç‚ºæ–‡ä»¶é»žçš„å­ç¯€é»žã€‚因此,屬性 %1 çš„ä½ç½®ä¸åˆé©ã€‚ - + A library module cannot be evaluated directly. It must be imported from a main module. ä¸èƒ½ç›´æŽ¥è¨ˆç®—函å¼æ¨¡çµ„。必須è¦å¾žä¸»æ¨¡çµ„匯入。 + No template by name %1 exists. 沒有å為 %1 的樣本存在。 - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. åž‹æ…‹ %1 的值ä¸èƒ½æ˜¯è¬‚詞(predicate)。謂詞必須是數值型態,或是實際布林值。 + A positional predicate must evaluate to a single numeric value. ä½ç½®è¬‚詞必須能計算出單一的數值。 - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. 處ç†æŒ‡ä»¤çš„目標å稱ä¸èƒ½æ˜¯ä»»ä½•å¤§å°å¯«çµ„åˆçš„ %1。因此,%2 是ä¸åˆæ³•çš„值。 + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„處ç†æŒ‡ä»¤çš„目標å稱。必須是 %2 的值,例如 %3。 - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. 路徑的最後一步必須是節點或原值,而ä¸èƒ½åœ¨å…©è€…之間。 - + The data of a processing instruction cannot contain the string %1 處ç†æŒ‡ä»¤çš„資料ä¸èƒ½åŒ…å«å­—串 %1 - + No namespace binding exists for the prefix %1 å‰ç½®å­—串 %1 沒有çµåˆå‘½å空間 - + No namespace binding exists for the prefix %1 in %2 在 %2 çš„å‰ç½®å­—串 %1 沒有çµåˆå‘½å空間 - + + %1 is an invalid %2 %1 是ä¸åˆæ³•çš„ %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 最多åªèƒ½æœ‰ %n 個åƒæ•¸ï¼Œå› æ­¤ %2 是ä¸åˆæ³•çš„。 + %1 requires at least %n argument(s). %2 is therefore invalid. %1 è‡³å°‘éœ€è¦ %n 個åƒæ•¸ï¼Œå› æ­¤ %2 是ä¸åˆæ³•çš„。 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是數值型態,xs.yearMonthDuration 或 xs.dayTimeDuration。 + The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是 %3ã€%4 或 %5 型態。 + The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. å‘¼å« %1 的第二個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是 %3ã€%4 或 %5 型態。 - + %1 is not a valid XML 1.0 character. %1 ä¸æ˜¯åˆæ³•çš„ XML 1.0 字元。 - + The first argument to %1 cannot be of type %2. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。 - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. 如果兩個值都有å€åŸŸä½ç§»ï¼Œå‰‡å¿…須是相åŒçš„å€åŸŸä½ç§»ã€‚%1 與 %2 並ä¸ç›¸åŒã€‚ - + %1 was called. %1 已被呼å«ã€‚ - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 後é¢å¿…須跟著 %2 或 %3,而éžå–代字串的çµå°¾ã€‚ + In the replacement string, %1 must be followed by at least one digit when not escaped. 在å–代字串中,在未脫逸的情形下 %1 必須至少跟著一ä½æ•¸å­—。 + In the replacement string, %1 can only be used to escape itself or %2, not %3 在å–代字串中,%1 åªèƒ½ç”¨æ–¼è‡ªèº«æˆ– %2 çš„è„«é€¸ï¼Œè€Œéž %3。 - + %1 matches newline characters %1 符åˆäº†æ›è¡Œå­—å…ƒ + %1 and %2 match the start and end of a line. %1 與 %2 符åˆäº†ä¸€è¡Œçš„開始與çµå°¾ã€‚ + Matches are case insensitive 比å°ç‚ºå€åˆ†å¤§å°å¯« + Whitespace characters are removed, except when they appear in character classes 空白字元已移除,除éžå®ƒå€‘出ç¾åœ¨å­—元類別 + %1 is an invalid regular expression pattern: %2 %1 是ä¸åˆæ³•çš„æ­£è¦è¡¨ç¤ºå¼æ¨£å¼ï¼š%2 + %1 is an invalid flag for regular expressions. Valid flags are: %1 是正è¦è¡¨ç¤ºå¼ä¸­ä¸åˆæ³•çš„旗標。åˆæ³•çš„旗標有: - + If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. 如果第一個åƒæ•¸æ˜¯ç©ºåºåˆ—,或是長度為 0 的字串(沒有命å空間),則無法指定å‰ç½®å­—串。但是您指定了 %1。 - + It will not be possible to retrieve %1. 無法å–å¾— %1。 - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. å‡½å¼ %1 的第二個åƒæ•¸çš„根節點必須是文件節點。%2 ä¸æ˜¯æ–‡ä»¶ç¯€é»žã€‚ - + The default collection is undefined é è¨­çš„收è—未定義 + %1 cannot be retrieved %1 無法å–å¾— - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). 未支æ´å¸¸æ…‹åŒ–表單 %1。支æ´çš„表單有 %2ã€%3ã€%4ã€%5,以åŠç„¡ï¼ˆä¹Ÿå°±æ˜¯ç©ºå­—串,未常態化)。 - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. å€åŸŸä½ç§»å¿…須是在 %1 到 %2 範åœä¹‹å…§ã€‚%3 已超出範åœã€‚ + %1 is not a whole number of minutes. %1 ä¸æ˜¯åˆ†é˜çš„數值。 - + Required cardinality is %1; got cardinality %2. 需è¦çš„基數為 %1;得到的是 %2。 - + The item %1 did not match the required type %2. é …ç›® %1 未符åˆéœ€è¦çš„åž‹æ…‹ %2。 + + %1 is an unknown schema type. %1 是未知的機制型態。 + Only one %1 declaration can occur in the query prolog. åªæœ‰ä¸€å€‹ %1 宣告å¯ä»¥åœ¨æŸ¥è©¢ä¸­ã€‚ + The initialization of variable %1 depends on itself 變數 %1 çš„åˆå§‹åŒ–與自身相ä¾ã€‚ + No variable by name %1 exists 沒有å為 %1 的變數存在 - + The variable %1 is unused 變數 %1 未使用 - + Version %1 is not supported. The supported XQuery version is 1.0. 版本 %1 未支æ´ã€‚支æ´çš„ XQuery 版本為 1.0。 + The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. 編碼 %1 ä¸åˆæ³•ã€‚å¿…é ˆåªèƒ½åŒ…å«æ‹‰ä¸å­—元,ä¸å«ç©ºç™½ï¼Œä¸¦ä¸”è¦ç¬¦åˆæ­£è¦è¡¨ç¤ºå¼ %2。 + No function with signature %1 is available 沒有簽章為 %1 的函å¼å¯ä½¿ç”¨ + + A default namespace declaration must occur before function, variable, and option declarations. é è¨­çš„命å空間宣告必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + Namespace declarations must occur before function, variable, and option declarations. 命å空間宣告必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + Module imports must occur before function, variable, and option declarations. 模組匯入必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + It is not possible to redeclare prefix %1. 無法é‡å®£å‘Šå‰ç½®å­—串 %1。 @@ -6135,22 +7466,27 @@ Please choose a different file name. åªæœ‰å‰ç½®å­—串 %1 å¯ä»¥è¢«å®£å‘Šèˆ‡å‘½å空間 %2 çµåˆã€‚它é è¨­å·²ç¶“與å‰ç½®å­—串 %1 çµåˆã€‚ + Prefix %1 is already declared in the prolog. å‰ç½®å­—串 %1 已在 prolog 中宣告。 + The name of an option must have a prefix. There is no default namespace for options. é¸é …å稱必須有å‰ç½®å­—串。沒有é¸é …çš„é è¨­å‘½å空間。 + The Schema Import feature is not supported, and therefore %1 declarations cannot occur. 機制匯入功能未支æ´ï¼Œå› æ­¤æœ‰ %1 個宣告無法é”æˆã€‚ + The target namespace of a %1 cannot be empty. %1 的目標命å空間ä¸èƒ½æ˜¯ç©ºçš„。 + The module import feature is not supported 模組匯入功能未支æ´ã€‚ @@ -6159,6 +7495,7 @@ Please choose a different file name. å稱為 %1 的變數已經在 prolog 中宣告。 + No value is available for the external variable by name %1. å為 %1 的外部變數沒有å¯ç”¨çš„值。 @@ -6167,162 +7504,202 @@ Please choose a different file name. 使用者定義的函å¼çš„命å空間ä¸èƒ½æ˜¯ç©ºçš„(請試試使用é å®šç¾©å‰ç½®å­—串 %1) + A construct was encountered which only is allowed in XQuery. é‡åˆ°äº†å»ºæ§‹ï¼Œå¯¦éš›ä¸Šåªèƒ½å…許在 XQuery 內。 + A template by name %1 has already been declared. å為 %1 的屬性已被宣告。 + The keyword %1 cannot occur with any other mode name. é—œéµå­— %1 ä¸èƒ½èˆ‡ä»»ä½•å…¶å®ƒæ¨¡å¼å稱一起存在。 + The value of attribute %1 must of type %2, which %3 isn't. 屬性 %1 的值必須為型態 %2,但 %3 ä¸æ˜¯ã€‚ + The prefix %1 can not be bound. By default, it is already bound to the namespace %2. å‰ç½®å­—串 %1 ä¸èƒ½è¢«çµåˆã€‚é è¨­å®ƒå·²èˆ‡å‘½å空間 %2 çµåˆã€‚ + A variable by name %1 has already been declared. å為 %1 的變數已被宣告。 + A stylesheet function must have a prefixed name. 樣å¼è¡¨å‡½å¼å¿…須有å‰ç½®å稱。 + The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) 使用者定義函å¼çš„命å空間ä¸èƒ½ç‚ºç©ºç™½ï¼ˆè«‹è©¦è‘—用é å…ˆå®šç¾©çš„å‰ç½®å­—串 %1) + The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. 命å空間 %1 已被ä¿ç•™ï¼Œå› æ­¤ä½¿ç”¨è€…定義函å¼ä¸èƒ½ä½¿ç”¨å®ƒã€‚請試試é å®šç¾©å‰ç½®å­—串 %2。 + The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 在函å¼æ¨¡çµ„中的使用者定義函å¼çš„命å空間必須與模組的命å空間相åŒã€‚也就是,應該為 %1 而ä¸æ˜¯ %2。 + A function already exists with the signature %1. 已經有簽章為 %1 的函å¼å­˜åœ¨ã€‚ + No external functions are supported. All supported functions can be used directly, without first declaring them as external 未支æ´å¤–部函å¼ã€‚所有支æ´çš„å«å¼å¯ä»¥ç›´æŽ¥ä½¿ç”¨è€Œä¸éœ€è¦å…ˆå®£å‘Šç‚ºå¤–部函å¼ã€‚ + An argument by name %1 has already been declared. Every argument name must be unique. å稱為 %1 çš„åƒæ•¸å·²è¢«å®£å‘Šã€‚æ¯å€‹åƒæ•¸å稱必須唯一。 + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. ç•¶å‡½å¼ %1 用於樣å¼æ¯”å°æ™‚,åƒæ•¸å¿…須是變數åƒè€ƒæˆ–字串。 + In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 的第一個åƒæ•¸å¿…須是字串,以便用於比å°ã€‚ + In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 的第一個åƒæ•¸å¿…須是文字或變數åƒè€ƒï¼Œä»¥ä¾¿ç”¨æ–¼æ¯”å°ã€‚ + In an XSL-T pattern, function %1 cannot have a third argument. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 çš„ä¸èƒ½æœ‰ç¬¬ä¸‰å€‹åƒæ•¸ã€‚ + In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. 在 XSL-T 樣å¼å…§ï¼Œåªæœ‰å‡½å¼ %1,%2 å¯ä»¥ç”¨æ–¼æ¯”å°ã€‚%3 ä¸è¡Œã€‚ + In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. 在 XSL-T 樣å¼å…§ï¼Œä¸èƒ½ç”¨ %1 軸,åªèƒ½ç”¨ %2 或 %3。 + %1 is an invalid template mode name. %1 ä¸æ˜¯åˆæ³•çš„樣本模å¼å稱。 + The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. 與 for 敘述çµåˆçš„變數å稱必須與ä½ç½®è®Šæ•¸ä¸åŒã€‚因此,有兩個å為 %1 的變數è¡çªäº†ã€‚ + The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. 未支æ´æ©Ÿåˆ¶ç¢ºèªåŠŸèƒ½ã€‚%1 敘述無法使用。 + None of the pragma expressions are supported. Therefore, a fallback expression must be present æœªæ”¯æ´ pragma 敘述。因次,必須有é è¨­çš„敘述。 + Each name of a template parameter must be unique; %1 is duplicated. æ¯å€‹æ¨£æœ¬åƒæ•¸çš„å稱必須唯一;%1 已經被使用。 + The %1-axis is unsupported in XQuery XQuery ä¸­æœªæ”¯æ´ %1 軸 + %1 is not a valid name for a processing-instruction. %1 ä¸æ˜¯è™•ç†æŒ‡ä»¤çš„åˆæ³•å稱。 + %1 is not a valid numeric literal. %1 ä¸æ˜¯åˆæ³•çš„數值。 + No function by name %1 is available. 沒有å為 %1 的函å¼ã€‚ + The namespace URI cannot be the empty string when binding to a prefix, %1. è¦èˆ‡å‰ç½®å­—串 %1 çµåˆçš„命å空間網å€ä¸èƒ½æ˜¯ç©ºå­—串。 + %1 is an invalid namespace URI. %1 是ä¸åˆæ³•çš„命å空間網å€ã€‚ + It is not possible to bind to the prefix %1 無法與å‰ç½®å­—串 %1 çµåˆã€‚ + Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). 命å空間 %1 åªèƒ½èˆ‡ %2 çµåˆï¼ˆä¹Ÿå°±æ˜¯èªªï¼Œè¦é å…ˆå®šç¾©ï¼‰ã€‚ + Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). å‰ç½®å­—串 %1 åªèƒ½èˆ‡ %2 çµåˆï¼ˆä¹Ÿå°±æ˜¯èªªï¼Œè¦é å…ˆå®šç¾©ï¼‰ã€‚ + Two namespace declaration attributes have the same name: %1. 有兩個命å空間宣告的屬性有相åŒçš„å稱:%1 + The namespace URI must be a constant and cannot use enclosed expressions. 命å空間網å€å¿…須是常數,並且ä¸èƒ½ä½¿ç”¨å°é–‰æ•˜è¿°ã€‚ + An attribute by name %1 has already appeared on this element. å為 %1 的屬性已出ç¾åœ¨æ­¤å…ƒç´ ã€‚ + A direct element constructor is not well-formed. %1 is ended with %2. 直接元素建構器沒有完整產生。%1 以 %2 çµæŸã€‚ + The name %1 does not refer to any schema type. å稱 %1 未指å‘任何機制型態。 + %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 是複數型態,無法轉æ›æˆè¤‡æ•¸åž‹æ…‹ã€‚然而,轉æ›ç‚ºåŽŸåž‹æ…‹ï¼Œå¦‚ %2 是å¯è¡Œçš„。 + %1 is not an atomic type. Casting is only possible to atomic types. %1 ä¸æ˜¯ä¸€å€‹åŽŸåž‹æ…‹ã€‚åªèƒ½è½‰æ›ç‚ºåŽŸåž‹æ…‹ã€‚ @@ -6331,260 +7708,313 @@ Please choose a different file name. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„處ç†æŒ‡ä»¤çš„å稱。因此å稱測試永é ä¸æœƒæˆåŠŸã€‚ + + %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 ä¸æ˜¯ç¯„åœå…§å±¬æ€§å®£å‘Šã€‚注æ„機制匯入功能未支æ´ã€‚ + The name of an extension expression must be in a namespace. 延伸敘述的å稱必須在命å空間內。 - + empty 空白 + zero or one 0 或 1 個 + exactly one 剛好一個 + one or more 一個以上 + zero or more 0 個以上 - + Required type is %1, but %2 was found. 需è¦çš„型態為 %1,但找到 %2。 + Promoting %1 to %2 may cause loss of precision. å°‡ %1 抬å‡ç‚º %2 å¯èƒ½æœƒå¤±åŽ»ç²¾ç¢ºåº¦ã€‚ + The focus is undefined. 焦點未定義。 - + It's not possible to add attributes after any other kind of node. ä¸èƒ½åœ¨ä»»ä½•å…¶å®ƒç¨®é¡žçš„節點後é¢åŠ å…¥å±¬æ€§ã€‚ + An attribute by name %1 has already been created. å為 %1 的屬性已被建立。 - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. åªæ”¯æ´ Unicode Codepoint Collation(%1)。%2 未支æ´ã€‚; - + Attribute %1 can't be serialized because it appears at the top level. 屬性元素 %1 無法åºåˆ—化,因為似乎是在頂層。 - + %1 is an unsupported encoding. %1 是個未被支æ´çš„編碼。 + %1 contains octets which are disallowed in the requested encoding %2. %1 包å«äº†åœ¨è¦æ±‚的編碼 %2 å…§ä¸å…許的八進ä½å€¼ã€‚ + The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. 在 %2 內的代碼點 %1(編碼 %3)是一個ä¸åˆæ³•çš„ XML 字元。 - + Ambiguous rule match. ä¸æ˜Žç¢ºçš„è¦å‰‡ç¬¦åˆã€‚ - In a namespace constructor, the value for a namespace value cannot be an empty string. - 在命å空間建構å­ä¸­ï¼Œå‘½å空間的值ä¸èƒ½æ˜¯ç©ºå­—串。 + 在命å空間建構å­ä¸­ï¼Œå‘½å空間的值ä¸èƒ½æ˜¯ç©ºå­—串。 + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + + The prefix must be a valid %1, which %2 is not. å‰ç½®å­—串必須是åˆæ³•çš„ %1,但 %2 ä¸æ˜¯ã€‚ + The prefix %1 cannot be bound. å‰ç½®å­—串 %1 ä¸èƒ½è¢«çµåˆã€‚ + Only the prefix %1 can be bound to %2 and vice versa. åªæœ‰å‰ç½®å­—串 %1 能與 %2 çµåˆã€‚å之亦然。 - + Circularity detected åµæ¸¬åˆ°ç’°ç‹€ - + The parameter %1 is required, but no corresponding %2 is supplied. 需è¦åƒæ•¸ %1,但是沒有æ供相關的 %2。 + The parameter %1 is passed, but no corresponding %2 exists. åƒæ•¸ %1 已傳é€ï¼Œä½†æ‰¾ä¸åˆ°ç›¸é—œçš„ %2。 - + The URI cannot have a fragment URI ä¸èƒ½æœ‰ç‰‡æ®µã€‚ - + Element %1 is not allowed at this location. 元素 %1 ä¸èƒ½åœ¨æ­¤ä½ç½®ã€‚ + Text nodes are not allowed at this location. 文字節點ä¸èƒ½åœ¨æ­¤ä½ç½®ã€‚ + Parse error: %1 剖æžéŒ¯èª¤ï¼š%1 + The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. XLS-T 版本屬性的值必須是型態 %1 的值,而 %2 ä¸æ˜¯ã€‚ + Running an XSL-T 1.0 stylesheet with a 2.0 processor. 使用 2.0 處ç†å™¨åŸ·è¡Œ XSL-T 1.0 樣å¼è¡¨ä¸­ã€‚ + Unknown XSL-T attribute %1. 未知的 XSL-T 屬性 %1。 + Attribute %1 and %2 are mutually exclusive. 屬性 %1 與 %2 彼此互斥。 + In a simplified stylesheet module, attribute %1 must be present. 在簡化的樣å¼è¡¨æ¨¡çµ„中,屬性 %1 必須存在。 + If element %1 has no attribute %2, it cannot have attribute %3 or %4. 若元素 %1 沒有屬性 %2,則也ä¸èƒ½æœ‰å±¬æ€§ %3 或 %4。 + Element %1 must have at least one of the attributes %2 or %3. 元素 %1 必須至少有屬性 %2 或 %3 其中一個。 + At least one mode must be specified in the %1-attribute on element %2. 在元素 %2 çš„ %1 屬性中至少è¦æŒ‡å®šä¸€å€‹æ¨¡å¼ã€‚ - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰æ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3 以åŠæ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3,%4 以åŠæ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3 以åŠæ¨™æº–屬性。 + XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. XSL-T 元素內的 XSL-T 屬性必須放在空(null)的命å空間,而ä¸æ˜¯åƒ %1 在 XSL-T 命å空間。 + The attribute %1 must appear on element %2. 屬性 %1 必須在元素 %2 內出ç¾ã€‚ + The element with local name %1 does not exist in XSL-T. 有本地å稱 %1 的元素在 XSL-T å…§ä¸å­˜åœ¨ã€‚ - + Element %1 must come last. 元素 %1 必須最後出ç¾ã€‚ + At least one %1-element must occur before %2. 至少一個元素 %1 è¦å‡ºç¾åœ¨ %2 之å‰ã€‚ + Only one %1-element can appear. åªèƒ½å‡ºç¾ä¸€å€‹å…ƒç´  %1。 + At least one %1-element must occur inside %2. 至少一個元素 %1 è¦å‡ºç¾åœ¨ %2 之內。 + When attribute %1 is present on %2, a sequence constructor cannot be used. 當屬性 %1 出ç¾åœ¨ %2 內時,ä¸èƒ½ä½¿ç”¨åºåˆ—建構å­ã€‚ + Element %1 must have either a %2-attribute or a sequence constructor. 元素 %1 必須至少有一個屬性 %2 或一個åºåˆ—建構å­ã€‚ + When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. 當需è¦åƒæ•¸æ™‚,ä¸èƒ½é€éŽå±¬æ€§ %1 或åºåˆ—建構å­æä¾›é è¨­å€¼ã€‚ + Element %1 cannot have children. 元素 %1 ä¸èƒ½æœ‰å­å…ƒç´ ã€‚ + Element %1 cannot have a sequence constructor. 元素 %1ä¸èƒ½æœ‰åºåˆ—建構å­ã€‚ + + The attribute %1 cannot appear on %2, when it is a child of %3. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨ %2,因為它是 %3 çš„å­å…ƒç´ ã€‚ + A parameter in a function cannot be declared to be a tunnel. 函å¼å…§çš„åƒæ•¸ä¸èƒ½è¢«å®£å‘Šç‚ºé€šé“(tunnel)。 + This processor is not Schema-aware and therefore %1 cannot be used. 此處ç†å™¨ä¸æ˜¯ Schema-aware,因此ä¸èƒ½ä½¿ç”¨ %1。 + Top level stylesheet elements must be in a non-null namespace, which %1 isn't. 頂層樣å¼è¡¨å…ƒç´ å¿…須是éžç©ºç™½çš„命å空間,而 %1 ä¸æ˜¯ã€‚ + The value for attribute %1 on element %2 must either be %3 or %4, not %5. 元素 %2 內屬性 %1 的值必須是 %3 或 %4,而ä¸æ˜¯ %5。 + Attribute %1 cannot have the value %2. 屬性 %1 的值ä¸èƒ½ç‚º %2。 + The attribute %1 can only appear on the first %2 element. 屬性 %1 åªèƒ½å‡ºç¾åœ¨å‰ %2 個元素內。 + At least one %1 element must appear as child of %2. %2 必須至少有一個å­å…ƒç´  %1。 @@ -6592,11 +8022,13 @@ Please choose a different file name. VolumeSlider - + Muted éœéŸ³ + + Volume: %1% 音é‡ï¼š%1% diff --git a/translations/qtconfig_pl.ts b/translations/qtconfig_pl.ts index cff5eb1..cafc022 100644 --- a/translations/qtconfig_pl.ts +++ b/translations/qtconfig_pl.ts @@ -1,10 +1,10 @@ - - + + MainWindow - + On The Spot W oknie dokumentu (On-The-Spot) @@ -76,7 +76,7 @@ Użyj prostego oprogramowania renderujÄ…cego - + Over The Spot Nad oknem dokumentu (Over-The-Spot) @@ -91,17 +91,21 @@ W dodatkowym oknie (Root) - + Select a Directory Wybierz katalog + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>Wersja %2 + <h3>%1</h3><br/>Wersja %2 - + Qt Configuration @@ -133,12 +137,22 @@ &Anuluj - + No changes to be saved. Brak zmian do zapisania. - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Saving changes... Zapisywanie zmian... @@ -809,6 +823,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_untranslated.ts b/translations/qtconfig_untranslated.ts index 09f8985..e0f85c3 100644 --- a/translations/qtconfig_untranslated.ts +++ b/translations/qtconfig_untranslated.ts @@ -1,9 +1,20 @@ - + + MainWindow - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + On The Spot @@ -75,7 +86,7 @@ - + No changes to be saved. @@ -85,7 +96,7 @@ - + Over The Spot @@ -100,17 +111,17 @@ - + Select a Directory - <h3>%1</h3><br/>Version %2 + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - + Qt Configuration @@ -796,6 +807,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_zh_CN.ts b/translations/qtconfig_zh_CN.ts index 90d3e6b..63e198c 100644 --- a/translations/qtconfig_zh_CN.ts +++ b/translations/qtconfig_zh_CN.ts @@ -1,16 +1,15 @@ - MainWindow - + On The Spot 客户端程åºé¢„编辑模å¼(On The Spot) - + Over The Spot 光标跟éšé£Žæ ¼(Over The Spot) @@ -25,17 +24,16 @@ 输入æœåŠ¡å™¨é¢„编辑模å¼(Root) - + Select a Directory 选择一个目录 - <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>版本 %2 + <h3>%1</h3><br/>版本 %2 - + Qt Configuration @@ -67,7 +65,7 @@ å–消(&C) - + No changes to be saved. 没有å˜åŒ–被ä¿å­˜ã€‚ @@ -77,7 +75,7 @@ 正在ä¿å­˜å˜åŒ–... - + @@ -85,7 +83,17 @@ 自动(默认) - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Choose audio output automatically. 自动选择音频输出。 @@ -133,7 +141,12 @@ 使用简å•çš„软件渲染。 - + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + aRts aRts @@ -810,6 +823,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_zh_TW.ts b/translations/qtconfig_zh_TW.ts index 88f9bb0..d55614d 100644 --- a/translations/qtconfig_zh_TW.ts +++ b/translations/qtconfig_zh_TW.ts @@ -1,110 +1,158 @@ - - + + MainWindow - + On The Spot On The Spot(在輸入處輸入) + No changes to be saved. 沒有è¦å„²å­˜çš„變更。 + Saving changes... 儲存變更... + Over The Spot Over The Spot(在輸入處æ供編輯視窗) + Off The Spot Off The Spot(在輸入處下方æ供編輯視窗) + Root Root(使用根視窗) + Select a Directory é¸æ“‡ä¸€å€‹ç›®éŒ„ <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>版本 %2 + <h3>%1</h3><br/>版本 %2 + + + Qt Configuration Qt 設定 + Save Changes 儲存變更 + Save changes to settings? è¦å„²å­˜è¨­å®šçš„變更嗎? + &Yes 是(&Y) + &No å¦(&N) + &Cancel å–消(&C) + + + + Auto (default) 自動(é è¨­ï¼‰ + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Choose audio output automatically. 自動é¸æ“‡éŸ³æ•ˆè¼¸å‡ºã€‚ + Phonon GStreamer backend not available. 沒有 Phonon GStreamer 後端介é¢ã€‚ + Choose render method automatically 自動é¸æ“‡æˆåƒæ–¹æ³• + + X11 X11 + Use X11 Overlays 使用 X11 æˆåƒ + + OpenGL OpenGL + Use OpenGL if avaiable å¯ä»¥çš„話使用 OpenGL + + Software 軟體 + Use simple software rendering 使用簡單的軟體æˆåƒ + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + + aRts aRts + Experimental aRts support for GStreamer. GStreamer 中實驗性的 aRts 支æ´ã€‚ @@ -112,318 +160,397 @@ MainWindowBase + Qt Configuration Qt 設定 + Appearance 外觀 + GUI Style 使用者介é¢é¢¨æ ¼ + Select GUI &Style: é¸æ“‡ä½¿ç”¨è€…介é¢é¢¨æ ¼(&S): + Build Palette 建構調色盤 + &3-D Effects: 立體效果(&3): + Window Back&ground: 視窗背景(&G): + &Tune Palette... 調整調色盤(&T)... + Preview é è¦½ + Select &Palette: é¸æ“‡èª¿è‰²ç›¤(&P): + Active Palette 啟動調色盤 + Inactive Palette åœç”¨èª¿è‰²ç›¤ + Disabled Palette 關閉調色盤 + Fonts å­—åž‹ + Default Font é è¨­å­—åž‹ + &Style: 風格(&S) + &Point Size: 點大å°(&P): + F&amily: 家æ—(&A): + Sample Text 範例文字 + Font Substitution å­—åž‹æ›¿æ› + S&elect or Enter a Family: é¸æ“‡æˆ–輸入一個字型家æ—(&E): + Current Substitutions: ç›®å‰çš„替代: + Up 上 + Down 下 + Remove 移除 + Select s&ubstitute Family: é¸æ“‡æ›¿ä»£å®¶æ—(&U): + Add 新增 + Interface ä»‹é¢ + Feel Settings 感覺設定 + ms 毫秒 + &Double Click Interval: 雙擊間隔(&D): + No blinking ä¸é–ƒçˆ + &Cursor Flash Time: 游標閃çˆæ™‚é–“(&C): + lines è¡Œ + Wheel &Scroll Lines: 滾輪æ²è»¸è¡Œæ•¸(&S): + Resolve symlinks in URLs 解譯網å€ä¸­çš„ç¬¦è™Ÿé€£çµ + GUI Effects 使用者介é¢æ•ˆæžœ + &Enable é–‹å•Ÿ(&E) + Alt+E Alt+E + &Menu Effect: é¸å–®æ•ˆæžœ(&M) + C&omboBox Effect: 下拉å¼é¸å–®æ•ˆæžœ(&O): + &ToolTip Effect: 工具æ示效果(&T): + Tool&Box Effect: 工具盒效果(&B): + Disable 關閉 + Animate å‹•ç•« + Fade 淡出 + Global Strut 全域支柱(Strut) + Minimum &Width: 最å°å¯¬åº¦(&W): + Minimum Hei&ght: 最å°é«˜åº¦(&G): + pixels åƒç´  + Enhanced support for languages written right-to-left å°ç”±å³åˆ°å·¦å¯«çš„èªžè¨€åŠ å¼·æ”¯æ´ + XIM Input Style: XIM 輸入風格: + On The Spot On The Spot(在輸入處輸入) + Over The Spot Over The Spot(在輸入處æ供編輯視窗) + Off The Spot Off The Spot(在輸入處下方æ供編輯視窗) + Root Root(使用根視窗) + Default Input Method: é è¨­è¼¸å…¥æ³•ï¼š + Printer å°è¡¨æ©Ÿ + Enable Font embedding 開啟字型嵌入 + Font Paths 字型路徑 + Browse... ç€è¦½... + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. 按下「ç€è¦½ã€éµæˆ–輸入一個目錄並按 Enter éµä¾†åŠ å…¥åˆ—表中。 + &File 檔案(&F) + &Help 說明(&H) + &Save 儲存(&S) + Save 儲存 + Ctrl+S Ctrl+S + E&xit 離開(&X) + Exit 離開 + &About 關於(&A) + About 關於 + About &Qt 關於Qt (&Q) + About Qt 關於Qt + Phonon Phonon + About Phonon 關於 Phonon + Current Version: ç›®å‰ç‰ˆæœ¬ï¼š + Not available 無法使用 + Website: 網站: + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -436,10 +563,12 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + About GStreamer 關於 GStreamer + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -452,18 +581,22 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + GStreamer backend settings GStreamer 後端介é¢è¨­å®š + Preferred audio sink: é è¨­ä½¿ç”¨çš„音效槽 + Preferred render method: é è¨­ä½¿ç”¨çš„æˆåƒæ–¹æ³•: + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -476,6 +609,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">注æ„:變更這些設定å¯èƒ½æœƒç„¡æ³•è®“應用程å¼æ­£ç¢ºå•Ÿå‹•ã€‚</span></p></body></html> + Please use the KDE Control Center to set the palette. 請使用 KDE 控制中心來設定調色盤。 @@ -483,217 +617,278 @@ p, li { white-space: pre-wrap; } PaletteEditorAdvancedBase + Tune Palette 調整調色盤 + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> <b>編輯調色盤</b><p>變更目å‰å…ƒä»¶æˆ–表單的調色盤。</p><p>使用產生的調色盤,或é¸æ“‡æ¯å€‹é¡è‰²ç¾¤çµ„或é¡è‰²è§’色的é¡è‰²ã€‚</p><p>調色盤å¯ä»¥åœ¨é è¦½å€ä¸­ç”¨ä¸åŒçš„元件佈局來測試。</p> + Select &Palette: é¸æ“‡èª¿è‰²ç›¤(&P): + Active Palette 啟動調色盤 + Inactive Palette åœç”¨èª¿è‰²ç›¤ + Disabled Palette 關閉調色盤 + Auto 自動 + Build inactive palette from active 從啟用的調色盤建立新的éžå•Ÿç”¨çš„調色盤 + Build disabled palette from active 從啟用的調色盤建立新的關閉的調色盤 + Central color &roles å°‡é¡è‰²è§’色置中(&R) + Choose central color role é¸æ“‡ä¸­å¤®é¡è‰²è§’色 + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> <b>é¸æ“‡é¡è‰²è§’色</b><p>å¯ç”¨çš„中央角色包括:<ul><li>視窗─一般背景é¡è‰²ã€‚</li><li>視窗文字─一般å‰æ™¯æ–‡å­—</li><li>基底─用於如文字輸入元件的背景,通常是白色或其它較淡的é¡è‰²ã€‚</li><li>文字─與基底一起使用的å‰æ™¯é¡è‰²ã€‚通常是與視窗文字一樣,這樣å¯ä»¥è®“視窗與基底都有好的å°æ¯”效果。</li><li>按éµâ”€ä¸€èˆ¬æŒ‰éµçš„背景é¡è‰²ï¼Œè¦èˆ‡è¦–窗的背景é¡è‰²ä¸åŒï¼Œå°±åƒéº¥é‡‘å¡”å¼çš„風格。</li><li>按éµæ–‡å­—─用於按éµçš„å‰æ™¯é¡è‰²ã€‚</li><li>çªé¡¯â”€ç”¨æ–¼é¸æ“‡å€æˆ–çªé¡¯é …目的é¡è‰²ã€‚</li><li>çªé¡¯æ–‡å­—─çªé¡¯æ–‡å­—用的é¡è‰²ã€‚</li><li>明亮文字─與視窗文字éžå¸¸ä¸åŒçš„文字é¡è‰²ã€‚</li></ul></p> + Window 視窗 + WindowText 視窗文字 + Button æŒ‰éµ + Base 基底 + Text 文字 + BrightText 明亮文字 + ButtonText 按éµæ–‡å­— + Highlight çªé¡¯ + HighlightedText çªé¡¯æ–‡å­— + &Select Color: é¸æ“‡é¡è‰²(&S): + Choose a color é¸æ“‡ä¸€å€‹é¡è‰² + Choose a color for the selected central color role. é¸æ“‡ç”¨æ–¼é¸å–的中央é¡è‰²è§’色的é¡è‰²ã€‚ + 3-D shadow &effects 立體陰影效果(&E) + Build &from button color 從按éµé¡è‰²å»ºç«‹(&F) + Generate shadings 產生é®è”½ + Check to let 3D-effect colors be calculated from button-color. 勾é¸ä»¥è®“立體效果å¯ä»¥å¾žæŒ‰éµé¡è‰²ä¸­è¨ˆç®—é¡è‰²ã€‚ + Choose 3D-effect color role é¸æ“‡ç«‹é«”效果é¡è‰²è§’色 + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> <b>é¸æ“‡é¡è‰²è§’色:</b><p>å¯ç”¨çš„角色包括:<ul><li>淡─比按éµé¡è‰²æ·¡ã€‚<li><li>中淡─在按éµé¡è‰²èˆ‡æ·¡è‰²ä¹‹é–“。</li><li>中等─在按éµé¡è‰²èˆ‡æš—色之間。</li><li>暗色─比按éµé¡è‰²æš—。</li><li>陰影:éžå¸¸æš—çš„é¡è‰²ã€‚</li></ul> + Light æ·¡ + Midlight 中淡 + Mid 中等 + Dark æš— + Shadow é™°å½± + Select Co&lor: é¸æ“‡é¡è‰²(&O): + Choose a color for the selected effect color role. é¸æ“‡ç”¨æ–¼é¸å–的效果é¡è‰²è§’色的é¡è‰²ã€‚ + OK 確定 + Close dialog and apply all changes. 關閉å°è©±æ¡†ï¼Œå¥—用所有的變更。 + Cancel å–消 + Close dialog and discard all changes. 關閉å°è©±æ¡†ï¼Œä¸¦ä¸Ÿæ£„所有的變更。 + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase + Preview Window é è¦½è¦–窗 + ButtonGroup 按éµç¾¤çµ„ + RadioButton1 圓鈕1 + RadioButton2 圓鈕2 + RadioButton3 圓鈕3 + ButtonGroup2 按éµç¾¤çµ„2 + CheckBox1 勾é¸ç›’1 + CheckBox2 勾é¸ç›’2 + LineEdit è¡Œç·¨è¼¯å€ + ComboBox 下拉å¼é¸å–® + PushButton æŒ‰éµ + <p> <a href="http://qtsoftware.com">http://qtsoftware.com</a> </p> diff --git a/translations/qvfb_pl.ts b/translations/qvfb_pl.ts index ac42503..a5baaed 100644 --- a/translations/qvfb_pl.ts +++ b/translations/qvfb_pl.ts @@ -1,10 +1,10 @@ - - + + AnimationSaveWidget - + Record Nagraj @@ -249,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. Nie można zaÅ‚adować pliku z obrazkiem '%1'. diff --git a/translations/qvfb_untranslated.ts b/translations/qvfb_untranslated.ts index 0f75227..cc18132 100644 --- a/translations/qvfb_untranslated.ts +++ b/translations/qvfb_untranslated.ts @@ -1,9 +1,10 @@ - + + AnimationSaveWidget - + Record @@ -248,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. diff --git a/translations/qvfb_zh_CN.ts b/translations/qvfb_zh_CN.ts index cbccfe3..d9c816d 100644 --- a/translations/qvfb_zh_CN.ts +++ b/translations/qvfb_zh_CN.ts @@ -4,7 +4,7 @@ AnimationSaveWidget - + Record å½•åƒ @@ -249,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. 图åƒæ–‡ä»¶â€œ%1â€ä¸èƒ½è¢«åŠ è½½ã€‚ diff --git a/translations/qvfb_zh_TW.ts b/translations/qvfb_zh_TW.ts index a48aae4..b789479 100644 --- a/translations/qvfb_zh_TW.ts +++ b/translations/qvfb_zh_TW.ts @@ -1,57 +1,74 @@ - - + + AnimationSaveWidget + + Record 錄影 + Reset é‡ç½® + Save 儲存 + Save in MPEG format (requires netpbm package installed) 以 MPEG æ ¼å¼å„²å­˜ (需è¦å®‰è£ netpbm 套件) + + Click record to begin recording. 按下「錄影ã€é–‹å§‹éŒ„影。 + + Finished saving. 完æˆå„²å­˜ã€‚ + Paused. Click record to resume, or save if done. 已暫åœã€‚按下「錄影ã€å¯ä»¥ç¹¼çºŒï¼ŒæŒ‰ã€Œå„²å­˜ã€è¡¨ç¤ºå·²å®Œæˆã€‚ + Pause æš«åœ + Recording... 錄影中... + Saving... 儲存中... + + Save animation... 儲存動畫... + Save canceled. 儲存已å–消。 + Save failed! 儲存失敗! @@ -59,138 +76,172 @@ Config + Configure 設定 + Size å¤§å° + 176x220 "SmartPhone" 176x220 「智慧型手機〠+ 240x320 "PDA" 240x320 「PDA〠+ 320x240 "TV" / "QVGA" 320x240 「TVã€/「QVGA〠+ 640x480 "VGA" 640x480「VGA〠+ 800x600 800x600 + 1024x768 1024x768 + Custom 自訂 + Depth 深度 + 1 bit monochrome 1 ä½å…ƒå–®è‰² + 4 bit grayscale 4 ä½å…ƒç°éšŽ + 8 bit 8 ä½å…ƒ + 12 (16) bit 12 (16) ä½å…ƒ + 16 bit 16 ä½å…ƒ + 18 bit 18 ä½å…ƒ + 24 bit 24 ä½å…ƒ + 32 bit 32 ä½å…ƒ + Skin 外觀 + None ç„¡ + Emulate touch screen (no mouse move) 模擬觸控å¼èž¢å¹•ï¼ˆæ²’有滑鼠移動) + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) 模擬液晶螢幕(åªå›ºå®šç¸®æ”¾ 3 å€ï¼‰ + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. <p>注æ„,任何使用此虛擬 framebuffer 的應用程å¼åœ¨æ‚¨è®Šæ›´å¤§å°æˆ–深度後都會被終止。ä¸éŽè®Šæ›´åº•ä¸‹çš„ Gamma 值則ä¸æœƒã€‚ + Gamma Gamma + Blue è— + 1.0 1.0 + Green 綠 + All 全部 + Red ç´… + Set all to 1.0 把所有的值都設為 1.0 + &OK 確定(&O) + &Cancel å–消(&C) + 15 bit 15 ä½å…ƒ + 32 bit ARGB 32 ä½å…ƒ ARGB @@ -198,47 +249,57 @@ DeviceSkin - + The image file '%1' could not be loaded. 無法載入影åƒæª” '%1'。 + The skin directory '%1' does not contain a configuration file. 外觀目錄 %1 內並沒有設定檔。 + The skin configuration file '%1' could not be opened. 無法開啟外觀設定檔 %1。 + The skin configuration file '%1' could not be read: %2 無法讀å–外觀設定檔 %1。 + Syntax error: %1 語法錯誤:%1 + The skin "up" image file '%1' does not exist. 「上ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "down" image file '%1' does not exist. 「下ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "closed" image file '%1' does not exist. 「關閉ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin cursor image file '%1' does not exist. 游標的外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + Syntax error in area definition: %1 å€åŸŸå®šç¾©ä¸­æœ‰èªžæ³•éŒ¯èª¤ï¼š%1 + Mismatch in number of areas, expected %1, got %2. å€åŸŸæ•¸é‡ä¸ç¬¦ï¼Œæ‡‰ç‚º %1,但實際上是 %2。 @@ -246,14 +307,17 @@ QVFb + Browse... ç€è¦½... + Load Custom Skin... 載入自訂的外觀... + All QVFB Skins (*.skin) 所有 QVFB 外觀檔 (*.skin) -- cgit v0.12 From 87257b41b6fb4313c713648b05a07d7835d13d24 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Sat, 18 Apr 2009 18:55:12 +1000 Subject: Fix the About Qt dialog text to be truthful, post-LGPL Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission. (cherry picked from commit 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96) --- src/gui/dialogs/qmessagebox.cpp | 53 +- tools/assistant/compat/mainwindow.cpp | 24 +- tools/assistant/tools/assistant/mainwindow.cpp | 19 +- tools/designer/src/designer/versiondialog.cpp | 24 +- tools/linguist/linguist/mainwindow.cpp | 24 +- tools/qdbus/qdbusviewer/qdbusviewer.cpp | 17 +- tools/qtconfig/mainwindow.cpp | 14 - translations/assistant_adp_de.ts | 59 +- translations/assistant_adp_ja.ts | 56 +- translations/assistant_adp_pl.ts | 50 +- translations/assistant_adp_tr_TR.ts | 967 ++++ translations/assistant_adp_untranslated.ts | 60 +- translations/assistant_adp_zh_CN.ts | 43 +- translations/assistant_adp_zh_TW.ts | 223 +- translations/assistant_de.ts | 226 +- translations/assistant_ja.ts | 259 +- translations/assistant_pl.ts | 231 +- translations/assistant_tr_TR.ts | 1059 ++++ translations/assistant_untranslated.ts | 259 +- translations/assistant_zh_CN.ts | 219 +- translations/assistant_zh_TW.ts | 293 +- translations/designer_de.ts | 571 +- translations/designer_ja.ts | 729 +-- translations/designer_pl.ts | 727 +-- translations/designer_tr_TR.ts | 6950 ++++++++++++++++++++++++ translations/designer_untranslated.ts | 556 +- translations/designer_zh_CN.ts | 704 +-- translations/designer_zh_TW.ts | 1664 +++++- translations/linguist_de.ts | 147 +- translations/linguist_fr.ts | 152 +- translations/linguist_ja.ts | 140 +- translations/linguist_pl.ts | 145 +- translations/linguist_tr_TR.ts | 1955 +++++++ translations/linguist_untranslated.ts | 150 +- translations/linguist_zh_CN.ts | 142 +- translations/linguist_zh_TW.ts | 477 +- translations/qt_ar.ts | 584 +- translations/qt_de.ts | 583 +- translations/qt_es.ts | 572 +- translations/qt_fr.ts | 581 +- translations/qt_help_de.ts | 28 +- translations/qt_help_ja.ts | 27 +- translations/qt_help_pl.ts | 28 +- translations/qt_help_tr_TR.ts | 355 ++ translations/qt_help_untranslated.ts | 27 +- translations/qt_help_zh_CN.ts | 27 +- translations/qt_help_zh_TW.ts | 78 +- translations/qt_iw.ts | 586 +- translations/qt_ja_JP.ts | 570 +- translations/qt_pl.ts | 618 ++- translations/qt_pt.ts | 572 +- translations/qt_ru.ts | 584 +- translations/qt_sk.ts | 578 +- translations/qt_sv.ts | 574 +- translations/qt_uk.ts | 572 +- translations/qt_untranslated.ts | 576 +- translations/qt_zh_CN.ts | 577 +- translations/qt_zh_TW.ts | 1892 ++++++- translations/qtconfig_pl.ts | 40 +- translations/qtconfig_untranslated.ts | 33 +- translations/qtconfig_zh_CN.ts | 43 +- translations/qtconfig_zh_TW.ts | 203 +- translations/qvfb_pl.ts | 8 +- translations/qvfb_untranslated.ts | 7 +- translations/qvfb_zh_CN.ts | 4 +- translations/qvfb_zh_TW.ts | 70 +- 66 files changed, 22935 insertions(+), 7450 deletions(-) create mode 100644 translations/assistant_adp_tr_TR.ts create mode 100644 translations/assistant_tr_TR.ts create mode 100644 translations/designer_tr_TR.ts create mode 100644 translations/linguist_tr_TR.ts create mode 100644 translations/qt_help_tr_TR.ts diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index f86d1bf..c0744d7 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1680,7 +1680,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) { #ifdef Q_WS_MAC static QPointer oldMsgBox; - + if (oldMsgBox) { oldMsgBox->show(); oldMsgBox->raise(); @@ -1692,29 +1692,34 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) QString translatedTextAboutQt; translatedTextAboutQt = QMessageBox::tr( "

About Qt

" - "%1

Qt is a C++ toolkit for cross-platform " - "application development.

" - "

Qt provides single-source " - "portability across MS Windows, Mac OS X, " - "Linux, and all major commercial Unix variants. Qt is also" - " available for embedded devices as Qt for Embedded Linux" - " and Qt for Windows CE.

" - "

Qt is a Nokia product. See " - "qtsoftware.com/qt/ for more information.

" - ) -#if QT_EDITION != QT_EDITION_OPENSOURCE - .arg(QMessageBox::tr("

This program uses Qt version %1.

")) -#else - .arg(QMessageBox::tr("

This program uses Qt Open Source Edition version %1.

" - "

Qt Open Source Edition is intended for the development " - "of Open Source applications. You need a commercial Qt " - "license for development of proprietary (closed source) " - "applications.

" - "

Please see qtsoftware.com/company/model/ " - "for an overview of Qt licensing.

")) -#endif - - .arg(QLatin1String(QT_VERSION_STR)); + "

This program uses Qt version %1.

" + "

Qt is a C++ toolkit for cross-platform application " + "development.

" + "

Qt provides single-source portability across MS Windows, " + "Mac OS X, Linux, and all major commercial Unix variants. " + "Qt is also available for embedded devices as Qt for Embedded Linux " + "and Qt for Windows CE.

" + "

Qt is available under three different licensing options designed " + "to accommodate the needs of our various users.

" + "Qt licensed under our commercial license agreement is appropriate " + "for development of proprietary/commercial software where you do not " + "want to share any source code with third parties or otherwise cannot " + "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version " + "3.0.

" + "

Qt licensed under the GNU LGPL version 2.1 is appropriate for the " + "development of Qt applications (proprietary or open source) provided " + "you can comply with the terms and conditions of the GNU LGPL version " + "2.1.

" + "

Qt licensed under the GNU General Public License version 3.0 is " + "appropriate for the development of Qt applications where you wish to " + "use such applications in combination with software subject to the " + "terms of the GNU GPL version 3.0 or where you are otherwise willing " + "to comply with the terms of the GNU GPL version 3.0.

" + "

Please see www.qtsoftware.com/products/licensing " + "for an overview of Qt licensing.

" + "

Qt is a Nokia product. See www.qtsoftware.com/qt " + "for more information.

" + ).arg(QLatin1String(QT_VERSION_STR)); QMessageBox *msgBox = new QMessageBox(parent); msgBox->setAttribute(Qt::WA_DeleteOnClose); diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp index effc8a8..5ae0bb6 100644 --- a/tools/assistant/compat/mainwindow.cpp +++ b/tools/assistant/compat/mainwindow.cpp @@ -311,29 +311,11 @@ void MainWindow::closeEvent(QCloseEvent *e) void MainWindow::about() { QMessageBox box(this); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt Assistant is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see qtsoftware.com/company/model for an overview of Qt licensing."); -#elif defined(QT_PRODUCT_LICENSE) - QString edition; - QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE))); -#else + + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); - -#endif + QString moreInfo; box.setText(QString::fromLatin1("
" "

%1

" diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index d70f7b9..dcf67c1 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -787,26 +787,11 @@ void MainWindow::showAboutDialog() aboutDia.setPixmap(pix); aboutDia.setWindowTitle(aboutDia.documentTitle()); } else { -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt Assistant is part of the Qt Open " - "Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development " - "of proprietary (closed source) applications. Please see " - "http://qtsoftware.com/company/about/businessmodel for an " - "overview of Qt licensing."); -#else + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); + QString moreInfo; -#endif QByteArray resources; aboutDia.setText(QString::fromLatin1("
" "

%1

" diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp index 47e86d1..b895676 100644 --- a/tools/designer/src/designer/versiondialog.cpp +++ b/tools/designer/src/designer/versiondialog.cpp @@ -169,31 +169,11 @@ VersionDialog::VersionDialog(QWidget *parent) VersionLabel *label = new VersionLabel; QLabel *lbl = new QLabel; QString version = tr("

%1



Version %2"); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString open = tr(" Open Source Edition"); - version.append(open); -#endif version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR)); version.append(tr("
Qt Designer is a graphical user interface designer for Qt applications.
")); - QString edition = -#if QT_EDITION == QT_EDITION_OPENSOURCE - tr("This version of Qt Designer is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/about/businessmodel" - ".html for an overview of Qt licensing.
"); -#elif defined(QT_PRODUCT_LICENSE) - tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.
").arg(QT_PRODUCT_LICENSE); -#else - tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.
"); -#endif + // TODO: Remove this variable for 4.6.0. Must keep this way for 4.5.x due to string freeze + QString edition; lbl->setText(tr("%1" "
%2" diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp index d4d0068..33bf0e4 100644 --- a/tools/linguist/linguist/mainwindow.cpp +++ b/tools/linguist/linguist/mainwindow.cpp @@ -1340,30 +1340,10 @@ void MainWindow::about() QMessageBox box(this); box.setTextFormat(Qt::RichText); QString version = tr("Version %1"); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString open = tr(" Open Source Edition"); - version.append(open); -#endif version = version.arg(QLatin1String(QT_VERSION_STR)); - QString edition = -#if QT_EDITION == QT_EDITION_OPENSOURCE - tr("This version of Qt Linguist is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/model" - ".html for an overview of Qt licensing."); -#elif defined(QT_PRODUCT_LICENSE) - tr("This program is licensed to you under the terms of the " - "Qt %1 License Agreement. For details, see the license file " - "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE)); -#else - tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution."); -#endif + // TODO: Remove this variable for 4.6.0. Must keep this way for 4.5.x due to string freeze. + QString edition; box.setText(tr("

%1

" "

Qt Linguist is a tool for adding translations to Qt " diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp index a81e9ce..be15d96 100644 --- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp @@ -440,22 +440,11 @@ void QDBusViewer::refreshChildren() void QDBusViewer::about() { QMessageBox box(this); -#if QT_EDITION == QT_EDITION_OPENSOURCE - QString edition = tr("Open Source Edition"); - QString info = tr("This version of Qt's D-Bus Viewer is part of the Qt Open Source Edition. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development."); - QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see qtsoftware.com/company/model.html for an overview of Qt licensing."); -#else + + // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. QString edition; QString info; - QString moreInfo(tr("This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution.")); - -#endif + QString moreInfo; box.setText(QString::fromLatin1("

" "

%1

" diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index aff0dd8..90899df 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -999,20 +999,6 @@ void MainWindow::helpAbout() QMessageBox box(this); box.setText(tr("

%1

" "
Version %2" -#if QT_EDITION == QT_EDITION_OPENSOURCE - " Open Source Edition

" - "This version of Qt Configuration is part of the Qt Open Source Edition, for use " - "in the development of Open Source applications. " - "Qt is a comprehensive C++ framework for cross-platform application " - "development.

" - "You need a commercial Qt license for development of proprietary (closed " - "source) applications. Please see http://qtsoftware.com/company/model" - ".html for an overview of Qt licensing." -#else - "

This program is licensed to you under the terms of the " - "Qt Commercial License Agreement. For details, see the file LICENSE " - "that came with this software distribution." -#endif "

Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)." "

The program is provided AS IS with NO WARRANTY OF ANY KIND," " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A" diff --git a/translations/assistant_adp_de.ts b/translations/assistant_adp_de.ts index c92d6f9..db2005a 100644 --- a/translations/assistant_adp_de.ts +++ b/translations/assistant_adp_de.ts @@ -1,6 +1,6 @@ - - + + Assistant @@ -15,7 +15,7 @@ AssistantServer - + Qt Assistant Qt Assistant @@ -103,7 +103,7 @@ FontPanel - + Font Schrift @@ -131,7 +131,7 @@ FontSettingsDialog - + Font Settings Schriftart @@ -188,9 +188,9 @@ Qt Assistant Handbuch - + - + Qt Assistant Qt Assistant @@ -199,7 +199,7 @@ Öffne Link im aktuellen Fenster - + Open Link in New Window Öffne Link in neuem Fenster @@ -245,7 +245,7 @@ Skipping file. - + Done Fertig @@ -284,7 +284,7 @@ Skipping file. - + Open Link in Current Tab Link im Aktuellen Tab öffnen @@ -307,7 +307,7 @@ Skipping file. Dokumentation %1 ist nicht kompatibel! Datei wird übersprungen. - + Failed to save fulltext search index Assistant will not work! Der Index für die Volltextsuche konnte nicht gespeichert werden. @@ -630,7 +630,7 @@ Assistent ist nicht einsatzbereit! Qt Assistant von Trolltech - %1 - + Help Hilfe @@ -717,7 +717,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert. Index - + Untitled Unbenannt @@ -853,7 +853,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.A&nsicht - + Ctrl+T Strg+T @@ -869,17 +869,15 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Strg+E - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. + Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des Qt %1 Lizenzvertrages. Einzelheiten können sie der mitgelieferten Lizenz-Datei entnehmen. + Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des Qt %1 Lizenzvertrages. Einzelheiten können sie der mitgelieferten Lizenz-Datei entnehmen. - + Qt Assistant Qt Assistant @@ -1082,7 +1080,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Umschalt+F1 - + Ctrl+S Strg+S @@ -1170,7 +1168,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert. - + Failed to open about application contents in file: '%1' Fehler beim öffnen des Inhalts in Datei: '%1' @@ -1179,7 +1177,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Fehler ... - + Sidebar Sidebar @@ -1229,22 +1227,19 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Zeigt die Hauptseite eines Dokumentensets an. - Open Source Edition - Open Source Edition + Open Source Edition - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Diese Version von Qt Assistant ist Teil der Qt Open Source Edition und darf für die Entwicklung von Open Source Anwendungen genutzt werden. Qt ist ein umfangreiches C++ Framework für die Entwicklung von Cross-Platform-Anwendungen. + Diese Version von Qt Assistant ist Teil der Qt Open Source Edition und darf für die Entwicklung von Open Source Anwendungen genutzt werden. Qt ist ein umfangreiches C++ Framework für die Entwicklung von Cross-Platform-Anwendungen. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des kommerziellen Qt Lizenzvertrages. Einzelheiten können Sie der mitgelieferten LICENSE-Datei entnehmen. + Dieses Programm ist für Sie lizenziert gemäß den Bedingungen des kommerziellen Qt Lizenzvertrages. Einzelheiten können Sie der mitgelieferten LICENSE-Datei entnehmen. - + ... ... @@ -1292,7 +1287,7 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.Qt Assistant von Trolltech - + Qt Assistant by Nokia @@ -1470,7 +1465,7 @@ Es müssen zuerst alle Inhalte gelöscht werden. Unbenannt - + Add page Seite einfügen @@ -1528,7 +1523,7 @@ Es müssen zuerst alle Inhalte gelöscht werden. TopicChooser - + Choose a topic for <b>%1</b> Wählen Sie ein Thema für <b>%1</b> diff --git a/translations/assistant_adp_ja.ts b/translations/assistant_adp_ja.ts index 0a4b209..312f00f 100644 --- a/translations/assistant_adp_ja.ts +++ b/translations/assistant_adp_ja.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings @@ -72,7 +73,7 @@ HelpDialog - + Open Link in Current Tab リンクをç¾åœ¨ã®ã‚¿ãƒ–ã«é–‹ã @@ -95,12 +96,12 @@ - + Qt Assistant Qt Assistant - + Failed to load keyword index file Assistant will not work! キーワードインデックスファイルã®ãƒ­ãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—㟠@@ -140,7 +141,7 @@ Skipping file. スキップã—ã¾ã™ã€‚ - + %n document(s) found. @@ -163,8 +164,8 @@ Skipping file. 検索 - - + + Done 完了 @@ -360,7 +361,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! HelpWindow - + Help ヘルプ @@ -414,7 +415,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Index - + Untitled タイトルãªã— @@ -422,7 +423,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! MainWindow - + Sidebar サイドãƒãƒ¼ @@ -482,17 +483,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! 指定ã•ã‚ŒãŸãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚»ãƒƒãƒˆã®ãƒ¡ã‚¤ãƒ³ãƒšãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã€‚ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - + Qt Assistant Qt Assistant @@ -853,7 +844,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! åå‰ã‚’ã¤ã‘ã¦ãƒšãƒ¼ã‚¸ã‚’ä¿å­˜... - + &Window ウィンドウ(&W) @@ -868,23 +859,20 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Ctrl+M - Open Source Edition - オープンソース版 + オープンソース版 - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - ã“ã® Qt Assistant 㯠Qt オープンソース版ã®ä¸€éƒ¨ã§ã‚ã‚Šã€ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºã‚’目的ã¨ã—ãŸã‚‚ã®ã§ã™ã€‚Qt ã¯ã€è¤‡æ•°ã®ãƒ—ラットフォームã«å¯¾å¿œã™ã‚‹ã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã® C++ ã®ã‚ã‹ã‚Šã‚„ã™ã„フレームワークã§ã™ã€‚ + ã“ã® Qt Assistant 㯠Qt オープンソース版ã®ä¸€éƒ¨ã§ã‚ã‚Šã€ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºã‚’目的ã¨ã—ãŸã‚‚ã®ã§ã™ã€‚Qt ã¯ã€è¤‡æ•°ã®ãƒ—ラットフォームã«å¯¾å¿œã™ã‚‹ã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã® C++ ã®ã‚ã‹ã‚Šã‚„ã™ã„フレームワークã§ã™ã€‚ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. 著作権ã®ã‚る(ソースを公開ã—ãªã„)アプリケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> ã‚’ã”覧ãã ã•ã„。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - ã“ã®ãƒ—ログラム㯠Qt 商用版ライセンスè¦ç´„ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã€ã‚ãªãŸã«ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚詳細ã¯ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ã¨ã‚‚ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをã”覧ãã ã•ã„。 + ã“ã®ãƒ—ログラム㯠Qt 商用版ライセンスè¦ç´„ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã€ã‚ãªãŸã«ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã•ã‚Œã¦ã„ã¾ã™ã€‚詳細ã¯ã“ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ã¨ã‚‚ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをã”覧ãã ã•ã„。 @@ -935,7 +923,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! Trolltech ã® Qt Assistant - + Qt Assistant by Nokia @@ -943,7 +931,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! TabbedBrowser - + ... ... @@ -1011,7 +999,7 @@ Assistant ã¯å‹•ãã¾ã›ã‚“! TopicChooser - + Choose a topic for <b>%1</b> <b>%1</b> ã®ãƒˆãƒ”ックをé¸æŠž diff --git a/translations/assistant_adp_pl.ts b/translations/assistant_adp_pl.ts index 3a80244..de0c71c 100644 --- a/translations/assistant_adp_pl.ts +++ b/translations/assistant_adp_pl.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font Czcionka @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings Ustawienia czcionki @@ -72,7 +73,7 @@ HelpDialog - + Open Link in Current Tab Otwórz odsyÅ‚acz w bieżącej karcie @@ -95,12 +96,12 @@ - + Qt Assistant Qt Assistant - + Failed to load keyword index file Assistant will not work! Nie można wczytać indeksu słów kluczowych @@ -141,7 +142,7 @@ Plik zostaje pominiÄ™ty. - + Done Zrobione @@ -346,7 +347,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! HelpWindow - + Help Pomoc @@ -396,7 +397,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Index - + Untitled Nienazwany @@ -404,7 +405,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! MainWindow - + Sidebar Panel @@ -479,22 +480,15 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Pokazuje głównÄ… stronÄ™ wybranego zestawu dokumentacji. - Open Source Edition - Wydanie Open Source + Wydanie Open Source - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - + Qt Assistant Qt Assistant @@ -865,14 +859,8 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Ustawienia czcionki... - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - + Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. @@ -882,7 +870,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! Qt Assistant Trolltech'a - + Qt Assistant by Nokia @@ -890,7 +878,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! TabbedBrowser - + ... ... @@ -958,7 +946,7 @@ Assistant nie bÄ™dzie dziaÅ‚aÅ‚! TopicChooser - + Choose a topic for <b>%1</b> Wybierz temat dla <b>%1</b> diff --git a/translations/assistant_adp_tr_TR.ts b/translations/assistant_adp_tr_TR.ts new file mode 100644 index 0000000..bb86689 --- /dev/null +++ b/translations/assistant_adp_tr_TR.ts @@ -0,0 +1,967 @@ + + + + + AssistantServer + + + Qt Assistant + + + + + Failed to bind to port %1 + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + FontSettingsDialog + + + Font Settings + + + + + Font settings for: + + + + + Browser + + + + + Application + + + + + Use custom settings + + + + + HelpDialog + + + Open Link in Current Tab + + + + + Open Link in New Window + + + + + Open Link in New Tab + + + + + + Prepare... + + + + + + + Qt Assistant + + + + + Failed to load keyword index file +Assistant will not work! + + + + + Cannot open the index file %1 + + + + + + + Warning + + + + + + Documentation file %1 does not exist! +Skipping file. + + + + + + Parse Error + + + + + Documentation file %1 is not compatible! +Skipping file. + + + + + + Done + + + + + Failed to save fulltext search index +Assistant will not work! + + + + + Indexing files... + + + + + Reading dictionary... + + + + + + Full Text Search + + + + + Using a wildcard within phrases is not allowed. + + + + + The closing quotation mark is missing. + + + + + %n document(s) found. + + + + + + + Help + + + + + <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> + + + + + Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. + + + + + Con&tents + + + + + <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> + + + + + column 1 + + + + + &Index + + + + + &Look For: + + + + + Enter keyword + + + + + <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> + + + + + <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> + + + + + &Bookmarks + + + + + Displays the list of bookmarks. + + + + + Add new bookmark + + + + + Add the currently displayed page as a new bookmark. + + + + + &New + + + + + Delete bookmark + + + + + Delete the selected bookmark. + + + + + &Delete + + + + + &Search + + + + + Searching f&or: + + + + + Enter searchword(s). + + + + + <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> + + + + + <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> + + + + + Found &Documents: + + + + + Display the help page. + + + + + Display the help page for the full text search. + + + + + He&lp + + + + + Start searching. + + + + + Pressing this button starts the search. + + + + + Preparing... + + + + + HelpWindow + + + Help + + + + + Unable to launch web browser. + + + + + + OK + + + + + Failed to open link: '%1' + + + + + <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + + + + + Error... + + + + + Copy &Link Location + + + + + Open Link in New Tab + + + + + Open Link in New Window Shift+LMB + + + + + Index + + + Untitled + + + + + MainWindow + + + Sidebar + + + + + &Window + + + + + Minimize + + + + + Ctrl+M + + + + + Initializing Qt Assistant... + + + + + SHIFT+CTRL+= + + + + + Ctrl+T + + + + + Ctrl+I + + + + + Ctrl+B + + + + + Ctrl+S + + + + + Ctrl+] + + + + + Ctrl+[ + + + + + Views + + + + + Displays the main page of a specific documentation set. + + + + + + Qt Assistant + + + + + Failed to open about application contents in file: '%1' + + + + + ... + + + + + + Save Page + + + + + Cannot open file for writing! + + + + + Qt Assistant by Nokia + + + + + Toolbar + + + + + Go + + + + + &Help + + + + + &File + + + + + Boo&kmarks + + + + + &Go + + + + + &View + + + + + &Edit + + + + + &Print... + + + + + Print the currently displayed page. + + + + + Ctrl+P + + + + + E&xit + + + + + Quit Qt Assistant. + + + + + Ctrl+Q + + + + + &Copy + + + + + Copy the selected text to the clipboard. + + + + + Ctrl+C + + + + + &Find in Text... + + + + + Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. + + + + + Ctrl+F + + + + + Find &Next + + + + + F3 + + + + + Find &Previous + + + + + Shift+F3 + + + + + &Home + + + + + Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. + + + + + Ctrl+Home + + + + + &Previous + + + + + Go to the previous page. + + + + + Alt+Left + + + + + &Next + + + + + Go to the next page. + + + + + Alt+Right + + + + + About Qt Assistant + + + + + Display further information about Qt Assistant. + + + + + About Qt + + + + + Zoom &in + + + + + Zoom in on the document, i.e. increase the font size. + + + + + Ctrl++ + + + + + Zoom &out + + + + + Zoom out on the document, i.e. decrease the font size. + + + + + Ctrl+- + + + + + New Window + + + + + Open a new window. + + + + + Ctrl+N + + + + + &Close + + + + + Close the current window. + + + + + Ctrl+W + + + + + &Add Bookmark + + + + + Add the currently displayed page as a new bookmark. + + + + + What's This? + + + + + "What's This?" context sensitive help. + + + + + Shift+F1 + + + + + Add Tab + + + + + Ctrl+Alt+N + + + + + Next Tab + + + + + Ctrl+Alt+Right + + + + + Previous Tab + + + + + Ctrl+Alt+Left + + + + + Close Tab + + + + + Ctrl+Alt+Q + + + + + Qt Assistant Manual + + + + + F1 + + + + + Save Page As... + + + + + Ctrl+Alt+S + + + + + Sync with Table of Contents + + + + + Select the page in contents tab. + + + + + Font Settings... + + + + + QObject + + + Qt Assistant by Nokia + + + + + TabbedBrowser + + + ... + + + + + Add page + + + + + Close page + + + + + New Tab + + + + + Close Tab + + + + + Close Other Tabs + + + + + TabbedBrowser + + + + + Untitled + + + + + Previous + + + + + Next + + + + + Case Sensitive + + + + + Whole words + + + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + + + + + TopicChooser + + + Choose a topic for <b>%1</b> + + + + + Choose Topic + + + + + Select a topic from the list and click the <b>Display</b>-button to open the online help. + + + + + &Topics + + + + + Displays a list of available help topics for the keyword. + + + + + Open the topic selected in the list. + + + + + &Display + + + + + Close the Dialog. + + + + + &Close + + + + diff --git a/translations/assistant_adp_untranslated.ts b/translations/assistant_adp_untranslated.ts index 52cc26c..e6c927a 100644 --- a/translations/assistant_adp_untranslated.ts +++ b/translations/assistant_adp_untranslated.ts @@ -1,9 +1,10 @@ - + + AssistantServer - + Qt Assistant @@ -16,7 +17,7 @@ FontPanel - + Font @@ -44,7 +45,7 @@ FontSettingsDialog - + Font Settings @@ -77,14 +78,14 @@ - + - + Qt Assistant - + Open Link in Current Tab @@ -143,7 +144,7 @@ Skipping file. - + Done @@ -340,7 +341,7 @@ Assistant will not work! HelpWindow - + Help @@ -389,7 +390,7 @@ Assistant will not work! Index - + Untitled @@ -457,7 +458,7 @@ Assistant will not work! - + Ctrl+T @@ -472,17 +473,7 @@ Assistant will not work! - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - + Qt Assistant @@ -493,7 +484,7 @@ Assistant will not work! - + Sidebar @@ -553,22 +544,7 @@ Assistant will not work! - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + Failed to open about application contents in file: '%1' @@ -867,7 +843,7 @@ Assistant will not work! QObject - + Qt Assistant by Nokia @@ -875,7 +851,7 @@ Assistant will not work! TabbedBrowser - + ... @@ -943,7 +919,7 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> diff --git a/translations/assistant_adp_zh_CN.ts b/translations/assistant_adp_zh_CN.ts index 656a598..62354b3 100644 --- a/translations/assistant_adp_zh_CN.ts +++ b/translations/assistant_adp_zh_CN.ts @@ -4,7 +4,7 @@ AssistantServer - + Qt Assistant Qt 助手 @@ -17,7 +17,7 @@ FontPanel - + Font 字体 @@ -45,7 +45,7 @@ FontSettingsDialog - + Font Settings 字体设置 @@ -73,7 +73,7 @@ HelpDialog - + Open Link in Current Tab 在当å‰æ ‡ç­¾é¡µæ‰“开链接 @@ -96,12 +96,12 @@ - + Qt Assistant Qt 助手 - + Failed to load keyword index file Assistant will not work! 加载关键è¯ç´¢å¼•æ–‡ä»¶å¤±è´¥ @@ -142,7 +142,7 @@ Skipping file. - + Done å®Œæˆ @@ -344,7 +344,7 @@ Assistant will not work! HelpWindow - + Help 帮助 @@ -394,7 +394,7 @@ Assistant will not work! Index - + Untitled 未命åçš„ @@ -402,7 +402,7 @@ Assistant will not work! MainWindow - + Sidebar ä¾§æ  @@ -477,22 +477,19 @@ Assistant will not work! 显示一个指定文档集的主页é¢ã€‚ - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 + 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + Qt Assistant Qt 助手 @@ -863,14 +860,12 @@ Assistant will not work! 字体设置... - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 + å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 @@ -880,7 +875,7 @@ Assistant will not work! Trolltech çš„ Qt 助手 - + Qt Assistant by Nokia Qt助手 - Nokia @@ -888,7 +883,7 @@ Assistant will not work! TabbedBrowser - + ... ... @@ -956,7 +951,7 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> 为<b>%1</b>选择一个主题 diff --git a/translations/assistant_adp_zh_TW.ts b/translations/assistant_adp_zh_TW.ts index ced339e..7fd1738 100644 --- a/translations/assistant_adp_zh_TW.ts +++ b/translations/assistant_adp_zh_TW.ts @@ -1,14 +1,15 @@ - - + + AssistantServer - + Qt Assistant Qt å°å¹«æ‰‹ + Failed to bind to port %1 無法çµåˆé€£æŽ¥åŸ  %1 @@ -16,23 +17,27 @@ FontPanel - + Font å­—åž‹ + &Writing system 寫入系統(&W) + &Family 家æ—(&F) + &Style 風格(&S) + &Point size 點大å°(&P) @@ -40,23 +45,27 @@ FontSettingsDialog - + Font Settings 字型設定 + Font settings for: 字型設定用於: + Browser ç€è¦½å™¨ + Application æ‡‰ç”¨ç¨‹å¼ + Use custom settings 使用者自訂設定 @@ -64,211 +73,269 @@ HelpDialog + Con&tents 內容(&T) + + + Qt Assistant Qt å°å¹«æ‰‹ + Open Link in Current Tab 在目å‰çš„分é é–‹å•Ÿé€£çµ + Open Link in New Window åœ¨æ–°è¦–çª—é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + + Prepare... 準備中... + Failed to load keyword index file Assistant will not work! 無法載入關éµå­—索引檔 å°å¹«æ‰‹å°‡ç„¡æ³•é‹ä½œ! + Cannot open the index file %1 無法開啟索引檔 %1 + + + Warning 警告 + + Documentation file %1 does not exist! Skipping file. 文件檔 %1 ä¸å­˜åœ¨ 將跳éŽæ­¤æª”案。 + + Parse Error 剖æžéŒ¯èª¤ + Documentation file %1 is not compatible! Skipping file. 文件檔 %1 ä¸ç›¸å®¹ 將跳éŽæ­¤æª”案。 + + Done å®Œæˆ + Failed to save fulltext search index Assistant will not work! 無法儲存全文檢索æœå°‹ç´¢å¼•ã€‚ å°å¹«æ‰‹å°‡ç„¡æ³•é‹ä½œ! + Indexing files... 建立檔案索引中... + Reading dictionary... 讀å–字典中... + + Full Text Search 全文檢索 + Using a wildcard within phrases is not allowed. 在片語中ä¸èƒ½ä½¿ç”¨è¬ç”¨å­—元。 + The closing quotation mark is missing. 沒有關閉引號。 + Help 說明 + <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> <b>說明</b><p>請從內容清單中é¸æ“‡æ‚¨éœ€è¦èªªæ˜Žçš„主題,或是在索引中æœå°‹é—œéµå­—。</p> + Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. ä¾åˆ†é¡žã€ç´¢å¼•æˆ–書籤來顯示說明主題。å¦ä¸€å€‹åˆ†é æœƒç¹¼æ‰¿æ­¤å…¨æ–‡æª¢ç´¢ã€‚ + <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> <b>ä¾é¡žåˆ¥çµ„織說明主題。</b><p>雙擊å¯ä»¥æŸ¥çœ‹è©²é¡žåˆ¥ä¸­æœ‰å“ªäº›ä¸»é¡Œã€‚雙擊該主題å¯ä»¥æŸ¥çœ‹å…§å®¹ã€‚</p> + column 1 欄 1 + &Index 索引(&I) + &Look For: æœå°‹(&L): + Enter keyword 輸入關éµå­— + <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> <b>輸入關éµå­—。</b><p>此清單å¯ä»¥é¸æ“‡æœ€èƒ½ç¬¦åˆè¼¸å…¥å­—串的項目。</p> + <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> <b>å¯ç”¨èªªæ˜Žä¸»é¡Œæ¸…單。</b><p>雙擊å¯ä»¥é–‹å•Ÿè©²èªªæ˜Žé é¢ã€‚如果找到一個以上,您必須指定您è¦çœ‹å“ªä¸€å€‹é é¢ã€‚</p> + &Bookmarks 書籤(&B) + Displays the list of bookmarks. 顯示書籤的清單。 + Add new bookmark 新增書籤 + Add the currently displayed page as a new bookmark. 將目å‰é¡¯ç¤ºçš„é é¢æ–°å¢žåˆ°æ›¸ç±¤ä¸­ã€‚ + &New 新增(&N) + Delete bookmark 刪除書籤 + Delete the selected bookmark. 刪除é¸å–的書籤。 + &Delete 刪除(&D) + &Search æœå°‹(&S) + Searching f&or: æœå°‹å…§å®¹(&O): + Enter searchword(s). 請輸入æœå°‹é—œéµå­—詞。 + <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> <b>輸入æœå°‹é—œéµå­—詞。</b><p>在此輸入您è¦æœå°‹çš„é—œéµå­—詞。å¯ä»¥ä½¿ç”¨è¬ç”¨å­—å…ƒ (*)。如果是一個片語,請用引號括起來。</p> + <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> <b>找到的文件</b><p>這放清單包å«äº†æ‰€æœ‰ä¸Šæ¬¡æœå°‹æ‰¾åˆ°çš„文件。文件會ä¾ç¬¦åˆç¨‹åº¦æŽ’åºã€‚</p> + Found &Documents: 找到的文件(&D): + Display the help page. 顯示說明é é¢ã€‚ + Display the help page for the full text search. 顯示全文檢索的說明é é¢ã€‚ + He&lp 說明(&L) + Start searching. 開始æœå°‹ã€‚ + Pressing this button starts the search. 按下此按éµé–‹å§‹æœå°‹ã€‚ + Preparing... 準備中... - + %n document(s) found. 找到 %n 個文件。 @@ -278,41 +345,49 @@ Assistant will not work! HelpWindow - + Help 說明 - Open Link in New WindowShift+LMB - 在新視窗開啟連çµShift+æ»‘é¼ å·¦éµ + + Open Link in New Window Shift+LMB + åœ¨æ–°è¦–çª—é–‹å•Ÿé€£çµ Shift+æ»‘é¼ å·¦éµ + Unable to launch web browser. 無法啟動ç€è¦½å™¨ã€‚ + OK 確定 + Failed to open link: '%1' 無法開啟連çµï¼š%1 + <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <div align="center"><h1>找ä¸åˆ°è©²é é¢</h1><br><h3>%1</h3></div> + Error... 錯誤... + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Copy &Link Location 複製連çµä½ç½®(&L) @@ -320,7 +395,7 @@ Assistant will not work! Index - + Untitled 未命å @@ -332,378 +407,466 @@ Assistant will not work! Qt å°å¹«æ‰‹ï¼ŒTrolltech å…¬å¸æä¾› + Toolbar 工具列 + &Print... 列å°(&P)... + E&xit 離開(&X) + &Copy 複製(&C) + &Find in Text... 在文字中尋找(&F)... + &Home 首é (&H) + &Previous å‰ä¸€å€‹(&P) + &Next 下一個(&N) + About Qt 關於 Qt + Zoom &in 放大(&I) + Zoom &out 縮å°(&O) + New Window 新視窗 - + Ctrl+T Ctrl+T + Ctrl+I Ctrl+I + Ctrl+B Ctrl+B + + Qt Assistant Qt å°å¹«æ‰‹ + &Add Bookmark 新增書籤(&A) + Sidebar 邊列 + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Initializing Qt Assistant... åˆå§‹åŒ– Qt å°å¹«æ‰‹ä¸­... + SHIFT+CTRL+= SHIFT+CTRL+= + Ctrl+S Ctrl+S + Ctrl+W Ctrl+W - + Ctrl+] Ctrl+] + Ctrl+[ Ctrl+[ + Views 檢視 + Displays the main page of a specific documentation set. 顯示指定文件集的主é é¢ã€‚ Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ + 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + Failed to open about application contents in file: '%1' 無法開啟檔案中應用程å¼çš„「關於ã€å…§å®¹ï¼š%1 + ... ... + + Save Page 儲存é é¢ + Cannot open file for writing! 無法開啟檔案以寫入! + Qt Assistant by Nokia Nokia æ供的 Qt å°å¹«æ‰‹ + Go èµ° + &Help 說明(&H) + &File 檔案(&F) + Boo&kmarks 書籤(&K) + &Go èµ°(&G) + &View 檢視(&V) + &Edit 編輯(&E) + Print the currently displayed page. 列å°ç›®å‰é¡¯ç¤ºçš„é é¢ã€‚ + Ctrl+P Ctrl+P + Quit Qt Assistant. 離開 Qt å°å¹«æ‰‹ã€‚ + Ctrl+Q Ctrl+Q + Copy the selected text to the clipboard. 複製é¸å–的文字到剪貼簿中。 + Ctrl+C Ctrl+C + Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. 開啟「尋找ã€å°è©±æ¡†ã€‚Qt å°å¹«æ‰‹æœƒåœ¨ç›®å‰é¡¯ç¤ºçš„é é¢ä¸­æœå°‹æ‚¨æ‰€è¼¸å…¥çš„文字。 + Ctrl+F Ctrl+F + Find &Next 尋找下一筆(&N) + F3 F3 + Find &Previous 尋找上一筆(&P) + Shift+F3 Shift+F3 + Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. 回到首é ã€‚Qt å°å¹«æ‰‹çš„首é ç‚º Qt åƒè€ƒæ–‡ä»¶ã€‚ + Ctrl+Home Ctrl+Home + Go to the previous page. 跳到上一é ã€‚ + Alt+Left Alt+Left + Go to the next page. 跳到下一é ã€‚ + Alt+Right Alt+Right + About Qt Assistant 關於 Qt å°å¹«æ‰‹ + Display further information about Qt Assistant. 顯示關於 Qt å°å¹«æ‰‹çš„詳情。 + Zoom in on the document, i.e. increase the font size. 放大文件,也就是加大字型。 + Ctrl++ Ctrl++ + Zoom out on the document, i.e. decrease the font size. 縮å°æ–‡ä»¶ï¼Œä¹Ÿå°±æ˜¯ç¸®å°å­—型。 + Ctrl+- Ctrl+- + Open a new window. 開啟新視窗。 + Ctrl+N Ctrl+N + &Close 關閉(&C) + Close the current window. 關閉目å‰çš„視窗。 + Add the currently displayed page as a new bookmark. 將目å‰é¡¯ç¤ºçš„é é¢æ–°å¢žåˆ°æ›¸ç±¤ä¸­ã€‚ + What's This? 這是什麼? + "What's This?" context sensitive help. 「這是什麼?ã€å…§æ–‡èªªæ˜Žã€‚ + Shift+F1 Shift+F1 + Add Tab æ–°å¢žåˆ†é  + Ctrl+Alt+N Ctrl+Alt+N + Next Tab ä¸‹ä¸€å€‹åˆ†é  + Ctrl+Alt+Right Ctrl+Alt+Right + Previous Tab å‰ä¸€å€‹åˆ†é  + Ctrl+Alt+Left Ctrl+Alt+Left + Close Tab é—œé–‰åˆ†é  + Ctrl+Alt+Q Ctrl+Alt+Q + Qt Assistant Manual Qt å°å¹«æ‰‹æ‰‹å†Š + F1 F1 + Save Page As... å¦å­˜é é¢ç‚º... + Ctrl+Alt+S Ctrl+Alt+S + Sync with Table of Contents 與目錄åŒæ­¥ + Select the page in contents tab. é¸æ“‡åœ¨å…§å®¹åˆ†é ä¸­çš„é é¢ã€‚ + Font Settings... 字型設定... You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a> for an overview of Qt licensing. - 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 + 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model">qtsoftware.com/company/model</a>。 This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§å¥—件中的授權檔。 + 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§å¥—件中的授權檔。 @@ -713,7 +876,7 @@ Assistant will not work! Qt å°å¹«æ‰‹ï¼ŒTrolltech å…¬å¸æä¾› - + Qt Assistant by Nokia Nokia æ供的 Qt å°å¹«æ‰‹ @@ -721,55 +884,67 @@ Assistant will not work! TabbedBrowser - + ... ... + Add page 新增é é¢ + Close page 關閉é é¢ + New Tab æ–°å¢žåˆ†é  + Close Tab é—œé–‰åˆ†é  + Close Other Tabs é—œé–‰å…¶ä»–åˆ†é  + TabbedBrowser 分é å¼ç€è¦½å™¨ + Untitled 未命å + Previous å‰ä¸€å€‹ + Next 下一個 + Case Sensitive å€åˆ†å¤§å°å¯« + Whole words 整個字詞 + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;æœå°‹å·²æŠ˜å›ž @@ -777,39 +952,47 @@ Assistant will not work! TopicChooser - + Choose a topic for <b>%1</b> 請為 <b>%1</b> é¸æ“‡ä¸€å€‹ä¸»é¡Œ + Choose Topic é¸æ“‡ä¸»é¡Œ + Select a topic from the list and click the <b>Display</b>-button to open the online help. 請從清單中é¸å–一個主題,並按下「顯示ã€éµé–‹å•Ÿç·šä¸Šèªªæ˜Žã€‚ + &Topics 主題(&T) + Displays a list of available help topics for the keyword. 顯示此關éµå­—å¯ç”¨çš„說明主題。 + &Display 顯示(&D) + Open the topic selected in the list. 開啟在清單中é¸å–的主題。 + &Close 關閉(&C) + Close the Dialog. 關閉å°è©±æ¡†ã€‚ diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 0bb0e66..0411ef1 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -1,10 +1,10 @@ - - + + AboutDialog - + &Close &Schließen @@ -52,7 +52,7 @@ Neuer Ordner - + @@ -163,7 +163,7 @@ CentralWidget - + Add new page Neue Seite hinzufügen @@ -173,12 +173,12 @@ Aktuelle Seite schließen - + Print Document Drucken - + unknown unbekannt @@ -204,7 +204,7 @@ Lesezeichen für diese Seite hinzufügen... - + Search Suchen @@ -212,7 +212,7 @@ ContentWindow - + Open Link Link öffnen @@ -242,7 +242,7 @@ FindWidget - + Previous Vorherige @@ -270,7 +270,7 @@ FontPanel - + Font Schriftart @@ -298,7 +298,7 @@ HelpViewer - + Help Hilfe @@ -314,12 +314,12 @@ OK - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Fehler 404...</title><div align="center"><br><br><h1>Die Seite konnte nicht gefunden werden!</h1><br><h3>'%1'</h3></div> - + Copy &Link Location &Link Adresse kopieren @@ -329,12 +329,12 @@ Link in neuem Tab öffnen - + Open Link in New Tab Link in neuem Tab öffnen - + Unable to launch external application. Fehler beim Starten der externen Anwendung. @@ -344,12 +344,12 @@ IndexWindow - + &Look for: Suche &nach: - + Open Link Link öffnen @@ -362,7 +362,7 @@ InstallDialog - + Install Documentation Dokumentation installieren @@ -462,38 +462,38 @@ MainWindow - - + + Index Index - - + + Contents Inhalt - - + + Bookmarks Lesezeichen - - + + Search Suchen - - - + + + Qt Assistant Qt Assistant - + Unfiltered Ohne Filter @@ -503,47 +503,44 @@ Datei - + Page Set&up... S&eite einrichten... - + Print Preview... Druckvorschau... - + &Print... &Drucken... - CTRL+P - CTRL+P + CTRL+P - + New &Tab Neue &Seite - CTRL+T - CTRL+T + CTRL+T - + &Close Tab &Seite schließen - CTRL+W - CTRL+W + CTRL+W - + &Quit &Beenden @@ -562,42 +559,38 @@ &Kopieren - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... &Textsuche... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next &Weitersuchen - F3 - F3 + F3 - + Find &Previous &Vorheriges suchen - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... Einstellungen... @@ -611,27 +604,25 @@ &Vergrößern - Ctrl++ - Ctrl++ + Ctrl++ - + Zoom &out Ver&kleinern - Ctrl+- - Ctrl+- + Ctrl+- - + Normal &Size Standard&größe - + Ctrl+0 Ctrl+0 @@ -664,27 +655,27 @@ &Startseite - + Ctrl+Home Strg+Pos1 - + &Back &Rückwärts - + &Forward &Vorwärts - + Sync with Table of Contents Seite mit Inhalt Tab syncronisieren - + Next Page Nächste Seite @@ -699,7 +690,7 @@ Vorherige Seite - + Ctrl+Alt+Left Ctrl+Alt+Left @@ -727,7 +718,7 @@ Navigationsleiste - + Toolbars Werkzeugleisten @@ -742,7 +733,7 @@ Filter: - + Address Toolbar Adressleiste @@ -752,31 +743,28 @@ Adresse: - + Could not find the associated content item. Der zugehörige Inhaltseintrag konnte nicht gefunden werden. - Open Source Edition - Open Source Edition + Open Source Edition - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. + This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. + This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + About %1 Ãœber %1 @@ -786,17 +774,17 @@ Suchindex wird aufgebaut - + Looking for Qt Documentation... Suche nach Qt Dokumentationen... - + &Window &Fenster - + Minimize Minimieren @@ -806,7 +794,7 @@ CTRL+M - + Zoom Zoom @@ -819,27 +807,27 @@ Entfernen - + &File &Datei - + &Edit &Bearbeiten - + &View &Ansicht - + &Go &Gehe - + &Bookmarks &Lesezeichen @@ -849,17 +837,16 @@ &Hilfe - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. + Sie benötigen eine kommerzielle Qt Lizenz für die Entwicklung von proprietären (geschlossenen) Anwendungen. Besuchen Sie <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> um sich einen Ãœberblick über die Qt Lizenzvergabe zu verschaffen. - + ALT+O ALT+O - + CTRL+D CTRL+D @@ -875,7 +862,7 @@ Von Helpserver herunterladen... - + Add Documentation @@ -897,7 +884,27 @@ Der Namespace %1 ist bereits registriert! - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + Abbrechen + + + + OK + OK + + + Use custom settings Benutze erweiterte Einstellungen @@ -975,24 +982,20 @@ Hinzufügen... - Network - Netzwerk + Netzwerk - Use Http Proxy - Http Proxy + Http Proxy - Http Proxy: - Http Proxy: + Http Proxy: - Port: - Port: + Port: @@ -1022,7 +1025,7 @@ Neuer Ordner - + The specified collection file does not exist! Die angegeben Katalogdatei (collection file) konnte nicht gefunden werden! @@ -1068,6 +1071,11 @@ Fehlende Hilfedatei! + + Missing filter argument! + + + Unknown option: %1 Unbekannte Option: %1 @@ -1079,7 +1087,7 @@ Qt Assistant - + Could not register documentation file %1 @@ -1093,7 +1101,7 @@ Reason: Dokumentation erfolgreich registriert. - + Could not unregister documentation file %1 @@ -1102,12 +1110,12 @@ Reason: Could not unregister documentation file%1Reason:%2 - + Documentation successfully unregistered. Dokumentation erfolgreich entfernt. - + Cannot load sqlite database driver! @@ -1126,7 +1134,7 @@ Reason: RemoteControl - + Debugging Remote Control Debugging Remote Control @@ -1139,7 +1147,7 @@ Reason: SearchWidget - + &Copy &Kopieren @@ -1168,7 +1176,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: diff --git a/translations/assistant_ja.ts b/translations/assistant_ja.ts index 5552272..1853155 100644 --- a/translations/assistant_ja.ts +++ b/translations/assistant_ja.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -149,7 +150,7 @@ CentralWidget - + Add new page @@ -159,12 +160,12 @@ - + Print Document - + unknown @@ -190,7 +191,7 @@ - + Search @@ -198,7 +199,7 @@ ContentWindow - + Open Link @@ -224,7 +225,7 @@ FindWidget - + Previous @@ -252,7 +253,7 @@ FontPanel - + Font @@ -280,7 +281,7 @@ HelpViewer - + Help @@ -290,12 +291,12 @@ - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - + Copy &Link Location @@ -305,12 +306,12 @@ - + Open Link in New Tab - + Unable to launch external application. @@ -319,12 +320,12 @@ IndexWindow - + &Look for: - + Open Link @@ -337,7 +338,7 @@ InstallDialog - + Install Documentation @@ -436,84 +437,69 @@ MainWindow - - + + Index - - + + Contents - - + + Bookmarks - - + + Search - - - + + + Qt Assistant - + Unfiltered - + Page Set&up... - + Print Preview... - - &Print... - - - - CTRL+P + &Print... - + New &Tab - - CTRL+T - - - - + &Close Tab - - CTRL+W - - - - + &Quit @@ -528,42 +514,22 @@ - - Ctrl+C - - - - + &Find in Text... - - Ctrl+F - - - - + Find &Next - - F3 - - - - + Find &Previous - - Shift+F3 - - - - + Preferences... @@ -573,27 +539,17 @@ - - Ctrl++ - - - - + Zoom &out - - Ctrl+- - - - - + Normal &Size - + Ctrl+0 @@ -618,27 +574,27 @@ - + Ctrl+Home - + &Back - + &Forward - + Sync with Table of Contents - + Next Page @@ -653,7 +609,7 @@ - + Ctrl+Alt+Left @@ -673,7 +629,7 @@ - + Toolbars @@ -688,7 +644,7 @@ - + Address Toolbar @@ -698,27 +654,12 @@ - + Could not find the associated content item. - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 @@ -728,17 +669,17 @@ - + Looking for Qt Documentation... - + &Window - + Minimize @@ -748,32 +689,32 @@ - + Zoom - + &File - + &Edit - + &View - + &Go - + &Bookmarks @@ -783,17 +724,12 @@ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - - - - + ALT+O - + CTRL+D @@ -801,7 +737,7 @@ PreferencesDialog - + Add Documentation @@ -823,7 +759,27 @@ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + Use custom settings @@ -902,26 +858,6 @@ - Network - - - - - Use Http Proxy - - - - - Http Proxy: - - - - - Port: - - - - Options @@ -944,7 +880,7 @@ QObject - + The specified collection file does not exist! @@ -990,6 +926,11 @@ + + Missing filter argument! + + + Unknown option: %1 @@ -1001,7 +942,7 @@ - + Could not register documentation file %1 @@ -1015,7 +956,7 @@ Reason: - + Could not unregister documentation file %1 @@ -1024,12 +965,12 @@ Reason: - + Documentation successfully unregistered. - + Cannot load sqlite database driver! @@ -1048,7 +989,7 @@ Reason: RemoteControl - + Debugging Remote Control @@ -1061,7 +1002,7 @@ Reason: SearchWidget - + &Copy @@ -1090,7 +1031,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: diff --git a/translations/assistant_pl.ts b/translations/assistant_pl.ts index 4985b72..f84bad2 100644 --- a/translations/assistant_pl.ts +++ b/translations/assistant_pl.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close Za&mknij @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -157,7 +158,7 @@ CentralWidget - + Add new page Dodaj nowÄ… stronÄ™ @@ -167,12 +168,12 @@ Zamknij bieżącÄ… stronÄ™ - + Print Document Wydrukuj dokument - + unknown nieznany @@ -198,7 +199,7 @@ Dodaj zakÅ‚adkÄ™ dla tej strony... - + Search Wyszukaj @@ -206,7 +207,7 @@ ContentWindow - + Open Link Otwórz odsyÅ‚acz @@ -236,7 +237,7 @@ FindWidget - + Previous Poprzedni @@ -264,7 +265,7 @@ FontPanel - + Font Czcionka @@ -292,7 +293,7 @@ HelpViewer - + Help Pomoc @@ -308,12 +309,12 @@ OK - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>BÅ‚Ä…d 404...</title><div align="center"><br><br><h1>Strona nie może być znaleziona</h1><br><h3>'%1'</h3></div> - + Copy &Link Location Skopiuj &odsyÅ‚acz @@ -323,12 +324,12 @@ Otwórz odsyÅ‚acz w nowej karcie Ctrl+LMB - + Open Link in New Tab Otwórz odsyÅ‚acz w nowej karcie - + Unable to launch external application. Nie można uruchomić zewnÄ™trznej aplikacji. @@ -338,12 +339,12 @@ IndexWindow - + &Look for: Wy&szukaj: - + Open Link Otwórz odsyÅ‚acz @@ -356,7 +357,7 @@ InstallDialog - + Install Documentation Zainstaluj dokumentacjÄ™ @@ -456,38 +457,38 @@ MainWindow - - + + Index Indeks - - + + Contents Spis treÅ›ci - - + + Bookmarks ZakÅ‚adki - - + + Search Wyszukaj - - - + + + Qt Assistant Qt Assistant - + Unfiltered Nieprzefiltrowany @@ -497,47 +498,44 @@ Plik - + Page Set&up... &Ustawienia strony... - + Print Preview... PodglÄ…d wydruku... - + &Print... Wy&drukuj... - CTRL+P - CTRL+P + CTRL+P - + New &Tab Nowa kar&ta - CTRL+T - CTRL+T + CTRL+T - + &Close Tab &Zamknij kartÄ™ - CTRL+W - CTRL+W + CTRL+W - + &Quit Za&koÅ„cz @@ -556,42 +554,38 @@ S&kopiuj zaznaczony tekst - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... Znajdź w &tekÅ›cie... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next Znajdź &nastÄ™pny - F3 - F3 + F3 - + Find &Previous Znajdź &poprzedni - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... Ustawienia... @@ -605,27 +599,17 @@ Po&wiÄ™ksz - - Ctrl++ - - - - + Zoom &out Po&mniejsz - - Ctrl+- - - - - + Normal &Size Normalny &rozmiar - + Ctrl+0 Ctrl+0 @@ -658,27 +642,27 @@ Strona &startowa - + Ctrl+Home - + &Back &Wstecz - + &Forward W &przód - + Sync with Table of Contents Znajdź bieżącÄ… stronÄ™ w spisie treÅ›ci - + Next Page NastÄ™pna strona @@ -693,7 +677,7 @@ Poprzednia strona - + Ctrl+Alt+Left @@ -717,7 +701,7 @@ Pasek do nawigacji - + Toolbars Paski narzÄ™dzi @@ -732,7 +716,7 @@ Przefiltrowane przez: - + Address Toolbar Pasek adresu @@ -742,27 +726,20 @@ Adres: - + Could not find the associated content item. Nie można znaleźć skojarzonego elementu zawartoÅ›ci. - Open Source Edition - Edycja Open Source + Edycja Open Source - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. + Ta wersja Qt Assistant jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji. - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 Informacje o %1 @@ -772,17 +749,17 @@ Uaktualnianie indeksu wyszukiwawczego - + Looking for Qt Documentation... Szukanie dokumentacji Qt... - + &Window &Okno - + Minimize Zminimalizuj @@ -792,7 +769,7 @@ - + Zoom PowiÄ™kszenie @@ -805,32 +782,31 @@ UsuÅ„ - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. + Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - + &File &Plik - + &Edit &Edycja - + &View &Widok - + &Go &Nawigacja - + &Bookmarks &ZakÅ‚adki @@ -840,12 +816,12 @@ &Pomoc - + ALT+O ALT+O - + CTRL+D CTRL+D @@ -853,7 +829,7 @@ PreferencesDialog - + Add Documentation @@ -875,7 +851,27 @@ PrzestrzeÅ„ nazw %1 jest już zarejestrowana! - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + Anuluj + + + + OK + OK + + + Use custom settings Użyj wÅ‚asnych ustawieÅ„ @@ -953,24 +949,20 @@ Dodaj... - Network - Sieć + Sieć - Use Http Proxy - Użyj poÅ›rednika http + Użyj poÅ›rednika http - Http Proxy: - PoÅ›rednik http: + PoÅ›rednik http: - Port: - Port: + Port: @@ -1000,7 +992,7 @@ Nowy katalog - + The specified collection file does not exist! Podany plik z kolekcjÄ… nie istnieje! @@ -1046,6 +1038,11 @@ Brak pliku pomocy! + + Missing filter argument! + + + Unknown option: %1 Nieznana opcja: %1 @@ -1057,7 +1054,7 @@ Qt Assistant - + Could not register documentation file %1 @@ -1075,7 +1072,7 @@ Powód: Dokumentacja poprawnie zarejestrowana. - + Could not unregister documentation file %1 @@ -1088,12 +1085,12 @@ Powód: %2 - + Documentation successfully unregistered. Dokumentacja poprawnie wyrejestrowana. - + Cannot load sqlite database driver! Nie można odczytać sterownika bazy danych sqlite! @@ -1112,7 +1109,7 @@ Powód: RemoteControl - + Debugging Remote Control Zdalne debugowanie @@ -1125,7 +1122,7 @@ Powód: SearchWidget - + &Copy S&kopiuj @@ -1154,7 +1151,7 @@ Powód: TopicChooser - + Choose a topic for <b>%1</b>: Wybierz temat dla <b>%1</b>: diff --git a/translations/assistant_tr_TR.ts b/translations/assistant_tr_TR.ts new file mode 100644 index 0000000..0ca29df --- /dev/null +++ b/translations/assistant_tr_TR.ts @@ -0,0 +1,1059 @@ + + + + + AboutDialog + + + &Close + + + + + AboutLabel + + + Warning + + + + + Unable to launch external application. + + + + + + OK + + + + + BookmarkDialog + + + Add Bookmark + + + + + Bookmark: + + + + + Add in Folder: + + + + + + + + + + + New Folder + + + + + + + + + Bookmarks + + + + + Delete Folder + + + + + Rename Folder + + + + + BookmarkManager + + + Bookmarks + + + + + Remove + + + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + + + + + + New Folder + + + + + BookmarkWidget + + + Delete Folder + + + + + Rename Folder + + + + + Show Bookmark + + + + + Show Bookmark in New Tab + + + + + Delete Bookmark + + + + + Rename Bookmark + + + + + Filter: + + + + + Add + + + + + Remove + + + + + CentralWidget + + + Add new page + + + + + Close current page + + + + + Print Document + + + + + + unknown + + + + + Add New Page + + + + + Close This Page + + + + + Close Other Pages + + + + + Add Bookmark for this Page... + + + + + Search + + + + + ContentWindow + + + Open Link + + + + + Open Link in New Tab + + + + + FilterNameDialogClass + + + Add Filter Name + + + + + Filter Name: + + + + + FindWidget + + + Previous + + + + + Next + + + + + Case Sensitive + + + + + Whole words + + + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + HelpViewer + + + Open Link in New Tab + + + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + + + + + Help + + + + + Unable to launch external application. + + + + + + OK + + + + + Copy &Link Location + + + + + Open Link in New Tab Ctrl+LMB + + + + + IndexWindow + + + &Look for: + + + + + Open Link + + + + + Open Link in New Tab + + + + + InstallDialog + + + + Install Documentation + + + + + Downloading documentation info... + + + + + Download canceled. + + + + + + + Done. + + + + + The file %1 already exists. Do you want to overwrite it? + + + + + Unable to save the file %1: %2. + + + + + Downloading %1... + + + + + + + Download failed: %1. + + + + + Documentation info file is corrupt! + + + + + Download failed: Downloaded file is corrupted. + + + + + Installing documentation %1... + + + + + Error while installing documentation: +%1 + + + + + Available Documentation: + + + + + Install + + + + + Cancel + + + + + Close + + + + + Installation Path: + + + + + ... + + + + + MainWindow + + + + Index + + + + + + Contents + + + + + + Bookmarks + + + + + + Search + + + + + + + Qt Assistant + + + + + + Unfiltered + + + + + Looking for Qt Documentation... + + + + + &File + + + + + Page Set&up... + + + + + Print Preview... + + + + + &Print... + + + + + New &Tab + + + + + &Close Tab + + + + + &Quit + + + + + CTRL+Q + + + + + &Edit + + + + + &Copy selected Text + + + + + &Find in Text... + + + + + Find &Next + + + + + Find &Previous + + + + + Preferences... + + + + + &View + + + + + Zoom &in + + + + + Zoom &out + + + + + Normal &Size + + + + + Ctrl+0 + + + + + ALT+C + + + + + ALT+I + + + + + ALT+O + + + + + ALT+S + + + + + &Go + + + + + &Home + + + + + Ctrl+Home + + + + + &Back + + + + + &Forward + + + + + Sync with Table of Contents + + + + + Next Page + + + + + Ctrl+Alt+Right + + + + + Previous Page + + + + + Ctrl+Alt+Left + + + + + &Bookmarks + + + + + Add Bookmark... + + + + + CTRL+D + + + + + &Help + + + + + About... + + + + + Navigation Toolbar + + + + + &Window + + + + + Zoom + + + + + Minimize + + + + + Ctrl+M + + + + + Toolbars + + + + + Filter Toolbar + + + + + Filtered by: + + + + + Address Toolbar + + + + + Address: + + + + + Could not find the associated content item. + + + + + About %1 + + + + + Updating search index + + + + + PreferencesDialog + + + + + Add Documentation + + + + + Qt Compressed Help Files (*.qch) + + + + + The specified file is not a valid Qt Help File! + + + + + The namespace %1 is already registered! + + + + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + + Use custom settings + + + + + PreferencesDialogClass + + + Preferences + + + + + Fonts + + + + + Font settings: + + + + + Browser + + + + + Application + + + + + Filters + + + + + Filter: + + + + + Attributes: + + + + + 1 + + + + + Add + + + + + Remove + + + + + Documentation + + + + + Registered Documentation: + + + + + Add... + + + + + Options + + + + + Homepage + + + + + Current Page + + + + + Restore to default + + + + + QObject + + + + Bookmark + + + + + The specified collection file does not exist! + + + + + Missing collection file! + + + + + Invalid URL! + + + + + Missing URL! + + + + + + + Unknown widget: %1 + + + + + + + Missing widget! + + + + + + The specified Qt help file does not exist! + + + + + + Missing help file! + + + + + Missing filter argument! + + + + + Unknown option: %1 + + + + + + Qt Assistant + + + + + Could not register documentation file +%1 + +Reason: +%2 + + + + + Documentation successfully registered. + + + + + Documentation successfully unregistered. + + + + + Could not unregister documentation file +%1 + +Reason: +%2 + + + + + Cannot load sqlite database driver! + + + + + The specified collection file could not be read! + + + + + RemoteControl + + + Debugging Remote Control + + + + + Received Command: %1 %2 + + + + + SearchWidget + + + &Copy + + + + + Copy &Link Location + + + + + + Open Link in New Tab + + + + + Select All + + + + + Open Link + + + + + TopicChooser + + + Choose a topic for <b>%1</b>: + + + + + Choose Topic + + + + + &Topics + + + + + &Display + + + + + &Close + + + + diff --git a/translations/assistant_untranslated.ts b/translations/assistant_untranslated.ts index 5552272..1853155 100644 --- a/translations/assistant_untranslated.ts +++ b/translations/assistant_untranslated.ts @@ -1,9 +1,10 @@ - + + AboutDialog - + &Close @@ -30,7 +31,7 @@ BookmarkDialog - + @@ -149,7 +150,7 @@ CentralWidget - + Add new page @@ -159,12 +160,12 @@ - + Print Document - + unknown @@ -190,7 +191,7 @@ - + Search @@ -198,7 +199,7 @@ ContentWindow - + Open Link @@ -224,7 +225,7 @@ FindWidget - + Previous @@ -252,7 +253,7 @@ FontPanel - + Font @@ -280,7 +281,7 @@ HelpViewer - + Help @@ -290,12 +291,12 @@ - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - + Copy &Link Location @@ -305,12 +306,12 @@ - + Open Link in New Tab - + Unable to launch external application. @@ -319,12 +320,12 @@ IndexWindow - + &Look for: - + Open Link @@ -337,7 +338,7 @@ InstallDialog - + Install Documentation @@ -436,84 +437,69 @@ MainWindow - - + + Index - - + + Contents - - + + Bookmarks - - + + Search - - - + + + Qt Assistant - + Unfiltered - + Page Set&up... - + Print Preview... - - &Print... - - - - CTRL+P + &Print... - + New &Tab - - CTRL+T - - - - + &Close Tab - - CTRL+W - - - - + &Quit @@ -528,42 +514,22 @@ - - Ctrl+C - - - - + &Find in Text... - - Ctrl+F - - - - + Find &Next - - F3 - - - - + Find &Previous - - Shift+F3 - - - - + Preferences... @@ -573,27 +539,17 @@ - - Ctrl++ - - - - + Zoom &out - - Ctrl+- - - - - + Normal &Size - + Ctrl+0 @@ -618,27 +574,27 @@ - + Ctrl+Home - + &Back - + &Forward - + Sync with Table of Contents - + Next Page @@ -653,7 +609,7 @@ - + Ctrl+Alt+Left @@ -673,7 +629,7 @@ - + Toolbars @@ -688,7 +644,7 @@ - + Address Toolbar @@ -698,27 +654,12 @@ - + Could not find the associated content item. - - Open Source Edition - - - - - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + About %1 @@ -728,17 +669,17 @@ - + Looking for Qt Documentation... - + &Window - + Minimize @@ -748,32 +689,32 @@ - + Zoom - + &File - + &Edit - + &View - + &Go - + &Bookmarks @@ -783,17 +724,12 @@ - - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - - - - + ALT+O - + CTRL+D @@ -801,7 +737,7 @@ PreferencesDialog - + Add Documentation @@ -823,7 +759,27 @@ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + + + + + OK + + + + Use custom settings @@ -902,26 +858,6 @@ - Network - - - - - Use Http Proxy - - - - - Http Proxy: - - - - - Port: - - - - Options @@ -944,7 +880,7 @@ QObject - + The specified collection file does not exist! @@ -990,6 +926,11 @@ + + Missing filter argument! + + + Unknown option: %1 @@ -1001,7 +942,7 @@ - + Could not register documentation file %1 @@ -1015,7 +956,7 @@ Reason: - + Could not unregister documentation file %1 @@ -1024,12 +965,12 @@ Reason: - + Documentation successfully unregistered. - + Cannot load sqlite database driver! @@ -1048,7 +989,7 @@ Reason: RemoteControl - + Debugging Remote Control @@ -1061,7 +1002,7 @@ Reason: SearchWidget - + &Copy @@ -1090,7 +1031,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: diff --git a/translations/assistant_zh_CN.ts b/translations/assistant_zh_CN.ts index 0384c47..a1f763f 100644 --- a/translations/assistant_zh_CN.ts +++ b/translations/assistant_zh_CN.ts @@ -1,11 +1,10 @@ - AboutDialog - + &Close 关闭(&C) @@ -33,7 +32,7 @@ BookmarkDialog - + @@ -164,7 +163,7 @@ CentralWidget - + Add new page æ·»åŠ æ–°é¡µé¢ @@ -174,12 +173,12 @@ 关闭当å‰é¡µé¢ - + Print Document 打å°æ–‡æ¡£ - + unknown 未知的 @@ -205,7 +204,7 @@ 把这个页é¢æ·»åŠ ä¸ºä¹¦ç­¾... - + Search æœç´¢ @@ -213,7 +212,7 @@ ContentWindow - + Open Link 打开链接 @@ -243,7 +242,7 @@ FindWidget - + Previous 上一个 @@ -271,7 +270,7 @@ FontPanel - + Font 字体 @@ -299,7 +298,7 @@ HelpViewer - + Help 帮助 @@ -315,12 +314,12 @@ 确定 - + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>404 错误...</title><div align="center"><br><br><h1>ä¸èƒ½æ‰¾åˆ°è¯¥é¡µé¢</h1><br><h3>'%1'</h3></div> - + Copy &Link Location å¤åˆ¶é“¾æŽ¥åœ°å€(&L) @@ -330,12 +329,12 @@ 在新标签页中打开链接 Ctrl+LMB - + Open Link in New Tab 在新标签页中打开链接 - + Unable to launch external application. ä¸èƒ½å¯åŠ¨å¤–部应用程åºã€‚ @@ -345,12 +344,12 @@ IndexWindow - + &Look for: 查找(&L): - + Open Link 打开链接 @@ -363,7 +362,7 @@ InstallDialog - + Install Documentation 安装文档 @@ -463,38 +462,38 @@ MainWindow - - + + Index 索引 - - + + Contents 内容 - - + + Bookmarks 书签 - - + + Search æœç´¢ - - - + + + Qt Assistant Qt 助手 - + Unfiltered 未过滤的 @@ -504,47 +503,44 @@ 文件 - + Page Set&up... 页é¢è®¾ç½®(&U)... - + Print Preview... 打å°é¢„览... - + &Print... 打å°(&P)... - CTRL+P - CTRL+P + CTRL+P - + New &Tab 新建标签页(&T) - CTRL+T - CTRL+T + CTRL+T - + &Close Tab 关闭标签页(&C) - CTRL+W - CTRL+W + CTRL+W - + &Quit 退出(&Q) @@ -563,42 +559,38 @@ å¤åˆ¶é€‰ä¸­çš„文本(&C) - Ctrl+C - Ctrl+C + Ctrl+C - + &Find in Text... 在文本中查找(&F)... - Ctrl+F - Ctrl+F + Ctrl+F - + Find &Next 查找下一个(&N) - F3 - F3 + F3 - + Find &Previous 查找上一个(&P) - Shift+F3 - Shift+F3 + Shift+F3 - + Preferences... 首选项... @@ -612,27 +604,25 @@ 放大(&I) - Ctrl++ - Ctrl++ + Ctrl++ - + Zoom &out 缩å°(&O) - Ctrl+- - Ctrl+- + Ctrl+- - + Normal &Size 正常大å°(&S) - + Ctrl+0 Ctrl+0 @@ -665,27 +655,27 @@ 主页(&H) - + Ctrl+Home Ctrl+Home - + &Back åŽé€€(&B) - + &Forward å‰è¿›(&F) - + Sync with Table of Contents åŒæ­¥ç›®å½• - + Next Page 下一页 @@ -700,7 +690,7 @@ 上一页 - + Ctrl+Alt+Left Ctrl+Alt+Left @@ -728,7 +718,7 @@ å¯¼èˆªå·¥å…·æ  - + Toolbars å·¥å…·æ  @@ -743,7 +733,7 @@ 过滤器为: - + Address Toolbar 地å€å·¥å…·æ  @@ -753,27 +743,24 @@ 地å€ï¼š - + Could not find the associated content item. ä¸èƒ½æ‰¾åˆ°ç›¸å…³å†…容项目。 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 + 这个版本的 Qt 助手是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + About %1 关于 %1 @@ -783,17 +770,17 @@ 正在更新æœç´¢ç´¢å¼• - + Looking for Qt Documentation... 正在查找 Qt 文档... - + &Window 窗å£(&W) - + Minimize 最å°åŒ– @@ -803,7 +790,7 @@ Ctrl+M - + Zoom 缩放 @@ -816,27 +803,26 @@ 移除 - You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/about/businessmodel">qtsoftware.com/company/about/businessmodel</a>。 + å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<a href="http://qtsoftware.com/company/about/businessmodel">qtsoftware.com/company/about/businessmodel</a>。 - + &File 文件(&F) - + &Edit 编辑(&E) - + &View 查看(&V) - + ALT+O ALT+O @@ -846,7 +832,7 @@ å‰å¾€(&G) - + &Bookmarks 书签(&B) @@ -864,7 +850,7 @@ PreferencesDialog - + Add Documentation @@ -886,7 +872,27 @@ 命å空间 %1 å·²ç»è¢«æ³¨å†Œï¼ - + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + å–消 + + + + OK + 确定 + + + Use custom settings 使用自定义设定 @@ -964,24 +970,20 @@ 添加... - Network - 网络 + 网络 - Use Http Proxy - 使用 HTTP ä»£ç† + 使用 HTTP ä»£ç† - Http Proxy: - HTTP 代ç†ï¼š + HTTP 代ç†ï¼š - Port: - 端å£ï¼š + 端å£ï¼š @@ -1011,7 +1013,7 @@ 新建文件夹 - + The specified collection file does not exist! 指定的收è—文件并ä¸å­˜åœ¨ï¼ @@ -1057,6 +1059,11 @@ ç¼ºå°‘å¸®åŠ©æ–‡ä»¶ï¼ + + Missing filter argument! + + + Unknown option: %1 未知的选项:%1 @@ -1068,7 +1075,7 @@ Qt 助手 - + Could not register documentation file %1 @@ -1086,7 +1093,7 @@ Reason: 文档已ç»æˆåŠŸæ³¨å†Œã€‚ - + Could not unregister documentation file %1 @@ -1099,12 +1106,12 @@ Reason: %2 - + Documentation successfully unregistered. 文档已ç»æˆåŠŸå–消注册。 - + Cannot load sqlite database driver! 无法加载sqliteæ•°æ®åº“é©±åŠ¨ï¼ @@ -1123,7 +1130,7 @@ Reason: RemoteControl - + Debugging Remote Control 正在调试é¥æŽ§å™¨ @@ -1136,7 +1143,7 @@ Reason: SearchWidget - + &Copy å¤åˆ¶(&C) @@ -1165,7 +1172,7 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: 为<b>%1</b>选择一个主题 diff --git a/translations/assistant_zh_TW.ts b/translations/assistant_zh_TW.ts index 179b69c..df6b827 100644 --- a/translations/assistant_zh_TW.ts +++ b/translations/assistant_zh_TW.ts @@ -1,10 +1,10 @@ - - + + AboutDialog - + &Close 關閉(&C) @@ -12,16 +12,19 @@ AboutLabel + Warning 警告 + Unable to launch external application. 無法啟動外部應用程å¼ã€‚ + OK 確定 @@ -29,34 +32,46 @@ BookmarkDialog + Add Bookmark 新增書籤 + Bookmark: 書籤: + Add in Folder: 新增到資料夾: + New Folder 新增資料夾 + + + + + Bookmarks 書籤 + + + + Delete Folder 刪除資料夾 + Rename Folder é‡å‘½å資料夾 @@ -64,18 +79,23 @@ BookmarkManager + Bookmarks 書籤 + Remove 移除 + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? 您打算刪除資料夾,這會將裡é¢çš„內容<br>一併移除。您確定è¦ç¹¼çºŒå—Žï¼Ÿ + + New Folder 新資料夾 @@ -83,6 +103,7 @@ BookmarkWidget + Filter: éŽæ¿¾ï¼š @@ -91,6 +112,7 @@ 書籤 + Remove 移除 @@ -99,26 +121,32 @@ 您打算刪除資料夾,這會將裡é¢çš„內容一併移除。您確定è¦ç¹¼çºŒå—Žï¼Ÿ + Delete Folder 刪除資料夾 + Rename Folder é‡å‘½å資料夾 + Show Bookmark 顯示書籤 + Show Bookmark in New Tab 於新分é é¡¯ç¤ºæ›¸ç±¤ + Delete Bookmark 刪除書籤 + Rename Bookmark é‡å‘½å書籤 @@ -127,6 +155,7 @@ æœå°‹å­—串: + Add 新增 @@ -134,39 +163,48 @@ CentralWidget - + Add new page 新增é é¢ + Close current page 關閉目å‰çš„é é¢ + Print Document 列å°æ–‡ä»¶ + + unknown 未知 + Add New Page 新增é é¢ + Close This Page 關閉此é é¢ + Close Other Pages 關閉其他é é¢ + Add Bookmark for this Page... 將此é é¢æ–°å¢žåˆ°æ›¸ç±¤... + Search æœå°‹ @@ -174,11 +212,12 @@ ContentWindow - + Open Link é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ @@ -190,10 +229,12 @@ éŽæ¿¾å™¨å稱å°è©±æ¡† + Filter Name: éŽæ¿¾å™¨å稱: + Add Filter Name 新增éŽæ¿¾å™¨å稱 @@ -201,22 +242,27 @@ FindWidget + Previous å‰ä¸€å€‹ + Next 下一個 + Case Sensitive å€åˆ†å¤§å°å¯« + Whole words 整個單字 + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/assistant/images/wrap.png">&nbsp;æœå°‹å·²éŽç›¡é ­ @@ -224,23 +270,27 @@ FontPanel - + Font å­—åž‹ + &Writing system 手寫系統(&W) + &Family 家æ—(&W) + &Style 樣å¼(&S) + &Point size 點大å°(&P) @@ -248,7 +298,7 @@ HelpViewer - + Help 說明 @@ -259,26 +309,32 @@ + OK 確定 + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>錯誤 404...</title><div align="center"><br><br><h1>找ä¸åˆ°é é¢</h1><br><h3>'%1'</h3></div> + Copy &Link Location 複製連çµä½ç½®(&L) - Open Link in New TabCtrl+LMB - 在新分é é–‹å•Ÿé€£çµCtrl+æ»‘é¼ å·¦éµ + + Open Link in New Tab Ctrl+LMB + 在新分é é–‹å•Ÿé€£çµ Ctrl+æ»‘é¼ å·¦éµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Unable to launch external application. 無法啟動外部應用程å¼ã€‚ @@ -288,15 +344,17 @@ IndexWindow - + &Look for: æœå°‹(&L): + Open Link é–‹å•Ÿé€£çµ + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ @@ -304,76 +362,99 @@ InstallDialog + + Install Documentation 安è£æ–‡ä»¶ + Downloading documentation info... 下載文件資訊中... + Download canceled. 下載已å–消。 + + + Done. 完æˆã€‚ + The file %1 already exists. Do you want to overwrite it? 檔案 %1 已存在。您è¦è¦†å¯«å®ƒå—Žï¼Ÿ + Unable to save the file %1: %2. 無法儲存檔案 %1:%2。 + Downloading %1... 下載 %1 中... + + + Download failed: %1. 下載失敗:%1。 + Documentation info file is corrupt! 文件資訊檔已ææ¯€ï¼ + Download failed: Downloaded file is corrupted. 下載失敗:下載的檔案已æ毀。 + Installing documentation %1... 安è£æ–‡ä»¶ %1 中... + Error while installing documentation: %1 安è£æ–‡ä»¶æ™‚發生錯誤: %1 + Available Documentation: å¯ç”¨çš„文件: + Install å®‰è£ + Cancel å–消 + Close 關閉 + Installation Path: 安è£è·¯å¾‘: + ... ... @@ -381,26 +462,39 @@ MainWindow + + Index 索引 + + Contents 內容 + + Bookmarks 書籤 + + Search æœå°‹ + + + Qt Assistant Qt å°å¹«æ‰‹ + + Unfiltered 未éŽæ¿¾ @@ -409,42 +503,49 @@ 檔案 + Page Set&up... é é¢è¨­å®š(&U)... + Print Preview... 列å°é è¦½... + &Print... 列å°(&P)... CTRL+P - CTRL+P + CTRL+P + New &Tab 新增分é (&T) CTRL+T - CTRL+T + CTRL+T + &Close Tab 關閉分é (&C) CTRL+W - CTRL+W + CTRL+W + &Quit 離開(&Q) + CTRL+Q CTRL+Q @@ -453,38 +554,43 @@ 編輯 + &Copy selected Text 複製é¸å–的文字(&C) Ctrl+C - Ctrl+C + Ctrl+C + &Find in Text... 在文字中尋找(&F)... Ctrl+F - Ctrl+F + Ctrl+F + Find &Next 尋找下一筆(&N) F3 - F3 + F3 + Find &Previous 尋找å‰ä¸€ç­†(&P) Shift+F3 - Shift+F3 + Shift+F3 + Preferences... 喜好設定... @@ -493,34 +599,40 @@ 檢視 + Zoom &in 放大(&I) Ctrl++ - Ctrl++ + Ctrl++ + Zoom &out 縮å°(&O) Ctrl+- - Ctrl+- + Ctrl+- + Normal &Size 一般大å°(&S) + Ctrl+0 Ctrl+0 + ALT+C ALT+C + ALT+I ALT+I @@ -529,6 +641,7 @@ ALT+B + ALT+S ALT+S @@ -537,42 +650,52 @@ å‰å¾€ + &Home 首é (&H) + Ctrl+Home Ctrl+Home + &Back 返回(&B) + &Forward å¾€å‰(&F) + Sync with Table of Contents 與目錄åŒæ­¥ + Next Page ä¸‹ä¸€é  + Ctrl+Alt+Right Ctrl+Alt+Right + Previous Page å‰ä¸€é  + Ctrl+Alt+Left Ctrl+Alt+Left + Add Bookmark... 新增書籤... @@ -585,44 +708,52 @@ 說明 + About... 關於... + Navigation Toolbar 導覽工具列 + Toolbars 工具列 + Filter Toolbar éŽæ¿¾å™¨å·¥å…·åˆ— + Filtered by: å·²éŽæ¿¾ï¼š + Address Toolbar ä½å€å·¥å…·åˆ— + Address: ä½å€ï¼š + Could not find the associated content item. 找ä¸åˆ°ç›¸é—œçš„內容項目。 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Assistant is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development. - 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ + 此版本的 Qt å°å¹«æ‰‹æ˜¯ Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> for an overview of Qt licensing. @@ -630,33 +761,40 @@ This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + About %1 關於 %1 + Updating search index æ›´æ–°æœå°‹ç´¢å¼• + Looking for Qt Documentation... æœå°‹ Qt 文件中... + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Zoom 縮放 @@ -670,37 +808,45 @@ You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a> for an overview of Qt licensing. - 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a>。 + 您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel</a>。 + &File 檔案(&F) + &Edit 編輯(&E) + &View 檢視(&V) + ALT+O ALT+O + &Go å‰å¾€(&G) + &Bookmarks 書籤(&B) + CTRL+D CTRL+D + &Help 說明(&H) @@ -716,22 +862,49 @@ 從說明伺æœå™¨ä¸‹è¼‰... + + + Add Documentation 新增文件 + Qt Compressed Help Files (*.qch) Qt 壓縮說明檔(*.qch) + The specified file is not a valid Qt Help File! 指定的檔案ä¸æ˜¯åˆæ³•çš„ Qt èªªæ˜Žæª”ï¼ + The namespace %1 is already registered! 命å空間 %1 å·²è¨»å†Šï¼ + + Remove Documentation + + + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + + + + + Cancel + å–消 + + + + OK + 確定 + + + Use custom settings 使用自訂設定 @@ -739,90 +912,108 @@ PreferencesDialogClass + Preferences 喜好設定 + Fonts å­—åž‹ + Font settings: 字型設定: + Browser ç€è¦½å™¨ + Application æ‡‰ç”¨ç¨‹å¼ + Filters éŽæ¿¾å™¨ + Filter: éŽæ¿¾ï¼š + Attributes: 屬性: + 1 1 + Add 新增 + Remove 移除 + Documentation 文件 + Registered Documentation: 已註冊文件: + Add... 新增... Network - 網路 + 網路 Use Http Proxy - 使用 Http 代ç†ä¼ºæœå™¨ + 使用 Http 代ç†ä¼ºæœå™¨ Http Proxy: - Http 代ç†ä¼ºæœå™¨ï¼š + Http 代ç†ä¼ºæœå™¨ï¼š Port: - 連接埠: + 連接埠: + Options é¸é … + Current Page ç›®å‰é é¢ + Restore to default 回復為é è¨­å€¼ + Homepage é¦–é  @@ -834,48 +1025,69 @@ 新資料夾 - + The specified collection file does not exist! 指定的收集檔ä¸å­˜åœ¨ï¼ + Missing collection file! éºå¤±æ”¶é›†æª”ï¼ + Invalid URL! ä¸åˆæ³•çš„網å€ï¼ + Missing URL! éºå¤±ç¶²å€ï¼ + + + Unknown widget: %1 未知的元件:%1 + + + Missing widget! éºå¤±å…ƒä»¶ï¼ + + The specified Qt help file does not exist! 指定的 Qt 說明檔ä¸å­˜åœ¨ï¼ + + Missing help file! éºå¤±èªªæ˜Žæª”ï¼ + + Missing filter argument! + + + + Unknown option: %1 未知的é¸é …:%1 + + Qt Assistant Qt å°å¹«æ‰‹ - + Could not register documentation file %1 @@ -888,10 +1100,12 @@ Reason: %2 + Documentation successfully registered. 文件已註冊æˆåŠŸã€‚ + Could not unregister documentation file %1 @@ -904,18 +1118,23 @@ Reason: %2 + Documentation successfully unregistered. 文件已æˆåŠŸè§£é™¤è¨»å†Šã€‚ + Cannot load sqlite database driver! 無法載入 sqlite 資料庫驅動程å¼ï¼ + The specified collection file could not be read! 指定的收集檔無法讀å–。 + + Bookmark 書籤 @@ -923,11 +1142,12 @@ Reason: RemoteControl - + Debugging Remote Control é ç«¯é™¤éŒ¯æŽ§åˆ¶ + Received Command: %1 %2 已接收指令:%1 %2 @@ -935,23 +1155,28 @@ Reason: SearchWidget - + &Copy 複製(&C) + Copy &Link Location 複製連çµä½ç½®(&L) + + Open Link in New Tab 在新分é é–‹å•Ÿé€£çµ + Select All 全部é¸å– + Open Link é–‹å•Ÿé€£çµ @@ -959,23 +1184,27 @@ Reason: TopicChooser - + Choose a topic for <b>%1</b>: é¸æ“‡ %1 的標題: + Choose Topic é¸æ“‡æ¨™é¡Œ + &Topics 標題(&T) + &Display 顯示(&D) + &Close 關閉(&C) diff --git a/translations/designer_de.ts b/translations/designer_de.ts index cac8afb..4cd9914 100644 --- a/translations/designer_de.ts +++ b/translations/designer_de.ts @@ -1,11 +1,10 @@ - - + <object> <Objekt> @@ -20,7 +19,7 @@ <Slot> - + The moose in the noose ate the goose who was loose. @@ -29,7 +28,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous &Vorige @@ -75,7 +74,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts Zusätzliche Schriftarten @@ -187,7 +186,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. Fehler beim Senden einer Anforderung: Das Programm Assistant antwortet nicht. @@ -205,7 +204,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. Bei dem Element fehlt das erforderliche Attribut '%2'. @@ -233,7 +232,7 @@ ate the goose who was loose. BrushPropertyManager - + Style Stil @@ -326,19 +325,24 @@ ate the goose who was loose. Command - - + + Change signal Signal ändern - - + + Change slot Slot ändern - + + Change signal-slot connection + + + + Change sender Sender ändern @@ -348,7 +352,7 @@ ate the goose who was loose. Empfänger ändern - + Add connection Verbindung hinzufügen @@ -373,7 +377,7 @@ ate the goose who was loose. Endpunkt ändern - + Insert '%1' '%1' einfügen @@ -398,7 +402,7 @@ ate the goose who was loose. '%1' einem anderen Widget zuordnen - + Promote to custom widget Platzhalter für benutzerdefinierte Klasse erzeugen @@ -428,48 +432,48 @@ ate the goose who was loose. Layout auflösen - - - + + + Move Page Seite verschieben - - - - + + + + Delete Page Seite löschen - - + + Page Seite - - - + + + page Seite - - - - + + + + Insert Page Seite einfügen - + tab Seite - + Change Tab order Seite ändern @@ -514,12 +518,12 @@ ate the goose who was loose. Ändern des Formularlayout-Elements - + Change Layout Item Geometry Geometrie des Layoutelements ändern - + Change Table Contents Tabelleninhalt ändern @@ -561,7 +565,7 @@ ate the goose who was loose. Werkzeugleiste löschen - + Set action text Text der Aktion setzen @@ -572,7 +576,7 @@ ate the goose who was loose. - + Move action Aktion verschieben @@ -587,7 +591,7 @@ ate the goose who was loose. Menü einfügen - + Change signals/slots Signale/Slots ändern @@ -612,17 +616,17 @@ ate the goose who was loose. Subwindow - + Change Z-order of '%1' Z-Reihenfolge von '%1' ändern - + Simplify Grid Layout Tabellarisches Layout vereinfachen - + Create button group Buttons gruppieren @@ -647,19 +651,19 @@ ate the goose who was loose. Buttons aus Gruppierung entfernen - + Morph %1/'%2' into %3 MorphWidgetCommand description %1/'%2' in %3 umwandeln - + Change layout of '%1' from %2 to %3 Layout von '%1' von %2 in %3 umwandeln - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup '%1' zu '%2' hinzufügen @@ -671,12 +675,12 @@ ate the goose who was loose. '%1' aus '%2' entfernen - + Change script Skript ändern - + Changed '%1' of '%2' '%1' von '%2' geändert @@ -757,7 +761,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution Standardauflösung (96 x 96) @@ -778,12 +782,12 @@ ate the goose who was loose. Designer - + Qt Designer Qt Designer - + Unable to launch %1. %1 konnte nicht gestartet werden. @@ -855,7 +859,7 @@ ate the goose who was loose. Bitte wandeln Sie sie mit dem Befehl <b>uic3&nbsp;-convert</b> zum Format von Qt 4. - + Custom Widgets Benutzerdefinierte Widgets @@ -868,7 +872,7 @@ ate the goose who was loose. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 ist kein gültiger Wert der Aufzählung '%2'. @@ -889,7 +893,7 @@ ate the goose who was loose. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1' ist keine gültige Zahl. @@ -931,7 +935,7 @@ ate the goose who was loose. DeviceSkin - + The image file '%1' could not be loaded. Die Pixmap-Datei '%1' konnte nicht geladen werden. @@ -989,7 +993,7 @@ ate the goose who was loose. EmbeddedOptionsControl - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Stil</b></td><td>%3</td></tr><tr><td><b>Auflösung</b></td><td>%4 x %5</td></tr></table></html> @@ -1013,7 +1017,7 @@ ate the goose who was loose. FontPanel - + Font Schriftart @@ -1041,7 +1045,7 @@ ate the goose who was loose. FontPropertyManager - + PreferDefault Voreinstellung bevorzugt @@ -1064,7 +1068,7 @@ ate the goose who was loose. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values Ungültiger Stretch-Wert für '%1': '%2' @@ -1079,7 +1083,7 @@ ate the goose who was loose. FormEditorOptionsPage - + %1 % %1 % @@ -1146,7 +1150,7 @@ ate the goose who was loose. FormWindow - + Unexpected element <%1> Ungültiges Element <%1> @@ -1222,7 +1226,7 @@ ate the goose who was loose. IconSelector - + All Pixmaps ( Alle Pixmap-Dateien ( @@ -1230,7 +1234,7 @@ ate the goose who was loose. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser Ausgewähltes Icon, aus @@ -1239,7 +1243,7 @@ ate the goose who was loose. LanguageResourceDialog - + Choose Resource Ressource auswählen @@ -1247,7 +1251,7 @@ ate the goose who was loose. MainWindowBase - + Main Not currently used (main tool bar) Haupt-Werkzeugleiste @@ -1281,7 +1285,7 @@ ate the goose who was loose. NewForm - + C&reate &Neu von Vorlage @@ -1334,7 +1338,7 @@ ate the goose who was loose. NewFormWidget - + Unable to open the form template file '%1': %2 Die Formularvorlage %1 konnte nicht geöffnet werden: %2 @@ -1342,7 +1346,7 @@ ate the goose who was loose. ObjectInspectorModel - + Object Objekt @@ -1365,7 +1369,7 @@ ate the goose who was loose. ObjectNameDialog - + Change Object Name Objektnamen bearbeiten @@ -1376,52 +1380,16 @@ ate the goose who was loose. - qdesigner_internal::PluginDialog - - - Components - Komponenten - + PluginDialog - - + Plugin Information - Plugins - - - - Refresh - Neu laden - - - - Scan for newly installed custom widget plugins. - Sucht nach neuinstallierten Plugins mit benutzerdefinierten Widgets. - - - - Qt Designer couldn't find any plugins - Qt Designer konnte keine plugins finden - - - - Qt Designer found the following plugins - Qt Designer hat die folgenden Plugins gefunden - - - - New custom widget plugins have been found. - Es wurden neuinstallierten Plugins mit benutzerdefinierten Widgets gefunden. - - - - TextLabel - + Plugins 1 - 1 + 1 @@ -1435,7 +1403,7 @@ ate the goose who was loose. PreviewConfigurationWidget - + Default Vorgabe @@ -1483,7 +1451,7 @@ ate the goose who was loose. PromotionModel - + Not used Usage of promoted widgets Nicht verwendet @@ -1492,7 +1460,7 @@ ate the goose who was loose. Q3WizardContainer - + Page Seite @@ -1501,7 +1469,7 @@ ate the goose who was loose. QAbstractFormBuilder - + Unexpected element <%1> Ungültiges Element <%1> @@ -1547,7 +1515,7 @@ This indicates an inconsistency in the ui-file. Fehler beim Setzen der Tabulatorreihenfolge: Es konnte kein Widget mit dem Namen '%1' gefunden werden. - + Invalid QButtonGroup reference '%1' referenced by '%2'. Ungültige Referenz der Buttongruppe '%1', referenziert von '%2'. @@ -1560,7 +1528,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX-Steuerelement @@ -1573,7 +1541,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control Steuerelement setzen @@ -1596,7 +1564,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ist kein Platzhalter für eine benutzerdefinierte Klasse. @@ -1646,7 +1614,7 @@ This indicates an inconsistency in the ui-file. Der Name der Include-Datei darf nicht leer sein. - + Exception at line %1: %2 Ausnahmefehler bei Zeile %1: %2 @@ -1665,7 +1633,7 @@ Script: %3 QDesigner - + %1 - warning %1 - Warnung @@ -1683,7 +1651,7 @@ Script: %3 QDesignerActions - + Edit Widgets Widgets bearbeiten @@ -1837,7 +1805,7 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Die Datei konnte nicht geöffnet werden - + The backup file %1 could not be written. Hintergrundsicherung: Die Datei %1 konnte nicht geschrieben werden. @@ -1858,7 +1826,7 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Bitte schließen Sie alle Formulare, um zusätzliche Schriftarten zu laden. - + Select New File Andere Datei @@ -1868,12 +1836,12 @@ Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen?Die Datei konnte nicht geschrieben werden - + &Close Preview Vorschau &schließen - + Save &Image... &Vorschaubild speichern... @@ -1906,7 +1874,7 @@ Would you like to retry? Möchten Sie es noch einmal versuchen? - + Image files (*.%1) Bilddateien (*.%1) @@ -1922,7 +1890,7 @@ Möchten Sie es noch einmal versuchen? Die Datei %1 konnte nicht geschrieben werden. - + &New... &Neu... @@ -1953,12 +1921,12 @@ Möchten Sie es noch einmal versuchen? - + &Close &Schließen - + View &Code... &Code anzeigen... @@ -1969,23 +1937,23 @@ Möchten Sie es noch einmal versuchen? Formular unter einem anderen Namen speichern - + Preview failed Es konnte keine Vorschau erzeugt werden - + Code generation failed Es konnte kein Code generiert werden - + Assistant Assistant - + Saved image %1. Das Vorschaubild wurde unter %1 gespeichert. @@ -1995,7 +1963,7 @@ Möchten Sie es noch einmal versuchen? %1 wurde gedruckt. - + ALT+CTRL+S ALT+CTRL+S @@ -2003,7 +1971,7 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog Ansicht @@ -2040,7 +2008,7 @@ Möchten Sie es noch einmal versuchen? Steuerelement setzen - + Control loaded Steuerelement geladen @@ -2053,7 +2021,7 @@ Möchten Sie es noch einmal versuchen? QDesignerFormBuilder - + Script errors occurred: Es sind Skriptfehler aufgetreten: @@ -2071,7 +2039,7 @@ Möchten Sie es noch einmal versuchen? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2156,7 +2124,7 @@ Möchten Sie es noch einmal versuchen? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 Fehler beim Auswerten des XML des benutzerdefinierten Widgets %1: %2 @@ -2179,7 +2147,7 @@ Möchten Sie es noch einmal versuchen? QDesignerPropertySheet - + Dynamic Properties Dynamische Eigenschaften @@ -2187,19 +2155,19 @@ Möchten Sie es noch einmal versuchen? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. Der Layout-Typ '%1' wird nicht unterstützt; es wurde ein Grid-Layout erzeugt. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Die Container-Extension des Widgets '%1' (%2) gab für Seite %5 ein Widget '%3' (%4) zurück, was nicht von Designer verwaltet wird. Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifiziert werden. - + Unexpected element <%1> Parsing clipboard contents Ungültiges Element <%1> @@ -2220,7 +2188,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerSharedSettings - + The template path %1 could not be created. Das Vorlagenverzeichnis %1 konnte nicht angelegt werden. @@ -2233,7 +2201,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerToolWindow - + Property Editor Eigenschaften @@ -2266,7 +2234,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 Fehler bei Zeile %1 von %2: %3 @@ -2289,7 +2257,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWorkbench - + &File &Datei @@ -2364,7 +2332,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Designer wurde offenbar nicht ordnungsgemäß beendet; es existieren noch Dateien von der Hintergrundsicherung. Möchten Sie sie laden? - + The file <b>%1</b> could not be opened. Die Datei <b>%1</b> konnte nicht geöffnet werden. @@ -2374,7 +2342,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Die Datei <b>%1</b> ist keine gültige Designer-Datei. - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Das Formular wurde geändert. Möchten Sie sich die Änderungen ansehen, bevor Sie das Programm beenden? @@ -2385,7 +2353,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method Der Methode %1 wurde ein leerer Klassennamen übergeben (Name '%2'). @@ -2406,7 +2374,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Layouts des Typs `%1' werden nicht unterstützt. - + The set-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Menge). @@ -2426,7 +2394,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird. - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Der Aufzählungswert '%1' ist ungültig. Der Vorgabewert '%2' wird verwendet. @@ -2439,7 +2407,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetEventFilter - + Previous Page Vorige Seite @@ -2500,7 +2468,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QTabWidgetEventFilter - + Delete Löschen @@ -2528,7 +2496,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QToolBoxHelper - + Delete Page Seite löschen @@ -2566,7 +2534,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolEdit - + True @@ -2582,7 +2550,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolPropertyManager - + True Wahr @@ -2595,7 +2563,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCharEdit - + Clear Char Zeichen löschen @@ -2611,7 +2579,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorPropertyManager - + Red Rot @@ -2791,7 +2759,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientEditor - + Start X Anfangswert X @@ -3066,7 +3034,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientStopsWidget - + New Stop Neuer Bezugspunkt @@ -3104,7 +3072,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientView - + Grad Grad @@ -3151,7 +3119,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientViewDialog - + Select Gradient Gradienten auswählen @@ -3168,7 +3136,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3235,22 +3203,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Breite @@ -3263,22 +3231,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Breite @@ -3291,7 +3259,7 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtResourceEditorDialog - + Edit Resources Ressourcen bearbeiten @@ -3454,7 +3422,7 @@ zu: Datei oder Ressource löschen - + %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. @@ -3466,7 +3434,7 @@ Wollen Sie sie überschreiben? Die Datei ist offenbar keine Ressourcendatei; an Stelle des erwarteten Elements '%2' wurde das Element '%1' gefunden. - + %1 [read-only] %1 [schreibgeschützt] @@ -3577,7 +3545,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceView - + Size: %1 x %2 %3 Größe: %1 x %2 @@ -3610,7 +3578,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -3628,7 +3596,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePolicyPropertyManager - + <Invalid> <Ungültig> @@ -3662,7 +3630,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -3680,7 +3648,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtToolBarDialog - + < S E P A R A T O R > < T R E N N E R > @@ -3788,7 +3756,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtTreePropertyBrowser - + Property Eigenschaft @@ -3801,7 +3769,7 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. SaveFormAsTemplate - + Add path... Verzeichnis anlegen... @@ -3866,7 +3834,7 @@ Möchten Sie sie überschreiben? ScriptErrorDialog - + An error occurred while running the scripts for "%1": Bei der Ausführung der Skripte für "%1" sind Fehler aufgetreten: @@ -3899,7 +3867,7 @@ Möchten Sie sie überschreiben? SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), EMPFÄNGER(%3), SLOT(%4) @@ -3940,7 +3908,7 @@ Möchten Sie sie überschreiben? Spacer - + Horizontal Spacer '%1', %2 x %3 Horizontales Füllelement '%1', %2 x %3 @@ -3953,7 +3921,7 @@ Möchten Sie sie überschreiben? TemplateOptionsPage - + Template Paths Tab in preferences dialog Verzeichnisse für Vorlagen @@ -3995,17 +3963,12 @@ Möchten Sie sie überschreiben? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - - Open Source Edition - - - - + Qt Designer Qt Designer @@ -4015,30 +3978,15 @@ Möchten Sie sie überschreiben? - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Die Datei enthält ein benutzerdefiniertes Widget '%1' dessen Basisklasse (%2) nicht mit dem Eintrag in der Widget-Datenbank übereinstimmt. Die Widget-Datenbank wird nicht geändert. @@ -4046,22 +3994,22 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionEditor - + Actions Aktionen - + New... Neu... - + Delete Löschen - + New action Neue Aktion @@ -4071,12 +4019,17 @@ Möchten Sie sie überschreiben? Aktion ändern - + Edit... Ändern... + Go to slot... + Slot anzeigen... + + + Copy Kopieren @@ -4096,7 +4049,7 @@ Möchten Sie sie überschreiben? Alles auswählen - + Icon View Icon-Ansicht @@ -4106,7 +4059,7 @@ Möchten Sie sie überschreiben? Detaillierte Ansicht - + Remove actions Aktionen löschen @@ -4116,12 +4069,12 @@ Möchten Sie sie überschreiben? Aktion '%1' löschen - + Used In Verwendet in - + Configure Action Editor Aktionseditor konfigurieren @@ -4129,7 +4082,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionModel - + Name Name @@ -4162,7 +4115,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditor - + Add buddy Buddy hinzufügen @@ -4196,7 +4149,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies Buddies bearbeiten @@ -4204,7 +4157,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorTool - + Edit Buddies Buddies bearbeiten @@ -4258,7 +4211,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::CodeDialog - + Save... Speichern... @@ -4316,7 +4269,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ColorAction - + Text Color Schriftfarbe @@ -4324,7 +4277,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... Einträge ändern... @@ -4416,7 +4369,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page Seite davor einfügen @@ -4479,7 +4432,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::DesignerPropertyManager - + AlignLeft Linksbündig ausrichten @@ -4605,7 +4558,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) Profile @@ -4765,7 +4718,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FilterWidget - + <Filter> <FIlter> @@ -4773,7 +4726,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormEditor - + Resource File Changed Änderung einer Ressourcendatei @@ -4794,7 +4747,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindow - + Edit contents Ändern @@ -4804,7 +4757,7 @@ Möchten Sie sie überschreiben? F2 - + Resize Größe ändern @@ -4890,7 +4843,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowBase - + Delete Löschen @@ -4903,7 +4856,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowManager - + Cu&t &Ausschneiden @@ -4985,7 +4938,7 @@ Möchten Sie sie überschreiben? Berechnet die Größe des ausgewählten Widgets aus dem Layout und passt das Widget an - + Lay Out &Horizontally Objekte &waagrecht anordnen @@ -5035,7 +4988,7 @@ Möchten Sie sie überschreiben? Ordnet die ausgewählten Objekte um einen Splitter senkecht an - + &Break Layout La&yout auflösen @@ -5060,7 +5013,7 @@ Möchten Sie sie überschreiben? Formular&einstellungen... - + Break Layout Layout auflösen @@ -5076,17 +5029,17 @@ Möchten Sie sie überschreiben? Es konnte keine Vorschau erzeugt werden - + Form Settings - %1 Formulareinstellungen - %1 - + Removes empty columns and rows Entfernt unbesetzte Zeilen und Spalten - + Lay Out in a &Form Layout Objekte in &Formularlayout anordnen @@ -5096,7 +5049,7 @@ Möchten Sie sie überschreiben? Ordnet die ausgewählten Objekte in einem zweispaltigen Formularlayout an - + Si&mplify Grid Layout Tabellarisches Layout &vereinfachen @@ -5104,7 +5057,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowSettings - + None Kein @@ -5155,7 +5108,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::GroupBoxTaskMenu - + Change title... Titel ändern... @@ -5171,7 +5124,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. Die Pixmap-Datei '%1' kann nicht gelesen werden. @@ -5323,7 +5276,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::LabelTaskMenu - + Change rich text... Formatierbaren Text ändern... @@ -5336,7 +5289,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::LineEditTaskMenu - + Change text... Text ändern... @@ -5344,7 +5297,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetEditor - + Edit List Widget List-Widget ändern @@ -5362,7 +5315,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -5398,7 +5351,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::MenuTaskMenu - + Remove Löschen @@ -5457,7 +5410,7 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name Namen der Eigenschaft setzen @@ -5577,7 +5530,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add Hinzufügen @@ -5615,7 +5568,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... &Suchen... @@ -5631,7 +5584,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) Position %1 (%2) @@ -5712,7 +5665,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette Palette ändern @@ -5720,7 +5673,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role Farbrolle @@ -5772,15 +5725,57 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text Text bearbeiten + qdesigner_internal::PluginDialog + + + Components + Komponenten + + + + Plugin Information + Plugins + + + + Refresh + Neu laden + + + + Scan for newly installed custom widget plugins. + Sucht nach neuinstallierten Plugins mit benutzerdefinierten Widgets. + + + + Qt Designer couldn't find any plugins + Qt Designer konnte keine plugins finden + + + + Qt Designer found the following plugins + Qt Designer hat die folgenden Plugins gefunden + + + + New custom widget plugins have been found. + Es wurden neuinstallierten Plugins mit benutzerdefinierten Widgets gefunden. + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1-Stil @@ -5823,7 +5818,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close &Schließen @@ -5920,7 +5915,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... Benutzerdefinierte Klassen... @@ -5948,7 +5943,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... Dynamische Eigenschaft hinzufügen... @@ -6008,7 +6003,7 @@ Klasse: %2 qdesigner_internal::PropertyLineEdit - + Insert line break Zeilenumbruch einfügen @@ -6122,12 +6117,12 @@ Klasse: %2 Slot anzeigen... - + no signals available Es sind keine Signale vorhanden - + Set size constraint on %n widget(s) Größenbeschränkung eines Widgets festlegen @@ -6135,7 +6130,7 @@ Klasse: %2 - + Size Constraints Größe @@ -6170,7 +6165,7 @@ Klasse: %2 Maximalgröße festlegen - + Edit ToolTip ToolTip bearbeiten @@ -6183,7 +6178,7 @@ Klasse: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> Ungültiges Element <%1> @@ -6238,7 +6233,7 @@ Klasse: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -6413,7 +6408,7 @@ Klasse: %2 qdesigner_internal::ScriptDialog - + Edit script Skript bearbeiten @@ -6463,7 +6458,7 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots Signale und Slots bearbeiten @@ -6476,7 +6471,7 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots Signale und Slots bearbeiten @@ -6484,7 +6479,7 @@ Klasse: %2 qdesigner_internal::StatusBarTaskMenu - + Remove Löschen @@ -6492,7 +6487,7 @@ Klasse: %2 qdesigner_internal::StringListEditorButton - + Change String List Zeichenkettenliste ändern @@ -6500,7 +6495,7 @@ Klasse: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet Stylesheet bearbeiten @@ -6539,7 +6534,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditor - + Start from Here Hier neu beginnen @@ -6567,7 +6562,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6575,7 +6570,7 @@ Klasse: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6583,7 +6578,7 @@ Klasse: %2 qdesigner_internal::TableWidgetEditor - + New Column Neue Spalte @@ -6632,7 +6627,7 @@ Klasse: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -6663,7 +6658,7 @@ Klasse: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... HTML ändern... @@ -6709,7 +6704,7 @@ Klasse: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator Trenner einfügen @@ -6737,7 +6732,7 @@ Klasse: %2 qdesigner_internal::TreeWidgetEditor - + &Columns &Spalten @@ -6863,7 +6858,7 @@ Klasse: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... Elemente ändern... @@ -6871,7 +6866,7 @@ Klasse: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Warnung: Die Erzeugung des Widgets in der Widget-Box schlug fehl. Das könnte durch fehlerhaften XML-Code benutzerdefinierter Widgets verursacht worden sein. @@ -6879,17 +6874,17 @@ Klasse: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad Ablage - + Custom Widgets Benutzerdefinierte Widgets - + Expand all Alles aufklappen @@ -6930,7 +6925,7 @@ Klasse: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets Widgets bearbeiten @@ -6938,12 +6933,12 @@ Klasse: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. Die Factory für benutzerdefinierte Widgets der Klasse %1 gab einen 0-Zeiger zurück. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Bei der Erzeugung von Widgets wurden widersprüchliche Klassennamen festgestellt: Die Factory für benutzerdefinierte Widgets der Klasse %1 gab ein Widget der Klasse %2 zurück. @@ -6985,7 +6980,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_ja.ts b/translations/designer_ja.ts index a403b8d..1bcb801 100644 --- a/translations/designer_ja.ts +++ b/translations/designer_ja.ts @@ -1,20 +1,21 @@ - + + - + The moose in the noose ate the goose who was loose. åŠä¸»ãŒå±é¢¨ã«ä¸Šæ‰‹ã«åŠä¸»ã®çµµã‚’æã„ãŸã€‚ - + <object> <オブジェクト> - + <signal> <シグナル> @@ -95,7 +96,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous @@ -141,7 +142,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts @@ -253,7 +254,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. @@ -271,7 +272,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. @@ -299,7 +300,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush @@ -396,19 +397,24 @@ ate the goose who was loose. Command - - + + Change signal シグナルを変更 - - + + Change slot スロットを変更 - + + Change signal-slot connection + + + + Change sender 発信者を変更 @@ -418,7 +424,7 @@ ate the goose who was loose. å—信者を変更 - + Add connection シグナル/スロット接続を追加 @@ -443,7 +449,7 @@ ate the goose who was loose. ターゲットを変更 - + Insert '%1' '%1' を挿入 @@ -473,7 +479,7 @@ ate the goose who was loose. '%1' ã®è¦ªã‚’ã¤ã‘ã‹ãˆ - + Promote to custom widget カスタムウィジェットã«æ ¼ä¸Šã’ @@ -508,48 +514,48 @@ ate the goose who was loose. - - - + + + Move Page ページを移動 - - - - + + + + Delete Page ページを削除 - - + + Page ページ - - - + + + page ページ - - - - + + + + Insert Page ページを挿入 - + tab タブ - + Change Tab order タブ順を変更 @@ -598,7 +604,7 @@ ate the goose who was loose. - + Change Layout Item Geometry レイアウトアイテムã®åº§æ¨™ã‚’変更 @@ -607,7 +613,7 @@ ate the goose who was loose. 行を挿入 - + Change Table Contents テーブルã®å†…容を変更 @@ -649,7 +655,7 @@ ate the goose who was loose. ツールãƒãƒ¼ã‚’削除 - + Set action text アクションã®ãƒ†ã‚­ã‚¹ãƒˆã‚’設定 @@ -660,7 +666,7 @@ ate the goose who was loose. - + Move action アクションを移動 @@ -725,12 +731,12 @@ ate the goose who was loose. - + Change signals/slots - + Delete Subwindow @@ -750,7 +756,7 @@ ate the goose who was loose. - + Create button group @@ -771,7 +777,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup @@ -788,23 +794,23 @@ ate the goose who was loose. - + Morph %1/'%2' into %3 MorphWidgetCommand description - + Change layout of '%1' from %2 to %3 - + Change script スクリプトを変更 - + Changed '%1' of '%2' @@ -878,7 +884,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution @@ -899,7 +905,7 @@ ate the goose who was loose. Designer - + Qt Designer Qt Designer @@ -979,7 +985,7 @@ The old form has been untouched, but you will have to save this form under a new ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ Qt-%1 ã® Designer ã§ä½œæˆã•ã‚ŒãŸã‚‚ã®ã§ã™ãŒã€èª­ã‚ã¾ã›ã‚“ã§ã—ãŸ:<br>%2<br><b>uic3 -convert</b> を実行ã—ã¦ã€Qt 4 ã® UI フォーマットã«å¤‰æ›ã—ã¦ãã ã•ã„。 - + Custom Widgets カスタムウィジェット @@ -989,7 +995,7 @@ The old form has been untouched, but you will have to save this form under a new 格上ã’ã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ - + Unable to launch %1. %1 ã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -1023,7 +1029,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. @@ -1044,7 +1050,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile @@ -1086,7 +1092,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. @@ -1144,66 +1150,16 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - - None - - - - - Add a profile - - - - - Edit the selected profile - - - - - Delete the selected profile - - - - - Add Profile - - - - - New profile - - - - - Edit Profile - - - - - Delete Profile - - - - - Would you like to delete the profile '%1'? - - - - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description - - - Default - - EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog @@ -1218,7 +1174,7 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font フォント @@ -1246,7 +1202,7 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault @@ -1269,7 +1225,7 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values @@ -1284,7 +1240,7 @@ The old form has been untouched, but you will have to save this form under a new FormEditorOptionsPage - + %1 % @@ -1351,7 +1307,7 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> @@ -1427,7 +1383,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( å…¨ã¦ã®ãƒ”ックスマップ ( @@ -1435,7 +1391,7 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser @@ -1444,7 +1400,7 @@ The old form has been untouched, but you will have to save this form under a new LanguageResourceDialog - + Choose Resource @@ -1459,7 +1415,7 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main Not currently used (main tool bar) @@ -1493,7 +1449,7 @@ The old form has been untouched, but you will have to save this form under a new NewForm - + C&reate 作æˆ(&R) @@ -1562,7 +1518,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 @@ -1570,7 +1526,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object オブジェクト @@ -1580,7 +1536,7 @@ The old form has been untouched, but you will have to save this form under a new クラス - + separator セパレータ @@ -1593,7 +1549,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name オブジェクトåを変更 @@ -1651,47 +1607,11 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog + PluginDialog - - Components - コンãƒãƒ¼ãƒãƒ³ãƒˆ - - - - + Plugin Information - プラグイン情報 - - - - Refresh - リフレッシュ - - - - Scan for newly installed custom widget plugins. - æ–°ã—ãインストールã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ—ラグインをスキャンã—ã¾ã™ã€‚ - - - - Qt Designer couldn't find any plugins - プラグインã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠- - - - Qt Designer found the following plugins - 以下ã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—㟠- - - - New custom widget plugins have been found. - æ–°ã—ã„カスタムウィジェットã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ - - - - TextLabel - テキストラベル + プラグイン情報 @@ -1742,7 +1662,7 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default @@ -1790,7 +1710,7 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used Usage of promoted widgets 使用ã•ã‚Œã¾ã›ã‚“ @@ -1799,7 +1719,7 @@ There's nothing more here. You should get back to work. Q3WizardContainer - + Page ページ @@ -1808,7 +1728,7 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> @@ -1854,7 +1774,7 @@ This indicates an inconsistency in the ui-file. タブストップã®é©ç”¨ä¸­: ウィジェット '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 - + Invalid QButtonGroup reference '%1' referenced by '%2'. @@ -1900,7 +1820,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX コントロール @@ -1913,7 +1833,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control コントロールを設定 @@ -1936,7 +1856,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ã¯æ ¼ä¸Šã’ã•ã‚ŒãŸã‚¯ãƒ©ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 @@ -1986,7 +1906,7 @@ This indicates an inconsistency in the ui-file. 空ã®ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã§ãã¾ã›ã‚“。 - + Exception at line %1: %2 %1 行目ã§ä¾‹å¤–ãŒç™ºç”Ÿ: %2 @@ -2006,7 +1926,7 @@ Script: %3 QDesigner - + %1 - warning %1 - 警告 @@ -2031,7 +1951,7 @@ Script: %3 QDesignerActions - + Edit Widgets ウィジェットを編集 @@ -2100,7 +2020,7 @@ Script: %3 CTRL+O - + Clear &Menu メニューをクリア(&M) @@ -2109,7 +2029,7 @@ Script: %3 CTRL+S - + CTRL+SHIFT+S CTRL+SHIFT+S @@ -2166,17 +2086,17 @@ Script: %3 - + About Qt Designer Qt Designer ã«ã¤ã„㦠- + About Qt Qt ã«ã¤ã„㦠- + Open Form フォームを開ã @@ -2197,7 +2117,7 @@ Script: %3 ä¿å­˜ - + %1 already exists. Do you want to replace it? %1 ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹? @@ -2218,7 +2138,7 @@ Do you want to replace it? - + &Recent Forms 最近使用ã—ãŸãƒ•ã‚©ãƒ¼ãƒ (&R) @@ -2266,7 +2186,7 @@ Do you want to update the file location or generate a new form? ファイルをオープンã§ãã¾ã›ã‚“ã§ã—㟠- + Saved image %1. @@ -2276,7 +2196,7 @@ Do you want to update the file location or generate a new form? - + Printed %1. @@ -2289,7 +2209,7 @@ Would you like to retry or change your file? リトライã—ã¾ã™ã‹ã€ãã‚Œã¨ã‚‚ファイルを変更ã—ã¾ã™ã‹? - + Select New File æ–°ã—ã„ファイルをé¸æŠž @@ -2307,7 +2227,7 @@ Would you like to retry? リトライã—ã¾ã™ã‹? - + &Close Preview プレビューを閉ã˜ã‚‹(&C) @@ -2316,7 +2236,7 @@ Would you like to retry? フォーム設定 - %1 - + &New... @@ -2347,12 +2267,12 @@ Would you like to retry? - + &Close é–‰ã˜ã‚‹(&C) - + Save &Image... @@ -2367,7 +2287,7 @@ Would you like to retry? - + Save Form As @@ -2387,7 +2307,7 @@ Would you like to retry? - + The backup file %1 could not be written. ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイル %1 ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -2408,12 +2328,12 @@ Would you like to retry? - + Code generation failed - + Image files (*.%1) @@ -2429,8 +2349,8 @@ Would you like to retry? - - + + Assistant @@ -2438,7 +2358,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog @@ -2447,7 +2367,7 @@ Would you like to retry? QDesignerAppearanceOptionsWidget - + Docked Window ドックウィンドウ @@ -2457,7 +2377,7 @@ Would you like to retry? 複数ã®ãƒˆãƒƒãƒ—レベルウィンドウ - + Toolwindow Font ツールウィンドウフォント @@ -2475,7 +2395,7 @@ Would you like to retry? - + Control loaded コントロールãŒãƒ­ãƒ¼ãƒ‰ã•ã‚Œã¾ã—㟠@@ -2488,7 +2408,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: スクリプトエラーãŒç™ºç”Ÿã—ã¾ã—ãŸ: @@ -2506,7 +2426,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2529,7 +2449,7 @@ Would you like to retry? QDesignerMenu - + Type Here ã“ã“ã«å…¥åŠ› @@ -2539,7 +2459,7 @@ Would you like to retry? セパレータを追加 - + Insert separator セパレータを挿入 @@ -2598,7 +2518,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 @@ -2636,7 +2556,7 @@ Would you like to retry? レイアウト - + Dynamic Properties ダイナミックプロパティ @@ -2644,18 +2564,18 @@ Would you like to retry? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents @@ -2683,7 +2603,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. テンプレートã®ãƒ‘ス %1 を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -2835,7 +2755,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor プロパティエディタ @@ -2872,7 +2792,7 @@ Container pages should only be added by specifying them in XML returned by the d ウィジェットボックス - + An error has been encountered at line %1 of %2: %3 @@ -2895,7 +2815,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File ファイル(&F) @@ -3014,7 +2934,7 @@ Container pages should only be added by specifying them in XML returned by the d å‰å›žä½¿ç”¨ã—ãŸã¨ãã« Designer ã¯æ­£ã—ã終了ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイルãŒå­˜åœ¨ã—ã¾ã™ã€‚ロードã—ã¾ã™ã‹? - + The file <b>%1</b> could not be opened. ファイル <b>%1</b> ã¯ã‚ªãƒ¼ãƒ—ンã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -3024,7 +2944,7 @@ Container pages should only be added by specifying them in XML returned by the d ファイル <b>%1</b> ã¯ã€æœ‰åŠ¹ãª Designer ã® UI ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“。 - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? @@ -3034,7 +2954,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method @@ -3055,7 +2975,7 @@ Container pages should only be added by specifying them in XML returned by the d レイアウトタイプ '%1' ã¯ã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 - + The set-type property %1 could not be read. Setåž‹ã®ãƒ—ロパティ %1 を読ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚ @@ -3075,7 +2995,7 @@ Container pages should only be added by specifying them in XML returned by the d プロパティ %1 を書ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚%2 ã¨ã„ã†åž‹ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. @@ -3325,7 +3245,7 @@ Script: %3 QStackedWidgetEventFilter - + Previous Page å‰ã®ãƒšãƒ¼ã‚¸ @@ -3386,7 +3306,7 @@ Script: %3 QTabWidgetEventFilter - + Delete 削除 @@ -3414,7 +3334,7 @@ Script: %3 QToolBoxHelper - + Delete Page ページを削除 @@ -3452,7 +3372,7 @@ Script: %3 QtBoolEdit - + True @@ -3468,7 +3388,7 @@ Script: %3 QtBoolPropertyManager - + True @@ -3481,7 +3401,7 @@ Script: %3 QtCharEdit - + Clear Char @@ -3497,7 +3417,7 @@ Script: %3 QtColorPropertyManager - + Red 赤 @@ -3677,7 +3597,7 @@ Script: %3 QtGradientEditor - + Start X 始点㮠X 座標 @@ -3956,7 +3876,7 @@ Script: %3 QtGradientStopsWidget - + New Stop æ–°ã—ã„終点 @@ -3998,7 +3918,7 @@ Script: %3 QtGradientView - + Grad @@ -4049,7 +3969,7 @@ Script: %3 グラデーションを編集 - + Select Gradient @@ -4066,7 +3986,7 @@ Script: %3 QtLocalePropertyManager - + %1, %2 @@ -4133,22 +4053,22 @@ Script: %3 QtRectFPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -4161,22 +4081,22 @@ Script: %3 QtRectPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -4189,7 +4109,7 @@ Script: %3 QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚上書ãã—ã¾ã™ã‹? @@ -4200,7 +4120,7 @@ Do you want to replace it? - + %1 [read-only] @@ -4469,7 +4389,7 @@ to QtResourceView - + Size: %1 x %2 %3 @@ -4501,7 +4421,7 @@ to QtSizeFPropertyManager - + %1 x %2 @@ -4519,12 +4439,18 @@ to QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] - + Horizontal Policy @@ -4547,7 +4473,7 @@ to QtSizePropertyManager - + %1 x %2 @@ -4565,7 +4491,7 @@ to QtToolBarDialog - + < S E P A R A T O R > @@ -4673,7 +4599,7 @@ to QtTreePropertyBrowser - + Property プロパティ @@ -4686,7 +4612,7 @@ to SaveFormAsTemplate - + Add path... パスを追加... @@ -4751,7 +4677,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": "%1" ã®ãŸã‚ã«ã‚¹ã‚¯ãƒªãƒ—トを実行ã—ã¦ã„ã¦ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: @@ -4770,11 +4696,21 @@ Do you want overwrite the template? Select signal + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -4815,7 +4751,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 @@ -4828,7 +4764,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog @@ -4870,17 +4806,16 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %2 - Open Source Edition - オープンソース版 + オープンソース版 - + Qt Designer Qt Designer @@ -4890,34 +4825,23 @@ Do you want overwrite the template? <br/>Qt Designer ã¯ã€Qt アプリケーションをデザインã™ã‚‹ãŸã‚ã® GUI ツールã§ã™ã€‚<br/> - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/model.html">http://qtsoftware.com/company/model.html</a> for an overview of Qt licensing.<br/> ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Designer ã¯ã€ã‚ªãƒ¼ãƒ—ンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <a href="http://qtsoftware.com/company/model.html">http://qtsoftware.com/company/model.html</a> ã‚’ã”覧ãã ã•ã„。<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。<br/> + ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). å…¨ã¦ã®æ¨©åˆ©ã¯ä¿è­·ã•ã‚Œã¦ã„ã¾ã™ã€‚<br/><br/>プログラムã¯ã€Œè¨­è¨ˆã€ã€ã€Œå¸‚場性ã€ãŠã‚ˆã³ã€Œç‰¹å®šã®ç›®çš„ã¸ã®é©åˆæ€§ã€ã‚‚å«ã‚€ã€ã‚らゆる種類ã®ã€Œä¿è¨¼ãŒãªãã€ã€ã€Œãã®ã¾ã¾ã§ã€æä¾›ã•ã‚Œã¾ã™ã€‚<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. @@ -4925,22 +4849,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions アクション - + New... æ–°è¦... - + Delete 削除 - + New action æ–°ã—ã„アクション @@ -4958,12 +4882,17 @@ Do you want overwrite the template? ãã®æ©Ÿèƒ½ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“! - + Edit... 編集... + Go to slot... + + + + Copy @@ -4983,7 +4912,7 @@ Do you want overwrite the template? - + Configure Action Editor @@ -4998,7 +4927,7 @@ Do you want overwrite the template? - + Remove actions @@ -5008,7 +4937,7 @@ Do you want overwrite the template? アクション '%1' を消去 - + Used In @@ -5023,7 +4952,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name åå‰ @@ -5056,7 +4985,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy buddy を追加 @@ -5088,7 +5017,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies buddy を編集 @@ -5096,7 +5025,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies buddy を編集 @@ -5150,7 +5079,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... @@ -5208,7 +5137,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color @@ -5216,7 +5145,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... アイテムを編集... @@ -5270,7 +5199,7 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel - + Sender 発信者 @@ -5290,7 +5219,7 @@ Do you want overwrite the template? スロット - + <sender> <発信者> @@ -5331,7 +5260,7 @@ Do you want overwrite the template? ページを削除 - + Insert Page Before Current Page ã“ã®ãƒšãƒ¼ã‚¸ã®å‰ã«ãƒšãƒ¼ã‚¸ã‚’挿入 @@ -5394,7 +5323,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft @@ -5519,7 +5448,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) @@ -5662,9 +5591,62 @@ Do you want overwrite the template? + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + + + + + Edit the selected profile + + + + + Delete the selected profile + + + + + Add Profile + + + + + New profile + + + + + Edit Profile + + + + + Delete Profile + + + + + Would you like to delete the profile '%1'? + + + + + Default + + + + qdesigner_internal::FilterWidget - + <Filter> @@ -5691,7 +5673,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed @@ -5712,7 +5694,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents 内容を編集 @@ -5726,7 +5708,7 @@ Do you want overwrite the template? ウィジェット '%1 を挿入 - + Resize サイズ変更 @@ -5762,13 +5744,13 @@ and then paste again. レイアウト - + Drop widget ウィジェットã®è²¼ã‚Šä»˜ã‘ - + Paste %n action(s) @@ -5817,7 +5799,7 @@ and then paste again. - + A QMainWindow-based form does not contain a central widget. @@ -5825,7 +5807,7 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 削除 @@ -5838,7 +5820,7 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 切りå–ã‚Š(&T) @@ -5920,7 +5902,7 @@ and then paste again. é¸æŠžã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚£ãƒˆã®ã‚µã‚¤ã‚ºã‚’調整 - + Lay Out &Horizontally æ°´å¹³ã«ä¸¦ã¹ã‚‹(&H) @@ -5980,7 +5962,7 @@ and then paste again. é¸æŠžã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’スプリッタã®ä¸­ã§åž‚ç›´æ–¹å‘ã«é…ç½® - + &Break Layout レイアウトを破棄(&B) @@ -6010,7 +5992,7 @@ and then paste again. フォームã®è¨­å®š(&S)... - + Break Layout レイアウトを破棄ã™ã‚‹ @@ -6026,12 +6008,12 @@ and then paste again. - + Form Settings - %1 フォーム設定 - %1 - + Removes empty columns and rows @@ -6039,7 +6021,7 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None @@ -6105,7 +6087,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... タイトルを変更... @@ -6121,7 +6103,7 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. @@ -6214,7 +6196,7 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< @@ -6273,7 +6255,7 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... リッãƒãƒ†ã‚­ã‚¹ãƒˆã‚’変更... @@ -6286,7 +6268,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... テキストを変更... @@ -6294,7 +6276,7 @@ and then paste again. qdesigner_internal::ListWidgetEditor - + Edit List Widget リストウィジェットを編集 @@ -6372,7 +6354,7 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -6408,7 +6390,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 消去 @@ -6467,7 +6449,7 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name プロパティåを設定 @@ -6593,7 +6575,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 追加 @@ -6647,7 +6629,7 @@ Please select another name. セパレータ - + &Find in Text... @@ -6663,7 +6645,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) インデックス %1 (%2) @@ -6752,7 +6734,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette パレットを変更 @@ -6760,7 +6742,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role 色役割 @@ -6812,15 +6794,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text テキストを編集 + qdesigner_internal::PluginDialog + + + Components + コンãƒãƒ¼ãƒãƒ³ãƒˆ + + + + Plugin Information + プラグイン情報 + + + + Refresh + リフレッシュ + + + + Scan for newly installed custom widget plugins. + æ–°ã—ãインストールã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ—ラグインをスキャンã—ã¾ã™ã€‚ + + + + Qt Designer couldn't find any plugins + プラグインã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠+ + + + Qt Designer found the following plugins + 以下ã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—㟠+ + + + New custom widget plugins have been found. + æ–°ã—ã„カスタムウィジェットã®ãƒ—ラグインãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ + + + TextLabel + テキストラベル + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 スタイル @@ -6862,7 +6890,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close é–‰ã˜ã‚‹(&C) @@ -6963,7 +6991,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... 格上ã’ã•ã‚ŒãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ... @@ -6991,7 +7019,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... ダイナミックプロパティを追加... @@ -7026,13 +7054,13 @@ Please select another name. - + Object: %1 Class: %2 - + String... @@ -7050,7 +7078,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break 改行を挿入 @@ -7198,7 +7226,7 @@ Class: %2 - + Edit ToolTip @@ -7207,15 +7235,20 @@ Class: %2 Edit WhatsThis + + + no signals available + + - + Set size constraint on %n widget(s) - + Change signals/slots... @@ -7258,7 +7291,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> @@ -7650,7 +7683,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H @@ -8002,7 +8035,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script スクリプトを編集 @@ -8059,7 +8092,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots シグナル/スロットを編集 @@ -8072,7 +8105,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots シグナル/スロットを編集 @@ -8080,7 +8113,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 消去 @@ -8092,7 +8125,7 @@ Class: %2 文字列リストを変更 - + Change String List @@ -8100,7 +8133,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet スタイルシートを変更 @@ -8159,7 +8192,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here @@ -8187,7 +8220,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order タブ順を編集 @@ -8195,7 +8228,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order タブ順を編集 @@ -8203,7 +8236,7 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column æ–°ã—ã„列 @@ -8364,7 +8397,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -8395,7 +8428,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Edit HTML @@ -8441,7 +8474,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator セパレータを挿入 @@ -8476,7 +8509,7 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns @@ -8686,7 +8719,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... アイテムを編集... @@ -8694,7 +8727,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. @@ -8729,17 +8762,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad スクラッãƒãƒ‘ッド - + Custom Widgets カスタムウィジェット - + Expand all ã™ã¹ã¦å±•é–‹ã™ã‚‹ @@ -8780,7 +8813,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets ウィジェットを編集 @@ -8788,12 +8821,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. %1 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ãŸã‚ã«ç™»éŒ²ã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ•ã‚¡ã‚¯ãƒˆãƒªãƒ¼ãŒ 0 ã‚’è¿”ã—ã¾ã—ãŸã€‚ - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. %1 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ãŸã‚ã«ç™»éŒ²ã•ã‚ŒãŸã‚«ã‚¹ã‚¿ãƒ ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãƒ•ã‚¡ã‚¯ãƒˆãƒªãƒ¼ã‚’使ã£ã¦ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’作æˆã—ã¦ã„ã‚‹ã¨ãã«ã€ã‚¯ãƒ©ã‚¹åã®ãƒŸã‚¹ãƒžãƒƒãƒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚%2 ã¨ã„ã†ã‚¯ãƒ©ã‚¹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’è¿”ã—ã¾ã—ãŸã€‚ @@ -8835,7 +8868,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor diff --git a/translations/designer_pl.ts b/translations/designer_pl.ts index 6ae369f..5b63f66 100644 --- a/translations/designer_pl.ts +++ b/translations/designer_pl.ts @@ -1,14 +1,15 @@ - + + - + <object> <obiekt> - + <signal> <sygnaÅ‚> @@ -18,7 +19,7 @@ <slot> - + The moose in the noose ate the goose who was loose. W Szczebrzeszynie @@ -28,7 +29,7 @@ chrzÄ…szcz brzmi w trzcinie. AbstractFindWidget - + &Previous &Poprzednie @@ -74,7 +75,7 @@ chrzÄ…szcz brzmi w trzcinie. AppFontDialog - + Additional Fonts Dodatkowe czcionki @@ -186,7 +187,7 @@ chrzÄ…szcz brzmi w trzcinie. AssistantClient - + Unable to send request: Assistant is not responding. Nie można wysÅ‚ac komendy. Asystent nie odpowiada. @@ -204,7 +205,7 @@ chrzÄ…szcz brzmi w trzcinie. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. Brak atrybutu '%2' w elemencie '%1'. @@ -232,7 +233,7 @@ chrzÄ…szcz brzmi w trzcinie. BrushPropertyManager - + No brush Brak szczotki @@ -325,19 +326,24 @@ chrzÄ…szcz brzmi w trzcinie. Command - - + + Change signal ZmieÅ„ sygnaÅ‚ - - + + Change slot ZmieÅ„ slot - + + Change signal-slot connection + + + + Change sender ZmieÅ„ nadawcÄ™ @@ -347,7 +353,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ odbiorcÄ™ - + Add connection Dodaj poÅ‚Ä…czenie @@ -372,7 +378,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ przeznaczenie - + Insert '%1' Wstaw '%1' @@ -397,7 +403,7 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ rodzica '%1' - + Promote to custom widget ZastÄ…p widżet @@ -427,48 +433,48 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ rozmieszczenie - - - + + + Move Page PrzenieÅ› stronÄ™ - - - - + + + + Delete Page UsuÅ„ stronÄ™ - - + + Page Strona - - - + + + page strona - - - - + + + + Insert Page Wstaw stronÄ™ - + tab tab - + Change Tab order ZmieÅ„ kolejność tabulacji @@ -513,12 +519,12 @@ chrzÄ…szcz brzmi w trzcinie. ZmieÅ„ geometriÄ™ elementu w formularzu - + Change Layout Item Geometry ZmieÅ„ geometriÄ™ elementu w rozmieszczeniu - + Change Table Contents ZmieÅ„ zawartość tabeli @@ -560,7 +566,7 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ pasek narzÄ™dzi - + Set action text Ustaw tekst akcji @@ -571,7 +577,7 @@ chrzÄ…szcz brzmi w trzcinie. - + Move action PrzenieÅ› akcjÄ™ @@ -586,12 +592,12 @@ chrzÄ…szcz brzmi w trzcinie. Wstaw menu - + Change signals/slots ZmieÅ„ sygnaÅ‚y/sloty - + Delete Subwindow UsuÅ„ podokno @@ -611,17 +617,17 @@ chrzÄ…szcz brzmi w trzcinie. Podokno - + Change Z-order of '%1' ZmieÅ„ porzÄ…dek gÅ‚Ä™bokoÅ›ci (Z-order) dla '%1' - + Simplify Grid Layout Uprość rozmieszczenie w siatce - + Create button group Utwórz grupÄ™ przycisków @@ -642,7 +648,7 @@ chrzÄ…szcz brzmi w trzcinie. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Dodaj '%1' do '%2' @@ -659,23 +665,23 @@ chrzÄ…szcz brzmi w trzcinie. UsuÅ„ '%1' z '%2' - + Morph %1/'%2' into %3 MorphWidgetCommand description Przekształć %1/%2 w %3 - + Change layout of '%1' from %2 to %3 ZmieÅ„ rozmieszczenie widżetu '%1' z %2 na %3 - + Change script ZmieÅ„ skrypt - + Changed '%1' of '%2' ZmieÅ„ '%1' w '%2' @@ -757,7 +763,7 @@ chrzÄ…szcz brzmi w trzcinie. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution Standardowa (96 x 96) @@ -778,12 +784,12 @@ chrzÄ…szcz brzmi w trzcinie. Designer - + Qt Designer Qt Designer - + Custom Widgets WÅ‚asne widżety @@ -793,7 +799,7 @@ chrzÄ…szcz brzmi w trzcinie. ZastÄ™pcze widżety - + Unable to launch %1. Nie można uruchomić %1. @@ -803,7 +809,7 @@ chrzÄ…szcz brzmi w trzcinie. %1 przekroczony czas operacji. - + This file cannot be read because it was created using %1. Nie można odczytać pliku ponieważ zostaÅ‚ utworzony przy użyciu %1. @@ -868,7 +874,7 @@ chrzÄ…szcz brzmi w trzcinie. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 nie jest poprawnÄ… wartoÅ›ciÄ… typu wyliczeniowego '%2'. @@ -889,7 +895,7 @@ chrzÄ…szcz brzmi w trzcinie. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1' nie jest liczbÄ…. @@ -931,7 +937,7 @@ chrzÄ…szcz brzmi w trzcinie. DeviceSkin - + The image file '%1' could not be loaded. Nie można wczytać pliku z obrazkiem %1. @@ -989,66 +995,56 @@ chrzÄ…szcz brzmi w trzcinie. EmbeddedOptionsControl - None - Å»adne + Å»adne - Add a profile - Dodaj profil + Dodaj profil - Edit the selected profile - Edytuj zaznaczony profil + Edytuj zaznaczony profil - Delete the selected profile - UsuÅ„ zaznaczony profil + UsuÅ„ zaznaczony profil - Add Profile - Dodaj profil + Dodaj profil - New profile - Nowy profil + Nowy profil - Edit Profile - Edytuj profil + Edytuj profil - Delete Profile - UsuÅ„ profil + UsuÅ„ profil - Would you like to delete the profile '%1'? - Czy chcesz usunać profil '%1'? + Czy chcesz usunać profil '%1'? - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Styl</b></td><td>%3</td></tr><tr><td><b>Rozdzielczość</b></td><td>%4 x %5</td></tr></table></html> - Default - DomyÅ›lny + DomyÅ›lny EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog Projekt dla urzÄ…dzeÅ„ specjalizowanych @@ -1063,7 +1059,7 @@ chrzÄ…szcz brzmi w trzcinie. FontPanel - + Font Czcionka @@ -1091,7 +1087,7 @@ chrzÄ…szcz brzmi w trzcinie. FontPropertyManager - + PreferDefault Preferuj domyÅ›lny @@ -1114,7 +1110,7 @@ chrzÄ…szcz brzmi w trzcinie. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values Niepoprawna wartość rozciÄ…gniecia dla '%1': '%2' @@ -1129,7 +1125,7 @@ chrzÄ…szcz brzmi w trzcinie. FormEditorOptionsPage - + %1 % %1 % @@ -1196,7 +1192,7 @@ chrzÄ…szcz brzmi w trzcinie. FormWindow - + Unexpected element <%1> Niespodziewany element <%1> @@ -1272,7 +1268,7 @@ chrzÄ…szcz brzmi w trzcinie. IconSelector - + All Pixmaps ( Wszystkie pixmapy ( @@ -1280,7 +1276,7 @@ chrzÄ…szcz brzmi w trzcinie. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX ikona wybrana wyÅ‚Ä…czona @@ -1289,7 +1285,7 @@ chrzÄ…szcz brzmi w trzcinie. LanguageResourceDialog - + Choose Resource Wybierz zasób @@ -1297,7 +1293,7 @@ chrzÄ…szcz brzmi w trzcinie. MainWindowBase - + Main Not currently used (main tool bar) Główny @@ -1331,7 +1327,7 @@ chrzÄ…szcz brzmi w trzcinie. NewForm - + New Form Nowy formularz @@ -1384,7 +1380,7 @@ chrzÄ…szcz brzmi w trzcinie. NewFormWidget - + Unable to open the form template file '%1': %2 Nie można otworzyć pliku '%1' z szablonem formularza: %2 @@ -1392,7 +1388,7 @@ chrzÄ…szcz brzmi w trzcinie. ObjectInspectorModel - + Object Obiekt @@ -1402,7 +1398,7 @@ chrzÄ…szcz brzmi w trzcinie. Klasa - + separator separator @@ -1415,7 +1411,7 @@ chrzÄ…szcz brzmi w trzcinie. ObjectNameDialog - + Change Object Name ZmieÅ„ nazwÄ™ obiektu @@ -1483,52 +1479,16 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. - qdesigner_internal::PluginDialog - - - Components - Komponenty - + PluginDialog - - + Plugin Information - Informacje o wtyczkach - - - - Qt Designer couldn't find any plugins - Qt Designer nie mógÅ‚ znaleźć żadnej wtyczki - - - - Qt Designer found the following plugins - Qt Designer znalazÅ‚ nastÄ™pujÄ…ce wtyczki: - - - - TextLabel - Etykieta - - - - Refresh - OdÅ›wież + Informacje o wtyczkach - - Scan for newly installed custom widget plugins. - Szukaj nowo zainstalowanych wtyczek z widżetami. - - - - New custom widget plugins have been found. - Znaleziono nowÄ… wtyczkÄ™ z widżetami. - - - + 1 - 1 + 1 @@ -1542,7 +1502,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. PreviewConfigurationWidget - + Default DomyÅ›lny @@ -1590,7 +1550,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. PromotionModel - + Not used Usage of promoted widgets Nie używana @@ -1599,7 +1559,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. Q3WizardContainer - + Page Strona @@ -1608,7 +1568,7 @@ Nie ma już nic wiÄ™cej. PowinieneÅ› zabrać siÄ™ do pracy. QAbstractFormBuilder - + Unexpected element <%1> Niespodziewany element <%1> @@ -1655,7 +1615,7 @@ To wskazuje na niespójność w pliku ui. Podczas przypisywania kolejnoÅ›ci tabulacji: widżet '%1' nie zostaÅ‚ znaleziony. - + Invalid QButtonGroup reference '%1' referenced by '%2'. Niepoprawny odnoÅ›nik QButtonGroup '%1', użyty w '%2'. @@ -1668,7 +1628,7 @@ To wskazuje na niespójność w pliku ui. QAxWidgetPlugin - + ActiveX control Kontrolka ActiveX @@ -1681,7 +1641,7 @@ To wskazuje na niespójność w pliku ui. QAxWidgetTaskMenu - + Set Control Ustaw kontrolkÄ™ @@ -1704,7 +1664,7 @@ To wskazuje na niespójność w pliku ui. QCoreApplication - + %1 is not a promoted class. %1 nie jest klasÄ… zastÄ™pczÄ…. @@ -1754,7 +1714,7 @@ To wskazuje na niespójność w pliku ui. Nie można ustawić pustego pliku nagłówkowego. - + Exception at line %1: %2 WyjÄ…tek w linii %1: %2 @@ -1774,7 +1734,7 @@ Skrypt: %3 QDesigner - + %1 - warning %1 - ostrzeżenie @@ -1792,12 +1752,12 @@ Skrypt: %3 QDesignerActions - + Clear &Menu Wyczyść &menu - + &Quit Za&koÅ„cz @@ -1858,17 +1818,17 @@ Skrypt: %3 - + About Qt Designer Informacje o Qt Designer - + About Qt Informacje o Qt - + &Recent Forms Os&tatnio edytowane formularze @@ -1909,19 +1869,19 @@ Czy chcesz spróbować ponownie lub zmienić nazwÄ™ pliku? Wybierz nowy plik - + %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz go zastÄ…pić? - + &Close Preview Za&mknij podglÄ…d - + Preferences... Ustawienia... @@ -1931,19 +1891,19 @@ Czy chcesz go zastÄ…pić? CTRL+SHIFT+S - + Designer UI files (*.%1);;All Files (*) Pliki Designer UI (*.%1);;Wszystkie pliki (*) - + Saved %1. Formularz %1 zachowany pomyÅ›lnie. - + Read error BÅ‚Ä…d odczytu @@ -1975,7 +1935,7 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz?Nie można zapisać pliku - + &New... &Nowy... @@ -2006,12 +1966,12 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz? - + &Close Za&mknij - + Save &Image... Zachowaj o&brazek... @@ -2026,18 +1986,18 @@ Czy chcesz zaktualizować poÅ‚ożenie pliku lub wygenerować nowy formularz?Pokaż &kod... - + Save Form As Zachowaj formularz jako - + Preview failed Nie można utworzyć podglÄ…du - + Code generation failed Nie można wygenerować kodu @@ -2051,7 +2011,7 @@ Powód:%2 Czy chcesz spróbować ponownie? - + The backup file %1 could not be written. Nie można zapisać pliku zapasowego %1. @@ -2083,13 +2043,13 @@ Czy chcesz spróbować ponownie? Nie można zapisać pliku %1. - - + + Assistant Assistant - + Saved image %1. Zachowano obrazek %1. @@ -2099,12 +2059,12 @@ Czy chcesz spróbować ponownie? Zamknij wszystkie formularze aby umożliwić wczytanie dodatkowych czcionek. - + Printed %1. Wydrukowano %1. - + ALT+CTRL+S ALT+CTRL+S @@ -2112,7 +2072,7 @@ Czy chcesz spróbować ponownie? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog WyglÄ…d @@ -2121,7 +2081,7 @@ Czy chcesz spróbować ponownie? QDesignerAppearanceOptionsWidget - + Docked Window Okna dokowalne @@ -2131,7 +2091,7 @@ Czy chcesz spróbować ponownie? Wiele okien głównych - + Toolwindow Font Czcionka okna narzÄ™dzi @@ -2149,7 +2109,7 @@ Czy chcesz spróbować ponownie? Ustaw kontrolkÄ™ - + Control loaded Kontrolka wczytana @@ -2162,7 +2122,7 @@ Czy chcesz spróbować ponownie? QDesignerFormBuilder - + Script errors occurred: WystÄ…piÅ‚y bÅ‚Ä™dy w skrypcie: @@ -2180,7 +2140,7 @@ Czy chcesz spróbować ponownie? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2203,7 +2163,7 @@ Czy chcesz spróbować ponownie? QDesignerMenu - + Type Here Wpisz tutaj @@ -2213,7 +2173,7 @@ Czy chcesz spróbować ponownie? Dodaj separator - + Remove action '%1' UsuÅ„ akcjÄ™ '%1' @@ -2265,7 +2225,7 @@ Czy chcesz spróbować ponownie? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 WystÄ…piÅ‚ bÅ‚Ä…d XML podczas przetwarzania kodu XML dla wÅ‚asnego widżetu %1: %2 @@ -2288,7 +2248,7 @@ Czy chcesz spróbować ponownie? QDesignerPropertySheet - + Dynamic Properties Dynamiczne wÅ‚aÅ›ciwoÅ›ci @@ -2301,13 +2261,13 @@ Czy chcesz spróbować ponownie? Rozmieszczenie typu '%1' nie jest obsÅ‚ugiwane. BÄ™dzie ono zastÄ…pione siatkÄ…. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents Niespodziewany element <%1> @@ -2328,7 +2288,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. Nie można utworzyć Å›cieżki %1 dla szablonów. @@ -2341,7 +2301,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor Edytor wÅ‚aÅ›ciwoÅ›ci @@ -2374,7 +2334,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 WystÄ…piÅ‚ bÅ‚Ä…d w linii %1 w %2: %3 @@ -2397,7 +2357,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File &Plik @@ -2472,7 +2432,7 @@ Container pages should only be added by specifying them in XML returned by the d Informacja o kopiach zapasowych - + The file <b>%1</b> could not be opened. Nie można otworzyć pliku <b>%1</b>. @@ -2482,7 +2442,7 @@ Container pages should only be added by specifying them in XML returned by the d Plik <b>%1</b> nie jest poprawnym plikiem Designer'a. - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? Jest %n formularz z niezachowanymi zmianami. Czy chcesz przejrzeć zmiany przed wyjÅ›ciem z programu? @@ -2494,7 +2454,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method Pusta nazwa klasy zostaÅ‚a przekazana do %1 (nazwa obiektu: '%2'). @@ -2515,7 +2475,7 @@ Container pages should only be added by specifying them in XML returned by the d Typ rozmieszczenia '%1' nie jest obsÅ‚ugiwany. - + The set-type property %1 could not be read. Nie można odczytać wÅ‚aÅ›ciwoÅ›ci %1 typu zbiór. @@ -2535,7 +2495,7 @@ Container pages should only be added by specifying them in XML returned by the d Nie można zapisać wÅ‚aÅ›ciwoÅ›ci %1. Typ %2 nie jest jeszcze obsÅ‚ugiwany. - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Niepoprawna wartość "%1" typu wyliczeniowego. Użyta bÄ™dzie domyÅ›lna wartość "%2". @@ -2548,7 +2508,7 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetEventFilter - + Previous Page Poprzednia strona @@ -2609,7 +2569,7 @@ Container pages should only be added by specifying them in XML returned by the d QTabWidgetEventFilter - + Delete UsuÅ„ @@ -2637,7 +2597,7 @@ Container pages should only be added by specifying them in XML returned by the d QToolBoxHelper - + Delete Page UsuÅ„ stronÄ™ @@ -2675,7 +2635,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolEdit - + True @@ -2691,7 +2651,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolPropertyManager - + True Prawda @@ -2704,7 +2664,7 @@ Container pages should only be added by specifying them in XML returned by the d QtCharEdit - + Clear Char Wyczyść znak @@ -2720,7 +2680,7 @@ Container pages should only be added by specifying them in XML returned by the d QtColorPropertyManager - + Red CzerwieÅ„ @@ -2900,7 +2860,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientEditor - + Start X PoczÄ…tek X @@ -3175,7 +3135,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientStopsWidget - + New Stop Nowy punkt @@ -3213,7 +3173,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientView - + Grad Grad @@ -3260,7 +3220,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientViewDialog - + Select Gradient Wybierz gradient @@ -3277,7 +3237,7 @@ Container pages should only be added by specifying them in XML returned by the d QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3344,22 +3304,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Szerokość @@ -3372,22 +3332,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width Szerokość @@ -3400,7 +3360,7 @@ Container pages should only be added by specifying them in XML returned by the d QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 już istnieje. @@ -3412,7 +3372,7 @@ Czy chcesz go zastÄ…pić? Plik nie wyglÄ…da na plik z zasobami; znaleziono element '%1' podczas gdy oczekiwano elementu '%2'. - + %1 [read-only] %1 - [tylko do odczytu] @@ -3686,7 +3646,7 @@ jako: QtResourceView - + Size: %1 x %2 %3 Rozmiar: %1 x %2 @@ -3719,7 +3679,7 @@ jako: QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -3737,12 +3697,18 @@ jako: QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] - + Horizontal Policy Strategia pozioma @@ -3765,7 +3731,7 @@ jako: QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -3783,7 +3749,7 @@ jako: QtToolBarDialog - + < S E P A R A T O R > < S E P A R A T O R > @@ -3891,7 +3857,7 @@ jako: QtTreePropertyBrowser - + Property WÅ‚aÅ›ciwość @@ -3904,7 +3870,7 @@ jako: SaveFormAsTemplate - + Add path... Dodaj Å›cieżkÄ™... @@ -3969,7 +3935,7 @@ Czy chcesz nadpisać szablon? ScriptErrorDialog - + An error occurred while running the scripts for "%1": WystÄ…piÅ‚ bÅ‚Ä…d podczas uruchamiana skryptu dla "%1": @@ -3988,11 +3954,21 @@ Czy chcesz nadpisać szablon? Select signal Wybierz sygnaÅ‚ + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) NADAJNIK(%1), SYGNAÅ(%2), ODBIORNIK(%3), SLOT(%4) @@ -4033,7 +4009,7 @@ Czy chcesz nadpisać szablon? Spacer - + Horizontal Spacer '%1', %2 x %3 Poziomy dystans '%1', %2 x %3 @@ -4046,7 +4022,7 @@ Czy chcesz nadpisać szablon? TemplateOptionsPage - + Template Paths Tab in preferences dialog Åšcieżki z szablonami @@ -4088,29 +4064,27 @@ Czy chcesz nadpisać szablon? VersionDialog - + Qt Designer Qt Designer - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Wersja %2 - Open Source Edition - Wydanie Open Source + Wydanie Open Source - + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer jest aplikacjÄ… umożliwiajÄ…cÄ… projektowanie interfejsów graficznych użytkownika w aplikacjach korzystajÄ…cych z Qt.<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - Ten program wydany jest na licencji Qt Commercial. Aby zapoznać siÄ™ ze szczegółami licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czony jest do pakietu Qt.<br/> + Ten program wydany jest na licencji Qt Commercial. Aby zapoznać siÄ™ ze szczegółami licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czony jest do pakietu Qt.<br/> @@ -4118,20 +4092,14 @@ Czy chcesz nadpisać szablon? %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). Wszystkie prawa zastrzeżone.<br/><br/>Program dostarczony jest BEZ Å»ADNYCH GWARANCJI.<br/> - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - Ta wersja Qt Designer jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>.<br/> + Ta wersja Qt Designer jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>.<br/> WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Plik zawiera wÅ‚asny widżet '%1' którego klasa bazowa (%2) różni siÄ™ od bieżącego elementu w bazie danych z widżetami (%3). Baza danych z widżetami zostaÅ‚a niezmieniona. @@ -4139,22 +4107,22 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ActionEditor - + Actions Akcje - + New... Nowa... - + Delete UsuÅ„ - + New action Nowa akcja @@ -4164,12 +4132,17 @@ Czy chcesz nadpisać szablon? Edytuj akcjÄ™ - + Edit... Edytuj... + Go to slot... + Przejdź do slotu... + + + Copy Skopiuj @@ -4189,7 +4162,7 @@ Czy chcesz nadpisać szablon? Zaznacz wszystko - + Configure Action Editor Skonfiguruj edytor akcji @@ -4204,7 +4177,7 @@ Czy chcesz nadpisać szablon? Szczegółowy widok - + Remove actions UsuÅ„ akcje @@ -4214,7 +4187,7 @@ Czy chcesz nadpisać szablon? UsuÅ„ akcjÄ™ '%1' - + Used In Użyta w @@ -4222,7 +4195,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ActionModel - + Name Nazwa @@ -4255,7 +4228,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditor - + Add buddy Dodaj skojarzonÄ… etykietÄ™ @@ -4291,7 +4264,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies Edytuj skojarzone etykiety @@ -4299,7 +4272,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::BuddyEditorTool - + Edit Buddies Edytuj skojarzone etykiety @@ -4353,7 +4326,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::CodeDialog - + Save... Zachowaj... @@ -4411,7 +4384,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ColorAction - + Text Color Color tekstu @@ -4419,7 +4392,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... Edytuj elementy... @@ -4458,7 +4431,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ConnectionModel - + Sender Nadajnik @@ -4478,7 +4451,7 @@ Czy chcesz nadpisać szablon? Slot - + <sender> <nadajnik> @@ -4511,7 +4484,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page Wstaw stronÄ™ przed bieżącÄ… stronÄ… @@ -4574,7 +4547,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::DesignerPropertyManager - + AlignLeft Wyrównanie do lewej @@ -4701,7 +4674,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) Profile urzÄ…dzeÅ„ (*.%1) @@ -4806,9 +4779,62 @@ Czy chcesz nadpisać szablon? + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + Dodaj profil + + + + Edit the selected profile + Edytuj zaznaczony profil + + + + Delete the selected profile + UsuÅ„ zaznaczony profil + + + + Add Profile + Dodaj profil + + + + New profile + Nowy profil + + + + Edit Profile + Edytuj profil + + + + Delete Profile + UsuÅ„ profil + + + + Would you like to delete the profile '%1'? + Czy chcesz usunać profil '%1'? + + + + Default + DomyÅ›lny + + + qdesigner_internal::FilterWidget - + <Filter> <Filtr> @@ -4816,7 +4842,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormEditor - + Resource File Changed Zmieniony plik z zasobami @@ -4837,7 +4863,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindow - + Edit contents Edytuj zawartość @@ -4847,7 +4873,7 @@ Czy chcesz nadpisać szablon? F2 - + Resize ZmieÅ„ rozmiar @@ -4878,13 +4904,13 @@ Czy chcesz nadpisać szablon? Rozmieść - + Drop widget Upuść widżet - + Paste %n action(s) Wklej %n akcjÄ™ @@ -4917,12 +4943,12 @@ Czy chcesz nadpisać szablon? Wybierz przodka - + A QMainWindow-based form does not contain a central widget. Formularz bazujÄ…cy na QMainWindow nie zawiera centralnego widżetu. - + Raise widgets PrzenieÅ› widżety na wierzch @@ -4935,7 +4961,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowBase - + Delete UsuÅ„ @@ -4948,7 +4974,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowManager - + Cu&t Wy&tnij @@ -5030,7 +5056,7 @@ Czy chcesz nadpisać szablon? Dopasuj wielkość zaznaczonego widżetu - + Lay Out &Horizontally Rozmieść w po&ziomie @@ -5080,7 +5106,7 @@ Czy chcesz nadpisać szablon? Rozmieszcza zaznaczone widżety pionowo w splitterze - + &Break Layout &UsuÅ„ rozmieszczenie @@ -5105,7 +5131,7 @@ Czy chcesz nadpisać szablon? Us&tawienia formularza... - + Break Layout UsuÅ„ rozmieszczenie @@ -5121,17 +5147,17 @@ Czy chcesz nadpisać szablon? Nie można utworzyć podglÄ…du formularza - + Form Settings - %1 Ustawienia formularza - %1 - + Removes empty columns and rows UsuÅ„ puste kolumny i wiersze - + Lay Out in a &Form Layout Rozmieść w &formularzu @@ -5141,7 +5167,7 @@ Czy chcesz nadpisać szablon? Rozmieszcza zaznaczone widżety w formularzu - + Si&mplify Grid Layout Up&rość rozmieszczenie w siatce @@ -5149,7 +5175,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::FormWindowSettings - + None Å»aden @@ -5200,7 +5226,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::GroupBoxTaskMenu - + Change title... ZmieÅ„ tytuÅ‚... @@ -5216,7 +5242,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. Nie można odczytać pliku z pixmapÄ… %1. @@ -5309,7 +5335,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ItemListEditor - + Properties &<< WÅ‚asciwoÅ›ci &<< @@ -5368,7 +5394,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::LabelTaskMenu - + Change rich text... ZmieÅ„ tekst sformatowany... @@ -5381,7 +5407,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::LineEditTaskMenu - + Change text... ZmieÅ„ tekst... @@ -5389,7 +5415,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ListWidgetEditor - + New Item Nowy element @@ -5407,7 +5433,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -5443,7 +5469,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::MenuTaskMenu - + Remove UsuÅ„ @@ -5502,7 +5528,7 @@ Czy chcesz nadpisać szablon? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name Ustaw nazwÄ™ wÅ‚aÅ›ciwoÅ›ci @@ -5623,7 +5649,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::NewPromotedClassPanel - + Add Dodaj @@ -5661,7 +5687,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::ObjectInspector - + &Find in Text... Z&najdź w tekÅ›cie... @@ -5677,7 +5703,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::OrderDialog - + Index %1 (%2) Indeks %1 (%2) @@ -5758,7 +5784,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PaletteEditorButton - + Change Palette ZmieÅ„ paletÄ™ @@ -5766,7 +5792,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PaletteModel - + Color Role Rola koloru @@ -5818,15 +5844,61 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PlainTextEditorDialog - + Edit text Edytuj tekst + qdesigner_internal::PluginDialog + + + Components + Komponenty + + + + Plugin Information + Informacje o wtyczkach + + + + Qt Designer couldn't find any plugins + Qt Designer nie mógÅ‚ znaleźć żadnej wtyczki + + + + Qt Designer found the following plugins + Qt Designer znalazÅ‚ nastÄ™pujÄ…ce wtyczki: + + + TextLabel + Etykieta + + + + Refresh + OdÅ›wież + + + + Scan for newly installed custom widget plugins. + Szukaj nowo zainstalowanych wtyczek z widżetami. + + + + New custom widget plugins have been found. + Znaleziono nowÄ… wtyczkÄ™ z widżetami. + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style Styl %1 @@ -5869,7 +5941,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PreviewDeviceSkin - + &Close Za&mknij @@ -5966,7 +6038,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... ZastÄ™pcze widżety... @@ -5994,7 +6066,7 @@ Wybierz innÄ… nazwÄ™. qdesigner_internal::PropertyEditor - + Add Dynamic Property... Dodaj dynamicznÄ… wÅ‚aÅ›ciwość ... @@ -6029,14 +6101,14 @@ Wybierz innÄ… nazwÄ™. Skonfiguruj edytor wÅ‚aÅ›ciwoÅ›ci - + Object: %1 Class: %2 Obiekt: %1 Klasa: %2 - + String... String... @@ -6054,7 +6126,7 @@ Klasa: %2 qdesigner_internal::PropertyLineEdit - + Insert line break Wstaw znak koÅ„ca linii @@ -6157,8 +6229,13 @@ Klasa: %2 Change script... ZmieÅ„ skrypt... + + + no signals available + + - + Set size constraint on %n widget(s) Ustaw ograniczenie rozmiaru w %n obiekcie @@ -6167,7 +6244,7 @@ Klasa: %2 - + Change signals/slots... ZmieÅ„ sygnaÅ‚y/sloty... @@ -6212,7 +6289,7 @@ Klasa: %2 Ustaw maksymalny rozmiar - + Edit ToolTip Edytuj podpowiedź @@ -6225,7 +6302,7 @@ Klasa: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> Niespodziewany element <%1> @@ -6281,7 +6358,7 @@ Klasa: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -6456,7 +6533,7 @@ Klasa: %2 qdesigner_internal::ScriptDialog - + Edit script Edytuj skrypt @@ -6506,7 +6583,7 @@ Klasa: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots Edytuj sygnaÅ‚y/sloty @@ -6519,7 +6596,7 @@ Klasa: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots Edytuj sygnaÅ‚y/sloty @@ -6527,7 +6604,7 @@ Klasa: %2 qdesigner_internal::StatusBarTaskMenu - + Remove UsuÅ„ @@ -6535,7 +6612,7 @@ Klasa: %2 qdesigner_internal::StringListEditorButton - + Change String List ZmieÅ„ listÄ™ tekstów @@ -6543,7 +6620,7 @@ Klasa: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet Edytuj arkusz stylu @@ -6582,7 +6659,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditor - + Start from Here Rozpocznij stÄ…d @@ -6610,7 +6687,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order Edytuj kolejność tabulacji @@ -6618,7 +6695,7 @@ Klasa: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order Edytuj kolejność tabulacji @@ -6636,7 +6713,7 @@ Klasa: %2 &Elementy - + New Row Nowy wiersz @@ -6675,7 +6752,7 @@ Klasa: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -6706,7 +6783,7 @@ Klasa: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... ZmieÅ„ HTML... @@ -6752,7 +6829,7 @@ Klasa: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator Wstaw separator @@ -6795,7 +6872,7 @@ Klasa: %2 Drzewo elementów - + &Columns &Kolumny @@ -6906,7 +6983,7 @@ Klasa: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... Edytuj elementy... @@ -6914,7 +6991,7 @@ Klasa: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Ostrzeżenie: BÅ‚Ä…d tworzenia widżetu w panelu widżetów. MogÅ‚o to być spowodowane niepoprawnym kodem XML widżetu. @@ -6922,17 +6999,17 @@ Klasa: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad Notatnik - + Custom Widgets WÅ‚asne widżety - + Expand all Rozszerz wszystkie @@ -6973,7 +7050,7 @@ Klasa: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets Edytuj widżety @@ -6981,12 +7058,12 @@ Klasa: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. Fabryka widżetów użytkownika zarejestrowana dla widżetów klasy %1 zwróciÅ‚a 0. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. WystÄ…piÅ‚a niezgodność nazwy klasy podczas tworzenia widżetu przy pomocy fabryki widżetów użytkownika zarejestrowanej dla klasy %1. Zwrócony zostaÅ‚ widżet klasy %2. @@ -7029,7 +7106,7 @@ To wskazuje na niespójność w pliku "ui". qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_tr_TR.ts b/translations/designer_tr_TR.ts new file mode 100644 index 0000000..73ea53e --- /dev/null +++ b/translations/designer_tr_TR.ts @@ -0,0 +1,6950 @@ + + + + + + + + The moose in the noose +ate the goose who was loose. + + + + + <object> + + + + + <signal> + + + + + <slot> + + + + + AbstractFindWidget + + + &Previous + + + + + &Next + + + + + &Case sensitive + + + + + Whole &words + + + + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped + + + + + AddLinkDialog + + + Insert Link + + + + + Title: + + + + + URL: + + + + + AppFontDialog + + + Additional Fonts + + + + + AppFontManager + + + '%1' is not a file. + + + + + The font file '%1' does not have read permissions. + + + + + The font file '%1' is already loaded. + + + + + The font file '%1' could not be loaded. + + + + + '%1' is not a valid font id. + + + + + There is no loaded font matching the id '%1'. + + + + + The font '%1' (%2) could not be unloaded. + + + + + AppFontWidget + + + Fonts + + + + + Add font files + + + + + Remove current font file + + + + + Remove all font files + + + + + Add Font Files + + + + + Font files (*.ttf) + + + + + Error Adding Fonts + + + + + Error Removing Fonts + + + + + Remove Fonts + + + + + Would you like to remove all fonts? + + + + + AppearanceOptionsWidget + + + Form + + + + + User Interface Mode + + + + + AssistantClient + + + Unable to send request: Assistant is not responding. + + + + + The binary '%1' does not exist. + + + + + Unable to launch assistant (%1). + + + + + BrushManagerProxy + + + The element '%1' is missing the required attribute '%2'. + + + + + Empty brush name encountered. + + + + + An unexpected element '%1' was encountered. + + + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + + + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + + + + + BrushPropertyManager + + + No brush + + + + + Solid + + + + + Dense 1 + + + + + Dense 2 + + + + + Dense 3 + + + + + Dense 4 + + + + + Dense 5 + + + + + Dense 6 + + + + + Dense 7 + + + + + Horizontal + + + + + Vertical + + + + + Cross + + + + + Backward diagonal + + + + + Forward diagonal + + + + + Crossing diagonal + + + + + Style + + + + + Color + + + + + [%1, %2] + + + + + Command + + + + Change signal + + + + + + Change slot + + + + + Change signal-slot connection + + + + + Change sender + + + + + Change receiver + + + + + Create button group + + + + + Break button group + + + + + Break button group '%1' + + + + + Add buttons to group + + + + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + + + + + Remove buttons from group + + + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + + + + + Add connection + + + + + Adjust connection + + + + + Delete connections + + + + + Change source + + + + + Change target + + + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + + + + + Insert '%1' + + + + + Change Z-order of '%1' + + + + + Raise '%1' + + + + + Lower '%1' + + + + + Delete '%1' + + + + + Reparent '%1' + + + + + Promote to custom widget + + + + + Demote from custom widget + + + + + Lay out using grid + + + + + Lay out vertically + + + + + Lay out horizontally + + + + + Break layout + + + + + Simplify Grid Layout + + + + + + + Move Page + + + + + + + + Delete Page + + + + + + Page + + + + + + + page + + + + + + + + Insert Page + + + + + tab + + + + + Change Tab order + + + + + Create Menu Bar + + + + + Delete Menu Bar + + + + + Create Status Bar + + + + + Delete Status Bar + + + + + Add Tool Bar + + + + + Add Dock Window + + + + + Adjust Size of '%1' + + + + + Change Form Layout Item Geometry + + + + + Change Layout Item Geometry + + + + + Delete Subwindow + + + + + Insert Subwindow + + + + + subwindow + + + + + Subwindow + + + + + Change Table Contents + + + + + Change Tree Contents + + + + + + Add action + + + + + + Remove action + + + + + Add menu + + + + + Remove menu + + + + + Create submenu + + + + + Delete Tool Bar + + + + + Change layout of '%1' from %2 to %3 + + + + + Set action text + + + + + Insert action + + + + + + Move action + + + + + Change Title + + + + + Insert Menu + + + + + Changed '%1' of '%2' + + + + + Changed '%1' of %n objects + + + + + + + Reset '%1' of '%2' + + + + + Reset '%1' of %n objects + + + + + + + Add dynamic property '%1' to '%2' + + + + + Add dynamic property '%1' to %n objects + + + + + + + Remove dynamic property '%1' from '%2' + + + + + Remove dynamic property '%1' from %n objects + + + + + + + Change script + + + + + Change signals/slots + + + + + ConnectDialog + + + Configure Connection + + + + + GroupBox + + + + + Edit... + + + + + Show signals and slots inherited from QWidget + + + + + DPI_Chooser + + + Standard (96 x 96) + Embedded device standard screen resolution + + + + + Greenphone (179 x 185) + Embedded device screen resolution + + + + + High (192 x 192) + Embedded device high definition screen resolution + + + + + Designer + + + Qt Designer + + + + + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. + + + + + Perhaps you forgot to create a layout? + + + + + Invalid ui file: The root element <ui> is missing. + + + + + An error has occurred while reading the ui file at line %1, column %2: %3 + + + + + This file cannot be read because it was created using %1. + + + + + This file was created using Designer from Qt-%1 and cannot be read. + + + + + The converted file could not be read. + + + + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. + + + + + The old form has not been touched, but you will have to save the form under a new name. + + + + + This file was created using Designer from Qt-%1 and could not be read: +%2 + + + + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. + + + + + This file cannot be read because the extra info extension failed to load. + + + + + Custom Widgets + + + + + Promoted Widgets + + + + + Unable to launch %1. + + + + + %1 timed out. + + + + + DesignerMetaEnum + + + %1 is not a valid enumeration value of '%2'. + + + + + '%1' could not be converted to an enumeration value of type '%2'. + + + + + DesignerMetaFlags + + + '%1' could not be converted to a flag value of type '%2'. + + + + + DeviceProfile + + + '%1' is not a number. + Reading a number for an embedded device profile + + + + + An invalid tag <%1> was encountered. + + + + + DeviceProfileDialog + + + &Family + + + + + &Point Size + + + + + Style + + + + + Device DPI + + + + + Name + + + + + DeviceSkin + + + The image file '%1' could not be loaded. + + + + + The skin directory '%1' does not contain a configuration file. + + + + + The skin configuration file '%1' could not be opened. + + + + + The skin configuration file '%1' could not be read: %2 + + + + + Syntax error: %1 + + + + + The skin "up" image file '%1' does not exist. + + + + + The skin "down" image file '%1' does not exist. + + + + + The skin "closed" image file '%1' does not exist. + + + + + The skin cursor image file '%1' does not exist. + + + + + Syntax error in area definition: %1 + + + + + Mismatch in number of areas, expected %1, got %2. + + + + + EmbeddedOptionsControl + + + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description + + + + + EmbeddedOptionsPage + + + Embedded Design + Tab in preferences dialog + + + + + Device Profiles + EmbeddedOptionsControl group box" + + + + + FontPanel + + + Font + + + + + &Writing system + + + + + &Family + + + + + &Style + + + + + &Point size + + + + + FontPropertyManager + + + PreferDefault + + + + + NoAntialias + + + + + PreferAntialias + + + + + Antialiasing + + + + + FormBuilder + + + Invalid stretch value for '%1': '%2' + Parsing layout stretch values + + + + + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values + + + + + FormEditorOptionsPage + + + %1 % + + + + + Preview Zoom + + + + + Default Zoom + + + + + Forms + Tab in preferences dialog + + + + + Default Grid + + + + + FormLayoutRowDialog + + + Add Form Layout Row + + + + + &Label text: + + + + + Field &type: + + + + + &Field name: + + + + + &Buddy: + + + + + &Row: + + + + + Label &name: + + + + + FormWindow + + + Unexpected element <%1> + + + + + Error while pasting clipboard contents at line %1, column %2: %3 + + + + + FormWindowSettings + + + Form Settings + + + + + Layout &Default + + + + + &Spacing: + + + + + &Margin: + + + + + &Layout Function + + + + + Ma&rgin: + + + + + Spa&cing: + + + + + &Pixmap Function + + + + + &Include Hints + + + + + Grid + + + + + Embedded Design + + + + + &Author + + + + + IconSelector + + + All Pixmaps ( + + + + + ItemPropertyBrowser + + + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser + + + + + LanguageResourceDialog + + + Choose Resource + + + + + MainWindowBase + + + Main + Not currently used (main tool bar) + + + + + File + + + + + Edit + + + + + Tools + + + + + Form + + + + + Qt Designer + + + + + NewForm + + + Show this Dialog on Startup + + + + + C&reate + + + + + Recent + + + + + New Form + + + + + &Close + + + + + &Open... + + + + + &Recent Forms + + + + + Read error + + + + + A temporary form file could not be created in %1. + + + + + The temporary form file %1 could not be written. + + + + + NewFormWidget + + + Unable to open the form template file '%1': %2 + + + + + ObjectInspectorModel + + + Object + + + + + Class + + + + + separator + + + + + <noname> + + + + + ObjectNameDialog + + + Change Object Name + + + + + Object Name + + + + + PluginDialog + + + Plugin Information + + + + + 1 + + + + + PreferencesDialog + + + Preferences + + + + + PreviewConfigurationWidget + + + Default + + + + + None + + + + + Browse... + + + + + Form + + + + + Print/Preview Configuration + + + + + Style + + + + + Style sheet + + + + + ... + + + + + Device skin + + + + + PromotionModel + + + Not used + Usage of promoted widgets + + + + + Q3WizardContainer + + + + Page + + + + + QAbstractFormBuilder + + + Unexpected element <%1> + + + + + An error has occurred while reading the ui file at line %1, column %2: %3 + + + + + Invalid ui file: The root element <ui> is missing. + + + + + The creation of a widget of the class '%1' failed. + + + + + Attempt to add child that is not of class QWizardPage to QWizard. + + + + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. +This indicates an inconsistency in the ui-file. + + + + + Empty widget item in %1 '%2'. + + + + + Flags property are not supported yet. + + + + + While applying tab stops: The widget '%1' could not be found. + + + + + Invalid QButtonGroup reference '%1' referenced by '%2'. + + + + + This version of the uitools library is linked without script support. + + + + + QAxWidgetPlugin + + + ActiveX control + + + + + ActiveX control widget + + + + + QAxWidgetTaskMenu + + + Set Control + + + + + Reset Control + + + + + Licensed Control + + + + + The control requires a design-time license + + + + + QCoreApplication + + + %1 is not a promoted class. + + + + + The base class %1 is invalid. + + + + + The class %1 already exists. + + + + + Promoted Widgets + + + + + The class %1 cannot be removed + + + + + The class %1 cannot be removed because it is still referenced. + + + + + The class %1 cannot be renamed + + + + + The class %1 cannot be renamed to an empty name. + + + + + There is already a class named %1. + + + + + Cannot set an empty include file. + + + + + Exception at line %1: %2 + + + + + Unknown error + + + + + An error occurred while running the script for %1: %2 +Script: %3 + + + + + QDesigner + + + %1 - warning + + + + + Qt Designer + + + + + This application cannot be used for the Console edition of Qt + + + + + QDesignerActions + + + Saved %1. + + + + + %1 already exists. +Do you want to replace it? + + + + + Edit Widgets + + + + + &New... + + + + + &Open... + + + + + &Save + + + + + Save &As... + + + + + Save A&ll + + + + + Save As &Template... + + + + + + &Close + + + + + Save &Image... + + + + + &Print... + + + + + &Quit + + + + + View &Code... + + + + + &Minimize + + + + + Bring All to Front + + + + + Preferences... + + + + + Additional Fonts... + + + + + ALT+CTRL+S + + + + + CTRL+SHIFT+S + + + + + CTRL+Q + + + + + CTRL+R + + + + + CTRL+M + + + + + Qt Designer &Help + + + + + Current Widget Help + + + + + What's New in Qt Designer? + + + + + About Plugins + + + + + + About Qt Designer + + + + + About Qt + + + + + Clear &Menu + + + + + &Recent Forms + + + + + + Open Form + + + + + + + Designer UI files (*.%1);;All Files (*) + + + + + + Save Form As + + + + + Designer + + + + + Feature not implemented yet! + + + + + Code generation failed + + + + + Read error + + + + + %1 +Do you want to update the file location or generate a new form? + + + + + &Update + + + + + &New Form + + + + + + Save Form? + + + + + Could not open file + + + + + The file %1 could not be opened. +Reason: %2 +Would you like to retry or select a different file? + + + + + Select New File + + + + + Could not write file + + + + + It was not possible to write the entire file %1 to disk. +Reason:%2 +Would you like to retry? + + + + + + Assistant + + + + + &Close Preview + + + + + + The backup file %1 could not be written. + + + + + The backup directory %1 could not be created. + + + + + The temporary backup directory %1 could not be created. + + + + + Preview failed + + + + + Image files (*.%1) + + + + + + Save Image + + + + + Saved image %1. + + + + + The file %1 could not be written. + + + + + Please close all forms to enable the loading of additional fonts. + + + + + Printed %1. + + + + + QDesignerAppearanceOptionsPage + + + Appearance + Tab in preferences dialog + + + + + QDesignerAppearanceOptionsWidget + + + Docked Window + + + + + Multiple Top-Level Windows + + + + + Toolwindow Font + + + + + QDesignerAxWidget + + + Reset control + + + + + Set control + + + + + Control loaded + + + + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". + + + + + QDesignerFormBuilder + + + Script errors occurred: + + + + + The preview failed to build. + + + + + Designer + + + + + QDesignerFormWindow + + + %1 - %2[*] + + + + + Save Form? + + + + + Do you want to save the changes to this document before closing? + + + + + If you don't save, your changes will be lost. + + + + + QDesignerMenu + + + Type Here + + + + + Add Separator + + + + + Insert separator + + + + + Remove separator + + + + + Remove action '%1' + + + + + + Add separator + + + + + Insert action + + + + + QDesignerMenuBar + + + Type Here + + + + + Remove Menu '%1' + + + + + Remove Menu Bar + + + + + Menu + + + + + QDesignerPluginManager + + + An XML error was encountered when parsing the XML of the custom widget %1: %2 + + + + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. + + + + + The class attribute for the class %1 is missing. + + + + + The class attribute for the class %1 does not match the class name %2. + + + + + QDesignerPropertySheet + + + Dynamic Properties + + + + + QDesignerResource + + + The layout type '%1' is not supported, defaulting to grid. + + + + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. +Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. + + + + + Unexpected element <%1> + Parsing clipboard contents + + + + + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents + + + + + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents + + + + + QDesignerSharedSettings + + + The template path %1 could not be created. + + + + + An error has been encountered while parsing device profile XML: %1 + + + + + QDesignerToolWindow + + + Property Editor + + + + + Action Editor + + + + + Object Inspector + + + + + Resource Browser + + + + + Signal/Slot Editor + + + + + Widget Box + + + + + QDesignerWidgetBox + + + An error has been encountered at line %1 of %2: %3 + + + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + + + + + Unexpected end of file encountered when parsing widgets. + + + + + A widget element could not be found. + + + + + QDesignerWorkbench + + + &File + + + + + Edit + + + + + F&orm + + + + + Preview in + + + + + &View + + + + + &Settings + + + + + &Window + + + + + &Help + + + + + Toolbars + + + + + Save Forms? + + + + + There are %n forms with unsaved changes. Do you want to review these changes before quitting? + + + + + + + If you do not review your documents, all your changes will be lost. + + + + + Discard Changes + + + + + Review Changes + + + + + Backup Information + + + + + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? + + + + + The file <b>%1</b> could not be opened. + + + + + The file <b>%1</b> is not a valid Designer ui file. + + + + + QFormBuilder + + + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method + + + + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. + + + + + QFormBuilder was unable to create a widget of the class '%1'. + + + + + The layout type `%1' is not supported. + + + + + The set-type property %1 could not be read. + + + + + The enumeration-type property %1 could not be read. + + + + + Reading properties of the type %1 is not supported yet. + + + + + The property %1 could not be written. The type %2 is not supported yet. + + + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + + + + + The flag-value '%1' is invalid. Zero will be used instead. + + + + + QStackedWidgetEventFilter + + + Previous Page + + + + + Next Page + + + + + Delete + + + + + Before Current Page + + + + + After Current Page + + + + + Change Page Order... + + + + + Change Page Order + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QStackedWidgetPreviewEventFilter + + + Go to previous page of %1 '%2' (%3/%4). + + + + + Go to next page of %1 '%2' (%3/%4). + + + + + QTabWidgetEventFilter + + + Delete + + + + + Before Current Page + + + + + After Current Page + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QToolBoxHelper + + + Delete Page + + + + + Before Current Page + + + + + After Current Page + + + + + Change Page Order... + + + + + Change Page Order + + + + + Page %1 of %2 + + + + + Insert Page + + + + + QtBoolEdit + + + + + True + + + + + + False + + + + + QtBoolPropertyManager + + + True + + + + + False + + + + + QtCharEdit + + + Clear Char + + + + + QtColorEditWidget + + + ... + + + + + QtColorPropertyManager + + + Red + + + + + Green + + + + + Blue + + + + + Alpha + + + + + QtCursorDatabase + + + Arrow + + + + + Up Arrow + + + + + Cross + + + + + Wait + + + + + IBeam + + + + + Size Vertical + + + + + Size Horizontal + + + + + Size Backslash + + + + + Size Slash + + + + + Size All + + + + + Blank + + + + + Split Vertical + + + + + Split Horizontal + + + + + Pointing Hand + + + + + Forbidden + + + + + Open Hand + + + + + Closed Hand + + + + + What's This + + + + + Busy + + + + + QtFontEditWidget + + + ... + + + + + Select Font + + + + + QtFontPropertyManager + + + Family + + + + + Point Size + + + + + Bold + + + + + Italic + + + + + Underline + + + + + Strikeout + + + + + Kerning + + + + + QtGradientDialog + + + Edit Gradient + + + + + QtGradientEditor + + + Start X + + + + + Start Y + + + + + Final X + + + + + Final Y + + + + + + Central X + + + + + + Central Y + + + + + Focal X + + + + + Focal Y + + + + + Radius + + + + + Angle + + + + + Form + + + + + Gradient Editor + + + + + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + Gradient Stops Editor + + + + + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. + + + + + Zoom + + + + + Reset Zoom + + + + + Position + + + + + Hue + + + + + H + + + + + Saturation + + + + + S + + + + + Sat + + + + + Value + + + + + V + + + + + Val + + + + + Alpha + + + + + A + + + + + Type + + + + + Spread + + + + + Color + + + + + Current stop's color + + + + + Show HSV specification + + + + + HSV + + + + + Show RGB specification + + + + + RGB + + + + + Current stop's position + + + + + % + + + + + Zoom In + + + + + Zoom Out + + + + + Toggle details extension + + + + + > + + + + + Linear Type + + + + + ... + + + + + Radial Type + + + + + Conical Type + + + + + Pad Spread + + + + + Repeat Spread + + + + + Reflect Spread + + + + + QtGradientStopsWidget + + + New Stop + + + + + Delete + + + + + Flip All + + + + + Select All + + + + + Zoom In + + + + + Zoom Out + + + + + Reset Zoom + + + + + QtGradientView + + + Grad + + + + + Remove Gradient + + + + + Are you sure you want to remove the selected gradient? + + + + + + New... + + + + + + Edit... + + + + + + Rename + + + + + + Remove + + + + + Gradient View + + + + + QtGradientViewDialog + + + + Select Gradient + + + + + QtKeySequenceEdit + + + Clear Shortcut + + + + + QtLocalePropertyManager + + + %1, %2 + + + + + Language + + + + + Country + + + + + QtPointFPropertyManager + + + (%1, %2) + + + + + X + + + + + Y + + + + + QtPointPropertyManager + + + (%1, %2) + + + + + X + + + + + Y + + + + + QtPropertyBrowserUtils + + + [%1, %2, %3] (%4) + + + + + [%1, %2] + + + + + QtRectFPropertyManager + + + [(%1, %2), %3 x %4] + + + + + X + + + + + Y + + + + + Width + + + + + Height + + + + + QtRectPropertyManager + + + [(%1, %2), %3 x %4] + + + + + X + + + + + Y + + + + + Width + + + + + Height + + + + + QtResourceEditorDialog + + + %1 already exists. +Do you want to replace it? + + + + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. + + + + + %1 [read-only] + + + + + + %1 [missing] + + + + + <no prefix> + + + + + + New Resource File + + + + + + Resource files (*.qrc) + + + + + Import Resource File + + + + + newPrefix + + + + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> + + + + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> + + + + + Add Files + + + + + Incorrect Path + + + + + + + + Copy + + + + + Copy As... + + + + + Keep + + + + + Skip + + + + + Clone Prefix + + + + + Enter the suffix which you want to add to the names of the cloned files. +This could for example be a language extension like "_de". + + + + + + Copy As + + + + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> + + + + + Could not overwrite %1. + + + + + Could not copy +%1 +to +%2 + + + + + A parse error occurred at line %1, column %2 of %3: +%4 + + + + + Save Resource File + + + + + Could not write %1: %2 + + + + + Edit Resources + + + + + New... + + + + + Open... + + + + + Open Resource File + + + + + + Remove + + + + + + Move Up + + + + + + Move Down + + + + + + Add Prefix + + + + + Add Files... + + + + + Change Prefix + + + + + Change Language + + + + + Change Alias + + + + + Clone Prefix... + + + + + Prefix / Path + + + + + Language / Alias + + + + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> + + + + + Resource Warning + + + + + Dialog + + + + + New File + + + + + N + + + + + Remove File + + + + + R + + + + + I + + + + + New Resource + + + + + A + + + + + Remove Resource or File + + + + + QtResourceView + + + Size: %1 x %2 +%3 + + + + + Edit Resources... + + + + + Reload + + + + + Copy Path + + + + + QtResourceViewDialog + + + Select Resource + + + + + QtSizeFPropertyManager + + + %1 x %2 + + + + + Width + + + + + Height + + + + + QtSizePolicyPropertyManager + + + + <Invalid> + + + + + [%1, %2, %3, %4] + + + + + Horizontal Policy + + + + + Vertical Policy + + + + + Horizontal Stretch + + + + + Vertical Stretch + + + + + QtSizePropertyManager + + + %1 x %2 + + + + + Width + + + + + Height + + + + + QtToolBarDialog + + + Custom Toolbar + + + + + < S E P A R A T O R > + + + + + Customize Toolbars + + + + + 1 + + + + + Actions + + + + + Toolbars + + + + + Add new toolbar + + + + + New + + + + + Remove selected toolbar + + + + + Remove + + + + + Rename toolbar + + + + + Rename + + + + + Move action up + + + + + Up + + + + + Remove action from toolbar + + + + + <- + + + + + Add action to toolbar + + + + + -> + + + + + Move action down + + + + + Down + + + + + Current Toolbar Actions + + + + + QtTreePropertyBrowser + + + Property + + + + + Value + + + + + SaveFormAsTemplate + + + Add path... + + + + + Template Exists + + + + + A template with the name %1 already exists. +Do you want overwrite the template? + + + + + Overwrite Template + + + + + Open Error + + + + + There was an error opening template %1 for writing. Reason: %2 + + + + + Write Error + + + + + There was an error writing the template %1 to disk. Reason: %2 + + + + + Pick a directory to save templates in + + + + + Save Form As Template + + + + + &Name: + + + + + &Category: + + + + + ScriptErrorDialog + + + An error occurred while running the scripts for "%1": + + + + + + SelectSignalDialog + + + Go to slot + + + + + Select signal + + + + + signal + + + + + class + + + + + SignalSlotConnection + + + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) + + + + + SignalSlotDialogClass + + + Signals and slots + + + + + Slots + + + + + Add + + + + + ... + + + + + Delete + + + + + Signals + + + + + Spacer + + + Horizontal Spacer '%1', %2 x %3 + + + + + Vertical Spacer '%1', %2 x %3 + + + + + TemplateOptionsPage + + + Template Paths + Tab in preferences dialog + + + + + ToolBarManager + + + Configure Toolbars... + + + + + Window + + + + + Help + + + + + Style + + + + + Dock views + + + + + Toolbars + + + + + VersionDialog + + + <h3>%1</h3><br/><br/>Version %2 + + + + + Qt Designer + + + + + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> + + + + + %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + + WidgetDataBase + + + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. + + + + + qdesigner_internal::ActionEditor + + + New... + + + + + Edit... + + + + + Go to slot... + + + + + Copy + + + + + Cut + + + + + Paste + + + + + Select all + + + + + Delete + + + + + Actions + + + + + Configure Action Editor + + + + + Icon View + + + + + Detailed View + + + + + New action + + + + + Edit action + + + + + Remove action '%1' + + + + + Remove actions + + + + + Used In + + + + + qdesigner_internal::ActionModel + + + Name + + + + + Used + + + + + Text + + + + + Shortcut + + + + + Checkable + + + + + ToolTip + + + + + qdesigner_internal::BuddyEditor + + + Add buddy + + + + + Remove buddies + + + + + Remove %n buddies + + + + + + + Add %n buddies + + + + + + + Set automatically + + + + + qdesigner_internal::BuddyEditorPlugin + + + Edit Buddies + + + + + qdesigner_internal::BuddyEditorTool + + + Edit Buddies + + + + + qdesigner_internal::ButtonGroupMenu + + + Select members + + + + + Break + + + + + qdesigner_internal::ButtonTaskMenu + + + Assign to button group + + + + + Button group + + + + + New button group + + + + + Change text... + + + + + None + + + + + Button group '%1' + + + + + qdesigner_internal::CodeDialog + + + Save... + + + + + Copy All + + + + + &Find in Text... + + + + + A temporary form file could not be created in %1. + + + + + The temporary form file %1 could not be written. + + + + + %1 - [Code] + + + + + Save Code + + + + + Header Files (*.%1) + + + + + The file %1 could not be opened: %2 + + + + + The file %1 could not be written: %2 + + + + + %1 - Error + + + + + qdesigner_internal::ColorAction + + + Text Color + + + + + qdesigner_internal::ComboBoxTaskMenu + + + Edit Items... + + + + + Change Combobox Contents + + + + + qdesigner_internal::CommandLinkButtonTaskMenu + + + Change description... + + + + + qdesigner_internal::ConnectionEdit + + + Select All + + + + + Deselect All + + + + + Delete + + + + + qdesigner_internal::ConnectionModel + + + Sender + + + + + Signal + + + + + Receiver + + + + + Slot + + + + + <sender> + + + + + <signal> + + + + + <receiver> + + + + + <slot> + + + + + The connection already exists!<br>%1 + + + + + Signal and Slot Editor + + + + + qdesigner_internal::ContainerWidgetTaskMenu + + + Delete + + + + + Insert + + + + + Insert Page Before Current Page + + + + + Insert Page After Current Page + + + + + Add Subwindow + + + + + Subwindow + + + + + Page + + + + + Page %1 of %2 + + + + + qdesigner_internal::DPI_Chooser + + + System (%1 x %2) + System resolution + + + + + User defined + + + + + x + DPI X/Y separator + + + + + qdesigner_internal::DesignerPropertyManager + + + + AlignLeft + + + + + AlignHCenter + + + + + AlignRight + + + + + AlignJustify + + + + + AlignTop + + + + + + AlignVCenter + + + + + AlignBottom + + + + + %1, %2 + + + + + Customized (%n roles) + + + + + + + Inherited + + + + + Horizontal + + + + + Vertical + + + + + Normal Off + + + + + Normal On + + + + + Disabled Off + + + + + Disabled On + + + + + Active Off + + + + + Active On + + + + + Selected Off + + + + + Selected On + + + + + + translatable + + + + + + disambiguation + + + + + + comment + + + + + qdesigner_internal::DeviceProfileDialog + + + Device Profiles (*.%1) + + + + + Default + + + + + Save Profile + + + + + Save Profile - Error + + + + + Unable to open the file '%1' for writing: %2 + + + + + Open profile + + + + + + Open Profile - Error + + + + + Unable to open the file '%1' for reading: %2 + + + + + '%1' is not a valid profile: %2 + + + + + qdesigner_internal::Dialog + + + Dialog + + + + + StringList + + + + + New String + + + + + &New + + + + + Delete String + + + + + &Delete + + + + + &Value: + + + + + Move String Up + + + + + Up + + + + + Move String Down + + + + + Down + + + + + qdesigner_internal::EmbeddedOptionsControl + + + None + + + + + Add a profile + + + + + Edit the selected profile + + + + + Delete the selected profile + + + + + Add Profile + + + + + New profile + + + + + Edit Profile + + + + + Delete Profile + + + + + Would you like to delete the profile '%1'? + + + + + Default + + + + + qdesigner_internal::FilterWidget + + + <Filter> + + + + + qdesigner_internal::FormEditor + + + Resource File Changed + + + + + The file "%1" has changed outside Designer. Do you want to reload it? + + + + + qdesigner_internal::FormLayoutMenu + + + Add form layout row... + + + + + qdesigner_internal::FormWindow + + + Edit contents + + + + + F2 + + + + + Insert widget '%1' + + + + + Resize + + + + + + Key Move + + + + + Paste %n action(s) + + + + + + + Paste %n widget(s) + + + + + + + Paste (%1 widgets, %2 actions) + + + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. + + + + + Break the layout of the container you want to paste into, select this container and then paste again. + + + + + Paste error + + + + + Raise widgets + + + + + Lower widgets + + + + + Select Ancestor + + + + + Lay out + + + + + + Drop widget + + + + + A QMainWindow-based form does not contain a central widget. + + + + + qdesigner_internal::FormWindowBase + + + Delete '%1' + + + + + Delete + + + + + qdesigner_internal::FormWindowManager + + + Cu&t + + + + + Cuts the selected widgets and puts them on the clipboard + + + + + &Copy + + + + + Copies the selected widgets to the clipboard + + + + + &Paste + + + + + Pastes the clipboard's contents + + + + + &Delete + + + + + Deletes the selected widgets + + + + + Select &All + + + + + Selects all widgets + + + + + Bring to &Front + + + + + + Raises the selected widgets + + + + + Send to &Back + + + + + + Lowers the selected widgets + + + + + Adjust &Size + + + + + Adjusts the size of the selected widget + + + + + Lay Out &Horizontally + + + + + Lays out the selected widgets horizontally + + + + + Lay Out &Vertically + + + + + Lays out the selected widgets vertically + + + + + Lay Out in a &Form Layout + + + + + Lays out the selected widgets in a form layout + + + + + Lay Out in a &Grid + + + + + Lays out the selected widgets in a grid + + + + + Lay Out Horizontally in S&plitter + + + + + Lays out the selected widgets horizontally in a splitter + + + + + Lay Out Vertically in Sp&litter + + + + + Lays out the selected widgets vertically in a splitter + + + + + &Break Layout + + + + + Breaks the selected layout + + + + + Si&mplify Grid Layout + + + + + Removes empty columns and rows + + + + + &Preview... + + + + + Preview current form + + + + + Form &Settings... + + + + + Break Layout + + + + + Adjust Size + + + + + Could not create form preview + Title of warning message box + + + + + Form Settings - %1 + + + + + qdesigner_internal::FormWindowSettings + + + None + + + + + Device Profile: %1 + + + + + qdesigner_internal::GridPanel + + + Form + + + + + Grid + + + + + Visible + + + + + Grid &X + + + + + Snap + + + + + Reset + + + + + Grid &Y + + + + + qdesigner_internal::GroupBoxTaskMenu + + + Change title... + + + + + qdesigner_internal::HtmlTextEdit + + + Insert HTML entity + + + + + qdesigner_internal::IconSelector + + + The pixmap file '%1' cannot be read. + + + + + The file '%1' does not appear to be a valid pixmap file: %2 + + + + + The file '%1' could not be read: %2 + + + + + Choose a Pixmap + + + + + Pixmap Read Error + + + + + ... + + + + + Normal Off + + + + + Normal On + + + + + Disabled Off + + + + + Disabled On + + + + + Active Off + + + + + Active On + + + + + Selected Off + + + + + Selected On + + + + + Choose Resource... + + + + + Choose File... + + + + + Reset + + + + + Reset All + + + + + qdesigner_internal::ItemListEditor + + + Properties &<< + + + + + + Properties &>> + + + + + Items List + + + + + New Item + + + + + &New + + + + + Delete Item + + + + + &Delete + + + + + Move Item Up + + + + + U + + + + + Move Item Down + + + + + D + + + + + qdesigner_internal::LabelTaskMenu + + + Change rich text... + + + + + Change plain text... + + + + + qdesigner_internal::LineEditTaskMenu + + + Change text... + + + + + qdesigner_internal::ListWidgetEditor + + + New Item + + + + + Edit List Widget + + + + + Edit Combobox + + + + + qdesigner_internal::ListWidgetTaskMenu + + + Edit Items... + + + + + Change List Contents + + + + + qdesigner_internal::MdiContainerWidgetTaskMenu + + + Next Subwindow + + + + + Previous Subwindow + + + + + Tile + + + + + Cascade + + + + + qdesigner_internal::MenuTaskMenu + + + Remove + + + + + qdesigner_internal::MorphMenu + + + Morph into + + + + + qdesigner_internal::NewActionDialog + + + New Action... + + + + + &Text: + + + + + Object &name: + + + + + &Icon: + + + + + Shortcut: + + + + + Checkable: + + + + + ToolTip: + + + + + ... + + + + + qdesigner_internal::NewDynamicPropertyDialog + + + Set Property Name + + + + + The current object already has a property named '%1'. +Please select another, unique one. + + + + + The '_q_' prefix is reserved for the Qt library. +Please select another name. + + + + + Create Dynamic Property + + + + + Property Name + + + + + horizontalSpacer + + + + + Property Type + + + + + qdesigner_internal::NewFormWidget + + + Default size + + + + + QVGA portrait (240x320) + + + + + QVGA landscape (320x240) + + + + + VGA portrait (480x640) + + + + + VGA landscape (640x480) + + + + + Widgets + New Form Dialog Categories + + + + + Custom Widgets + + + + + None + + + + + Error loading form + + + + + Internal error: No template selected. + + + + + 0 + + + + + Choose a template for a preview + + + + + Embedded Design + + + + + Device: + + + + + Screen Size: + + + + + qdesigner_internal::NewPromotedClassPanel + + + Add + + + + + New Promoted Class + + + + + Base class name: + + + + + Promoted class name: + + + + + Header file: + + + + + Global include + + + + + Reset + + + + + qdesigner_internal::ObjectInspector + + + &Find in Text... + + + + + qdesigner_internal::ObjectInspector::ObjectInspectorPrivate + + + Change Current Page + + + + + qdesigner_internal::OrderDialog + + + Index %1 (%2) + + + + + %1 %2 + + + + + Change Page Order + + + + + Page Order + + + + + Move page up + + + + + Move page down + + + + + qdesigner_internal::PaletteEditor + + + Edit Palette + + + + + Tune Palette + + + + + Show Details + + + + + Compute Details + + + + + Quick + + + + + Preview + + + + + Disabled + + + + + Inactive + + + + + Active + + + + + qdesigner_internal::PaletteEditorButton + + + Change Palette + + + + + qdesigner_internal::PaletteModel + + + Color Role + + + + + Active + + + + + Inactive + + + + + Disabled + + + + + qdesigner_internal::PixmapEditor + + + Choose Resource... + + + + + Choose File... + + + + + Copy Path + + + + + Paste Path + + + + + + ... + + + + + qdesigner_internal::PlainTextEditorDialog + + + Edit text + + + + + qdesigner_internal::PluginDialog + + + Components + + + + + Plugin Information + + + + + Refresh + + + + + Scan for newly installed custom widget plugins. + + + + + Qt Designer couldn't find any plugins + + + + + Qt Designer found the following plugins + + + + + New custom widget plugins have been found. + + + + + qdesigner_internal::PreviewActionGroup + + + %1 Style + + + + + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate + + + Load Custom Device Skin + + + + + All QVFB Skins (*.%1) + + + + + %1 - Duplicate Skin + + + + + The skin '%1' already exists. + + + + + %1 - Error + + + + + %1 is not a valid skin directory: +%2 + + + + + qdesigner_internal::PreviewDeviceSkin + + + &Close + + + + + qdesigner_internal::PreviewManager + + + %1 - [Preview] + + + + + qdesigner_internal::PreviewWidget + + + Preview Window + + + + + LineEdit + + + + + ComboBox + + + + + PushButton + + + + + ButtonGroup2 + + + + + CheckBox1 + + + + + CheckBox2 + + + + + ButtonGroup + + + + + RadioButton1 + + + + + RadioButton2 + + + + + RadioButton3 + + + + + qdesigner_internal::PromotionModel + + + Name + + + + + Header file + + + + + Global include + + + + + Usage + + + + + qdesigner_internal::PromotionTaskMenu + + + Promoted widgets... + + + + + Promote to ... + + + + + Change signals/slots... + + + + + Promote to + + + + + Demote to %1 + + + + + qdesigner_internal::PropertyEditor + + + Add Dynamic Property... + + + + + Remove Dynamic Property + + + + + Sorting + + + + + Color Groups + + + + + Tree View + + + + + Drop Down Button View + + + + + String... + + + + + Bool... + + + + + Other... + + + + + Configure Property Editor + + + + + Object: %1 +Class: %2 + + + + + qdesigner_internal::PropertyLineEdit + + + Insert line break + + + + + qdesigner_internal::QDesignerPromotionDialog + + + Promoted Widgets + + + + + Promoted Classes + + + + + Promote + + + + + Change signals/slots... + + + + + %1 - Error + + + + + qdesigner_internal::QDesignerResource + + + Loading qrc file + + + + + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> + + + + + New location for %1 + + + + + Resource files (*.qrc) + + + + + qdesigner_internal::QDesignerTaskMenu + + + Change objectName... + + + + + Change toolTip... + + + + + Change whatsThis... + + + + + Change styleSheet... + + + + + Create Menu Bar + + + + + Add Tool Bar + + + + + Create Status Bar + + + + + Remove Status Bar + + + + + Change script... + + + + + Change signals/slots... + + + + + Go to slot... + + + + + Size Constraints + + + + + Set Minimum Width + + + + + Set Minimum Height + + + + + Set Minimum Size + + + + + Set Maximum Width + + + + + Set Maximum Height + + + + + Set Maximum Size + + + + + Edit ToolTip + + + + + Edit WhatsThis + + + + + no signals available + + + + + Set size constraint on %n widget(s) + + + + + + + qdesigner_internal::QDesignerWidgetBox + + + + Unexpected element <%1> + + + + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 +%5 + + + + + The XML code specified for the widget %1 does not contain any widget elements. +%2 + + + + + qdesigner_internal::QtGradientEditor + + + Linear + + + + + Radial + + + + + Conical + + + + + Pad + + + + + Repeat + + + + + Reflect + + + + + qdesigner_internal::QtGradientStopsController + + + H + + + + + S + + + + + V + + + + + + Hue + + + + + Sat + + + + + Val + + + + + Saturation + + + + + Value + + + + + R + + + + + G + + + + + B + + + + + Red + + + + + Green + + + + + Blue + + + + + qdesigner_internal::RichTextEditorDialog + + + Edit text + + + + + Rich Text + + + + + Source + + + + + &OK + + + + + &Cancel + + + + + qdesigner_internal::RichTextEditorToolBar + + + Bold + + + + + CTRL+B + + + + + Italic + + + + + CTRL+I + + + + + Underline + + + + + CTRL+U + + + + + Left Align + + + + + Center + + + + + Right Align + + + + + Justify + + + + + Superscript + + + + + Subscript + + + + + Insert &Link + + + + + Insert &Image + + + + + qdesigner_internal::ScriptDialog + + + Edit script + + + + + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. + + + + + Syntax error + + + + + qdesigner_internal::ScriptErrorDialog + + + Script errors + + + + + qdesigner_internal::SignalSlotDialog + + + There is already a slot with the signature '%1'. + + + + + There is already a signal with the signature '%1'. + + + + + %1 - Duplicate Signature + + + + + + Signals/Slots of %1 + + + + + qdesigner_internal::SignalSlotEditorPlugin + + + Edit Signals/Slots + + + + + F4 + + + + + qdesigner_internal::SignalSlotEditorTool + + + Edit Signals/Slots + + + + + qdesigner_internal::StatusBarTaskMenu + + + Remove + + + + + qdesigner_internal::StringListEditorButton + + + Change String List + + + + + qdesigner_internal::StyleSheetEditorDialog + + + + Valid Style Sheet + + + + + Add Resource... + + + + + Add Gradient... + + + + + Add Color... + + + + + Add Font... + + + + + Edit Style Sheet + + + + + Invalid Style Sheet + + + + + qdesigner_internal::TabOrderEditor + + + Start from Here + + + + + Restart + + + + + Tab Order List... + + + + + Tab Order List + + + + + Tab Order + + + + + qdesigner_internal::TabOrderEditorPlugin + + + Edit Tab Order + + + + + qdesigner_internal::TabOrderEditorTool + + + Edit Tab Order + + + + + qdesigner_internal::TableWidgetEditor + + + New Column + + + + + New Row + + + + + &Columns + + + + + &Rows + + + + + Properties &<< + + + + + + Properties &>> + + + + + Edit Table Widget + + + + + &Items + + + + + Table Items + + + + + qdesigner_internal::TableWidgetTaskMenu + + + Edit Items... + + + + + qdesigner_internal::TemplateOptionsWidget + + + Pick a directory to save templates in + + + + + Form + + + + + Additional Template Paths + + + + + ... + + + + + qdesigner_internal::TextEditTaskMenu + + + Edit HTML + + + + + Change HTML... + + + + + Edit Text + + + + + Change Plain Text... + + + + + qdesigner_internal::TextEditor + + + Choose Resource... + + + + + Choose File... + + + + + ... + + + + + Choose a File + + + + + qdesigner_internal::ToolBarEventFilter + + + Insert Separator before '%1' + + + + + Append Separator + + + + + Remove action '%1' + + + + + Remove Toolbar '%1' + + + + + Insert Separator + + + + + qdesigner_internal::TreeWidgetEditor + + + New Column + + + + + &Columns + + + + + Per column properties + + + + + Common properties + + + + + + New Item + + + + + + New Subitem + + + + + Properties &<< + + + + + + Properties &>> + + + + + Edit Tree Widget + + + + + &Items + + + + + Tree Items + + + + + 1 + + + + + &New + + + + + New &Subitem + + + + + Delete Item + + + + + &Delete + + + + + Move Item Left (before Parent Item) + + + + + L + + + + + Move Item Right (as a First Subitem of the Next Sibling Item) + + + + + R + + + + + Move Item Up + + + + + U + + + + + Move Item Down + + + + + D + + + + + qdesigner_internal::TreeWidgetTaskMenu + + + Edit Items... + + + + + qdesigner_internal::WidgetBox + + + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. + + + + + qdesigner_internal::WidgetBoxTreeWidget + + + Scratchpad + + + + + Custom Widgets + + + + + Expand all + + + + + Collapse all + + + + + List View + + + + + Icon View + + + + + Remove + + + + + Edit name + + + + + qdesigner_internal::WidgetDataBase + + + A custom widget plugin whose class name (%1) matches that of an existing class has been found. + + + + + qdesigner_internal::WidgetEditorTool + + + Edit Widgets + + + + + qdesigner_internal::WidgetFactory + + + The custom widget factory registered for widgets of class %1 returned 0. + + + + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. + + + + + %1 Widget + + + + + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. + + + + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. +This indicates an inconsistency in the ui-file. + + + + + Cannot create style '%1'. + + + + + qdesigner_internal::WizardContainerWidgetTaskMenu + + + Next + + + + + Back + + + + + qdesigner_internal::ZoomMenu + + + %1 % + Zoom factor + + + + diff --git a/translations/designer_untranslated.ts b/translations/designer_untranslated.ts index 209d871..1666363 100644 --- a/translations/designer_untranslated.ts +++ b/translations/designer_untranslated.ts @@ -4,7 +4,7 @@ - + <object> @@ -19,7 +19,7 @@ - + The moose in the noose ate the goose who was loose. @@ -28,7 +28,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous @@ -74,7 +74,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts @@ -186,7 +186,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. @@ -204,7 +204,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. @@ -232,7 +232,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush @@ -325,19 +325,24 @@ ate the goose who was loose. Command - - + + Change signal - - + + Change slot - + + Change signal-slot connection + + + + Change sender @@ -347,7 +352,7 @@ ate the goose who was loose. - + Add connection @@ -372,7 +377,7 @@ ate the goose who was loose. - + Insert '%1' @@ -397,7 +402,7 @@ ate the goose who was loose. - + Promote to custom widget @@ -427,48 +432,48 @@ ate the goose who was loose. - - - + + + Move Page - - - - + + + + Delete Page - - + + Page - - - + + + page - - - - + + + + Insert Page - + tab - + Change Tab order @@ -513,12 +518,12 @@ ate the goose who was loose. - + Change Layout Item Geometry - + Change Table Contents @@ -560,7 +565,7 @@ ate the goose who was loose. - + Set action text @@ -571,7 +576,7 @@ ate the goose who was loose. - + Move action @@ -586,7 +591,7 @@ ate the goose who was loose. - + Change signals/slots @@ -611,17 +616,17 @@ ate the goose who was loose. - + Change Z-order of '%1' - + Simplify Grid Layout - + Create button group @@ -642,7 +647,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup @@ -659,23 +664,23 @@ ate the goose who was loose. - + Morph %1/'%2' into %3 MorphWidgetCommand description - + Change layout of '%1' from %2 to %3 - + Change script - + Changed '%1' of '%2' @@ -749,7 +754,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution @@ -770,7 +775,7 @@ ate the goose who was loose. Designer - + Qt Designer @@ -836,7 +841,7 @@ ate the goose who was loose. - + Custom Widgets @@ -846,7 +851,7 @@ ate the goose who was loose. - + Unable to launch %1. @@ -859,7 +864,7 @@ ate the goose who was loose. DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. @@ -880,7 +885,7 @@ ate the goose who was loose. DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile @@ -922,7 +927,7 @@ ate the goose who was loose. DeviceSkin - + The image file '%1' could not be loaded. @@ -980,7 +985,7 @@ ate the goose who was loose. EmbeddedOptionsControl - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description @@ -1004,7 +1009,7 @@ ate the goose who was loose. FontPanel - + Font @@ -1032,7 +1037,7 @@ ate the goose who was loose. FontPropertyManager - + PreferDefault @@ -1055,7 +1060,7 @@ ate the goose who was loose. FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values @@ -1070,7 +1075,7 @@ ate the goose who was loose. FormEditorOptionsPage - + %1 % @@ -1137,7 +1142,7 @@ ate the goose who was loose. FormWindow - + Unexpected element <%1> @@ -1213,7 +1218,7 @@ ate the goose who was loose. IconSelector - + All Pixmaps ( @@ -1221,7 +1226,7 @@ ate the goose who was loose. ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser @@ -1230,7 +1235,7 @@ ate the goose who was loose. LanguageResourceDialog - + Choose Resource @@ -1238,7 +1243,7 @@ ate the goose who was loose. MainWindowBase - + Main Not currently used (main tool bar) @@ -1272,7 +1277,7 @@ ate the goose who was loose. NewForm - + C&reate @@ -1325,7 +1330,7 @@ ate the goose who was loose. NewFormWidget - + Unable to open the form template file '%1': %2 @@ -1333,7 +1338,7 @@ ate the goose who was loose. ObjectInspectorModel - + Object @@ -1356,7 +1361,7 @@ ate the goose who was loose. ObjectNameDialog - + Change Object Name @@ -1367,49 +1372,13 @@ ate the goose who was loose. - qdesigner_internal::PluginDialog - - - Components - - + PluginDialog - - + Plugin Information - - Refresh - - - - - Scan for newly installed custom widget plugins. - - - - - Qt Designer couldn't find any plugins - - - - - Qt Designer found the following plugins - - - - - New custom widget plugins have been found. - - - - - TextLabel - - - 1 @@ -1426,7 +1395,7 @@ ate the goose who was loose. PreviewConfigurationWidget - + Default @@ -1474,7 +1443,7 @@ ate the goose who was loose. PromotionModel - + Not used Usage of promoted widgets @@ -1483,7 +1452,7 @@ ate the goose who was loose. Q3WizardContainer - + Page @@ -1492,7 +1461,7 @@ ate the goose who was loose. QAbstractFormBuilder - + Unexpected element <%1> @@ -1538,7 +1507,7 @@ This indicates an inconsistency in the ui-file. - + Invalid QButtonGroup reference '%1' referenced by '%2'. @@ -1551,7 +1520,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control @@ -1564,7 +1533,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control @@ -1587,7 +1556,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. @@ -1637,7 +1606,7 @@ This indicates an inconsistency in the ui-file. - + Exception at line %1: %2 @@ -1656,7 +1625,7 @@ Script: %3 QDesigner - + %1 - warning @@ -1674,7 +1643,7 @@ Script: %3 QDesignerActions - + Edit Widgets @@ -1841,12 +1810,12 @@ Do you want to update the file location or generate a new form? - + &Close Preview - + Save &Image... @@ -1870,7 +1839,7 @@ Would you like to retry? - + The backup file %1 could not be written. @@ -1902,7 +1871,7 @@ Would you like to retry? - + &New... @@ -1933,12 +1902,12 @@ Would you like to retry? - + &Close - + View &Code... @@ -1949,23 +1918,23 @@ Would you like to retry? - + Preview failed - + Code generation failed - + Assistant - + Saved image %1. @@ -1980,7 +1949,7 @@ Would you like to retry? - + ALT+CTRL+S @@ -1988,7 +1957,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog @@ -2025,7 +1994,7 @@ Would you like to retry? - + Control loaded @@ -2038,7 +2007,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: @@ -2056,7 +2025,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] @@ -2141,7 +2110,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 @@ -2164,7 +2133,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties @@ -2172,18 +2141,18 @@ Would you like to retry? QDesignerResource - + The layout type '%1' is not supported, defaulting to grid. - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - + Unexpected element <%1> Parsing clipboard contents @@ -2204,7 +2173,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. @@ -2217,7 +2186,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor @@ -2250,7 +2219,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWidgetBox - + An error has been encountered at line %1 of %2: %3 @@ -2273,7 +2242,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File @@ -2348,7 +2317,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The file <b>%1</b> could not be opened. @@ -2358,7 +2327,7 @@ Container pages should only be added by specifying them in XML returned by the d - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? @@ -2368,7 +2337,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method @@ -2389,7 +2358,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The set-type property %1 could not be read. @@ -2409,7 +2378,7 @@ Container pages should only be added by specifying them in XML returned by the d - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. @@ -2422,7 +2391,7 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetEventFilter - + Previous Page @@ -2483,7 +2452,7 @@ Container pages should only be added by specifying them in XML returned by the d QTabWidgetEventFilter - + Delete @@ -2511,7 +2480,7 @@ Container pages should only be added by specifying them in XML returned by the d QToolBoxHelper - + Delete Page @@ -2549,7 +2518,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolEdit - + True @@ -2565,7 +2534,7 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolPropertyManager - + True @@ -2578,7 +2547,7 @@ Container pages should only be added by specifying them in XML returned by the d QtCharEdit - + Clear Char @@ -2594,7 +2563,7 @@ Container pages should only be added by specifying them in XML returned by the d QtColorPropertyManager - + Red @@ -2774,7 +2743,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientEditor - + Start X @@ -3049,7 +3018,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientStopsWidget - + New Stop @@ -3087,7 +3056,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientView - + Grad @@ -3134,7 +3103,7 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientViewDialog - + Select Gradient @@ -3151,7 +3120,7 @@ Container pages should only be added by specifying them in XML returned by the d QtLocalePropertyManager - + %1, %2 @@ -3218,22 +3187,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectFPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -3246,22 +3215,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectPropertyManager - + [(%1, %2), %3 x %4] - + X - + Y - + Width @@ -3274,7 +3243,7 @@ Container pages should only be added by specifying them in XML returned by the d QtResourceEditorDialog - + %1 already exists. Do you want to replace it? @@ -3285,7 +3254,7 @@ Do you want to replace it? - + %1 [read-only] @@ -3554,7 +3523,7 @@ to QtResourceView - + Size: %1 x %2 %3 @@ -3586,7 +3555,7 @@ to QtSizeFPropertyManager - + %1 x %2 @@ -3604,7 +3573,7 @@ to QtSizePolicyPropertyManager - + <Invalid> @@ -3638,7 +3607,7 @@ to QtSizePropertyManager - + %1 x %2 @@ -3656,7 +3625,7 @@ to QtToolBarDialog - + < S E P A R A T O R > @@ -3764,7 +3733,7 @@ to QtTreePropertyBrowser - + Property @@ -3777,7 +3746,7 @@ to SaveFormAsTemplate - + Add path... @@ -3841,7 +3810,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": @@ -3873,7 +3842,7 @@ Do you want overwrite the template? SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -3914,7 +3883,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 @@ -3927,7 +3896,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog @@ -3969,17 +3938,12 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 - - Open Source Edition - - - - + Qt Designer @@ -3989,30 +3953,15 @@ Do you want overwrite the template? - - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - - WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. @@ -4020,22 +3969,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions - + New... - + Delete - + New action @@ -4045,12 +3994,17 @@ Do you want overwrite the template? - + Edit... + Go to slot... + + + + Copy @@ -4070,7 +4024,7 @@ Do you want overwrite the template? - + Icon View @@ -4080,7 +4034,7 @@ Do you want overwrite the template? - + Remove actions @@ -4090,12 +4044,12 @@ Do you want overwrite the template? - + Used In - + Configure Action Editor @@ -4103,7 +4057,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name @@ -4136,7 +4090,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy @@ -4168,7 +4122,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies @@ -4176,7 +4130,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies @@ -4230,7 +4184,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... @@ -4288,7 +4242,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color @@ -4296,7 +4250,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... @@ -4388,7 +4342,7 @@ Do you want overwrite the template? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page @@ -4451,7 +4405,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft @@ -4576,7 +4530,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) @@ -4736,7 +4690,7 @@ Do you want overwrite the template? qdesigner_internal::FilterWidget - + <Filter> @@ -4744,7 +4698,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed @@ -4765,7 +4719,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents @@ -4775,7 +4729,7 @@ Do you want overwrite the template? - + Resize @@ -4859,7 +4813,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowBase - + Delete @@ -4872,7 +4826,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowManager - + Cu&t @@ -4954,7 +4908,7 @@ Do you want overwrite the template? - + Lay Out &Horizontally @@ -5004,7 +4958,7 @@ Do you want overwrite the template? - + &Break Layout @@ -5029,7 +4983,7 @@ Do you want overwrite the template? - + Break Layout @@ -5045,17 +4999,17 @@ Do you want overwrite the template? - + Form Settings - %1 - + Removes empty columns and rows - + Lay Out in a &Form Layout @@ -5065,7 +5019,7 @@ Do you want overwrite the template? - + Si&mplify Grid Layout @@ -5073,7 +5027,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindowSettings - + None @@ -5124,7 +5078,7 @@ Do you want overwrite the template? qdesigner_internal::GroupBoxTaskMenu - + Change title... @@ -5140,7 +5094,7 @@ Do you want overwrite the template? qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. @@ -5292,7 +5246,7 @@ Do you want overwrite the template? qdesigner_internal::LabelTaskMenu - + Change rich text... @@ -5305,7 +5259,7 @@ Do you want overwrite the template? qdesigner_internal::LineEditTaskMenu - + Change text... @@ -5313,7 +5267,7 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetEditor - + Edit List Widget @@ -5331,7 +5285,7 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetTaskMenu - + Edit Items... @@ -5367,7 +5321,7 @@ Do you want overwrite the template? qdesigner_internal::MenuTaskMenu - + Remove @@ -5426,7 +5380,7 @@ Do you want overwrite the template? qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name @@ -5545,7 +5499,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add @@ -5583,7 +5537,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... @@ -5599,7 +5553,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) @@ -5680,7 +5634,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette @@ -5688,7 +5642,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role @@ -5740,15 +5694,53 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text + qdesigner_internal::PluginDialog + + + Components + + + + + Plugin Information + + + + + Refresh + + + + + Scan for newly installed custom widget plugins. + + + + + Qt Designer couldn't find any plugins + + + + + Qt Designer found the following plugins + + + + + New custom widget plugins have been found. + + + + qdesigner_internal::PreviewActionGroup - + %1 Style @@ -5790,7 +5782,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close @@ -5887,7 +5879,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... @@ -5915,7 +5907,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... @@ -5974,7 +5966,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break @@ -6033,14 +6025,14 @@ Class: %2 qdesigner_internal::QDesignerTaskMenu - + Set size constraint on %n widget(s) - + Change objectName... @@ -6130,7 +6122,7 @@ Class: %2 - + Edit ToolTip @@ -6140,7 +6132,7 @@ Class: %2 - + no signals available @@ -6148,7 +6140,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> @@ -6202,7 +6194,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H @@ -6377,7 +6369,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script @@ -6427,7 +6419,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots @@ -6440,7 +6432,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots @@ -6448,7 +6440,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove @@ -6456,7 +6448,7 @@ Class: %2 qdesigner_internal::StringListEditorButton - + Change String List @@ -6464,7 +6456,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet @@ -6503,7 +6495,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here @@ -6531,7 +6523,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order @@ -6539,7 +6531,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order @@ -6547,7 +6539,7 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column @@ -6596,7 +6588,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... @@ -6627,7 +6619,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... @@ -6673,7 +6665,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator @@ -6701,7 +6693,7 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns @@ -6827,7 +6819,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... @@ -6835,7 +6827,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. @@ -6843,17 +6835,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad - + Custom Widgets - + Expand all @@ -6894,7 +6886,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets @@ -6902,12 +6894,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. @@ -6949,7 +6941,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor diff --git a/translations/designer_zh_CN.ts b/translations/designer_zh_CN.ts index 0024ea3..5a78afaa 100644 --- a/translations/designer_zh_CN.ts +++ b/translations/designer_zh_CN.ts @@ -1,23 +1,22 @@ - - + The moose in the noose ate the goose who was loose. The moose in the noose ate the goose who was loose. - + <object> <对象> - + <signal> <ä¿¡å·> @@ -45,7 +44,7 @@ ate the goose who was loose. AbstractFindWidget - + &Previous &上一个 @@ -91,7 +90,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts 附加字体 @@ -203,7 +202,7 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. 无法å‘é€è¯·æ±‚:助手无å“应。 @@ -221,7 +220,7 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. 组件“%1â€ç¼ºå°‘必需的属性“%2â€ã€‚ @@ -249,7 +248,7 @@ ate the goose who was loose. BrushPropertyManager - + No brush 无画刷 @@ -342,19 +341,24 @@ ate the goose who was loose. Command - - + + Change signal 改å˜ä¿¡å· - - + + Change slot 改å˜æ§½ - + + Change signal-slot connection + + + + Change sender 改å˜å‘é€è€… @@ -364,7 +368,7 @@ ate the goose who was loose. 改å˜æŽ¥æ”¶è€… - + Add connection 添加连接 @@ -397,7 +401,7 @@ ate the goose who was loose. é‡ç½®â€œ%2â€çš„“%1†- + Insert '%1' æ’入“%1†@@ -422,7 +426,7 @@ ate the goose who was loose. é‡å®šä¹‰â€œ%1â€çš„父对象 - + Promote to custom widget æå‡è‡³è‡ªå®šä¹‰çª—å£éƒ¨ä»¶ @@ -452,48 +456,48 @@ ate the goose who was loose. å–消布局 - - - + + + Move Page 移动页 - - - - + + + + Delete Page 删除页 - - + + Page 页 - - - + + + page 页 - - - - + + + + Insert Page æ’入页 - + tab 标签页 - + Change Tab order 改å˜åˆ¶è¡¨ç¬¦é¡ºåº @@ -542,12 +546,12 @@ ate the goose who was loose. 改å˜è¡¨å•å¸ƒå±€é¡¹çš„几何ä½ç½® - + Change Layout Item Geometry 改å˜å¸ƒå±€é¡¹çš„几何ä½ç½® - + Change Table Contents 改å˜è¡¨æ ¼å†…容 @@ -631,7 +635,7 @@ ate the goose who was loose. - + Set action text 设定动作文本 @@ -642,7 +646,7 @@ ate the goose who was loose. - + Move action 移动动作 @@ -657,17 +661,17 @@ ate the goose who was loose. æ’å…¥èœå• - + Change Z-order of '%1' 改å˜â€œ%1â€çš„ Z é¡ºåº - + Simplify Grid Layout 简易网格布局 - + Delete Subwindow 删除å­çª—å£ @@ -687,12 +691,12 @@ ate the goose who was loose. å­çª—å£ - + Change signals/slots 改å˜ä¿¡å·/槽 - + Create button group 创建按钮组 @@ -713,7 +717,7 @@ ate the goose who was loose. - + Add '%1' to '%2' Command description for adding buttons to a QButtonGroup 添加“%1â€åˆ°â€œ%2†@@ -730,23 +734,23 @@ ate the goose who was loose. 从“%2â€ä¸­ç§»é™¤â€œ%1†- + Morph %1/'%2' into %3 MorphWidgetCommand description å°†%1/“%2â€å˜å½¢ä¸º%3 - + Change layout of '%1' from %2 to %3 将“%1â€çš„布局从%2å˜ä¸º%3 - + Change script 改å˜è„šæœ¬ - + Changed '%1' of '%2' 已改å˜â€œ%2â€ä¸ªä¸­çš„“%1â€ä¸ª @@ -820,7 +824,7 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) Embedded device standard screen resolution 标准(96 x 96) @@ -841,7 +845,7 @@ ate the goose who was loose. Designer - + Qt Designer Qt 设计师 @@ -856,7 +860,7 @@ The old form has been untouched, but you will have to save this form under a new 旧的窗体没有改å˜ï¼Œä½†æ˜¯æ‚¨å°†ä¸å¾—ä¸ä½¿ç”¨æ–°çš„å称ä¿å­˜è¿™ä¸ªè¡¨å•ã€‚ - + Custom Widgets 自定义窗å£éƒ¨ä»¶ @@ -866,7 +870,7 @@ The old form has been untouched, but you will have to save this form under a new æå‡çª—å£éƒ¨ä»¶ - + Unable to launch %1. ä¸èƒ½å¯åŠ¨ %1。 @@ -876,7 +880,7 @@ The old form has been untouched, but you will have to save this form under a new %1 超时。 - + This file cannot be read because it was created using %1. ä¸èƒ½è¯»å–这个文件,因为它是被使用 %1 创建的。 @@ -945,7 +949,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum - + %1 is not a valid enumeration value of '%2'. %1 ä¸æ˜¯â€œ%2â€ä¸­çš„一个有效的枚举值。 @@ -966,7 +970,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. Reading a number for an embedded device profile '%1'ä¸æ˜¯ä¸€ä¸ªæ•°å­— @@ -1008,7 +1012,7 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. 无法加载图åƒæ–‡ä»¶â€œ%1â€ã€‚ @@ -1066,66 +1070,56 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - None - æ—  + æ—  - Add a profile - 添加æ述文件 + 添加æ述文件 - Edit the selected profile - 编辑选中的æ述文件 + 编辑选中的æ述文件 - Delete the selected profile - 删除选中的æ述文件 + 删除选中的æ述文件 - Add Profile - 添加æ述文件 + 添加æ述文件 - New profile - 新建æ述文件 + 新建æ述文件 - Edit Profile - 编辑æ述文件 + 编辑æ述文件 - Delete Profile - 删除æ述文件 + 删除æ述文件 - Would you like to delete the profile '%1'? - ä½ è¦åˆ é™¤æ述文件“%1â€å—? + ä½ è¦åˆ é™¤æ述文件“%1â€å—? - + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>字体</b></td><td>%1,%2</td></tr><tr><td><b>风格</b></td><td>%3</td><tr><td><b>解æžåº¦</b></td><td>%4 x %5</td></tr></table></html> - Default - 默认 + 默认 EmbeddedOptionsPage - + Embedded Design Tab in preferences dialog 嵌入å¼è®¾è®¡ @@ -1163,7 +1157,7 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font 字体 @@ -1191,7 +1185,7 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault 首选默认 @@ -1214,7 +1208,7 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' Parsing layout stretch values “%1â€ï¼šâ€œ%2â€æ— æ•ˆçš„拉伸值 @@ -1229,7 +1223,7 @@ The old form has been untouched, but you will have to save this form under a new FormEditorOptionsPage - + %1 % %1 % @@ -1296,7 +1290,7 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> 未预期的元素<%1> @@ -1372,7 +1366,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( 所有åƒç´ æ˜ å°„ ( @@ -1380,7 +1374,7 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX图标选择关闭 @@ -1389,7 +1383,7 @@ The old form has been untouched, but you will have to save this form under a new LanguageResourceDialog - + Choose Resource é€‰æ‹©èµ„æº @@ -1397,7 +1391,7 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main Not currently used (main tool bar) ä¸»è¦ @@ -1439,7 +1433,7 @@ The old form has been untouched, but you will have to save this form under a new é€‰æ‹©ä¸€ä¸ªç”¨äºŽé¢„è§ˆçš„æ¨¡æ¿ - + New Form 新建窗体 @@ -1504,7 +1498,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 无法打开窗体模版文件'%1':%2 @@ -1512,7 +1506,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object 对象 @@ -1522,7 +1516,7 @@ The old form has been untouched, but you will have to save this form under a new ç±» - + separator 分隔符 @@ -1535,7 +1529,7 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name 改å˜å¯¹è±¡å称 @@ -1597,52 +1591,16 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog + PluginDialog - - Components - 组件 - - - - + Plugin Information - æ’ä»¶ä¿¡æ¯ - - - - Qt Designer couldn't find any plugins - Qt 设计师无法找到任何æ’件 - - - - Qt Designer found the following plugins - Qt 设计师已ç»æ‰¾åˆ°å¦‚下æ’件 - - - - TextLabel - 文本标签 - - - - Refresh - 刷新 - - - - Scan for newly installed custom widget plugins. - 扫æ新安装的自定义窗å£éƒ¨ä»¶æ’件。 + æ’ä»¶ä¿¡æ¯ - - New custom widget plugins have been found. - 新的自定义窗å£éƒ¨ä»¶æ’件已ç»è¢«æ‰¾åˆ°ã€‚ - - - + 1 - 1 + 1 @@ -1688,7 +1646,7 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default 默认 @@ -1736,7 +1694,7 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used Usage of promoted widgets 没有被使用 @@ -1752,7 +1710,7 @@ There's nothing more here. You should get back to work. Q3WizardContainer - + Page 页 @@ -1761,7 +1719,7 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> 未预期的元素<%1> @@ -1808,7 +1766,7 @@ This indicates an inconsistency in the ui-file. 在应用制表符时中断:无法找到窗å£éƒ¨ä»¶â€œ%1â€ã€‚ - + Invalid QButtonGroup reference '%1' referenced by '%2'. “%2â€å‚考了无效的QButtonGroupå‚考“%1â€ã€‚ @@ -1854,7 +1812,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX 控件 @@ -1867,7 +1825,7 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control 设置控件 @@ -1890,7 +1848,7 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ä¸æ˜¯æå‡çš„类。 @@ -1940,7 +1898,7 @@ This indicates an inconsistency in the ui-file. 无法设定一个空白包å«æ–‡ä»¶ã€‚ - + Exception at line %1: %2 %1 è¡Œå‘生æ„外:%2 @@ -1960,7 +1918,7 @@ Script: %3 QDesigner - + %1 - warning %1 - 警告 @@ -1993,7 +1951,7 @@ Script: %3 CTRL+O - + Clear &Menu 清空èœå•(&M) @@ -2006,7 +1964,7 @@ Script: %3 CTRL+W - + &Quit 退出(&Q) @@ -2079,17 +2037,17 @@ Script: %3 - + About Qt Designer 关于 Qt 设计师 - + About Qt 关于 Qt - + &Recent Forms 最近的窗体(&R) @@ -2130,19 +2088,19 @@ Would you like to retry or select a different file? 选择新文件 - + %1 already exists. Do you want to replace it? %1 å·²ç»å­˜åœ¨ã€‚ 您想è¦æ›¿æ¢å®ƒä¹ˆï¼Ÿ - + &Close Preview 关闭预览(&C) - + Preferences... 属性... @@ -2152,19 +2110,19 @@ Do you want to replace it? CTRL+SHIFT+S - + Designer UI files (*.%1);;All Files (*) 设计师 UI 文件 (*.%1);;全部文件 (*) - + Saved %1. %1 已被ä¿å­˜ã€‚ - + Read error 读å–错误 @@ -2216,7 +2174,7 @@ Would you like to retry? 窗体设定 - %1 - + &New... 新建(&N)... @@ -2247,12 +2205,12 @@ Would you like to retry? - + &Close 关闭(&C) - + Save &Image... ä¿å­˜å›¾åƒ(&I)... @@ -2276,18 +2234,18 @@ Would you like to retry? ALT+CTRL+S - + Save Form As 窗体å¦å­˜ä¸º - + Preview failed 预览失败 - + Code generation failed 代ç ç”Ÿæˆå¤±è´¥ @@ -2302,12 +2260,12 @@ Would you like to retry? - + Assistant 助手 - + The backup file %1 could not be written. 备份文件%1无法被写入。 @@ -2349,7 +2307,7 @@ Would you like to retry? 请关闭所有窗体文件,以便加载附加字体 - + Printed %1. %1 已被打å°ã€‚ @@ -2357,7 +2315,7 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance Tab in preferences dialog 外观 @@ -2366,7 +2324,7 @@ Would you like to retry? QDesignerAppearanceOptionsWidget - + Docked Window é”šæŽ¥çš„çª—å£ @@ -2376,7 +2334,7 @@ Would you like to retry? å¤šä¸ªé¡¶çº§çª—å£ - + Toolwindow Font 工具窗å£å­—体 @@ -2394,7 +2352,7 @@ Would you like to retry? 设置控件 - + Control loaded 控件已ç»åŠ è½½ @@ -2407,7 +2365,7 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: å‘生脚本错误: @@ -2425,7 +2383,7 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] @@ -2448,7 +2406,7 @@ Would you like to retry? QDesignerMenu - + Type Here 在这里输入 @@ -2458,7 +2416,7 @@ Would you like to retry? 添加分隔符 - + Remove action '%1' 移除动作“%1†@@ -2517,7 +2475,7 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 在解æžè‡ªå®šä¹‰çª—å£éƒ¨ä»¶%1çš„XMLæ—¶å‘生错误:%2 @@ -2551,7 +2509,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties 动æ€å±žæ€§ @@ -2564,14 +2522,14 @@ Would you like to retry? ä¸æ”¯æŒå¸ƒå±€ç±»åž‹â€œ%1â€ï¼Œé»˜è®¤ä¸ºç½‘格。 - + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. 在查询页é¢#%5时,窗å£éƒ¨ä»¶â€œ%1â€(%2)的容器扩展返回了一个没有被设计师管ç†çš„窗å£éƒ¨ä»¶ã€‚ 容器页é¢åº”该åªèƒ½ç”±è‡ªå®šä¹‰çª—å£éƒ¨ä»¶çš„domXml()方法传回的XML指定。 - + Unexpected element <%1> Parsing clipboard contents 未预期的元素<%1> @@ -2599,7 +2557,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. 无法创建临时路径 %1。 @@ -2619,7 +2577,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor 属性编辑器 @@ -2656,7 +2614,7 @@ Container pages should only be added by specifying them in XML returned by the d 窗å£éƒ¨ä»¶ç›’ - + An error has been encountered at line %1 of %2: %3 在%2的第%1è¡Œå‘生错误:%3 @@ -2679,7 +2637,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File 文件(&F) @@ -2790,7 +2748,7 @@ Container pages should only be added by specifying them in XML returned by the d 设计师在您上一次对è¯ä¸­æ²¡æœ‰æ­£å¸¸ç»ˆæ­¢ã€‚还有一些备份文件存在,您想è¦åŠ è½½å®ƒä»¬ä¹ˆï¼Ÿ - + The file <b>%1</b> could not be opened. 无法打开文件 <b>%1</b>。 @@ -2804,7 +2762,7 @@ Container pages should only be added by specifying them in XML returned by the d 文件 - + There are %n forms with unsaved changes. Do you want to review these changes before quitting? 还有 %n 个窗体没有ä¿å­˜å˜åŒ–。您想è¦åœ¨é€€å‡ºä¹‹å‰è¯„审这些å˜åŒ–么? @@ -2834,7 +2792,7 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). Empty class name passed to widget factory method 一个空白的类å称被传é€åˆ°%1(对象å称:%2)。 @@ -2855,7 +2813,7 @@ Container pages should only be added by specifying them in XML returned by the d 布局类型“%1â€ä¸è¢«æ”¯æŒã€‚ - + The set-type property %1 could not be read. 无法读å–集类型属性 %1。 @@ -2875,7 +2833,7 @@ Container pages should only be added by specifying them in XML returned by the d 属性 %1 无法被写入。还ä¸æ”¯æŒç±»åž‹ %2。 - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. 枚举å˜é‡å€¼â€œ%1â€æ˜¯æ— æ•ˆçš„。默认值“%2â€å°†ä¼šè¢«ç”¨æ¥æ›¿ä»£ã€‚ @@ -3134,7 +3092,7 @@ This indicates an inconsistency in the ui-file. QStackedWidgetEventFilter - + Previous Page 上一页 @@ -3195,7 +3153,7 @@ This indicates an inconsistency in the ui-file. QTabWidgetEventFilter - + Delete 删除 @@ -3223,7 +3181,7 @@ This indicates an inconsistency in the ui-file. QToolBoxHelper - + Delete Page 删除页 @@ -3261,7 +3219,7 @@ This indicates an inconsistency in the ui-file. QtBoolEdit - + True @@ -3277,7 +3235,7 @@ This indicates an inconsistency in the ui-file. QtBoolPropertyManager - + True 真 @@ -3290,7 +3248,7 @@ This indicates an inconsistency in the ui-file. QtCharEdit - + Clear Char 清除字符 @@ -3306,7 +3264,7 @@ This indicates an inconsistency in the ui-file. QtColorPropertyManager - + Red 红色 @@ -3494,7 +3452,7 @@ This indicates an inconsistency in the ui-file. QtGradientEditor - + Start X 开始 X @@ -3769,7 +3727,7 @@ This indicates an inconsistency in the ui-file. QtGradientStopsWidget - + New Stop 新建中止点 @@ -3807,7 +3765,7 @@ This indicates an inconsistency in the ui-file. QtGradientView - + Grad æ¸å˜ @@ -3854,7 +3812,7 @@ This indicates an inconsistency in the ui-file. QtGradientViewDialog - + Select Gradient 选择æ¸å˜ @@ -3871,7 +3829,7 @@ This indicates an inconsistency in the ui-file. QtLocalePropertyManager - + %1, %2 %1, %2 @@ -3938,22 +3896,22 @@ This indicates an inconsistency in the ui-file. QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width 宽度 @@ -3966,22 +3924,22 @@ This indicates an inconsistency in the ui-file. QtRectPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - + X X - + Y Y - + Width 宽度 @@ -3994,7 +3952,7 @@ This indicates an inconsistency in the ui-file. QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 å·²ç»å­˜åœ¨ã€‚ @@ -4006,7 +3964,7 @@ Do you want to replace it? 这个文件好åƒä¸æ˜¯ä¸€ä¸ªèµ„æºæ–‡ä»¶ï¼›æˆ‘们所期望的是“%2â€ï¼Œä½†æ˜¯åªæ‰¾åˆ°äº†å…ƒç´ â€œ%1â€ã€‚ - + %1 [read-only] %1 [åªè¯»] @@ -4298,7 +4256,7 @@ to QtResourceView - + Size: %1 x %2 %3 大å°ï¼š%1 x %2 @@ -4331,7 +4289,7 @@ to QtSizeFPropertyManager - + %1 x %2 %1 x %2 @@ -4349,12 +4307,18 @@ to QtSizePolicyPropertyManager - + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] - + Horizontal Policy 水平策略 @@ -4377,7 +4341,7 @@ to QtSizePropertyManager - + %1 x %2 %1 x %2 @@ -4395,7 +4359,7 @@ to QtToolBarDialog - + Custom Toolbar è‡ªå®šä¹‰å·¥å…·æ  @@ -4503,7 +4467,7 @@ to QtTreePropertyBrowser - + Property 属性 @@ -4516,7 +4480,7 @@ to SaveFormAsTemplate - + Add path... 添加路径... @@ -4581,7 +4545,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": 在è¿è¡Œâ€œ%1â€çš„脚本过程中å‘生一个错误: @@ -4600,11 +4564,21 @@ Do you want overwrite the template? Select signal é€‰æ‹©ä¿¡å· + + + signal + + + + + class + + SignalSlotConnection - + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) @@ -4645,7 +4619,7 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 水平间隔器“%1â€ï¼Œ%2 x %3 @@ -4658,7 +4632,7 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths Tab in preferences dialog 模æ¿è·¯å¾„ @@ -4700,29 +4674,27 @@ Do you want overwrite the template? VersionDialog - + Qt Designer Qt 设计师 - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>版本 %2 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt è®¾è®¡å¸ˆæ˜¯ç”¨äºŽå¼€å‘ Qt 应用程åºçš„图形用户界é¢è®¾è®¡å¸ˆã€‚<br/> - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 @@ -4730,20 +4702,18 @@ Do you want overwrite the template? %1<br/>%2<br/>版æƒæ‰€æœ‰ 2000-$THISYEAR$ Nokia Corporation and/or its subsidiary(-ies)。所有æƒåˆ©å·²è¢«ä¿ç•™ã€‚<br/><br/>本程åºæ˜¯åœ¨<b>没有任何担ä¿ï¼ˆå…¶ä¸­åŒ…括任何特定目的的设计ã€å•†ä¸šå’Œé€‚当性的担ä¿ï¼‰</b>çš„æ¡ä»¶ä¸‹æ供的。<br/> - This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - 这个版本的 Qt 设计师是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œæ‚¨éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/about/businessmodel</tt>。 + 这个版本的 Qt 设计师是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œæ‚¨éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/about/businessmodel</tt>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的许å¯å议文件。 WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. 这个文件包å«äº†ä¸€ä¸ªè‡ªå®šä¹‰çª—å£éƒ¨ä»¶â€œ%1â€ï¼Œå…¶åŸºç±»(%2)和窗å£éƒ¨ä»¶æ•°æ®åº“(%3)的当å‰æ¡ç›®ä¸åŒã€‚这个窗å£éƒ¨ä»¶æ•°æ®åº“并未åšä»»ä½•æ”¹åŠ¨ã€‚ @@ -4751,22 +4721,22 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions 动作 - + New... 新建... - + Delete 删除 - + New action 新建动作 @@ -4776,12 +4746,17 @@ Do you want overwrite the template? 编辑动作 - + Edit... 编辑... + Go to slot... + 转到槽... + + + Copy å¤åˆ¶ @@ -4801,7 +4776,7 @@ Do you want overwrite the template? 选择全部 - + Configure Action Editor é…置动作编辑器 @@ -4816,7 +4791,7 @@ Do you want overwrite the template? 细节视图 - + Remove actions 移除动作 @@ -4826,7 +4801,7 @@ Do you want overwrite the template? 移除动作“%1†- + Used In 用于 @@ -4841,7 +4816,7 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name å称 @@ -4874,7 +4849,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy 添加伙伴 @@ -4906,7 +4881,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies 编辑伙伴 @@ -4914,7 +4889,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies 编辑伙伴 @@ -4968,7 +4943,7 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... ä¿å­˜... @@ -5026,7 +5001,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color 文本颜色 @@ -5034,7 +5009,7 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... 编辑项目... @@ -5073,7 +5048,7 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel - + Sender å‘é€è€… @@ -5093,7 +5068,7 @@ Do you want overwrite the template? 槽 - + <sender> <å‘é€è€…> @@ -5126,7 +5101,7 @@ Do you want overwrite the template? qdesigner_internal::ContainerWidgetTaskMenu - + Insert Page Before Current Page 在当å‰é¡µä¹‹å‰æ’入页 @@ -5189,7 +5164,7 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - + AlignLeft AlignLeft @@ -5330,7 +5305,7 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) 设备æ述文件(*.%1) @@ -5437,14 +5412,60 @@ Do you want overwrite the template? qdesigner_internal::EmbeddedOptionsControl + + Add a profile + 添加æ述文件 + + + + Edit the selected profile + 编辑选中的æ述文件 + + + + Delete the selected profile + 删除选中的æ述文件 + + + + Add Profile + 添加æ述文件 + + + + New profile + 新建æ述文件 + + + + Edit Profile + 编辑æ述文件 + + + + Delete Profile + 删除æ述文件 + + + + Would you like to delete the profile '%1'? + ä½ è¦åˆ é™¤æ述文件“%1â€å—? + + + + Default + 默认 + + + None - æ—  + æ—  qdesigner_internal::FilterWidget - + <Filter> <过滤器> @@ -5452,7 +5473,7 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed 资æºæ–‡ä»¶å·²æ”¹å˜ @@ -5473,7 +5494,7 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - + Edit contents 编辑内容 @@ -5487,7 +5508,7 @@ Do you want overwrite the template? æ’入窗å£éƒ¨ä»¶%1 - + Resize é‡å®šä¹‰å¤§å° @@ -5531,13 +5552,13 @@ and then paste again. 布局 - + Drop widget 丢弃窗å£éƒ¨ä»¶ - + Paste %n action(s) 粘贴 %n 个动作 @@ -5576,7 +5597,7 @@ and then paste again. 选择祖先 - + A QMainWindow-based form does not contain a central widget. 一个基于 QMainWindow 的窗体没有包å«ä¸­å¤®çª—å£éƒ¨ä»¶ã€‚ @@ -5584,7 +5605,7 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 删除 @@ -5597,7 +5618,7 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 剪切(&T) @@ -5679,7 +5700,7 @@ and then paste again. 调整选中的窗å£éƒ¨ä»¶çš„å¤§å° - + Lay Out &Horizontally 水平布局(&H) @@ -5729,7 +5750,7 @@ and then paste again. 在一个分裂器中垂直布局选中的窗å£éƒ¨ä»¶ - + &Break Layout 打破布局(&B) @@ -5754,7 +5775,7 @@ and then paste again. 窗体设定(&S)... - + Break Layout 打破布局 @@ -5770,12 +5791,12 @@ and then paste again. 无法创建窗体预览 - + Form Settings - %1 窗体设定 - %1 - + Lay Out in a &Form Layout 在窗体布局中布局(&F) @@ -5785,7 +5806,7 @@ and then paste again. 在一个窗体布局中布局选中的窗å£éƒ¨ä»¶ - + Si&mplify Grid Layout 简易网格布局(&M) @@ -5798,7 +5819,7 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None æ—  @@ -5849,7 +5870,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... 改å˜æ ‡é¢˜... @@ -5865,7 +5886,7 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. 无法读å–åƒç´ æ˜ å°„文件“%1â€ã€‚ @@ -5958,7 +5979,7 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< 属性&<< @@ -6017,7 +6038,7 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... 改å˜å¤šä¿¡æ¯æ–‡æœ¬... @@ -6030,7 +6051,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... 改å˜æ–‡æœ¬... @@ -6062,7 +6083,7 @@ and then paste again. U - + New Item 新建项目 @@ -6096,7 +6117,7 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... 编辑项目... @@ -6132,7 +6153,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 移除 @@ -6191,7 +6212,7 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name 设置属性å称 @@ -6311,7 +6332,7 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 添加 @@ -6349,7 +6370,7 @@ Please select another name. qdesigner_internal::ObjectInspector - + &Find in Text... 在文本中查找(&F)... @@ -6365,7 +6386,7 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) 索引 %1 (%2) @@ -6446,7 +6467,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette 改å˜è°ƒè‰²æ¿ @@ -6454,7 +6475,7 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role 颜色角色 @@ -6506,15 +6527,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text 编辑文本 + qdesigner_internal::PluginDialog + + + Components + 组件 + + + + Plugin Information + æ’ä»¶ä¿¡æ¯ + + + + Qt Designer couldn't find any plugins + Qt 设计师无法找到任何æ’件 + + + + Qt Designer found the following plugins + Qt 设计师已ç»æ‰¾åˆ°å¦‚下æ’件 + + + TextLabel + 文本标签 + + + + Refresh + 刷新 + + + + Scan for newly installed custom widget plugins. + 扫æ新安装的自定义窗å£éƒ¨ä»¶æ’件。 + + + + New custom widget plugins have been found. + 新的自定义窗å£éƒ¨ä»¶æ’件已ç»è¢«æ‰¾åˆ°ã€‚ + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 风格 @@ -6557,7 +6624,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close 关闭(&C) @@ -6658,7 +6725,7 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... æå‡çš„窗å£éƒ¨ä»¶... @@ -6686,7 +6753,7 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... 添加动æ€å±žæ€§ ... @@ -6742,7 +6809,7 @@ Please select another name. %2 - + Object: %1 Class: %2 对象:%1 @@ -6752,7 +6819,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break æ’å…¥æ¢è¡Œç¬¦ @@ -6901,7 +6968,7 @@ Class: %2 è®¾ç½®æœ€å¤§å¤§å° - + Edit ToolTip 编辑工具æ示 @@ -6910,8 +6977,13 @@ Class: %2 Edit WhatsThis 编辑这是什么 + + + no signals available + + - + Set size constraint on %n widget(s) 为 %n 个窗å£éƒ¨ä»¶è®¾ç½®å¤§å°é™å®š @@ -6921,7 +6993,7 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - + Unexpected element <%1> 未预期的元素<%1> @@ -6977,7 +7049,7 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H H @@ -7152,7 +7224,7 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script 编辑脚本 @@ -7202,7 +7274,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots 编辑信å·/槽 @@ -7215,7 +7287,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots 编辑信å·/槽 @@ -7223,7 +7295,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 移除 @@ -7231,7 +7303,7 @@ Class: %2 qdesigner_internal::StringListEditorButton - + Change String List 改å˜å­—符串列表 @@ -7239,7 +7311,7 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet 编辑样å¼è¡¨ @@ -7278,7 +7350,7 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here 从这里开始 @@ -7306,7 +7378,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order 编辑 Tab é¡ºåº @@ -7314,7 +7386,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order 编辑 Tab é¡ºåº @@ -7356,7 +7428,7 @@ Class: %2 表格行 - + New Row 新建行 @@ -7431,7 +7503,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... 编辑项目... @@ -7462,7 +7534,7 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... 改å˜HTML... @@ -7508,7 +7580,7 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator æ’入分隔符 @@ -7558,7 +7630,7 @@ Class: %2 树项目 - + &Columns 列(&C) @@ -7705,7 +7777,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... 编辑项目... @@ -7713,7 +7785,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. 警告:部件框中的部件创建失败。å¯èƒ½æ˜¯ç”±äºŽæ— æ•ˆçš„自定义部件XML引起的。 @@ -7748,17 +7820,17 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - + Scratchpad ä¾¿æ¡ - + Custom Widgets 自定义窗å£éƒ¨ä»¶ - + Expand all 全部展开 @@ -7799,7 +7871,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets 编辑窗å£éƒ¨ä»¶ @@ -7807,12 +7879,12 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. 为类 %1 的窗å£éƒ¨ä»¶æ³¨å†Œçš„自定义窗å£éƒ¨ä»¶å·¥åŽ‚返回 0。 - + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. 在使用为类 %1 的窗å£éƒ¨ä»¶æ³¨å†Œçš„自定义窗å£éƒ¨ä»¶å·¥åŽ‚创建一个窗å£éƒ¨ä»¶æ—¶ï¼Œå‘生了类å称ä¸åŒ¹é…。它返回了一个类 %2 的窗å£éƒ¨ä»¶ã€‚ @@ -7855,7 +7927,7 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % Zoom factor %1 % diff --git a/translations/designer_zh_TW.ts b/translations/designer_zh_TW.ts index 6dfd546..83c3c66 100644 --- a/translations/designer_zh_TW.ts +++ b/translations/designer_zh_TW.ts @@ -1,25 +1,27 @@ - - + + - + The moose in the noose ate the goose who was loose. The moose in the noose ate the goose who was loose. - + <object> <物件> + <signal> <信號> + <slot> <信號槽> @@ -42,23 +44,27 @@ ate the goose who was loose. AbstractFindWidget - + &Previous å‰ä¸€å€‹(&P) + &Next 下一個(&N) + &Case sensitive å€åˆ†å¤§å°å¯«(&C) + Whole &words 整個單字(&W) + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;æœå°‹æŠ˜å›ž @@ -66,14 +72,17 @@ ate the goose who was loose. AddLinkDialog + Insert Link æ’å…¥é€£çµ + Title: 標題: + URL: 網å€ï¼š @@ -81,7 +90,7 @@ ate the goose who was loose. AppFontDialog - + Additional Fonts é¡å¤–çš„å­—åž‹ @@ -89,30 +98,37 @@ ate the goose who was loose. AppFontManager + '%1' is not a file. %1 ä¸æ˜¯ä¸€å€‹æª”案。 + The font file '%1' does not have read permissions. 您沒有讀å–字型檔 %1 的權é™ã€‚ + The font file '%1' is already loaded. 字型檔 %1 已載入。 + The font file '%1' could not be loaded. 無法載入字型檔 %1。 + '%1' is not a valid font id. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„字型代碼。 + There is no loaded font matching the id '%1'. 已載入的字型中沒有一個符åˆä»£ç¢¼ %1。 + The font '%1' (%2) could not be unloaded. 無法å¸è¼‰å­—åž‹ %1(%2)。 @@ -120,42 +136,52 @@ ate the goose who was loose. AppFontWidget + Fonts å­—åž‹ + Add font files 新增字型檔 + Remove current font file 移除ç¾æœ‰çš„字型檔 + Remove all font files 移除所有字型檔 + Add Font Files 新增字型檔 + Font files (*.ttf) 字型檔(*.ttf) + Error Adding Fonts 新增字型時發生錯誤 + Error Removing Fonts 移除字型時發生錯誤 + Remove Fonts 移除字型 + Would you like to remove all fonts? 您è¦ç§»é™¤æ‰€æœ‰çš„字型嗎? @@ -163,10 +189,12 @@ ate the goose who was loose. AppearanceOptionsWidget + Form 表單 + User Interface Mode 使用者介é¢æ¨¡å¼ @@ -174,15 +202,17 @@ ate the goose who was loose. AssistantClient - + Unable to send request: Assistant is not responding. 無法傳é€è¦æ±‚:å°å¹«æ‰‹æœªå›žæ‡‰ã€‚ + The binary '%1' does not exist. 執行檔 %1 ä¸å­˜åœ¨ã€‚ + Unable to launch assistant (%1). 無法啟動å°å¹«æ‰‹ï¼ˆ%1)。 @@ -190,23 +220,27 @@ ate the goose who was loose. BrushManagerProxy - + The element '%1' is missing the required attribute '%2'. 元素 %1 中缺少必須的屬性 %2。 + Empty brush name encountered. é‡åˆ°ç©ºç™½çš„筆刷å稱。 + An unexpected element '%1' was encountered. é‡åˆ°æœªé æœŸçš„元素 %1。 + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 讀å–筆刷定義檔 %1 時發生錯誤,在第 %2 行第 %3 欄:%4 + An error occurred when reading the resource file '%1' at line %2, column %3: %4 讀å–資æºæª” %1 時發生錯誤,在第 %2 行第 %3 欄:%4 @@ -214,75 +248,92 @@ ate the goose who was loose. BrushPropertyManager - + No brush 沒有筆刷 + Solid 固體 + Dense 1 濃稠 1 + Dense 2 濃稠 2 + Dense 3 濃稠 3 + Dense 4 濃稠 4 + Dense 5 濃稠 5 + Dense 6 濃稠 6 + Dense 7 濃稠 7 + Horizontal æ°´å¹³ + Vertical åž‚ç›´ + Cross äº¤å‰ + Backward diagonal 往回斜線 + Forward diagonal å¾€å‰æ–œç·š + Crossing diagonal 交å‰æ–œç·š + Style æ¨£å¼ + Color é¡è‰² + [%1, %2] [%1, %2] @@ -290,132 +341,180 @@ ate the goose who was loose. Command + + Change signal 變更信號 + + Change slot 變更信號槽 + + Change signal-slot connection + + + + Change sender 變更發é€è€… + Change receiver 變更接收者 - + Add connection 新增連線 + Adjust connection 調整連線 + Delete connections 刪除連線 + Change source è®Šæ›´ä¾†æº + Change target 變更目標 - + Insert '%1' æ’å…¥ '%1' + Raise '%1' æå‡ '%1' + Lower '%1' é™ä½Ž '%1' + Delete '%1' 刪除 '%1' + Reparent '%1' é‡å®šç¾©çˆ¶ç‰©ä»¶ '%1' + Promote to custom widget æå‡åˆ°è‡ªè¨‚元件 + Demote from custom widget 從自訂元件é™ç´š + Lay out using grid 使用格線佈局 + Lay out vertically 垂直佈局 + Lay out horizontally 水平佈局 + Break layout 打斷佈局 + + + Move Page 移動é é¢ + + + + Delete Page 刪除é é¢ + + Page é é¢ + + + page é é¢ + + + + Insert Page æ’å…¥é é¢ + tab 定ä½é»ž + Change Tab order 變更定ä½é †åº + Create Menu Bar 建立é¸å–®åˆ— + Delete Menu Bar 刪除é¸å–®åˆ— + Create Status Bar 建立狀態列 + Delete Status Bar 刪除狀態列 + Add Tool Bar 新增工具列 @@ -424,14 +523,17 @@ ate the goose who was loose. 設定嵌入視窗元件 + Add Dock Window 新增嵌入視窗 + Adjust Size of '%1' 調整 '%1' çš„å¤§å° + Change Layout Item Geometry 變更佈局項目ä½ç½® @@ -440,56 +542,70 @@ ate the goose who was loose. æ’入列 + Change Table Contents 變更表格內容 + Change Tree Contents 變更樹狀圖內容 + + Add action 新增動作 + + Remove action 移除動作 + Add menu 新增é¸å–® + Remove menu 移除é¸å–® + Create submenu 建立å­é¸å–® + Delete Tool Bar 刪除工具列 - + Set action text 設定動作文字 + Insert action æ’入動作 - + + Move action 移動動作 + Change Title 變更標題 + Insert Menu æ’å…¥é¸å–® @@ -544,119 +660,142 @@ ate the goose who was loose. + Change Z-order of '%1' 變更 %1 çš„ Z é †åº + Simplify Grid Layout 簡化格線佈局 + Change Form Layout Item Geometry 變更表單佈局項目的ä½ç½® + Delete Subwindow 刪除å­è¦–窗 + Insert Subwindow æ’å…¥å­è¦–窗 + subwindow å­è¦–窗 + Subwindow å­è¦–窗 - + Change signals/slots 變更信號/信號槽 - + Create button group 建立按éµç¾¤çµ„ + Break button group 打破按éµç¾¤çµ„ + Break button group '%1' 打破按éµç¾¤çµ„ %1 + Add buttons to group 將按éµæ–°å¢žåˆ°ç¾¤çµ„ - + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup å°‡ %1 新增到 %2 + Remove buttons from group 將按éµå¾žç¾¤çµ„內移除 + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup å°‡ %1 從 %2 內移除 - + Morph %1/'%2' into %3 + MorphWidgetCommand description å°‡ %1/%2 變形為 %3 - + Change layout of '%1' from %2 to %3 å°‡ %1 的佈局由 %2 變為 %3 - + Change script 變更文稿 - + Changed '%1' of '%2' 已變更 %1 個,共 %2 個 + Changed '%1' of %n objects 已變更 %1 個,共 %n 個物件 + Reset '%1' of '%2' å·²é‡ç½® %1 個,共 %2 個 + Reset '%1' of %n objects å·²é‡ç½® %1 個,共 %n 個物件 + Add dynamic property '%1' to '%2' 新增動態屬性 %1 到 %2 + Add dynamic property '%1' to %n objects 新增動態屬性 %1 到 %n 個物件 + Remove dynamic property '%1' from '%2' 從 %2 移除動態屬性 %1 + Remove dynamic property '%1' from %n objects 從 %n 個物件移除動態屬性 %1 @@ -666,18 +805,22 @@ ate the goose who was loose. ConnectDialog + Configure Connection 設定連線 + GroupBox 群組盒 + Edit... 編輯... + Show signals and slots inherited from QWidget 顯示從 QWidget 繼承的信號與信號槽 @@ -685,23 +828,28 @@ ate the goose who was loose. DPI_Chooser - + Standard (96 x 96) + Embedded device standard screen resolution 標準(96 x 96) + Greenphone (179 x 185) + Embedded device screen resolution 綠色手機(179 x 185) + High (192 x 192) + Embedded device high definition screen resolution 高(192 x 192) Designer - + Qt Designer Qt 設計家 @@ -710,52 +858,64 @@ ate the goose who was loose. 此檔案包å«æœ€ä¸Šå±¤çš„間隔器。<br>它們<b>尚未</b>存到表單中。<br>也許您忘了建立佈局? + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. 此檔案包å«æœ€ä¸Šå±¤çš„間隔器。<br>它們<b>尚未</b>存到表單中。 + Perhaps you forgot to create a layout? 也許您忘了建立佈局? + Invalid ui file: The root element <ui> is missing. ä¸åˆæ³•çš„ ui 檔。沒有根元素 <ui>。 + An error has occurred while reading the ui file at line %1, column %2: %3 è®€å– ui 檔時發生錯誤,在第 %1 行,第 %2 欄:%3 + This file cannot be read because it was created using %1. 此檔案無法讀å–,因為是用 %1 建立的。 + This file was created using Designer from Qt-%1 and cannot be read. 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–。 + This file cannot be read because the extra info extension failed to load. 此檔案無法讀å–,因為載入é¡å¤–的資訊延伸時失敗。 + The converted file could not be read. 轉æ›å¾Œçš„檔案無法讀å–。 + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. 此檔案是用 Qt-%1 的設計家建立的,將會自動轉æ›æˆæ–°å¼çš„表單。 + The old form has not been touched, but you will have to save the form under a new name. 舊表單ä¸æœƒåšä»»ä½•æ›´å‹•ï¼Œä½†æ˜¯æ‚¨å¿…é ˆå¦å­˜æ–°æª”。 + This file was created using Designer from Qt-%1 and could not be read: %2 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–: %2 + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. 請執行 <b>uic3 &nbsp; -convert</b> 將它轉æ›æˆ Qt 4 çš„ ui æ ¼å¼ã€‚ @@ -770,19 +930,22 @@ The old form has been untouched, but you will have to save this form under a new 此檔案是用 Qt-%1 的設計家建立的,因此無法讀å–。<br>%2<br>請先用 <b>uic3 -convert</b> 將它轉æ›æˆ Qt-4 çš„æ ¼å¼ã€‚ + Custom Widgets 自訂元件 + Promoted Widgets å·²æå‡çš„元件 - + Unable to launch %1. 無法啟動 %1。 + %1 timed out. %1 逾時。 @@ -812,10 +975,12 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaEnum + %1 is not a valid enumeration value of '%2'. %1 ä¸æ˜¯ %2 çš„åˆæ³•åˆ—舉值。 + '%1' could not be converted to an enumeration value of type '%2'. %1 無法轉æ›ç‚º %2 型態的列舉值。 @@ -823,6 +988,7 @@ The old form has been untouched, but you will have to save this form under a new DesignerMetaFlags + '%1' could not be converted to a flag value of type '%2'. %1 無法轉æ›ç‚º %2 型態的旗標值。 @@ -830,11 +996,13 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfile - + '%1' is not a number. + Reading a number for an embedded device profile %1 ä¸æ˜¯ä¸€å€‹æ•¸å­—。 + An invalid tag <%1> was encountered. é‡åˆ°ä¸åˆæ³•çš„標籤 <%1>。 @@ -842,22 +1010,27 @@ The old form has been untouched, but you will have to save this form under a new DeviceProfileDialog + &Family 家æ—(&F) + &Point Size 點大å°(&P) + Style æ¨£å¼ + Device DPI è£ç½®çš„ DPI + Name å稱 @@ -865,47 +1038,57 @@ The old form has been untouched, but you will have to save this form under a new DeviceSkin - + The image file '%1' could not be loaded. 無法載入影åƒæª” %1。 + The skin directory '%1' does not contain a configuration file. 外觀目錄 %1 沒有設定檔。 + The skin configuration file '%1' could not be opened. 外觀設定檔 %1 無法開啟。 + The skin configuration file '%1' could not be read: %2 外觀設定檔 %1 無法讀å–:%2 + Syntax error: %1 語法錯誤:%1 + The skin "up" image file '%1' does not exist. 外觀中的「上ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "down" image file '%1' does not exist. 外觀中的「下ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "closed" image file '%1' does not exist. 外觀中的「關閉ã€å½±åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin cursor image file '%1' does not exist. 外觀中的游標影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + Syntax error in area definition: %1 å€åŸŸå®šç¾©ä¸­æœ‰èªžæ³•éŒ¯èª¤ï¼š%1 + Mismatch in number of areas, expected %1, got %2. å€åŸŸæ•¸é‡ä¸ç¬¦ã€‚應為 %1,實際上為 %2。 @@ -913,59 +1096,64 @@ The old form has been untouched, but you will have to save this form under a new EmbeddedOptionsControl - None - ç„¡ + ç„¡ Add a profile - 新增設定檔 + 新增設定檔 Edit the selected profile - 編輯é¸å–的設定檔 + 編輯é¸å–的設定檔 Delete the selected profile - 刪除é¸å–的設定檔 + 刪除é¸å–的設定檔 Add Profile - 新增設定檔 + 新增設定檔 New profile - 新增設定檔 + 新增設定檔 Edit Profile - 編輯設定檔 + 編輯設定檔 Delete Profile - 刪除設定檔 + 刪除設定檔 Would you like to delete the profile '%1'? - 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description <html><table><tr><td><b>å­—åž‹</b></td><td>%1,%2</td></tr><tr><td><b>樣å¼</b></td><td>%3</td><tr><td><b>解æžåº¦</b></td><td>%4 x %5</td></tr></table></html> Default - é è¨­ + é è¨­ EmbeddedOptionsPage + Embedded Design + Tab in preferences dialog 嵌入å¼è¨­è¨ˆ + Device Profiles + EmbeddedOptionsControl group box" è£ç½®è¨­å®šæª” @@ -995,23 +1183,27 @@ The old form has been untouched, but you will have to save this form under a new FontPanel - + Font å­—åž‹ + &Writing system 寫入系統(&W) + &Family 家æ—(&F) + &Style 風格(&S) + &Point size 點大å°(&P) @@ -1019,19 +1211,22 @@ The old form has been untouched, but you will have to save this form under a new FontPropertyManager - + PreferDefault é è¨­å–œå¥½è¨­å®š + NoAntialias 沒有å鋸齒 + PreferAntialias é è¨­å鋸齒 + Antialiasing å鋸齒 @@ -1039,35 +1234,43 @@ The old form has been untouched, but you will have to save this form under a new FormBuilder - + Invalid stretch value for '%1': '%2' + Parsing layout stretch values %1 的延伸值ä¸åˆæ³•ï¼š%2 + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values %1 的最å°å€¼ä¸åˆæ³•ï¼š%2 FormEditorOptionsPage - + %1 % %1 % + Preview Zoom é è¦½ç¸®æ”¾ + Default Zoom é è¨­ç¸®æ”¾ + Forms + Tab in preferences dialog 表單 + Default Grid é è¨­æ ¼ç·š @@ -1075,30 +1278,37 @@ The old form has been untouched, but you will have to save this form under a new FormLayoutRowDialog + Add Form Layout Row 新增表單佈局列 + &Label text: 標籤文字(&L): + Field &type: 欄ä½åž‹æ…‹(&T): + &Field name: 欄ä½å稱(&F): + &Buddy: åŒä¼´(&B): + &Row: 列(&R): + Label &name: 標籤å稱(&N): @@ -1106,11 +1316,12 @@ The old form has been untouched, but you will have to save this form under a new FormWindow - + Unexpected element <%1> 未é æœŸçš„元素 <%1> + Error while pasting clipboard contents at line %1, column %2: %3 貼上剪貼簿內容時發生錯誤,在第 %1 行第 %2 欄:%3 @@ -1118,50 +1329,62 @@ The old form has been untouched, but you will have to save this form under a new FormWindowSettings + Form Settings 表單設定 + Layout &Default 佈局é è¨­å€¼(&D) + &Spacing: 間隔空間(&S): + &Margin: 邊緣留白(&M): + &Layout Function 佈局功能(&L) + Ma&rgin: 邊緣留白(&R): + Spa&cing: 間隔空間(&C): + Embedded Design 嵌入å¼è¨­è¨ˆ + &Author 作者(&A) + &Include Hints 引入æ示(&I) + &Pixmap Function åƒç´ åœ–功能(&P) + Grid 格線 @@ -1169,7 +1392,7 @@ The old form has been untouched, but you will have to save this form under a new IconSelector - + All Pixmaps ( 所有åƒç´ åœ– ( @@ -1177,14 +1400,16 @@ The old form has been untouched, but you will have to save this form under a new ItemPropertyBrowser - + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser XX 圖示é¸æ“‡é—œé–‰ LanguageResourceDialog + Choose Resource é¸æ“‡è³‡æº @@ -1192,27 +1417,33 @@ The old form has been untouched, but you will have to save this form under a new MainWindowBase - + Main + Not currently used (main tool bar) ä¸»è¦ + File 檔案 + Edit 編輯 + Tools 工具 + Form 表單 + Qt Designer Qt 設計家 @@ -1220,23 +1451,27 @@ The old form has been untouched, but you will have to save this form under a new NewForm - + C&reate 建立(&R) + Recent 最近的 + &Close 關閉(&C) + &Open... é–‹å•Ÿ(&O)... + &Recent Forms 最近開啟的表單(&R) @@ -1249,10 +1484,12 @@ The old form has been untouched, but you will have to save this form under a new é¸æ“‡é è¦½çš„樣本 + Read error 讀å–錯誤 + New Form 新表單 @@ -1261,6 +1498,7 @@ The old form has been untouched, but you will have to save this form under a new 0 + Show this Dialog on Startup 啟動時顯示此å°è©±æ¡† @@ -1273,10 +1511,12 @@ The old form has been untouched, but you will have to save this form under a new 自訂元件 + A temporary form file could not be created in %1. 無法於 %1 建立暫存表單檔。 + The temporary form file %1 could not be written. 無法寫入暫存表單檔 %1。 @@ -1284,7 +1524,7 @@ The old form has been untouched, but you will have to save this form under a new NewFormWidget - + Unable to open the form template file '%1': %2 無法開啟表單樣本檔 %1:%2 @@ -1292,19 +1532,22 @@ The old form has been untouched, but you will have to save this form under a new ObjectInspectorModel - + Object 物件 + Class 類別 + separator 分隔器 + <noname> <未命å> @@ -1312,11 +1555,12 @@ The old form has been untouched, but you will have to save this form under a new ObjectNameDialog - + Change Object Name 變更物件å稱 + Object Name 物件å稱 @@ -1373,43 +1617,16 @@ There's nothing more here. You should get back to work. - qdesigner_internal::PluginDialog - - - Components - 組件 - + PluginDialog + Plugin Information - 外掛程å¼è³‡è¨Š - - - Refresh - 刷新 - - - Scan for newly installed custom widget plugins. - 掃æ是å¦æœ‰æ–°å®‰è£çš„自訂元件外掛程å¼ã€‚ - - - Qt Designer couldn't find any plugins - Qt 設計家找ä¸åˆ°ä»»ä½•çš„外掛程å¼ã€‚ - - - Qt Designer found the following plugins - Qt è¨­è¨ˆå®¶æ‰¾åˆ°ä»¥ä¸‹çš„å¤–æŽ›ç¨‹å¼ - - - New custom widget plugins have been found. - 找到新的自訂元件外掛程å¼ã€‚ - - - TextLabel - 文字標籤 + 外掛程å¼è³‡è¨Š + 1 - 1 + 1 @@ -1435,6 +1652,7 @@ There's nothing more here. You should get back to work. è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Preferences 喜好設定 @@ -1454,39 +1672,47 @@ There's nothing more here. You should get back to work. PreviewConfigurationWidget - + Default é è¨­ + None ç„¡ + Browse... ç€è¦½... + Form 表單 + Print/Preview Configuration 列å°/é è¦½è¨­å®š + Style æ¨£å¼ + Style sheet 樣å¼è¡¨ + ... ... + Device skin è£ç½®å¤–觀 @@ -1494,8 +1720,9 @@ There's nothing more here. You should get back to work. PromotionModel - + Not used + Usage of promoted widgets 未使用 @@ -1509,6 +1736,8 @@ There's nothing more here. You should get back to work. Q3WizardContainer + + Page é é¢ @@ -1516,48 +1745,58 @@ There's nothing more here. You should get back to work. QAbstractFormBuilder - + Unexpected element <%1> 未é æœŸçš„元素 <%1> + An error has occurred while reading the ui file at line %1, column %2: %3 è®€å– ui 檔時發生錯誤,在第 %1 行,第 %2 欄:%3 + Invalid ui file: The root element <ui> is missing. ä¸åˆæ³•çš„ ui 檔。沒有根元素 <ui>。 + The creation of a widget of the class '%1' failed. 建立類別 %1 的元件時失敗。 + Attempt to add child that is not of class QWizardPage to QWizard. 試圖將ä¸æ˜¯ QWizardPage çš„å­é¡žåˆ¥åŠ å…¥ QWizard。 + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. 您試圖將一個佈局新增到元件 %1(%2)中,但該元件已經有一個éžç›’狀型態為 %3 的未管ç†ä½ˆå±€ã€‚這表示在 ui 檔中有發生ä¸ä¸€è‡´çš„情æ³ã€‚ + Empty widget item in %1 '%2'. 空白的元件項目於 %1「%2ã€ã€‚ + Flags property are not supported yet. 尚未支æ´æ——標屬性。 + While applying tab stops: The widget '%1' could not be found. 套用定ä½é»žæ™‚:找ä¸åˆ°å…ƒä»¶ %1。 + Invalid QButtonGroup reference '%1' referenced by '%2'. %2 åƒè€ƒäº†ä¸åˆæ³•çš„ QButtonGroup åƒè€ƒ %1。 + This version of the uitools library is linked without script support. 這個 uitools 函å¼åº«çš„版本沒有支æ´æ–‡ç¨¿ã€‚ @@ -1598,11 +1837,12 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - + ActiveX control ActiveX 控制 + ActiveX control widget ActiveX 控制元件 @@ -1610,19 +1850,22 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - + Set Control 設定控制 + Reset Control é‡ç½®æŽ§åˆ¶ + Licensed Control 已授權的控制 + The control requires a design-time license 此控制è¦æ±‚設計期間的授權 @@ -1630,56 +1873,67 @@ This indicates an inconsistency in the ui-file. QCoreApplication - + %1 is not a promoted class. %1 ä¸æ˜¯ä¸€å€‹å·²æå‡çš„類別。 + The base class %1 is invalid. 基底類別 %1 ä¸åˆæ³•ã€‚ + The class %1 already exists. 類別 %1 已存在。 + Promoted Widgets å·²æå‡å…ƒä»¶ + The class %1 cannot be removed 類別 %1 無法移除 + The class %1 cannot be removed because it is still referenced. 類別 %1 無法移除,因為它ä»åœ¨è¢«åƒè€ƒä¸­ã€‚ + The class %1 cannot be renamed 類別 %1 無法é‡æ–°å‘½å + The class %1 cannot be renamed to an empty name. 類別 %1 無法é‡æ–°å‘½å為空的å稱。 + There is already a class named %1. 已經有å為 %1 的類別。 + Cannot set an empty include file. ä¸æ³•è¨­å®šç©ºçš„引入檔。 - + Exception at line %1: %2 例外發生於行 %1:%2 + Unknown error 未知的錯誤 + An error occurred while running the script for %1: %2 Script: %3 執行 %1 的文稿時發生錯誤:%2 @@ -1689,15 +1943,17 @@ Script: %3 QDesigner - + %1 - warning %1─警告 + Qt Designer Qt 設計家 + This application cannot be used for the Console edition of Qt 此應用程å¼ç„¡æ³•ç”¨æ–¼ä¸»æŽ§å°ç‰ˆçš„ Qt @@ -1712,7 +1968,7 @@ Script: %3 QDesignerActions - + Edit Widgets 編輯元件 @@ -1745,6 +2001,7 @@ Script: %3 關閉表單(&C) + &Quit 離開(&Q) @@ -1757,14 +2014,17 @@ Script: %3 表單設定(&S)... + &Minimize 最å°åŒ–(&M) + Bring All to Front 把全部都帶到å‰æ™¯ + Preferences... 喜好設定 @@ -1777,6 +2037,7 @@ Script: %3 CTRL+O + Clear &Menu 清除é¸å–®(&M) @@ -1785,6 +2046,7 @@ Script: %3 CTRL+S + CTRL+SHIFT+S CTRL+SHIFT+S @@ -1793,6 +2055,7 @@ Script: %3 CTRL+W + CTRL+Q CTRL+Q @@ -1805,6 +2068,7 @@ Script: %3 CTRL+SHIFT+Z + CTRL+R CTRL+R @@ -1813,38 +2077,51 @@ Script: %3 %1 風格 + CTRL+M CTRL+M + Qt Designer &Help Qt 設計家說明(&H) + Current Widget Help ç›®å‰å…ƒä»¶èªªæ˜Ž + What's New in Qt Designer? Qt 設計家有什麼新功能? + About Plugins é—œæ–¼å¤–æŽ›ç¨‹å¼ + + About Qt Designer 關於 Qt 設計家 + About Qt 關於 Qt + + Open Form 開啟表單 + + + Designer UI files (*.%1);;All Files (*) 設計家介é¢æª” (*.%1);;所有檔案 (*) @@ -1857,54 +2134,67 @@ Script: %3 儲存 + %1 already exists. Do you want to replace it? %1 已存在。 您è¦å–代它嗎? + Saved %1. 已儲存 %1。 + Additional Fonts... é¡å¤–çš„å­—åž‹ + &Recent Forms 最近開啟的表單(&R) + Designer 設計家 + Feature not implemented yet! åŠŸèƒ½å°šæœªå¯¦ä½œï¼ + Read error 讀å–錯誤 + %1 Do you want to update the file location or generate a new form? %1 您è¦æ›´æ–°æª”案ä½ç½®ï¼Œé‚„是建立新的表單? + &Update æ›´æ–°(&U) + &New Form 新增表單(&N) + + Save Form? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ + Could not open file 無法開啟檔案 @@ -1917,10 +2207,12 @@ Would you like to retry or change your file? 您è¦é‡è©¦ï¼Œé‚„是è¦æ”¹è®Šæª”案? + Select New File é¸æ“‡æ–°æª”案 + Could not write file 無法寫入檔案 @@ -1933,6 +2225,7 @@ Would you like to retry? 您è¦é‡è©¦å—Žï¼Ÿ + &Close Preview 關閉é è¦½(&C) @@ -1945,38 +2238,48 @@ Would you like to retry? F3 + &New... 新增(&N)... + &Open... é–‹å•Ÿ(&O)... + &Save 儲存(&S) + Save &As... å¦å­˜æ–°æª”(&A)... + Save A&ll 全部儲存(&A) + Save As &Template... 儲存為樣本(&T)... + + &Close 關閉(&C) + Save &Image... 儲存影åƒ(&I)... + &Print... 列å°(&P)... @@ -1985,26 +2288,33 @@ Would you like to retry? é è¦½(&P)... + View &Code... 檢視程å¼ç¢¼(&C)... + ALT+CTRL+S ALT+CTRL+S + + Save Form As å¦å­˜è¡¨å–® + Preview failed é è¦½å¤±æ•— + Code generation failed 程å¼ç¢¼ç”¢ç”Ÿå¤±æ•— + The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -2013,6 +2323,7 @@ Would you like to retry or select a different file? 您è¦å†å˜—試,還是è¦é¸æ“‡å…¶å®ƒæª”案? + It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -2021,42 +2332,55 @@ Would you like to retry? 您è¦é‡è©¦å—Žï¼Ÿ + + Assistant å°åŠ©æ‰‹ + + The backup file %1 could not be written. 備份檔 %1 無法寫入。 + The backup directory %1 could not be created. 無法建立備份目錄 %1。 + The temporary backup directory %1 could not be created. 無法建立暫存備份目錄 %1。 + Image files (*.%1) å½±åƒæª” (*.%1) + + Save Image å„²å­˜å½±åƒ + Saved image %1. å·²å„²å­˜å½±åƒ %1。 + The file %1 could not be written. 檔案 %1 無法寫入。 + Please close all forms to enable the loading of additional fonts. 請關閉所有表單,æ‰èƒ½è¼‰å…¥é¡å¤–的字型。 + Printed %1. å·²åˆ—å° %1。 @@ -2064,22 +2388,26 @@ Would you like to retry? QDesignerAppearanceOptionsPage - + Appearance + Tab in preferences dialog 外觀 QDesignerAppearanceOptionsWidget + Docked Window 已嵌入視窗 + Multiple Top-Level Windows 多個頂層視窗 + Toolwindow Font 工具視窗字型 @@ -2087,19 +2415,22 @@ Would you like to retry? QDesignerAxWidget + Reset control é‡ç½®æŽ§åˆ¶ + Set control 設定控制 - + Control loaded 控制已載入 + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". 執行型態 %1 çš„ meta 呼å«æ™‚發生 COM 例外,索引 %2/%3。 @@ -2107,15 +2438,17 @@ Would you like to retry? QDesignerFormBuilder - + Script errors occurred: 發生文稿錯誤: + The preview failed to build. 建立é è¦½æ™‚失敗。 + Designer 設計家 @@ -2123,19 +2456,22 @@ Would you like to retry? QDesignerFormWindow - + %1 - %2[*] %1 - %2[*] + Save Form? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ + Do you want to save the changes to this document before closing? 您è¦åœ¨é—œé–‰å‰å…ˆå„²å­˜å°æ­¤æ–‡ä»¶çš„變更嗎? + If you don't save, your changes will be lost. 如果您ä¸å„²å­˜ï¼Œæ‰€åšçš„變更將éºå¤±ã€‚ @@ -2143,30 +2479,38 @@ Would you like to retry? QDesignerMenu + Type Here 在此輸入 + Add Separator 新增分隔器 + Insert separator æ’入分隔器 + Remove separator 移除分隔器 + Remove action '%1' 移除動作 %1 + + Add separator 新增分隔器 + Insert action æ’入動作 @@ -2174,18 +2518,22 @@ Would you like to retry? QDesignerMenuBar + Type Here 在此輸入 + Remove Menu '%1' 移除é¸å–® %1 + Remove Menu Bar 移除é¸å–®åˆ— + Menu é¸å–® @@ -2200,19 +2548,22 @@ Would you like to retry? QDesignerPluginManager - + An XML error was encountered when parsing the XML of the custom widget %1: %2 剖æžè‡ªè¨‚元件 %1 çš„ XML æ ¼å¼æ™‚發生錯誤:%2 + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. 自訂元件 %1 çš„ XML 未包å«ä»»ä½• <widget> 或 <ui> 元素。 + The class attribute for the class %1 is missing. 類別 %1 éºå¤±äº†é¡žåˆ¥å±¬æ€§ã€‚ + The class attribute for the class %1 does not match the class name %2. 類別 %1 的類別屬性與類別å稱 %2 ä¸ç¬¦ã€‚ @@ -2231,7 +2582,7 @@ Would you like to retry? QDesignerPropertySheet - + Dynamic Properties 動態屬性 @@ -2239,25 +2590,33 @@ Would you like to retry? QDesignerResource + The layout type '%1' is not supported, defaulting to grid. 未支æ´ä½ˆå±€åž‹æ…‹ %1。改使用é è¨­çš„格線型態。 + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. 元件 %1(%2)的容器延伸在查詢é é¢ #%5 時傳回了éžè¨­è¨ˆå™¨ %3(%4)管ç†çš„元件。 容器é é¢æ‡‰è©²åªèƒ½ç¶“由自訂元件的 domXml() 方法傳回的 XML 內指定加入。 + Unexpected element <%1> + Parsing clipboard contents 未é æœŸçš„元素 <%1> + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents 貼上剪貼簿內容時發生錯誤,在第 %1 行第 %2 欄:%3 + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents 貼上剪貼簿內容時發生錯誤:沒有根元素 <ui>。 @@ -2275,11 +2634,12 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - + The template path %1 could not be created. 無法建立樣本路徑 %1。 + An error has been encountered while parsing device profile XML: %1 剖æžè£ç½®è¨­å®šæª” XML 時發生錯誤:%1 @@ -2387,27 +2747,32 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - + Property Editor 屬性編輯器 + Action Editor 動作編輯器 + Object Inspector 物件指示器 + Resource Browser 資æºç€è¦½å™¨ + Signal/Slot Editor 信號/信號槽編輯器 + Widget Box 元件盒 @@ -2419,19 +2784,22 @@ Container pages should only be added by specifying them in XML returned by the d 元件盒 - + An error has been encountered at line %1 of %2: %3 在 %2 的第 %1 行發生錯誤:%3 + Unexpected element <%1> encountered when parsing for <widget> or <ui> å‰–æž <widget> 或 <ui> 時é‡åˆ°æœªé æœŸçš„元素 <%1> + Unexpected end of file encountered when parsing widgets. 剖æžå…ƒä»¶æ™‚é‡åˆ°æœªé æœŸçš„檔案çµæŸã€‚ + A widget element could not be found. 找ä¸åˆ°å…ƒä»¶çš„元素。 @@ -2439,7 +2807,7 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - + &File 檔案(&F) @@ -2452,10 +2820,12 @@ Container pages should only be added by specifying them in XML returned by the d 編輯(&E) + F&orm 表單(&O) + Preview in é è¦½æ–¼ @@ -2464,10 +2834,12 @@ Container pages should only be added by specifying them in XML returned by the d 工具(&T) + &Window 視窗(&W) + &Help 說明(&H) @@ -2476,6 +2848,7 @@ Container pages should only be added by specifying them in XML returned by the d 檔案 + Edit 編輯 @@ -2488,6 +2861,7 @@ Container pages should only be added by specifying them in XML returned by the d 表單 + Toolbars 工具列 @@ -2500,6 +2874,7 @@ Container pages should only be added by specifying them in XML returned by the d Qt 設計家 + Save Forms? è¦å„²å­˜è¡¨å–®å—Žï¼Ÿ @@ -2508,30 +2883,37 @@ Container pages should only be added by specifying them in XML returned by the d 若您ä¸æª¢æŸ¥æ‚¨çš„文件,所有變更將éºå¤±ã€‚ + &View 檢視(&V) + &Settings 設定(&S) + If you do not review your documents, all your changes will be lost. 若您ä¸æª¢æŸ¥æ‚¨çš„文件,所有變更將éºå¤±ã€‚ + Discard Changes 丟棄變更 + Review Changes 檢查變更 + Backup Information 備份資訊 + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? 設計器上次並未正確çµæŸï¼Œä¸éŽæœ‰ç•™ä¸‹å‚™ä»½æª”。您è¦è¼‰å…¥å‚™ä»½æª”嗎? @@ -2540,14 +2922,17 @@ Container pages should only be added by specifying them in XML returned by the d 設計家在您上次工作階段並沒有正確地çµæŸã€‚有一些備份檔案存在,您è¦è¼‰å…¥å®ƒå€‘嗎? + The file <b>%1</b> could not be opened. 檔案 %1 無法開啟。 + The file <b>%1</b> is not a valid Designer ui file. 檔案 %1 ä¸æ˜¯åˆæ³•çš„設計家介é¢æª”。 + There are %n forms with unsaved changes. Do you want to review these changes before quitting? 有 %n 個表單有未儲存的變更。您è¦åœ¨é›¢é–‹å‰å…ˆæª¢æŸ¥é€™äº›è®Šæ›´å—Žï¼Ÿ @@ -2577,45 +2962,53 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method 傳é€äº†ç©ºç™½çš„類別å稱給 %1(物件å稱:%2) + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder 無法建立類別 %1 的自訂元件。改為使用é è¨­çš„基礎類別 %2。 + QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder 無法建立類別 %1 的元件。 + The layout type `%1' is not supported. 佈局型態 %1 未被支æ´ã€‚ - + The set-type property %1 could not be read. 設定型態屬性 %1 無法被讀å–。 + The enumeration-type property %1 could not be read. 列舉型態屬性 %1 無法被讀å–。 + Reading properties of the type %1 is not supported yet. åž‹æ…‹ %1 的讀å–屬性尚未被支æ´ã€‚ + The property %1 could not be written. The type %2 is not supported yet. 屬性 %1 無法被寫入。型態 %2 尚未被支æ´ã€‚ - + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. 列舉數值 %1 ä¸åˆæ³•ã€‚將改用é è¨­å€¼ %2。 + The flag-value '%1' is invalid. Zero will be used instead. 旗標值 %1 ä¸åˆæ³•ï¼Œå°‡æ”¹ç”¨ 0。 @@ -2881,39 +3274,47 @@ This indicates an inconsistency in the ui-file. QStackedWidgetEventFilter - + Previous Page å‰ä¸€é  + Next Page ä¸‹ä¸€é  + Delete 刪除 + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Change Page Order... 變更é é¢é †åº... + Change Page Order 變更é é¢é †åº + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2921,10 +3322,12 @@ This indicates an inconsistency in the ui-file. QStackedWidgetPreviewEventFilter + Go to previous page of %1 '%2' (%3/%4). 跳到 %1 çš„å‰ä¸€é ã€Œ%2ã€ï¼ˆç¬¬ %3 é ï¼Œå…± %4 é ï¼‰ã€‚ + Go to next page of %1 '%2' (%3/%4). 跳到 %1 的下一é ã€Œ%2ã€ï¼ˆç¬¬ %3 é ï¼Œå…± %4 é ï¼‰ã€‚ @@ -2932,23 +3335,27 @@ This indicates an inconsistency in the ui-file. QTabWidgetEventFilter - + Delete 刪除 + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2956,31 +3363,37 @@ This indicates an inconsistency in the ui-file. QToolBoxHelper - + Delete Page 刪除é é¢ + Before Current Page 在目å‰é é¢ä¹‹å‰ + After Current Page 在目å‰é é¢ä¹‹å¾Œ + Change Page Order... 變更é é¢é †åº... + Change Page Order 變更é é¢é †åº + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  + Insert Page æ’å…¥é é¢ @@ -2988,10 +3401,15 @@ This indicates an inconsistency in the ui-file. QtBoolEdit + + + True 真 + + False å‡ @@ -2999,11 +3417,12 @@ This indicates an inconsistency in the ui-file. QtBoolPropertyManager - + True 真 + False å‡ @@ -3011,7 +3430,7 @@ This indicates an inconsistency in the ui-file. QtCharEdit - + Clear Char 清除字元 @@ -3019,6 +3438,7 @@ This indicates an inconsistency in the ui-file. QtColorEditWidget + ... ... @@ -3026,19 +3446,22 @@ This indicates an inconsistency in the ui-file. QtColorPropertyManager - + Red ç´… + Green 綠 + Blue è— + Alpha Alpha @@ -3046,78 +3469,97 @@ This indicates an inconsistency in the ui-file. QtCursorDatabase + Arrow ç®­é ­ + Up Arrow 上箭頭 + Cross äº¤å‰ + Wait 等待 + IBeam I åž‹ + Size Vertical åž‚ç›´å¤§å° + Size Horizontal æ°´å¹³å¤§å° + Size Backslash åæ–œç·šå¤§å° + Size Slash æ–œç·šå¤§å° + Size All å…¨éƒ¨å¤§å° + Blank 空白 + Split Vertical 垂直分割 + Split Horizontal 水平分割 + Pointing Hand 指å‘手 + Forbidden ç¦æ­¢çš„ + Open Hand 開啟的手 + Closed Hand 關閉的手 + What's This 這是什麼 + Busy 忙碌 @@ -3129,11 +3571,12 @@ This indicates an inconsistency in the ui-file. QtFontEditWidget - + ... ... + Select Font é¸æ“‡å­—åž‹ @@ -3145,30 +3588,37 @@ This indicates an inconsistency in the ui-file. [%1, %2] + Family å®¶æ— + Point Size é»žå¤§å° + Bold ç²—é«” + Italic 斜體 + Underline 底線 + Strikeout 刪除線 + Kerning 上下çªå‡º @@ -3176,6 +3626,7 @@ This indicates an inconsistency in the ui-file. QtGradientDialog + Edit Gradient 編輯漸層 @@ -3183,219 +3634,274 @@ This indicates an inconsistency in the ui-file. QtGradientEditor - + Start X 起點 X 座標 + Start Y 起點 Y 座標 + Final X 終點 X 座標 + Final Y 終點 Y 座標 + + Central X 中心 X 座標 + + Central Y 中心 Y 座標 + Focal X 焦點 X 座標 + Focal Y 焦點 Y 座標 + Radius åŠå¾‘ + Angle 角度 + Form 表單 + Gradient Editor 漸層編輯器 + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. æ­¤å€åŸŸé¡¯ç¤ºæ­£åœ¨ç·¨è¼¯ä¸­çš„漸層é è¦½ã€‚它也å…許您用拖放來編輯此漸層型態的一些åƒæ•¸ï¼Œå¦‚起點與終點,åŠå¾‘等等。 + 1 1 + 2 2 + 3 3 + 4 4 + 5 5 + Gradient Stops Editor 漸層åœæ­¢é»žç·¨è¼¯å™¨ + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. 這個å€åŸŸå¯ä»¥è®“您編輯漸層åœæ­¢é»žã€‚雙擊ç¾æœ‰çš„åœæ­¢é»žå¯ä»¥è¤‡è£½ä¸€ä»½ã€‚在åœæ­¢é»žå¤–雙擊å¯ä»¥ç”¢ç”Ÿæ–°çš„åœæ­¢é»žã€‚拖放åœæ­¢é»žå¯ä»¥æ”¹è®Šä½ç½®ã€‚點擊滑鼠å³éµæœƒå‡ºç¾é¸å–®ï¼Œå¯ä»¥é¸æ“‡æ›´å¤šå‹•ä½œã€‚ + Zoom 縮放 + Reset Zoom é‡ç½®ç¸®æ”¾ + Position ä½ç½® + Hue 色調 + H H + Saturation 飽和度 + S S + Sat Sat + Value 數值 + V V + Val Val + Alpha Alpha + A A + Type åž‹æ…‹ + Spread 散布 + Color é¡è‰² + Current stop's color ç›®å‰åœæ­¢é»žçš„é¡è‰² + Show HSV specification 顯示 HSV è¦æ ¼ + HSV HSV + Show RGB specification 顯示 RGB è¦æ ¼ + RGB RGB + Current stop's position ç›®å‰åœæ­¢é»žä½ç½® + % % + Zoom In 放大 + Zoom Out ç¸®å° + Toggle details extension 切æ›è©³æƒ…延伸 + > > + Linear Type 線性型態 + ... ... + Radial Type 放射型態 + Conical Type 圓éŒåž‹æ…‹ + Pad Spread 填補散布 + Repeat Spread é‡è¦†æ•£å¸ƒ + Reflect Spread å射散布 @@ -3403,31 +3909,37 @@ This indicates an inconsistency in the ui-file. QtGradientStopsWidget - + New Stop 新增åœæ­¢é»ž + Delete 刪除 + Flip All 全部翻轉 + Select All 全部é¸å– + Zoom In 放大 + Zoom Out ç¸®å° + Reset Zoom é‡ç½®ç¸®æ”¾ @@ -3435,35 +3947,46 @@ This indicates an inconsistency in the ui-file. QtGradientView - + Grad 漸層 + Remove Gradient 移除漸層 + Are you sure you want to remove the selected gradient? 您確定è¦ç§»é™¤é¸å–的漸層嗎? + + New... 新增... + + Edit... 編輯... + + Rename é‡æ–°å‘½å + + Remove 移除 + Gradient View 漸層檢視 @@ -3471,6 +3994,8 @@ This indicates an inconsistency in the ui-file. QtGradientViewDialog + + Select Gradient é¸æ“‡æ¼¸å±¤ @@ -3478,7 +4003,7 @@ This indicates an inconsistency in the ui-file. QtKeySequenceEdit - + Clear Shortcut 清除æ·å¾‘ @@ -3486,14 +4011,17 @@ This indicates an inconsistency in the ui-file. QtLocalePropertyManager + %1, %2 %1,%2 + Language 語言 + Country 國家 @@ -3501,14 +4029,17 @@ This indicates an inconsistency in the ui-file. QtPointFPropertyManager + (%1, %2) (%1,%2) + X X + Y Y @@ -3516,14 +4047,17 @@ This indicates an inconsistency in the ui-file. QtPointPropertyManager + (%1, %2) (%1,%2) + X X + Y Y @@ -3531,10 +4065,12 @@ This indicates an inconsistency in the ui-file. QtPropertyBrowserUtils + [%1, %2, %3] (%4) [%1, %2, %3] (%4) + [%1, %2] [%1, %2] @@ -3542,23 +4078,27 @@ This indicates an inconsistency in the ui-file. QtRectFPropertyManager - + [(%1, %2), %3 x %4] [(%1, %2), %3x%4] + X X + Y Y + Width 寬度 + Height 高度 @@ -3566,22 +4106,27 @@ This indicates an inconsistency in the ui-file. QtRectPropertyManager + [(%1, %2), %3 x %4] [(%1, %2), %3x%4] + X X + Y Y + Width 寬度 + Height 高度 @@ -3589,41 +4134,52 @@ This indicates an inconsistency in the ui-file. QtResourceEditorDialog - + %1 already exists. Do you want to replace it? %1 已存在。 您è¦å–代它嗎? + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. 此檔案似乎ä¸æ˜¯è³‡æºæª”;應該是元素 %2 但是找到元素 %1。 + %1 [read-only] %1 [唯讀] + + %1 [missing] %1 [éºå¤±] + <no prefix> <沒有å‰ç½®å­—串> + + New Resource File 新資æºæª” + + Resource files (*.qrc) 資æºæª” (*.qrc) + Import Resource File 匯入資æºæª” + newPrefix æ–°å‰ç½®å­—串 @@ -3632,48 +4188,63 @@ Do you want to replace it? <p><b>警告:</b>檔案:</p><p>%1</p><p>放在目å‰è³‡æºæª”目錄之外。</p><p>您å¯ä»¥æŒ‰ä¸‹</p><table><tr><th>複製</th><td>來將檔案複製到資æºæª”目錄中。</td></tr><tr><th>複製為...</th><td>來將檔案複製到æŸä¸€å€‹è³‡æºæª”çš„å­ç›®éŒ„。</td></tr><tr><th>ä¿æŒ</th><td>使用它目å‰çš„ä½ç½®ã€‚</td></tr></table> + Add Files 新增檔案 + Incorrect Path ä¸æ­£ç¢ºçš„路徑 + + + + Copy 複製 + Copy As... 複製為... + Keep ä¿æŒ + Skip ç•¥éŽ + Clone Prefix 複製å‰ç½®å­—串 + Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". 請輸入您è¦è¤‡è£½æª”案的檔å的後置字串。 å¯ä»¥ç”¨èªžè¨€çš„延伸代碼,例如 "_tw"。 + + Copy As 複製為 + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>é¸å–的檔案:</p><p>%1</p><p>在目å‰çš„資æºæª”目錄:</p><p>%2</p><p>之外。請é¸æ“‡åœ¨è©²ç›®éŒ„之內的路徑存放。</p> + Could not overwrite %1. 無法覆寫 %1。 @@ -3688,14 +4259,17 @@ to: %2 + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>警告:</b>檔案</p><p>%1</p><p>放在目å‰è³‡æºæª”的父目錄以外。</p> + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>è¦è§£æ±ºæ­¤å•é¡Œï¼Œè«‹æŒ‰</p><table><tr><th align="left">複製</th><td>將該檔案複製到資æºæª”的父目錄。</td></tr><tr><th align="left">複製為...</th><td>將該檔案複製到資æºæª”的父目錄底下的æŸå€‹å­ç›®éŒ„。</td></tr><tr><th align="left">ä¿æŒ</th><td>則ä¸ç§»å‹•è©²æª”案。</td></tr></table> + Could not copy %1 to @@ -3706,120 +4280,153 @@ to %2 + A parse error occurred at line %1, column %2 of %3: %4 %3 中發生剖æžéŒ¯èª¤æ–¼è¡Œ %1 欄 %2: %4 + Save Resource File 儲存資æºæª” + Could not write %1: %2 無法寫入 %1:%2 + Edit Resources ç·¨è¼¯è³‡æº + New... 新增... + Open... é–‹å•Ÿ... + Open Resource File 開啟資æºæª” + + Remove 移除 + + Move Up 上移 + + Move Down 下移 + + Add Prefix 新增å‰ç½®å­—串 + Add Files... 新增檔案... + Change Prefix 變更å‰ç½®å­—串 + Change Language 變更語言 + Change Alias 變更別å + Clone Prefix... 複製å‰ç½®å­—串... + Prefix / Path å‰ç½®å­—串/路徑 + Language / Alias 語言/別å + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>警告:</b>é‡æ–°è¼‰å…¥è³‡æº</p><pre>%1</pre> <p>時發生å•é¡Œã€‚</p></html> + Resource Warning 資æºè­¦å‘Š + Dialog å°è©±æ¡† + New File 新增檔案 + N N + Remove File 移除檔案 + R R + I I + New Resource æ–°å¢žè³‡æº + A A + Remove Resource or File 移除資æºæˆ–檔案 @@ -3831,21 +4438,24 @@ to QtResourceView - + Size: %1 x %2 %3 大å°ï¼š%1x%2 %3 + Edit Resources... 編輯資æº... + Reload é‡æ–°è¼‰å…¥ + Copy Path 複製路徑 @@ -3853,6 +4463,7 @@ to QtResourceViewDialog + Select Resource é¸æ“‡è³‡æº @@ -3860,14 +4471,17 @@ to QtSizeFPropertyManager + %1 x %2 %1x%2 + Width 寬度 + Height 高度 @@ -3875,22 +4489,33 @@ to QtSizePolicyPropertyManager + + + <Invalid> + + + + [%1, %2, %3, %4] [%1, %2, %3, %4] + Horizontal Policy 水平政策 + Vertical Policy 垂直政策 + Horizontal Stretch 水平伸展 + Vertical Stretch 垂直伸展 @@ -3898,14 +4523,17 @@ to QtSizePropertyManager + %1 x %2 %1x%2 + Width 寬度 + Height 高度 @@ -3913,87 +4541,107 @@ to QtToolBarDialog - + Custom Toolbar 自訂工具列 + < S E P A R A T O R > <分隔器> + Customize Toolbars 自訂工具列 + 1 1 + Actions 動作 + Toolbars 工具列 + Add new toolbar 新增工具列 + New 新增 + Remove selected toolbar 移除é¸å–的工具列 + Remove 移除 + Rename toolbar é‡æ–°å‘½å工具列 + Rename é‡æ–°å‘½å + Move action up 將動作上移 + Up 上 + Remove action from toolbar 從工具列移除動作 + <- <- + Add action to toolbar 新增動作到工具列 + -> -> + Move action down 將動作下移 + Down 下 + Current Toolbar Actions ç›®å‰å·¥å…·åˆ—的動作 @@ -4001,11 +4649,12 @@ to QtTreePropertyBrowser - + Property 屬性 + Value 數值 @@ -4013,53 +4662,64 @@ to SaveFormAsTemplate - + Add path... 新增路徑... + Template Exists 樣本已存在 + A template with the name %1 already exists. Do you want overwrite the template? å稱為 %1 的樣本已存在。 您è¦è¦†å¯«æ­¤æ¨£æœ¬å—Žï¼Ÿ + Overwrite Template 覆寫樣本 + Open Error 開啟錯誤 + There was an error opening template %1 for writing. Reason: %2 開啟樣本 %1 以寫入時失敗。ç†ç”±ï¼š%2 + Write Error 寫入錯誤 + There was an error writing the template %1 to disk. Reason: %2 將樣本 %1 寫入ç£ç¢Ÿæ™‚發生錯誤。ç†ç”±ï¼š%2 + Pick a directory to save templates in è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Save Form As Template 將表單存為樣本 + &Category: 分類(&C): + &Name: å稱(&N): @@ -4067,7 +4727,7 @@ Do you want overwrite the template? ScriptErrorDialog - + An error occurred while running the scripts for "%1": 執行 %1 的文稿時發生錯誤: @@ -4077,17 +4737,30 @@ Do you want overwrite the template? SelectSignalDialog + Go to slot 跳到信號槽 + Select signal é¸æ“‡ä¿¡è™Ÿ + + + signal + + + + + class + + SignalSlotConnection + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) 發é€è€…(%1),信號(%2),接收者(%3),信號槽(%4) @@ -4095,26 +4768,32 @@ Do you want overwrite the template? SignalSlotDialogClass + Signals and slots 信號與信號槽 + Slots 信號槽 + Add 新增 + ... ... + Delete 刪除 + Signals 信號 @@ -4122,11 +4801,12 @@ Do you want overwrite the template? Spacer - + Horizontal Spacer '%1', %2 x %3 水平空間 %1,%2x%3 + Vertical Spacer '%1', %2 x %3 垂直空間 %1,%2x%3 @@ -4134,35 +4814,41 @@ Do you want overwrite the template? TemplateOptionsPage - + Template Paths + Tab in preferences dialog 樣本路徑 ToolBarManager - + Configure Toolbars... 設定工具列... + Window 視窗 + Help 說明 + Style æ¨£å¼ + Dock views 嵌入檢視 + Toolbars 工具列 @@ -4170,19 +4856,21 @@ Do you want overwrite the template? VersionDialog - + <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>版本 %2 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ + Qt Designer Qt 設計家 + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br />Qt 設計家是一套圖形使用者介é¢æ‡‰ç”¨ç¨‹å¼ï¼Œç”¨æ–¼è¨­è¨ˆ Qt 的應用程å¼ã€‚<br /> @@ -4192,25 +4880,26 @@ Do you want overwrite the template? This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.<br/> - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。<br /> + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。<br /> + %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> This version of Qt Designer is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a> for an overview of Qt licensing.<br/> - 此版本的 Qt 設計家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a>。<br/> + 此版本的 Qt 設計家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <a href="http://qtsoftware.com/company/about/businessmodel">http://qtsoftware.com/company/about/businessmodel.html</a>。<br/> This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.<br/> - 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§æ­¤è»Ÿé«”套件中的授權檔。<br /> + 此程å¼ä»¥ Qt %1 授權åŒæ„書授權給您。詳情請åƒç…§æ­¤è»Ÿé«”套件中的授權檔。<br /> WidgetDataBase - + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. 此檔案包å«äº†è‡ªè¨‚元件 %1,其基礎類別(%2)與在元件資料庫目å‰çš„項目(%3)ä¸åŒã€‚元件資料庫並未åšæ›´å‹•ã€‚ @@ -4218,23 +4907,27 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - + Actions 動作 + New... 新增... + Delete 刪除 + New action 新動作 + Edit action 編輯動作 @@ -4247,46 +4940,62 @@ Do you want overwrite the template? åŠŸèƒ½å°šæœªå¯¦ä½œï¼ + Edit... 編輯... + + Go to slot... + 跳到信號槽... + + + Copy 複製 + Cut 剪下 + Paste 貼上 + Select all 全部é¸å– + Configure Action Editor 設定動作編輯器 + Icon View 圖示檢視 + Detailed View 詳情檢視 + Remove actions 移除動作 + Remove action '%1' 移除動作 %1 + Used In 使用於 @@ -4301,27 +5010,32 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - + Name å稱 + Used 已使用 + Text 文字 + Shortcut æ·å¾‘ + Checkable å¯å‹¾é¸ + ToolTip 工具æ示 @@ -4329,27 +5043,31 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - + Add buddy 新增åŒä¼´ + Remove buddies 移除åŒä¼´ + Remove %n buddies 移除 %n 個項目 + Add %n buddies 新增 %n 個項目 + Set automatically 自動設定 @@ -4357,7 +5075,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - + Edit Buddies 編輯åŒä¼´ @@ -4365,7 +5083,7 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - + Edit Buddies 編輯åŒä¼´ @@ -4373,11 +5091,12 @@ Do you want overwrite the template? qdesigner_internal::ButtonGroupMenu - + Select members é¸æ“‡æˆå“¡ + Break 打斷 @@ -4385,26 +5104,32 @@ Do you want overwrite the template? qdesigner_internal::ButtonTaskMenu + Assign to button group 指定按éµç¾¤çµ„ + Button group 按éµç¾¤çµ„ + New button group 新增按éµç¾¤çµ„ + Change text... 變更文字... + None ç„¡ + Button group '%1' 按éµç¾¤çµ„ %1 @@ -4412,47 +5137,57 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - + Save... 儲存... + Copy All 全部複製 + &Find in Text... 在文字中尋找(&F)... + A temporary form file could not be created in %1. 無法於 %1 建立暫存表單檔。 + The temporary form file %1 could not be written. 無法寫入暫存表單檔 %1。 + %1 - [Code] %1─[æºç¢¼] + Save Code 儲存程å¼ç¢¼ + Header Files (*.%1) 標頭檔 (*.%1) + The file %1 could not be opened: %2 檔案 %1 無法開啟:%2 + The file %1 could not be written: %2 檔案 %1 無法寫入:%2 + %1 - Error %1─錯誤 @@ -4460,7 +5195,7 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - + Text Color 文字é¡è‰² @@ -4468,11 +5203,12 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - + Edit Items... 編輯項目... + Change Combobox Contents 變更下拉å¼é¸å–®å…§å®¹ @@ -4480,7 +5216,7 @@ Do you want overwrite the template? qdesigner_internal::CommandLinkButtonTaskMenu - + Change description... 變更æè¿°... @@ -4503,15 +5239,17 @@ Do you want overwrite the template? qdesigner_internal::ConnectionEdit - + Select All 全部é¸å– + Deselect All 全部å–消é¸å– + Delete 刪除 @@ -4519,38 +5257,47 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel + Sender 發é€è€… + Signal 信號 + Receiver 接收者 + Slot 信號槽 + <sender> <發é€è€…> + <signal> <信號> + <receiver> <接收者> + <slot> <信號槽> + Signal and Slot Editor 信號與信號槽編輯器 @@ -4559,6 +5306,7 @@ Do you want overwrite the template? 連線已存在。<br>發é€è€…(%1),信號(%2),接收者(%3),信號槽(%4) + The connection already exists!<br>%1 連線已存在ï¼<br>%1 @@ -4570,35 +5318,42 @@ Do you want overwrite the template? 刪除é é¢ - + Insert Page Before Current Page 在目å‰é é¢ä¹‹å‰æ’å…¥ + Insert Page After Current Page 在目å‰é é¢ä¹‹å¾Œæ’å…¥ + Delete 刪除 + Insert æ’å…¥ + Add Subwindow 新增å­è¦–窗 + Subwindow å­è¦–窗 + Page é é¢ + Page %1 of %2 第 %1 é ï¼Œå…± %2 é  @@ -4606,46 +5361,59 @@ Do you want overwrite the template? qdesigner_internal::DPI_Chooser - + System (%1 x %2) + System resolution 系統(%1 x %2) + User defined 使用者定義 + x + DPI X/Y separator x qdesigner_internal::DesignerPropertyManager + + AlignLeft 置左å°é½Š + AlignHCenter 置中å°é½Š + AlignRight ç½®å³å°é½Š + AlignJustify å…©é‚Šå°é½Š + AlignTop 置頂å°é½Š + + AlignVCenter 垂直置中 + AlignBottom 置底å°é½Š @@ -4662,68 +5430,87 @@ Do you want overwrite the template? é è¨­å鋸齒 + %1, %2 %1,%2 + Customized (%n roles) 自訂(%n 個角色) + Inherited 繼承 + Horizontal æ°´å¹³ + Vertical åž‚ç›´ + Normal Off 正常時關閉 + Normal On 正常時開啟 + Disabled Off 關閉時關閉 + Disabled On 關閉時開啟 + Active Off 啟用時關閉 + Active On 啟用時開啟 + Selected Off é¸æ“‡æ™‚關閉 + Selected On é¸æ“‡æ™‚é–‹å•Ÿ + + translatable å¯ç¿»è­¯ + + disambiguation 澄清 + + comment 註解 @@ -4735,39 +5522,48 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - + Device Profiles (*.%1) è£ç½®è¨­å®šæª”(*.%1) + Default é è¨­ + Save Profile 儲存設定檔 + Save Profile - Error 儲存設定檔 ─ 錯誤 + Unable to open the file '%1' for writing: %2 無法開啟檔案 %1 以寫入:%2 + Open profile 開啟設定檔 + + Open Profile - Error 開啟設定檔 ─ 錯誤 + Unable to open the file '%1' for reading: %2 無法開啟檔案 %1 以讀å–:%2 + '%1' is not a valid profile: %2 %1 ä¸æ˜¯åˆæ³•çš„設定檔:%2 @@ -4775,46 +5571,57 @@ Do you want overwrite the template? qdesigner_internal::Dialog + Dialog å°è©±æ¡† + StringList 字串列表 + New String 新增字串 + &New 新增(&N) + Delete String 刪除字串 + &Delete 刪除(&D) + &Value: 數值(&V): + Move String Up 字串上移 + Up 上 + Move String Down 字串下移 + Down 下 @@ -4861,14 +5668,60 @@ Do you want overwrite the template? qdesigner_internal::EmbeddedOptionsControl + + Add a profile + 新增設定檔 + + + + Edit the selected profile + 編輯é¸å–的設定檔 + + + + Delete the selected profile + 刪除é¸å–的設定檔 + + + + Add Profile + 新增設定檔 + + + + New profile + 新增設定檔 + + + + Edit Profile + 編輯設定檔 + + + + Delete Profile + 刪除設定檔 + + + + Would you like to delete the profile '%1'? + 您è¦åˆªé™¤è¨­å®šæª” %1 嗎? + + + + Default + é è¨­ + + + None - ç„¡ + ç„¡ qdesigner_internal::FilterWidget - + <Filter> <éŽæ¿¾å™¨> @@ -4895,11 +5748,12 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - + Resource File Changed 資æºæª”已變更 + The file "%1" has changed outside Designer. Do you want to reload it? 檔案 %1 在設計器之外被人更動éŽã€‚您è¦é‡æ–°è¼‰å…¥å—Žï¼Ÿ @@ -4907,7 +5761,7 @@ Do you want overwrite the template? qdesigner_internal::FormLayoutMenu - + Add form layout row... 新增表單佈局列... @@ -4915,10 +5769,12 @@ Do you want overwrite the template? qdesigner_internal::FormWindow + Edit contents 編輯內容 + F2 F2 @@ -4927,10 +5783,13 @@ Do you want overwrite the template? æ’入元件 %1 + Resize é‡æ–°èª¿æ•´å¤§å° + + Key Move éµç§»å‹• @@ -4939,6 +5798,7 @@ Do you want overwrite the template? 貼上 + Paste error 貼上錯誤 @@ -4955,54 +5815,67 @@ and then paste again. 打斷佈局 + Lay out 佈局 + + Drop widget 丟棄元件 + Paste %n action(s) 貼上 %n 個動作 + Insert widget '%1' æ’入元件 %1 + Paste %n widget(s) 貼上 %n 個元件 + Paste (%1 widgets, %2 actions) 貼上(%1 個元件,%2 個動作) + Cannot paste widgets. Designer could not find a container without a layout to paste into. 無法貼上元件。設計器找ä¸åˆ°æ²’有佈局的容器來貼上。 + Break the layout of the container you want to paste into, select this container and then paste again. 請先打斷您è¦è²¼ä¸Šçš„容器佈局,å†é¸æ“‡è©²å®¹å™¨ï¼Œä¸¦é‡æ–°è²¼ä¸Šã€‚ + Raise widgets 抬å‡å…ƒä»¶ + Lower widgets é™ä½Žå…ƒä»¶ + Select Ancestor é¸æ“‡ç¥–å…ˆ + A QMainWindow-based form does not contain a central widget. QMainWindow 為基底的表單並未包å«ä¸­å¤®å…ƒä»¶ã€‚ @@ -5010,11 +5883,12 @@ and then paste again. qdesigner_internal::FormWindowBase - + Delete 刪除 + Delete '%1' 刪除 '%1' @@ -5022,160 +5896,200 @@ and then paste again. qdesigner_internal::FormWindowManager - + Cu&t 剪下(&T) + Cuts the selected widgets and puts them on the clipboard 剪下é¸å–的元件,並放到剪貼簿中 + &Copy 複製(&C) + Copies the selected widgets to the clipboard å°‡é¸å–的元件複製進剪貼簿 + &Paste 貼上(&P) + Pastes the clipboard's contents 貼上剪貼簿中的內容 + &Delete 刪除(&D) + Deletes the selected widgets 刪除é¸å–的元件 + Select &All 全部é¸å–(&A) + Selects all widgets é¸æ“‡æ‰€æœ‰çš„元件 + Bring to &Front 帶到å‰æ™¯(&F) + + Raises the selected widgets 抬å‡é¸å–的元件 + Send to &Back é€å›žèƒŒæ™¯(&B) + + Lowers the selected widgets é™ä½Žé¸å–的元件 + Adjust &Size 調整大å°(&S) + Adjusts the size of the selected widget 調整é¸å–çš„å…ƒä»¶å¤§å° + Lay Out &Horizontally 水平佈局(&H) + Lays out the selected widgets horizontally å°‡é¸å–的元件åšæ°´å¹³ä½ˆå±€ + Lay Out &Vertically 垂直佈局(&V) + Lays out the selected widgets vertically å°‡é¸å–的元件åšåž‚直佈局 + Lay Out in a &Grid 使用格線佈局(&G) + Lays out the selected widgets in a grid å°‡é¸å–的元件佈局在格線內 + Lay Out Horizontally in S&plitter 以水平分離佈局(&P) + Lays out the selected widgets horizontally in a splitter å°‡é¸å–的元件在分離器中åšæ°´å¹³ä½ˆå±€ + Lay Out Vertically in Sp&litter 以垂直分離佈局(&L) + Lays out the selected widgets vertically in a splitter å°‡é¸å–的元件在分離器中åšåž‚直佈局 + &Break Layout 打斷佈局(&B) + Breaks the selected layout 打斷é¸å–的佈局 + &Preview... é è¦½(&P)... + Preview current form é è¦½ç›®å‰çš„表單 + Form &Settings... 表單設定(&S)... + Break Layout 打斷佈局 + Adjust Size èª¿æ•´å¤§å° + Could not create form preview Title of warning message box 無法建立表單é è¦½ + Form Settings - %1 表單設定─%1 + Lay Out in a &Form Layout 在表單中佈局(&F) + Lays out the selected widgets in a form layout å°‡é¸å–的元件於表單中佈局 + Si&mplify Grid Layout 簡化格線佈局(&M) + Removes empty columns and rows 移除空的欄與列 @@ -5183,11 +6097,12 @@ and then paste again. qdesigner_internal::FormWindowSettings - + None ç„¡ + Device Profile: %1 è£ç½®è¨­å®šæª”:%1 @@ -5206,30 +6121,37 @@ and then paste again. qdesigner_internal::GridPanel + Form 表單 + Grid 格線 + Visible å¯è¦‹çš„ + Grid &X X 軸格線(&X) + Snap 貼齊 + Reset é‡ç½® + Grid &Y Y 軸格線(&Y) @@ -5237,7 +6159,7 @@ and then paste again. qdesigner_internal::GroupBoxTaskMenu - + Change title... 變更標題... @@ -5245,6 +6167,7 @@ and then paste again. qdesigner_internal::HtmlTextEdit + Insert HTML entity æ’å…¥ HTML entity @@ -5252,75 +6175,92 @@ and then paste again. qdesigner_internal::IconSelector - + The pixmap file '%1' cannot be read. 無法讀å–åƒç´ æª” %1。 + The file '%1' does not appear to be a valid pixmap file: %2 檔案 %1 似乎ä¸æ˜¯åˆæ³•çš„åƒç´ æª”:%2 + The file '%1' could not be read: %2 檔案 %1 無法讀å–:%2 + Choose a Pixmap é¸æ“‡åƒç´ åœ– + Pixmap Read Error åƒç´ åœ–讀å–錯誤 + ... ... + Normal Off 正常時關閉 + Normal On 正常時開啟 + Disabled Off 關閉時關閉 + Disabled On 關閉時開啟 + Active Off 啟用時關閉 + Active On 啟用時開啟 + Selected Off é¸æ“‡æ™‚關閉 + Selected On é¸æ“‡æ™‚é–‹å•Ÿ + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + Reset é‡ç½® + Reset All 全部é‡ç½® @@ -5328,47 +6268,58 @@ and then paste again. qdesigner_internal::ItemListEditor - + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> + Items List 項目列表 + New Item 新增項目 + &New 新增(&N) + Delete Item 刪除項目 + &Delete 刪除(&D) + Move Item Up 將項目上移 + U U + Move Item Down 將項目下移 + D D @@ -5376,11 +6327,12 @@ and then paste again. qdesigner_internal::LabelTaskMenu - + Change rich text... 變更 rich text... + Change plain text... 變更純文字... @@ -5388,7 +6340,7 @@ and then paste again. qdesigner_internal::LineEditTaskMenu - + Change text... 變更文字... @@ -5396,15 +6348,17 @@ and then paste again. qdesigner_internal::ListWidgetEditor - + Edit List Widget 編輯列表元件 + Edit Combobox 編輯下拉å¼é¸å–® + New Item 新增項目 @@ -5484,11 +6438,12 @@ and then paste again. qdesigner_internal::ListWidgetTaskMenu - + Edit Items... 編輯項目... + Change List Contents 變更列表內容 @@ -5496,19 +6451,22 @@ and then paste again. qdesigner_internal::MdiContainerWidgetTaskMenu - + Next Subwindow 下一個å­è¦–窗 + Previous Subwindow å‰ä¸€å€‹å­è¦–窗 + Tile 鋪排 + Cascade 串接 @@ -5516,7 +6474,7 @@ and then paste again. qdesigner_internal::MenuTaskMenu - + Remove 移除 @@ -5524,7 +6482,7 @@ and then paste again. qdesigner_internal::MorphMenu - + Morph into 變型為 @@ -5532,34 +6490,42 @@ and then paste again. qdesigner_internal::NewActionDialog + New Action... 新增動作... + &Text: 文字(&T) + Shortcut: æ·å¾‘: + Checkable: å¯å‹¾é¸ï¼š + ToolTip: 工具æ示: + ... ... + &Icon: 圖示(&I) + Object &name: 物件å稱(&N): @@ -5567,11 +6533,12 @@ and then paste again. qdesigner_internal::NewDynamicPropertyDialog - + Set Property Name 設定屬性å稱 + The current object already has a property named '%1'. Please select another, unique one. ç›®å‰çš„物件已經有å為 %1 的屬性了。 @@ -5584,25 +6551,29 @@ Please select another name. è«‹é¸æ“‡å¦å¤–çš„å稱。 + Create Dynamic Property 建立動態屬性 + Property Name 屬性å稱 + Property Type 屬性型態 - + The '_q_' prefix is reserved for the Qt library. Please select another name. å‰ç½®å­—串 '_q_' 是ä¿ç•™çµ¦ Qt 函å¼åº«ç”¨çš„。 è«‹é¸æ“‡å…¶å®ƒå­—串。 + horizontalSpacer 水平間隔 @@ -5610,62 +6581,78 @@ Please select another name. qdesigner_internal::NewFormWidget + Default size é è¨­å¤§å° + QVGA portrait (240x320) QVGA 縱å‘(240 x 320) + QVGA landscape (320x240) QVGA æ©«å‘(320 x 240) + VGA portrait (480x640) VGA 縱å‘(480 x 640) + VGA landscape (640x480) VGA æ©«å‘(640 x 480) + Widgets + New Form Dialog Categories 元件 + Custom Widgets 自訂元件 + None ç„¡ + Error loading form 載入表單時發生錯誤 + Internal error: No template selected. 內部錯誤:沒有é¸æ“‡æ¨£æœ¬ã€‚ + 0 0 + Choose a template for a preview é¸æ“‡é è¦½çš„樣本 + Embedded Design 嵌入å¼è¨­è¨ˆ + Device: è£ç½®ï¼š + Screen Size: 螢幕大å°ï¼š @@ -5673,31 +6660,37 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - + Add 新增 + New Promoted Class 新增æå‡çš„元件 + Base class name: 基底類別å稱: + Promoted class name: æå‡çš„類別å稱: + Header file: 標頭檔: + Global include 全域引入 + Reset é‡ç½® @@ -5721,7 +6714,7 @@ Please select another name. 分隔器 - + &Find in Text... 在文字中尋找(&F)... @@ -5729,6 +6722,7 @@ Please select another name. qdesigner_internal::ObjectInspector::ObjectInspectorPrivate + Change Current Page 變更目å‰çš„é é¢ @@ -5736,15 +6730,17 @@ Please select another name. qdesigner_internal::OrderDialog - + Index %1 (%2) 索引 %1(%2) + Change Page Order 變更é é¢é †åº + Page Order é é¢é †åº @@ -5757,15 +6753,17 @@ Please select another name. 下 - + %1 %2 %1 %2 + Move page up é é¢ä¸Šç§» + Move page down é é¢ä¸‹ç§» @@ -5773,38 +6771,47 @@ Please select another name. qdesigner_internal::PaletteEditor + Edit Palette 編輯調色盤 + Tune Palette 調整調色盤 + Show Details 顯示詳情 + Compute Details 計算詳情 + Quick å¿« + Preview é è¦½ + Disabled 已關閉 + Inactive 未啟動 + Active å•Ÿå‹• @@ -5812,7 +6819,7 @@ Please select another name. qdesigner_internal::PaletteEditorButton - + Change Palette 變更調色盤 @@ -5820,19 +6827,22 @@ Please select another name. qdesigner_internal::PaletteModel - + Color Role é¡è‰²è§’色 + Active å•Ÿå‹• + Inactive 未啟動 + Disabled 已關閉 @@ -5840,22 +6850,28 @@ Please select another name. qdesigner_internal::PixmapEditor + Copy Path 複製路徑 + Paste Path 貼上路徑 + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + + ... ... @@ -5863,15 +6879,61 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - + Edit text 編輯文字 + qdesigner_internal::PluginDialog + + + Components + 組件 + + + + Plugin Information + 外掛程å¼è³‡è¨Š + + + + Refresh + 刷新 + + + + Scan for newly installed custom widget plugins. + 掃æ是å¦æœ‰æ–°å®‰è£çš„自訂元件外掛程å¼ã€‚ + + + + Qt Designer couldn't find any plugins + Qt 設計家找ä¸åˆ°ä»»ä½•çš„外掛程å¼ã€‚ + + + + Qt Designer found the following plugins + Qt è¨­è¨ˆå®¶æ‰¾åˆ°ä»¥ä¸‹çš„å¤–æŽ›ç¨‹å¼ + + + + New custom widget plugins have been found. + 找到新的自訂元件外掛程å¼ã€‚ + + + TextLabel + 文字標籤 + + + 1 + 1 + + + qdesigner_internal::PreviewActionGroup - + %1 Style %1 æ¨£å¼ @@ -5879,27 +6941,32 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - + Load Custom Device Skin 載入自訂è£ç½®å¤–觀 + All QVFB Skins (*.%1) 所有 QVFB 外觀檔 (*.%1) + %1 - Duplicate Skin %1─複製外觀 + The skin '%1' already exists. 外觀 %1 已存在。 + %1 - Error %1─錯誤 + %1 is not a valid skin directory: %2 %1 ä¸æ˜¯åˆæ³•çš„外觀目錄: @@ -5909,7 +6976,7 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - + &Close 關閉(&C) @@ -5917,6 +6984,7 @@ Please select another name. qdesigner_internal::PreviewManager + %1 - [Preview] %1─[é è¦½] @@ -5928,46 +6996,57 @@ Please select another name. qdesigner_internal::PreviewWidget + Preview Window é è¦½è¦–窗 + LineEdit 行編輯器 + ComboBox 下拉å¼é¸å–® + PushButton æŒ‰éµ + ButtonGroup2 按éµç¾¤çµ„2 + CheckBox1 勾é¸ç›’1 + CheckBox2 勾é¸ç›’2 + ButtonGroup 按éµç¾¤çµ„ + RadioButton1 å–®é¸åœ“鈕1 + RadioButton2 å–®é¸åœ“鈕2 + RadioButton3 å–®é¸åœ“鈕3 @@ -5975,19 +7054,22 @@ Please select another name. qdesigner_internal::PromotionModel - + Name å稱 + Header file 標頭檔 + Global include 全域引入 + Usage 用法 @@ -5995,23 +7077,27 @@ Please select another name. qdesigner_internal::PromotionTaskMenu - + Promoted widgets... å·²æå‡å…ƒä»¶ + Promote to ... æå‡åˆ°... + Promote to æå‡åˆ° + Demote to %1 é™ç´šåˆ° %1 + Change signals/slots... 變更信號/信號槽... @@ -6019,43 +7105,52 @@ Please select another name. qdesigner_internal::PropertyEditor - + Add Dynamic Property... 新增動態屬性... + Remove Dynamic Property 移除動態屬性 + Sorting æŽ’åº + Color Groups é¡è‰²ç¾¤çµ„ + Tree View 樹狀檢視 + Drop Down Button View 放下按éµæª¢è¦– + String... 字串... + Bool... 布林值... + Other... 其它... + Configure Property Editor 設定屬性編輯器 @@ -6066,6 +7161,7 @@ Please select another name. %2 + Object: %1 Class: %2 物件:%1 @@ -6075,7 +7171,7 @@ Class: %2 qdesigner_internal::PropertyLineEdit - + Insert line break æ’入行中斷 @@ -6083,23 +7179,27 @@ Class: %2 qdesigner_internal::QDesignerPromotionDialog - + Promoted Widgets å·²æå‡å…ƒä»¶ + Promoted Classes å·²æå‡é¡žåˆ¥ + Promote æå‡ + %1 - Error %1─錯誤 + Change signals/slots... 變更信號/信號槽... @@ -6107,19 +7207,22 @@ Class: %2 qdesigner_internal::QDesignerResource - + Loading qrc file 載入 qrc 檔 + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> 找ä¸åˆ°æŒ‡å®šçš„ qrc 檔 <p><b>%1</b></p><p>您è¦æ›´æ–°ä½ç½®å—Žï¼Ÿ</p> + New location for %1 %1 çš„æ–°ä½ç½® + Resource files (*.qrc) 資æºæª” (*.qrc) @@ -6127,87 +7230,112 @@ Class: %2 qdesigner_internal::QDesignerTaskMenu - + Change objectName... 變更物件å稱... + Change toolTip... 變更工具æ示... + Change whatsThis... 變更「這是什麼?ã€... + Change styleSheet... 變更樣å¼è¡¨... + Create Menu Bar 建立é¸å–®åˆ— + Add Tool Bar 新增工具列 + Create Status Bar 建立狀態列 + Remove Status Bar 移除狀態列 + Change script... 變更文稿... + Change signals/slots... 變更信號/信號槽... + Go to slot... 跳到信號槽... + Size Constraints 大å°é™åˆ¶ + Set Minimum Width 設定最å°å¯¬åº¦ + Set Minimum Height 設定最å°é«˜åº¦ + Set Minimum Size 設定最å°å¤§å° + Set Maximum Width 設定最大寬度 + Set Maximum Height 設定最大高度 + Set Maximum Size è¨­å®šæœ€å¤§å¤§å° + Edit ToolTip 編輯工具æ示 + Edit WhatsThis 編輯「這是什麼〠+ + + no signals available + + + Set size constraint on %n widget(s) 設定 %n 個元件的大å°é™åˆ¶ @@ -6217,16 +7345,20 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox + + Unexpected element <%1> 未é æœŸçš„元素 <%1> + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 在元件 %3 çš„ XML 代碼第 %1 行第 %2 個字元發生剖æžéŒ¯èª¤ï¼š%4 %5 + The XML code specified for the widget %1 does not contain any widget elements. %2 元件 %1 çš„ XML æºç¢¼æœªåŒ…å«ä»»ä½•å…ƒä»¶å…ƒç´ ã€‚ @@ -6274,8 +7406,8 @@ Class: %2 é¡è‰²æ¨£å¼ - RenameF2 - é‡æ–°å‘½åF2 + Rename F2 + é‡æ–°å‘½å F2 Form @@ -6458,27 +7590,32 @@ Class: %2 qdesigner_internal::QtGradientEditor - + Linear 線性 + Radial 放射狀 + Conical 圓éŒç‹€ + Pad 墊å­ç‹€ + Repeat é‡è¦† + Reflect åå°„ @@ -6538,59 +7675,73 @@ Class: %2 qdesigner_internal::QtGradientStopsController - + H H + S S + V V + + Hue 色調 + Sat 飽和度 + Val 數值 + Saturation 飽和度 + Value 數值 + R R + G G + B B + Red ç´… + Green 綠 + Blue è— @@ -6759,23 +7910,27 @@ Class: %2 qdesigner_internal::RichTextEditorDialog - + Edit text 編輯文字 + &OK 確定(&O) + &Cancel å–消(&C) + Rich Text Rich Text + Source ä¾†æº @@ -6783,58 +7938,72 @@ Class: %2 qdesigner_internal::RichTextEditorToolBar + Bold ç²—é«” + CTRL+B CTRL+B + Italic 斜體 + CTRL+I CTRL+I + Underline 底線 + CTRL+U CTRL+U + Left Align 置左å°é½Š + Center 置中 + Right Align ç½®å³å°é½Š + Justify å…©é‚Šå°é½Š + Superscript 上標 + Subscript 下標 + Insert &Link æ’入連çµ(&L) + Insert &Image æ’入影åƒ(&I) @@ -6842,15 +8011,17 @@ Class: %2 qdesigner_internal::ScriptDialog - + Edit script 編輯文稿 + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>請輸入載入表單時è¦åŸ·è¡Œçš„文稿片段。<br>元件與å­å…ƒä»¶å¯ä»¥ç”¨è®Šæ•¸ <i>widget</i> 與 <i>childWidgets</i> 來存å–。 + Syntax error 語法錯誤 @@ -6858,7 +8029,7 @@ Class: %2 qdesigner_internal::ScriptErrorDialog - + Script errors 文稿錯誤 @@ -6873,19 +8044,23 @@ Class: %2 qdesigner_internal::SignalSlotDialog - + There is already a slot with the signature '%1'. 已經有一個信號槽,其簽章為 %1。 + There is already a signal with the signature '%1'. 已經有一個信號,其簽章為 %1。 + %1 - Duplicate Signature %1─複製簽章 + + Signals/Slots of %1 %1 的信號與信號槽 @@ -6893,11 +8068,12 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - + Edit Signals/Slots 編輯信號與信號槽 + F4 F4 @@ -6905,7 +8081,7 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - + Edit Signals/Slots 編輯信號與信號槽 @@ -6913,7 +8089,7 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - + Remove 移除 @@ -6925,7 +8101,7 @@ Class: %2 變更字串列表 - + Change String List 變更字串列表 @@ -6933,31 +8109,38 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - + Edit Style Sheet 編輯樣å¼è¡¨ + + Valid Style Sheet åˆæ³•æ¨£å¼è¡¨ + Invalid Style Sheet ä¸åˆæ³•çš„樣å¼è¡¨ + Add Resource... 新增資æº... + Add Gradient... 新增漸層... + Add Color... 新增é¡è‰²... + Add Font... 新增字型... @@ -6986,23 +8169,27 @@ Class: %2 qdesigner_internal::TabOrderEditor - + Start from Here 從這裡開始 + Restart é‡æ–°é–‹å§‹ + Tab Order List... 定ä½é»žé †åºåˆ—表... + Tab Order List 定ä½é»žé †åºåˆ—表 + Tab Order 定ä½é»žé †åº @@ -7010,7 +8197,7 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - + Edit Tab Order 編輯定ä½é»žé †åº @@ -7018,7 +8205,7 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - + Edit Tab Order 編輯定ä½é»žé †åº @@ -7026,35 +8213,43 @@ Class: %2 qdesigner_internal::TableWidgetEditor - + New Column æ–°å¢žæ¬„ä½ + New Row 新增列 + &Columns 欄(&C) + &Rows 列(&R) + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> + Edit Table Widget 編輯表格元件 + &Items é …ç›®(&I) @@ -7119,6 +8314,7 @@ Class: %2 é‡ç½®åˆ—åƒç´ åœ– + Table Items 表格項目 @@ -7182,7 +8378,7 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - + Edit Items... 編輯項目... @@ -7190,18 +8386,22 @@ Class: %2 qdesigner_internal::TemplateOptionsWidget + Pick a directory to save templates in è«‹é¸æ“‡è¦å„²å­˜æ¨£æœ¬çš„目錄 + Form 表單 + Additional Template Paths é¡å¤–樣本路徑 + ... ... @@ -7209,19 +8409,22 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - + Change HTML... 變更 HTML... + Edit HTML 編輯 HTML + Edit Text 編輯文字 + Change Plain Text... 變更純文字... @@ -7229,18 +8432,22 @@ Class: %2 qdesigner_internal::TextEditor + Choose Resource... é¸æ“‡è³‡æº... + Choose File... é¸æ“‡æª”案... + Choose a File é¸æ“‡æª”案 + ... ... @@ -7248,23 +8455,27 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - + Insert Separator æ’入分隔器 + Remove action '%1' 移除動作 %1 + Remove Toolbar '%1' 移除工具列 %1 + Insert Separator before '%1' 在 %1 之å‰æ’入分隔器 + Append Separator 附加分隔器 @@ -7279,27 +8490,34 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - + &Columns 欄(&C) + Per column properties æ¯æ¬„屬性 + Common properties å…±åŒå±¬æ€§ + + New Item 新增項目 + Properties &<< 屬性 &<< + + Properties &>> 屬性 &>> @@ -7308,18 +8526,22 @@ Class: %2 新增å­é …ç›® + New Column æ–°å¢žæ¬„ä½ + Edit Tree Widget 編輯樹狀圖元件 + &Items é …ç›®(&I) + Tree Items 樹狀圖項目 @@ -7352,14 +8574,18 @@ Class: %2 新增項目(&N) + + New Subitem 新增å­é …ç›® + New &Subitem 新增å­é …ç›®(&S) + Delete Item 刪除項目 @@ -7368,34 +8594,42 @@ Class: %2 刪除項目(&D) + Move Item Left (before Parent Item) 將項目左移(在父項目之å‰ï¼‰ + L L + Move Item Right (as a First Subitem of the Next Sibling Item) 將項目å³ç§»ï¼ˆç§»åˆ°å³é„°é …目的第一個å­é …目) + R R + Move Item Up 將項目上移 + U U + Move Item Down 將項目下移 + D D @@ -7448,14 +8682,17 @@ Class: %2 æ¨¹ç‹€åœ–æ¬„ä½ + 1 1 + &New 新增(&N) + &Delete 刪除(&D) @@ -7467,7 +8704,7 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - + Edit Items... 編輯項目... @@ -7475,7 +8712,7 @@ Class: %2 qdesigner_internal::WidgetBox - + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. 警告:在元件盒內建立元件失敗。å¯èƒ½æ˜¯ä¸åˆæ³•çš„自訂元件 XML 造æˆçš„。 @@ -7510,34 +8747,42 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget + Scratchpad æš«å­˜ + Custom Widgets 自訂元件 + Expand all 全部展開 + Collapse all 全部折疊 + List View 列表檢視 + Icon View 圖示檢視 + Remove 移除 + Edit name 編輯å稱 @@ -7545,6 +8790,7 @@ Class: %2 qdesigner_internal::WidgetDataBase + A custom widget plugin whose class name (%1) matches that of an existing class has been found. 類別å稱為 %1 的自訂元件外掛程å¼æ‰¾åˆ°äº†ç›¸åŒå稱的類別。 @@ -7552,7 +8798,7 @@ Class: %2 qdesigner_internal::WidgetEditorTool - + Edit Widgets 編輯元件 @@ -7560,29 +8806,34 @@ Class: %2 qdesigner_internal::WidgetFactory - + The custom widget factory registered for widgets of class %1 returned 0. 類別 %1 的元件的自訂元件工廠註冊時傳回值 0。 + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. 當使用類別 %1 的元件所註冊的自訂元件工廠建立元件時,發生類別å稱ä¸ç›¸ç¬¦çš„錯誤。它傳回的元件為類別 %2 的元件。 + %1 Widget %1 元件 + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. 在建立佈局時,容器 %1(%2)裡目å‰çš„é é¢ç„¡æ³•è¢«æ±ºå®šã€‚這表示介é¢æª”中å¯èƒ½æœ‰ä¸ç›¸ç¬¦çš„情æ³ã€‚å¯èƒ½åœ¨å®¹å™¨å…ƒä»¶è£¡å·²ç¶“建構了一個佈局。 + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. 您試圖將一個佈局新增到元件 %1(%2)中,但該元件已經有一個型態為 %3 的未管ç†ä½ˆå±€ã€‚ 這表示在 ui 檔中有發生ä¸ä¸€è‡´çš„情æ³ã€‚ + Cannot create style '%1'. ç„¡æ³•å»ºç«‹æ¨£å¼ %1。 @@ -7590,10 +8841,12 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::WizardContainerWidgetTaskMenu + Next 下一個 + Back 返回 @@ -7601,8 +8854,9 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - + %1 % + Zoom factor %1 % diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts index 925b6c2..712f75d 100644 --- a/translations/linguist_de.ts +++ b/translations/linguist_de.ts @@ -1,10 +1,10 @@ - - + + - + (New Entry) @@ -19,7 +19,7 @@ AboutDialog - + Qt Linguist QT Linguist @@ -27,7 +27,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -118,7 +118,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -138,10 +138,21 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + EditorPage @@ -201,7 +212,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. Zusätzliche Kurztaste im Ãœbersetzungstext. @@ -373,7 +384,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -922,9 +933,8 @@ p, li { white-space: pre-wrap; } Gehe zum nächsten unerledigten Eintrag. - Ctrl+L - Ctrl+L + Ctrl+L @@ -950,9 +960,8 @@ p, li { white-space: pre-wrap; } Gehe zum nächsten Eintrag. - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -1153,13 +1162,13 @@ p, li { white-space: pre-wrap; } Eryeuge eine Qt Nachrichtendatei aus der aktuellen Ãœbersetzungsdatei. Der Dateiname wird automatisch aus dem Namen der .ts Datei abgeleitet. - + This is the application's main window. - + Source text Ursprungstext @@ -1212,32 +1221,32 @@ p, li { white-space: pre-wrap; } - + Loading... Lade... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. @@ -1245,7 +1254,7 @@ Skip loading the first named file? - + Related files (%1);; @@ -1255,20 +1264,20 @@ Skip loading the first named file? - - + + File saved. Datei gespeichert. - - + + Release Freigeben - + Qt message files for released applications (*.qm) All files (*) Qt Nachrichtendateien (*.qm) @@ -1332,7 +1341,7 @@ Alle Dateien (*) - + @@ -1344,7 +1353,7 @@ Alle Dateien (*) - + Cannot find the string '%1'. Kann Zeichenkette '%1' nicht finden. @@ -1449,27 +1458,11 @@ Alle Dateien (*) Version %1 - Open Source Edition - Open Source Edition - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - + Open Source Edition - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ist ein Werkzeug zum Ãœbersetzen von Qt Anwendungen.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1652,7 +1645,7 @@ Alle Dateien (*) - + All @@ -1672,7 +1665,7 @@ Alle Dateien (*) F5 - + Translation File &Settings... E&instellungen... @@ -1695,11 +1688,21 @@ Alle Dateien (*) Ctrl+T Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German Deutsch @@ -1834,7 +1837,7 @@ Zeile: %2 Index - + Completion status for %1 @@ -1864,7 +1867,7 @@ Zeile: %2 MsgEdit - + This is the right panel of the main window. @@ -1877,13 +1880,13 @@ Zeile: %2 %1 - %2[*] - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist @@ -2002,7 +2005,7 @@ Zeile: %2 PhraseModel - + Source phrase Ursprungstext @@ -2020,7 +2023,7 @@ Zeile: %2 PhraseView - + Insert Einfügen @@ -2048,7 +2051,7 @@ Zeile: %2 - + Translation files (%1);; @@ -2058,37 +2061,38 @@ Zeile: %2 - + - + + - + Qt Linguist Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -2099,11 +2103,11 @@ Zeile: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -2113,10 +2117,15 @@ Zeile: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2155,7 +2164,7 @@ Zeile: %2 SourceCodeView - + <i>Source code not available</i> <i>Quelltext nicht verfügbar</i> @@ -2710,7 +2719,7 @@ Alle Dateien (*) TranslationSettingsDialog - + Any Country Land diff --git a/translations/linguist_fr.ts b/translations/linguist_fr.ts index ad346bf..b8317b2 100644 --- a/translations/linguist_fr.ts +++ b/translations/linguist_fr.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -11,7 +12,7 @@ AboutDialog - + Qt Linguist @@ -19,7 +20,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -109,7 +110,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -129,15 +130,26 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. @@ -274,7 +286,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -707,11 +719,6 @@ - Ctrl+L - - - - P&rev @@ -727,11 +734,6 @@ - Ctrl+Shift+L - - - - &Done and Next @@ -909,13 +911,13 @@ - + This is the application's main window. - + Source text @@ -968,39 +970,39 @@ - + Loading... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -1010,20 +1012,20 @@ Skip loading the first named file? - - + + File saved. - - + + Release - + Qt message files for released applications (*.qm) All files (*) @@ -1086,7 +1088,7 @@ All files (*) - + @@ -1098,7 +1100,7 @@ All files (*) - + Cannot find the string '%1'. @@ -1193,27 +1195,7 @@ All files (*) - - Open Source Edition - - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1396,7 +1378,7 @@ All files (*) - + All @@ -1416,7 +1398,7 @@ All files (*) - + Translation File &Settings... @@ -1431,11 +1413,21 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German @@ -1529,7 +1521,7 @@ Line: %2 MessageModel - + Completion status for %1 @@ -1552,7 +1544,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1561,13 +1553,13 @@ Line: %2 PhraseBookBox - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist @@ -1670,7 +1662,7 @@ Line: %2 PhraseModel - + Source phrase @@ -1688,7 +1680,7 @@ Line: %2 PhraseView - + Insert @@ -1716,7 +1708,7 @@ Line: %2 - + Translation files (%1);; @@ -1726,37 +1718,38 @@ Line: %2 - + - + + - + Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -1767,11 +1760,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -1781,15 +1774,20 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> @@ -1932,7 +1930,7 @@ Line: %2 TranslationSettingsDialog - + Any Country diff --git a/translations/linguist_ja.ts b/translations/linguist_ja.ts index 41c24ca..7af3ebb 100644 --- a/translations/linguist_ja.ts +++ b/translations/linguist_ja.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -18,7 +19,7 @@ AboutDialog - + Qt Linguist Qt Linguist @@ -30,7 +31,7 @@ %1 é …ç›®ãŒä¸€æ‹¬ç¿»è¨³ã•ã‚Œã¾ã—㟠- + &Cancel キャンセル(&C) @@ -135,7 +136,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -155,10 +156,21 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + EditorPage @@ -186,7 +198,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. 訳ã«ä½™åˆ†ãªã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ãŒã¤ã„ã¦ã„ã¾ã™ã€‚ @@ -373,7 +385,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -507,9 +519,8 @@ Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -552,9 +563,8 @@ Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -838,13 +848,13 @@ ソート順åºã‚’åˆæœŸçŠ¶æ…‹ã«(&R) - + This is the application's main window. - + Source text ソーステキスト @@ -897,39 +907,39 @@ - + Loading... ロードã—ã¦ã„ã¾ã™... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -939,20 +949,20 @@ Skip loading the first named file? - - + + File saved. ファイルãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚ - - + + Release リリース - + Qt message files for released applications (*.qm) All files (*) リリースã•ã‚ŒãŸã‚¢ãƒ—リケーション用㮠Qt メッセージファイル (*.qm) @@ -1016,7 +1026,7 @@ All files (*) - + @@ -1028,7 +1038,7 @@ All files (*) Qt Linguist - + Cannot find the string '%1'. 文字列 '%1' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 @@ -1134,27 +1144,19 @@ All files (*) ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 - Open Source Edition - オープンソース版 + オープンソース版 - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Linguist ã¯ã€ オープンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <tt>http://qtsoftware.com/company/model.html</tt> ã‚’ã”覧ãã ã•ã„。 - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - + ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Qt Linguist ã¯ã€ オープンソースアプリケーションを開発ã™ã‚‹ãŸã‚ã® Qt オープンソース版ã®ä¸€éƒ¨ã§ã™ã€‚Qt ã¯ã€ã‚¯ãƒ­ã‚¹ãƒ—ラットフォームãªã‚¢ãƒ—リケーションを開発ã™ã‚‹ãŸã‚ã®åŒ…括的㪠C++ ã®ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚<br/><br/>独å çš„ãªï¼ˆã‚½ãƒ¼ã‚¹ãŒéš ã•ã‚ŒãŸï¼‰ã‚¢ãƒ—リケーションを開発ã™ã‚‹ã«ã¯ã€Qt ã®å•†ç”¨ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚Qt ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã®æ¦‚è¦ã«ã¤ã„ã¦ã¯ <tt>http://qtsoftware.com/company/model.html</tt> ã‚’ã”覧ãã ã•ã„。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。 + ã“ã®ãƒ—ログラムã¯ã€Qt 商用ライセンス契約書ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§ã‚ãªãŸã®åˆ©ç”¨ãŒèªã‚られã¦ã„ã¾ã™ã€‚詳細ã¯ã€ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¨ä¸€ç·’ã«é…布ã•ã‚Œã‚‹ LICENSE ファイルをå‚ç…§ã—ã¦ãã ã•ã„。 - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist ã¯ã€Qt アプリケーションã®ç¿»è¨³ã‚’è¡Œã†ãƒ„ールã§ã™ã€‚</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). å…¨ã¦ã®æ¨©åˆ©ã¯ä¿è­·ã•ã‚Œã¦ã„ã¾ã™ã€‚</p><p>ã“ã®ãƒ—ログラムã¯ã€ã€Œè¨­è¨ˆã€ã€ã€Œå¸‚場性ã€ãŠã‚ˆã³ã€Œç‰¹å®šã®ç›®çš„ã¸ã®é©åˆæ€§ã€ã‚‚å«ã‚€ã€ã‚らゆる種類ã®ã€Œä¿è¨¼ãŒãªãã€ã€ã€Œãã®ã¾ã¾ã§ã€æä¾›ã•ã‚Œã¾ã™ã€‚</p> @@ -1320,7 +1322,7 @@ All files (*) - + All @@ -1409,7 +1411,7 @@ All files (*) ツール(&L) - + Translation 翻訳 @@ -1645,6 +1647,16 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1693,7 +1705,7 @@ All files (*) タブ - + German @@ -1807,7 +1819,7 @@ Line: %2 項目数 - + Completion status for %1 @@ -1837,7 +1849,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1973,7 +1985,7 @@ Line: %2 訳(&T): - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1982,7 +1994,7 @@ Line: %2 PhraseModel - + Definition 定義 @@ -2000,7 +2012,7 @@ Line: %2 PhraseView - + Insert @@ -2028,7 +2040,7 @@ Line: %2 - + Translation files (%1);; @@ -2038,37 +2050,38 @@ Line: %2 - + - + + - + Qt Linguist Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -2079,11 +2092,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -2093,10 +2106,15 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2127,7 +2145,7 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> @@ -2688,7 +2706,7 @@ All files (*) TranslationSettingsDialog - + Any Country 指定ã—ãªã„ diff --git a/translations/linguist_pl.ts b/translations/linguist_pl.ts index 12b98d5..efed849 100644 --- a/translations/linguist_pl.ts +++ b/translations/linguist_pl.ts @@ -1,10 +1,10 @@ - - + + - + (New Entry) (Nowe wyrażenie) @@ -12,7 +12,7 @@ AboutDialog - + Qt Linguist Qt Linguist @@ -20,7 +20,7 @@ BatchTranslationDialog - + Batch translated %n entries Automat przetÅ‚umaczyÅ‚ %n wpis @@ -112,7 +112,7 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>Znaleziono powtórzenia w '%1': @@ -132,15 +132,26 @@ <br>* Komentarz: %3 - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 Nie można utworzyć '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. Prawdopodobnie nadmiarowy klawisz skrótu w tÅ‚umaczeniu. @@ -277,7 +288,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -406,9 +417,8 @@ Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -451,9 +461,8 @@ Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -676,13 +685,13 @@ Zamienia tÅ‚umaczenia we wszystkich pasujÄ…cych do wzorca wpisach. - + This is the application's main window. - + Source text Tekst źródÅ‚owy @@ -735,18 +744,18 @@ MOD - + Loading... Åadowanie... + - Loading File - Qt Linguist Wczytywanie pliku - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -755,7 +764,7 @@ Close the open file(s) first? Czy chcesz najpierw zamknąć otwarty plik (pliki)? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -764,7 +773,7 @@ Skip loading the first named file? Czy chcesz pominąć pierwszy plik? - + %n translation unit(s) loaded. ZaÅ‚adowano %n część z tÅ‚umaczeniami. @@ -773,7 +782,7 @@ Czy chcesz pominąć pierwszy plik? - + Related files (%1);; ZwiÄ…zane pliki (%1);; @@ -783,20 +792,20 @@ Czy chcesz pominąć pierwszy plik? Otwórz pliki z tÅ‚umaczeniami - - + + File saved. Plik zachowany. - - + + Release Wydaj - + Qt message files for released applications (*.qm) All files (*) Pliki z wydanymi tÅ‚umaczeniami (*.qm) @@ -860,7 +869,7 @@ Wszystkie pliki (*) - + @@ -872,7 +881,7 @@ Wszystkie pliki (*) Qt Linguist - + Cannot find the string '%1'. Nie można znaleźć tekstu '%1'. @@ -984,27 +993,19 @@ Wszystkie pliki (*) Wersja %1 - Open Source Edition - Wydanie Open Source + Wydanie Open Source - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - Ta wersja Qt Linguist jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. + Ta wersja Qt Linguist jest częściÄ… wydania Qt Open Source, przeznaczonego do tworzenia aplikacji Open Source. Qt zawiera obszerny zestaw bibliotek wykorzystywanych do pisania przenoÅ›nych aplikacji.<br/><br/>Aby móc tworzyć przy pomocy Qt wÅ‚asne aplikacje bez publikowania kodu (closed source) potrzebujesz wydania komercyjnego. Opis sposobów licencjonowania Qt znajduje siÄ™ na stronie <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a>. - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - Ten program wydany jest na licencji Qt Commercial. Aby sprawdzić szczegóły licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czany jest do pakietu Qt. + Ten program wydany jest na licencji Qt Commercial. Aby sprawdzić szczegóły licencji, proszÄ™ sprawdzić plik LICENSE, który doÅ‚Ä…czany jest do pakietu Qt. - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1170,7 +1171,7 @@ Wszystkie pliki (*) Czy chcesz zachować książke wyrażeÅ„ '%1'? - + All Wszystko @@ -1240,7 +1241,7 @@ Wszystkie pliki (*) &TÅ‚umaczenie - + Translation TÅ‚umaczenie @@ -1468,11 +1469,21 @@ Wszystkie pliki (*) Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. PrzeÅ‚Ä…cz sprawdzanie zgodnoÅ›ci znaczników, tzn. czy: %1, %2, ... sÄ… spójnie użyte w tekÅ›cie źródÅ‚owym i tÅ‚umaczeniu. W przypadku niezgodnoÅ›ci pojawia siÄ™ komunikat w oknie z ostrzeżeniami. + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German Niemieckie @@ -1567,7 +1578,7 @@ Linia: %2 MessageModel - + Completion status for %1 Stan ukoÅ„czenia dla %1 @@ -1590,7 +1601,7 @@ Linia: %2 MsgEdit - + This is the right panel of the main window. @@ -1699,7 +1710,7 @@ Linia: %2 &TÅ‚umaczenie: - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1708,7 +1719,7 @@ Linia: %2 PhraseModel - + Definition Definicja @@ -1726,7 +1737,7 @@ Linia: %2 PhraseView - + Insert Wstaw @@ -1754,7 +1765,7 @@ Linia: %2 Skompilowane tÅ‚umaczenia Qt - + Translation files (%1);; Pliki z tÅ‚umaczeniami (%1);; @@ -1764,37 +1775,38 @@ Linia: %2 Wszystkie pliki (*) - + - + + - + Qt Linguist Qt Linguist - + C++ source files Pliki źródÅ‚owe C++ - + Java source files Pliki źródÅ‚owe Java - + GNU Gettext localization files Pliki GNU Gettext - + Qt Script source files Pliki źródÅ‚owe Qt Script - + Qt translation sources (format 1.1) ŹródÅ‚a tlumaczeÅ„ Qt (format 1.1) @@ -1805,11 +1817,15 @@ Linia: %2 + Qt translation sources (latest format) + + + Qt translation sources - ŹródÅ‚a tlumaczeÅ„ Qt + ŹródÅ‚a tlumaczeÅ„ Qt - + Qt Designer form files Pliki z formularzami Qt Designer @@ -1819,15 +1835,20 @@ Linia: %2 Pliki z formularzami Qt Jambi - + XLIFF localization files Pliki XLIFF + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> <i>Kod źródÅ‚owy nie jest dostÄ™pny</i> @@ -1970,7 +1991,7 @@ Linia: %2 TranslationSettingsDialog - + Any Country Dowolny kraj diff --git a/translations/linguist_tr_TR.ts b/translations/linguist_tr_TR.ts new file mode 100644 index 0000000..1a1baa8 --- /dev/null +++ b/translations/linguist_tr_TR.ts @@ -0,0 +1,1955 @@ + + + + + + + + (New Entry) + + + + + AboutDialog + + + Qt Linguist + + + + + BatchTranslationDialog + + + Qt Linguist - Batch Translation + + + + + Options + + + + + Set translated entries to finished + + + + + Retranslate entries with existing translation + + + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. + + + + + Translate also finished entries + + + + + Phrase book preference + + + + + Move up + + + + + Move down + + + + + The batch translator will search through the selected phrase books in the order given above. + + + + + &Run + + + + + Cancel + + + + + Batch Translation of '%1' - Qt Linguist + + + + + Searching, please wait... + + + + + &Cancel + + + + + Linguist batch translator + + + + + Batch translated %n entries + + + + + + + DataModel + + + <qt>Duplicate messages found in '%1': + + + + + <p>[more duplicates omitted] + + + + + <p>* Context: %1<br>* Source: %2 + + + + + <br>* Comment: %3 + + + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + + Cannot create '%2': %1 + + + + + Universal Form + + + + + ErrorsView + + + Accelerator possibly superfluous in translation. + + + + + Accelerator possibly missing in translation. + + + + + Translation does not end with the same punctuation as the source text. + + + + + A phrase book suggestion for '%1' was ignored. + + + + + Translation does not refer to the same place markers as in the source text. + + + + + Translation does not contain the necessary %n place marker. + + + + + Unknown error + + + + + FindDialog + + + + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + + + + + Find + + + + + This window allows you to search for some text in the translation source file. + + + + + &Find what: + + + + + Type in the text to search for. + + + + + Options + + + + + Source texts are searched when checked. + + + + + &Source texts + + + + + Translations are searched when checked. + + + + + &Translations + + + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + + + + + &Match case + + + + + Comments and contexts are searched when checked. + + + + + &Comments + + + + + Ignore &accelerators + + + + + Click here to find the next occurrence of the text you typed in. + + + + + Find Next + + + + + Click here to close this window. + + + + + Cancel + + + + + LRelease + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + + + + + + + Ignored %n untranslated source text(s) + + + + + + + + MainWindow + + + + This is the application's main window. + + + + + Source text + + + + + + Index + + + + + + Context + + + + + Items + + + + + This panel lists the source contexts. + + + + + Strings + + + + + Phrases and guesses + + + + + Sources and Forms + + + + + Warnings + + + + + MOD + status bar: file(s) modified + + + + + Loading... + + + + + + Loading File - Qt Linguist + + + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + + + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + + + + + %n translation unit(s) loaded. + + + + + + + Related files (%1);; + + + + + Open Translation Files + + + + + + File saved. + + + + + + + Release + + + + + Qt message files for released applications (*.qm) +All files (*) + + + + + + File created. + + + + + + Printing... + + + + + Context: %1 + + + + + finished + + + + + unresolved + + + + + obsolete + + + + + + Printing... (page %1) + + + + + + Printing completed + + + + + + Printing aborted + + + + + Search wrapped. + + + + + + + + + + + + + + Qt Linguist + + + + + + Cannot find the string '%1'. + + + + + Search And Translate in '%1' - Qt Linguist + + + + + + + Translate - Qt Linguist + + + + + Translated %n entry(s) + + + + + + + No more occurrences of '%1'. Start over? + + + + + Create New Phrase Book + + + + + Qt phrase books (*.qph) +All files (*) + + + + + Phrase book created. + + + + + Open Phrase Book + + + + + Qt phrase books (*.qph);;All files (*) + + + + + %n phrase(s) loaded. + + + + + + + + + Add to phrase book + + + + + No appropriate phrasebook found. + + + + + Adding entry to phrasebook %1 + + + + + Select phrase book to add to + + + + + Unable to launch Qt Assistant (%1) + + + + + Version %1 + + + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + + + + + Do you want to save the modified files? + + + + + Do you want to save '%1'? + + + + + Qt Linguist[*] + + + + + %1[*] - Qt Linguist + + + + + + No untranslated translation units left. + + + + + &Window + + + + + Minimize + + + + + Ctrl+M + + + + + Display the manual for %1. + + + + + Display information about %1. + + + + + &Save '%1' + + + + + Save '%1' &As... + + + + + Release '%1' + + + + + Release '%1' As... + + + + + &Close '%1' + + + + + + &Save + + + + + + + Save &As... + + + + + + + Release As... + + + + + + &Close + + + + + Save All + + + + + + &Release All + + + + + Close All + + + + + &Release + + + + + Translation File &Settings for '%1'... + + + + + &Batch Translation of '%1'... + + + + + Search And &Translate in '%1'... + + + + + + Translation File &Settings... + + + + + + &Batch Translation... + + + + + Search And &Translate... + + + + + + File + + + + + + Edit + + + + + + Translation + + + + + + Validation + + + + + + Help + + + + + Cannot read from phrase book '%1'. + + + + + Close this phrase book. + + + + + Enables you to add, modify, or delete entries in this phrase book. + + + + + Print the entries in this phrase book. + + + + + Cannot create phrase book '%1'. + + + + + Do you want to save phrase book '%1'? + + + + + All + + + + + MainWindow + + + + + &Phrases + + + + + &Close Phrase Book + + + + + &Edit Phrase Book + + + + + &Print Phrase Book + + + + + V&alidation + + + + + &View + + + + + Vie&ws + + + + + &Toolbars + + + + + &Help + + + + + &Translation + + + + + &File + + + + + Recently Opened &Files + + + + + &Edit + + + + + &Open... + + + + + Open a Qt translation source file (TS file) for editing + + + + + Ctrl+O + + + + + E&xit + + + + + Close this window and exit. + + + + + Ctrl+Q + + + + + Save + + + + + Save changes made to this Qt translation source file + + + + + Save As... + + + + + Save changes made to this Qt translation source file into a new file. + + + + + Create a Qt message file suitable for released applications from the current message file. + + + + + &Print... + + + + + Print a list of all the translation units in the current translation source file. + + + + + Ctrl+P + + + + + &Undo + + + + + Undo the last editing operation performed on the current translation. + + + + + Ctrl+Z + + + + + &Redo + + + + + Redo an undone editing operation performed on the translation. + + + + + Ctrl+Y + + + + + Cu&t + + + + + Copy the selected translation text to the clipboard and deletes it. + + + + + Ctrl+X + + + + + &Copy + + + + + Copy the selected translation text to the clipboard. + + + + + Ctrl+C + + + + + &Paste + + + + + Paste the clipboard text into the translation. + + + + + Ctrl+V + + + + + Select &All + + + + + Select the whole translation text. + + + + + Ctrl+A + + + + + &Find... + + + + + Search for some text in the translation source file. + + + + + Ctrl+F + + + + + Find &Next + + + + + Continue the search where it was left. + + + + + F3 + + + + + &Prev Unfinished + + + + + Previous unfinished item. + + + + + Move to the previous unfinished item. + + + + + Ctrl+K + + + + + &Next Unfinished + + + + + Next unfinished item. + + + + + Move to the next unfinished item. + + + + + Ctrl+J + + + + + P&rev + + + + + Move to previous item. + + + + + Move to the previous item. + + + + + Ctrl+Shift+K + + + + + Ne&xt + + + + + Next item. + + + + + Move to the next item. + + + + + Ctrl+Shift+J + + + + + &Done and Next + + + + + Mark item as done and move to the next unfinished item. + + + + + Mark this item as done and move to the next unfinished item. + + + + + Copy from source text + + + + + Copies the source text into the translation field. + + + + + Ctrl+B + + + + + &Accelerators + + + + + Toggle the validity check of accelerators. + + + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + + + + + &Ending Punctuation + + + + + Toggle the validity check of ending punctuation. + + + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + + + + + &Phrase matches + + + + + Toggle checking that phrase suggestions are used. + + + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + + + + + Place &Marker Matches + + + + + Toggle the validity check of place markers. + + + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + + + + + &New Phrase Book... + + + + + Create a new phrase book. + + + + + Ctrl+N + + + + + &Open Phrase Book... + + + + + Open a phrase book to assist translation. + + + + + Ctrl+H + + + + + &Reset Sorting + + + + + Sort the items back in the same order as in the message file. + + + + + &Display guesses + + + + + Set whether or not to display translation guesses. + + + + + &Statistics + + + + + Display translation statistics. + + + + + &Manual + + + + + F1 + + + + + About Qt Linguist + + + + + About Qt + + + + + Display information about the Qt toolkit by Trolltech. + + + + + &What's This? + + + + + What's This? + + + + + Enter What's This? mode. + + + + + Shift+F1 + + + + + &Search And Translate... + + + + + Replace the translation on all entries that matches the search source text. + + + + + Batch translate all entries using the information in the phrase books. + + + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. + + + + + Open/Refresh Form &Preview + + + + + Form Preview Tool + + + + + F5 + + + + + &Add to Phrase Book + + + + + Ctrl+T + + + + + Open Read-O&nly... + + + + + &Save All + + + + + Ctrl+S + + + + + Close + + + + + &Close All + + + + + Ctrl+W + + + + + MessageEditor + + + German + + + + + Japanese + + + + + French + + + + + Polish + + + + + Chinese + + + + + This whole panel allows you to view and edit the translation of some source text. + + + + + Source text + + + + + This area shows the source text. + + + + + Source text (Plural) + + + + + This area shows the plural form of the source text. + + + + + Developer comments + + + + + This area shows a comment that may guide you, and the context in which the text occurs. + + + + + Here you can enter comments for your own use. They have no effect on the translated applications. + + + + + %1 translation (%2) + + + + + This is where you can enter or modify the translation of the above source text. + + + + + %1 translation + + + + + %1 translator comments + + + + + '%1' +Line: %2 + + + + + MessageModel + + + Completion status for %1 + + + + + <file header> + + + + + <context comment> + + + + + <unnamed context> + + + + + MsgEdit + + + + This is the right panel of the main window. + + + + + PhraseBookBox + + + + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + + + + + %1[*] - Qt Linguist + + + + + Qt Linguist + + + + + Cannot save phrase book '%1'. + + + + + Edit Phrase Book + + + + + This window allows you to add, modify, or delete entries in a phrase book. + + + + + &Translation: + + + + + This is the phrase in the target language corresponding to the source phrase. + + + + + S&ource phrase: + + + + + This is a definition for the source phrase. + + + + + This is the phrase in the source language. + + + + + &Definition: + + + + + Click here to add the phrase to the phrase book. + + + + + &New Entry + + + + + Click here to remove the entry from the phrase book. + + + + + &Remove Entry + + + + + Settin&gs... + + + + + Click here to save the changes made. + + + + + &Save + + + + + Click here to close this window. + + + + + Close + + + + + PhraseModel + + + Source phrase + + + + + Translation + + + + + Definition + + + + + PhraseView + + + Insert + + + + + Edit + + + + + Guess (%1) + + + + + Guess + + + + + QObject + + + Translation files (%1);; + + + + + All files (*) + + + + + + + + + + + Qt Linguist + + + + + C++ source files + + + + + Java source files + + + + + GNU Gettext localization files + + + + + Compiled Qt translations + + + + + Qt Linguist 'Phrase Book' + + + + + Qt Script source files + + + + + Qt translation sources (format 1.1) + + + + + Qt translation sources (format 2.0) + + + + + Qt translation sources (latest format) + + + + + Qt Designer form files + + + + + Qt Jambi form files + + + + + XLIFF localization files + + + + + SourceCodeView + + + <i>Source code not available</i> + + + + + <i>File %1 not available</i> + + + + + <i>File %1 not readable</i> + + + + + Statistics + + + Statistics + + + + + Close + + + + + Translation + + + + + Source + + + + + 0 + + + + + Words: + + + + + Characters: + + + + + Characters (with spaces): + + + + + TranslateDialog + + + This window allows you to search for some text in the translation source file. + + + + + Type in the text to search for. + + + + + Find &source text: + + + + + &Translate to: + + + + + Search options + + + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + + + + + Match &case + + + + + Mark new translation as &finished + + + + + Click here to find the next occurrence of the text you typed in. + + + + + Find Next + + + + + Translate + + + + + Translate All + + + + + Click here to close this window. + + + + + Cancel + + + + + TranslationSettingsDialog + + + Source language + + + + + Language + + + + + Country/Region + + + + + Target language + + + + + Any Country + + + + + + Settings for '%1' - Qt Linguist + + + + diff --git a/translations/linguist_untranslated.ts b/translations/linguist_untranslated.ts index 5690378..ae3ff20 100644 --- a/translations/linguist_untranslated.ts +++ b/translations/linguist_untranslated.ts @@ -1,9 +1,10 @@ - + + - + (New Entry) @@ -11,7 +12,7 @@ AboutDialog - + Qt Linguist @@ -19,7 +20,7 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist @@ -109,7 +110,7 @@ DataModel - + <qt>Duplicate messages found in '%1': @@ -129,15 +130,26 @@ - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 + + + Universal Form + + ErrorsView - + Accelerator possibly superfluous in translation. @@ -274,7 +286,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -572,11 +584,6 @@ - Ctrl+L - - - - P&rev @@ -592,11 +599,6 @@ - Ctrl+Shift+L - - - - &Done and Next @@ -743,13 +745,13 @@ - + This is the application's main window. - + Source text @@ -802,39 +804,39 @@ - + Loading... + - Loading File - Qt Linguist - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? - + %n translation unit(s) loaded. - + Related files (%1);; @@ -844,20 +846,20 @@ Skip loading the first named file? - - + + File saved. - - + + Release - + Qt message files for released applications (*.qm) All files (*) @@ -920,7 +922,7 @@ All files (*) - + @@ -932,7 +934,7 @@ All files (*) - + Cannot find the string '%1'. @@ -1027,27 +1029,7 @@ All files (*) - - Open Source Edition - - - - - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - - - - - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - - - - - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - - - - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> @@ -1230,7 +1212,7 @@ All files (*) - + All @@ -1410,7 +1392,7 @@ All files (*) - + &Batch Translation... @@ -1431,11 +1413,21 @@ All files (*) Ctrl+T + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor - + German @@ -1529,7 +1521,7 @@ Line: %2 MessageModel - + Completion status for %1 @@ -1552,7 +1544,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1661,7 +1653,7 @@ Line: %2 - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. @@ -1670,7 +1662,7 @@ Line: %2 PhraseModel - + Source phrase @@ -1688,7 +1680,7 @@ Line: %2 PhraseView - + Insert @@ -1716,7 +1708,7 @@ Line: %2 - + Translation files (%1);; @@ -1726,37 +1718,38 @@ Line: %2 - + - + + - + Qt Linguist - + C++ source files - + Java source files - + GNU Gettext localization files - + Qt Script source files - + Qt translation sources (format 1.1) @@ -1767,11 +1760,11 @@ Line: %2 - Qt translation sources + Qt translation sources (latest format) - + Qt Designer form files @@ -1781,15 +1774,20 @@ Line: %2 - + XLIFF localization files + + + Qt Linguist 'Phrase Book' + + SourceCodeView - + <i>Source code not available</i> @@ -1932,7 +1930,7 @@ Line: %2 TranslationSettingsDialog - + Any Country diff --git a/translations/linguist_zh_CN.ts b/translations/linguist_zh_CN.ts index a9ecdb6..3a81543 100644 --- a/translations/linguist_zh_CN.ts +++ b/translations/linguist_zh_CN.ts @@ -1,7 +1,6 @@ - @@ -9,7 +8,7 @@ (新短语) - + (New Entry) (新æ¡ç›®ï¼‰ @@ -17,7 +16,7 @@ AboutDialog - + Qt Linguist Qt 语言家 @@ -25,7 +24,7 @@ BatchTranslationDialog - + Batch translated %n entries å·²ç»æ‰¹ç¿»è¯‘ %n 个æ¡ç›® @@ -115,7 +114,7 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>在“%1â€ä¸­æ‰¾åˆ°çš„é‡å¤ä¿¡æ¯ï¼š @@ -135,10 +134,21 @@ <br>* 注释:%3 - + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 ä¸èƒ½åˆ›å»º'%2': %1 + + + Universal Form + + EditorPage @@ -198,7 +208,7 @@ ErrorsView - + Accelerator possibly superfluous in translation. 译文中å¯èƒ½åŠ é€Ÿé”®è¿‡å¤šã€‚ @@ -342,7 +352,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -538,9 +548,8 @@ p, li { white-space: pre-wrap; } Ctrl+K - Ctrl+L - Ctrl+L + Ctrl+L @@ -583,9 +592,8 @@ p, li { white-space: pre-wrap; } Ctrl+Shift+K - Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L @@ -816,13 +824,13 @@ p, li { white-space: pre-wrap; } 替æ¢æ‰€æœ‰å’Œæœç´¢çš„æºæ–‡åŒ¹é…çš„æ¡ç›®çš„译文。 - + This is the application's main window. - + Source text æºæ–‡ @@ -875,18 +883,18 @@ p, li { white-space: pre-wrap; } 已修改 - + Loading... 正在载入... + - Loading File - Qt Linguist 正在载入文件 - Qt 语言家 - + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -895,7 +903,7 @@ Close the open file(s) first? è¦å°†æ‰“开的文件先关闭么? - + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -904,14 +912,14 @@ Skip loading the first named file? è¦è·³è¿‡å¯¹ç¬¬ä¸€ä¸ªæ–‡ä»¶çš„加载么? - + %n translation unit(s) loaded. %n 个翻译å•å…ƒå·²ç»è¢«åŠ è½½ã€‚ - + Related files (%1);; 相关文件(%1);; @@ -921,20 +929,20 @@ Skip loading the first named file? 打开翻译文件 - - + + File saved. 文件已ä¿å­˜ã€‚ - - + + Release å‘布 - + Qt message files for released applications (*.qm) All files (*) 用于å‘布应用程åºçš„ Qt 消æ¯æ–‡ä»¶ (*.qm) @@ -998,7 +1006,7 @@ All files (*) - + @@ -1010,7 +1018,7 @@ All files (*) Qt 语言家 - + Cannot find the string '%1'. 无法找到字符串“%1â€ã€‚ @@ -1116,27 +1124,23 @@ All files (*) %1 版本 - Open Source Edition - å¼€æºç‰ˆæœ¬ + å¼€æºç‰ˆæœ¬ - This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - 这个版本的 Qt 语言家是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/model.html</tt>。 + 这个版本的 Qt 语言家是 Qt å¼€æºç‰ˆæœ¬çš„一部分,用于开å‘å¼€æºåº”用程åºã€‚Qt 是一个用于跨平å°åº”用程åºå¼€å‘çš„ç»¼åˆ C++ 框架。<br/><br/>å¼€å‘商业(闭æºï¼‰åº”用程åºï¼Œä½ éœ€è¦å•†ä¸š Qt 许å¯ã€‚对于 Qt 许å¯çš„概览,请å‚考<tt>http://qtsoftware.com/company/model.html</tt>。 - This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的å议文件。 + 我们已ç»å…许您在 Qt %1 许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的å议文件。 - This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 + 我们已ç»å…许您在 Qt 商业许å¯å议下使用本程åºã€‚有关细节,请阅读本软件å‘行中所带的 LICENSE 文件。 - + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt 语言家是一个用于为 Qt 应用程åºæ·»åŠ ç¿»è¯‘的工具。</p><p>%2</p><p>版æƒæ‰€æœ‰ (C) 2000-$THISYEAR$ Nokiaå…¬å¸å’Œ/或它的å­å…¬å¸ã€‚所有æƒåˆ©å·²è¢«ä¿ç•™ã€‚</p><p>本程åºæ˜¯åœ¨<b>没有任何担ä¿ï¼ˆå…¶ä¸­åŒ…括任何特定目的的设计ã€å•†ä¸šå’Œé€‚当性的担ä¿ï¼‰</b>çš„æ¡ä»¶ä¸‹æ供的。</p> @@ -1302,7 +1306,7 @@ All files (*) 是å¦ä¿å­˜çŸ­è¯­ä¹¦'%1'? - + All 全部 @@ -1376,7 +1380,7 @@ All files (*) 译文(&T) - + Translation 译文 @@ -1624,6 +1628,16 @@ All files (*) Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. 切æ¢ç»“æŸæ ‡ç‚¹æœ‰æ•ˆæ€§æ£€æŸ¥ã€‚如果检查失败,会在警告窗å£ä¸­æ˜¾ç¤ºä¸€æ¡æ¶ˆæ¯ã€‚ + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1652,7 +1666,7 @@ All files (*) 制表符 - + German 德语 @@ -1762,7 +1776,7 @@ Line: %2 索引 - + Completion status for %1 %1 的完æˆçŠ¶æ€ @@ -1792,7 +1806,7 @@ Line: %2 MsgEdit - + This is the right panel of the main window. @@ -1801,13 +1815,13 @@ Line: %2 PhraseBookBox - + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - + %1[*] - Qt Linguist %1[*] - Qt 语言家 @@ -1930,7 +1944,7 @@ Line: %2 PhraseModel - + Definition 准确度 @@ -1948,7 +1962,7 @@ Line: %2 PhraseView - + Insert æ’å…¥ @@ -1976,7 +1990,7 @@ Line: %2 已编译的 Qt 翻译 - + Translation files (%1);; 翻译文件(%1);; @@ -1986,37 +2000,38 @@ Line: %2 全部文件(*) - + - + + - + Qt Linguist Qt 语言家 - + C++ source files C++æºæ–‡ä»¶ - + Java source files Javaæºæ–‡ä»¶ - + GNU Gettext localization files GNU Gettext 本地化文件 - + Qt Script source files Qt脚本æºæ–‡ä»¶ - + Qt translation sources (format 1.1) Qt翻译æºï¼ˆæ ¼å¼1.1) @@ -2027,11 +2042,15 @@ Line: %2 + Qt translation sources (latest format) + + + Qt translation sources - Qtç¿»è¯‘æº + Qtç¿»è¯‘æº - + Qt Designer form files Qt设计师表å•æ–‡ä»¶ @@ -2041,10 +2060,15 @@ Line: %2 Qt Jambi表å•æ–‡ä»¶ - + XLIFF localization files XLIFF 本地化文件 + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -2083,7 +2107,7 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> <i>æºä»£ç ä¸å¯ç”¨</i> @@ -2651,7 +2675,7 @@ XLIFF 本地化文件 (*.xlf) TranslationSettingsDialog - + Any Country ä»»æ„国家 diff --git a/translations/linguist_zh_TW.ts b/translations/linguist_zh_TW.ts index 47aff95..7bb7e57 100644 --- a/translations/linguist_zh_TW.ts +++ b/translations/linguist_zh_TW.ts @@ -1,6 +1,6 @@ - - + + @@ -8,7 +8,7 @@ (新片語) - + (New Entry) (新項目) @@ -23,7 +23,7 @@ AboutDialog - + Qt Linguist Qt 語言家 @@ -31,73 +31,89 @@ BatchTranslationDialog - + Batch Translation of '%1' - Qt Linguist 批次翻譯 %1 ─ Qt 語言家 + Searching, please wait... æœå°‹ä¸­ï¼Œè«‹ç¨å€™... + &Cancel å–消(&C) + Linguist batch translator 語言家批次翻譯器 + Batch translated %n entries 已批次翻譯 %n 個æ¢ç›® + Qt Linguist - Batch Translation Qt 語言家─批次翻譯 + Options é¸é … + Set translated entries to finished 將已翻譯æ¢ç›®è¨­ç‚ºå®Œæˆ + Retranslate entries with existing translation 以ç¾æœ‰çš„翻譯來é‡æ–°ç¿»è­¯é …ç›® + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. 注æ„,若上述的「將已翻譯æ¢ç›®è¨­ç‚ºå®Œæˆã€æœªè¢«å‹¾é¸ï¼Œå‰‡è®Šæ›´çš„項目將會設為「未完æˆã€ã€‚ + Translate also finished entries 也å°å·²å®Œæˆçš„é …ç›®åšç¿»è­¯ + Phrase book preference 片語書喜好設定 + Move up 上移 + Move down 下移 + The batch translator will search through the selected phrase books in the order given above. 批次翻譯器會ä¾æŒ‡å®šçš„é †åºæœå°‹é¸å–的片語書。 + &Run 執行(&R) + Cancel å–消 @@ -105,26 +121,41 @@ DataModel - + <qt>Duplicate messages found in '%1': <qt>複製在 %1 找到的訊æ¯ï¼š + <p>[more duplicates omitted] <p>[çœç•¥æ›´å¤šè¤‡è£½] + <p>* Context: %1<br>* Source: %2 <p>* 內文:%1<br>* æºç¢¼ï¼š%2 + <br>* Comment: %3 <br>* 註解:%3 + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + + + + Cannot create '%2': %1 無法建立 %2:%1 + + + Universal Form + + EditorPage @@ -196,31 +227,37 @@ ErrorsView - + Accelerator possibly superfluous in translation. 翻譯中的快æ·éµå¯èƒ½éŽå¤šã€‚ + Accelerator possibly missing in translation. 翻譯中的快æ·éµå¯èƒ½æœ‰éºå¤±ã€‚ + Translation does not end with the same punctuation as the source text. 翻譯沒有以與原始訊æ¯ç›¸åŒçš„標點çµæŸã€‚ + A phrase book suggestion for '%1' was ignored. å° %1 的片語書建議已被忽略。 + Translation does not refer to the same place markers as in the source text. 翻譯中使用了原始訊æ¯ä¸­æ²’有的åƒæ•¸ç¬¦ã€‚ + Translation does not contain the necessary %n place marker. 翻譯中未包å«å¿…須的 %n åƒæ•¸ç¬¦ã€‚ + Unknown error 未知的錯誤 @@ -232,6 +269,7 @@ Qt 語言家 + This window allows you to search for some text in the translation source file. 此視窗讓您æœå°‹ç¿»è­¯æºç¢¼æª”中的一些文字。 @@ -240,14 +278,17 @@ è¦æœå°‹çš„文字: + Type in the text to search for. 請輸入è¦æœå°‹çš„文字。 + Options é¸é … + Source texts are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹åŽŸå§‹è¨Šæ¯ä¸­çš„文字。 @@ -256,6 +297,7 @@ 原始訊æ¯æ–‡å­— + Translations are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹å·²ç¿»è­¯çš„文字。 @@ -264,6 +306,7 @@ 翻譯 + Texts such as 'TeX' and 'tex' are considered as different when checked. 勾é¸æ­¤é …目的話,TeX 與 tex 會被èªç‚ºæ˜¯å…©å€‹ä¸åŒçš„字串。 @@ -272,6 +315,7 @@ 符åˆå¤§å°å¯« + Comments and contexts are searched when checked. 勾é¸æ­¤é …目的話,會æœå°‹è¨»è§£èˆ‡å…§æ–‡ã€‚ @@ -280,51 +324,62 @@ 註解 + Click here to find the next occurrence of the text you typed in. 點é¸é€™è£¡ä»¥å°‹æ‰¾ä¸‹ä¸€ç­†ç¬¦åˆçš„字串。 + Find Next 尋找下一個 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 + Cancel å–消 + Find 尋找 + &Find what: 尋找什麼(&F): + &Source texts 來æºæ–‡å­—(&S) + &Translations 翻譯(&T) + &Match case 符åˆå¤§å°å¯«(&M) + &Comments 註解(&C) + Ignore &accelerators 忽略快æ·éµ(&A) - + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog @@ -359,7 +414,7 @@ LRelease - + Generated %n translation(s) (%1 finished and %2 unfinished) @@ -368,6 +423,7 @@ + Ignored %n untranslated source text(s) @@ -462,38 +518,47 @@ p, li { white-space: pre-wrap; } MainWindow + MainWindow 主視窗 + &Phrases 片語(&P) + &Close Phrase Book 關閉片語書(&C) + &Edit Phrase Book 編輯片語書(&E) + &Print Phrase Book 列å°ç‰‡èªžæ›¸(&P) + V&alidation 確èª(&A) + &View 檢視(&V) + Vie&ws 檢視(&W) + &Toolbars 工具列(&T) @@ -502,14 +567,17 @@ p, li { white-space: pre-wrap; } 工具(&L) + &Help 說明(&H) + &Translation 翻譯(&T) + &File 檔案(&F) @@ -518,6 +586,7 @@ p, li { white-space: pre-wrap; } 最近開啟的檔案(&C) + &Edit 編輯(&E) @@ -530,63 +599,80 @@ p, li { white-space: pre-wrap; } é–‹å•Ÿ(&O) + Open a Qt translation source file (TS file) for editing é–‹å•Ÿ Qt 翻譯æºç¢¼æª” (TS 檔) 來編輯 + Ctrl+O Ctrl+Q + E&xit 離開(&X) + Close this window and exit. 關閉視窗並離開。 + Ctrl+Q Ctrl+Q + + &Save 儲存(&S) + Save changes made to this Qt translation source file 儲存å°æ­¤æª”案的變更 + Open Read-O&nly... 以唯讀模å¼é–‹å•Ÿ(&N)... + &Save All 全部儲存(&S) + Ctrl+S Ctrl+S + + + Save &As... å¦å­˜æ–°æª”(&A)... + Save As... å¦å­˜æ–°æª”... + Save changes made to this Qt translation source file into a new file. 將此檔存æˆå¦ä¸€å€‹æª”案。 - + &Release 釋出(&R) + Create a Qt message file suitable for released applications from the current message file. 以目å‰çš„訊æ¯æª”來建立é©ç”¨æ–¼é‡‹å‡ºæ‡‰ç”¨ç¨‹å¼çš„ Qt 訊æ¯æª”。 @@ -599,10 +685,12 @@ p, li { white-space: pre-wrap; } 列å°ç›®å‰ Qt 翻譯æºç¢¼æª”中所有的片語清單。 + Ctrl+P Ctrl+P + &Undo 復原(&U) @@ -611,66 +699,82 @@ p, li { white-space: pre-wrap; } 復原上次的編輯動作。 + Ctrl+Z Ctrl+Z + &Redo é‡åš(&R) + Redo an undone editing operation performed on the translation. é‡åšä¸Šæ¬¡å¾©åŽŸçš„動作。 + Ctrl+Y Ctrl+Y + Cu&t 剪下(&T) + Copy the selected translation text to the clipboard and deletes it. å°‡é¸å–的翻譯文字剪下。 + Ctrl+X Ctrl+X + &Copy 複製(&C) + Copy the selected translation text to the clipboard. 複製所é¸å–的文字到剪貼簿中。 + Ctrl+C Ctrl+C + &Paste 貼上(&P) + Paste the clipboard text into the translation. 將剪貼簿內容貼到翻譯å€ã€‚ + Ctrl+V Ctrl+V + Select &All 全部é¸å–(&A) + Select the whole translation text. é¸æ“‡æ•´å€‹ç¿»è­¯æ–‡å­—。 + Ctrl+A Ctrl+A @@ -679,26 +783,32 @@ p, li { white-space: pre-wrap; } 尋找(&F) + Search for some text in the translation source file. 在翻譯æºç¢¼æª”中尋找文字。 + Ctrl+F Ctrl+F + Find &Next 尋找下一個(&N) + Continue the search where it was left. 繼續尋找下一個。 + F3 F3 + &Prev Unfinished å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®(&P) @@ -707,10 +817,12 @@ p, li { white-space: pre-wrap; } 移到å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Ctrl+K Ctrl+K + &Next Unfinished 下一個未完æˆçš„æ¢ç›®(&N) @@ -720,9 +832,10 @@ p, li { white-space: pre-wrap; } Ctrl+L - Ctrl+L + Ctrl+L + P&rev å‰ä¸€å€‹(&R) @@ -731,10 +844,12 @@ p, li { white-space: pre-wrap; } 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Ctrl+Shift+K Ctrl+Shift+K + Ne&xt 下一個(&X) @@ -744,9 +859,10 @@ p, li { white-space: pre-wrap; } Ctrl+Shift+L - Ctrl+Shift+L + Ctrl+Shift+L + &Done and Next 完æˆä¸¦è·³åˆ°ä¸‹ä¸€å€‹(&D) @@ -759,14 +875,17 @@ p, li { white-space: pre-wrap; } 複製原始訊æ¯(&B) + Copies the source text into the translation field. 將原始訊æ¯è¤‡è£½åˆ°ç¿»è­¯æ¬„ä½ä¸­ã€‚ + Ctrl+B Ctrl+B + &Accelerators å¿«æ·éµ(&A) @@ -775,6 +894,7 @@ p, li { white-space: pre-wrap; } 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ã€‚ + &Ending Punctuation çµæŸçš„標點(&E) @@ -783,14 +903,17 @@ p, li { white-space: pre-wrap; } 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。 + &Phrase matches 片語翻譯建議(&P) + Toggle checking that phrase suggestions are used. 切æ›æ˜¯å¦è¦ä½¿ç”¨ç‰‡èªžç¿»è­¯å»ºè­°ã€‚ + Place &Marker Matches åƒæ•¸ç¬¦è™Ÿ(&M) @@ -803,10 +926,12 @@ p, li { white-space: pre-wrap; } 新增片語書(&N) + Create a new phrase book. 建立新的片語書。 + Ctrl+N Ctrl+N @@ -815,10 +940,12 @@ p, li { white-space: pre-wrap; } 開啟片語書(&O) + Open a phrase book to assist translation. 開啟片語書以å”助翻譯。 + Ctrl+H Ctrl+H @@ -827,18 +954,22 @@ p, li { white-space: pre-wrap; } åå‘排åº(&R) + Sort the items back in the same order as in the message file. ä¾è¨Šæ¯æª”中的順åºåå‘排列。 + &Display guesses 顯示猜測(&D) + Set whether or not to display translation guesses. 設定是å¦è¦é¡¯ç¤ºçŒœæ¸¬çš„翻譯。 + &Statistics 統計(&S) @@ -847,38 +978,47 @@ p, li { white-space: pre-wrap; } 設定是å¦è¦é¡¯ç¤ºç¿»è­¯çµ±è¨ˆã€‚ + &Manual 手冊(&M) + F1 F1 + About Qt Linguist 關於 Qt 語言家 + About Qt 關於 Qt + Display information about the Qt toolkit by Trolltech. 顯示關於 Qt 的資訊。 + &What's This? 這是什麼?(&W) + What's This? 這是什麼? + Enter What's This? mode. 進入「這是什麼?ã€æ¨¡å¼ã€‚ + Shift+F1 Shift+F1 @@ -887,6 +1027,7 @@ p, li { white-space: pre-wrap; } æœå°‹ä¸¦ç¿»è­¯(&S) + Replace the translation on all entries that matches the search source text. 在所有æ¢ç›®ä¸­æœå°‹ï¼Œä¸¦å–代符åˆè€…。 @@ -895,14 +1036,19 @@ p, li { white-space: pre-wrap; } 批次翻譯(&B) + Batch translate all entries using the information in the phrase books. 使用片語書中的資訊來批次翻譯所有的æ¢ç›®ã€‚ + + + Release As... 釋出為... + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. 以目å‰çš„訊æ¯æª”來建立é©ç”¨æ–¼é‡‹å‡ºæ‡‰ç”¨ç¨‹å¼çš„ Qt 訊æ¯æª”。檔å會自動由此檔的å‰é¢ä¸€éƒ¨ä»½ä¾†æ±ºå®šã€‚ @@ -912,55 +1058,71 @@ p, li { white-space: pre-wrap; } + Source text 原始訊æ¯æ–‡å­— + + Index 索引 + + Context 內文 + Items æ¢ç›® + This panel lists the source contexts. æ­¤é¢æ¿åˆ—出æºç¢¼æª”中的內容。 + Strings 字串 + Phrases and guesses 片語與猜測 + Sources and Forms 來æºèˆ‡è¡¨å–® + Warnings 警告 + MOD status bar: file(s) modified 已變更 + Loading... 載入中... + + Loading File - Qt Linguist 載入檔案中 ─ Qt 語言家 + The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -969,6 +1131,7 @@ Close the open file(s) first? è¦å°‡é–‹å•Ÿçš„檔案先關閉嗎? + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -977,78 +1140,114 @@ Skip loading the first named file? è¦è·³éŽè¼‰å…¥ç¬¬ä¸€å€‹æª”案嗎? + %n translation unit(s) loaded. 載入 %n 個翻譯單ä½ã€‚ + Related files (%1);; é—œè¯æª”案(%1);; + Open Translation Files 開啟翻譯檔 + + File saved. 檔案已儲存。 + + + Release 釋出 + Qt message files for released applications (*.qm) All files (*) 釋出的應用程å¼ä½¿ç”¨çš„ Qt 訊æ¯æª” (*.qm) 所有檔案 (*) + + File created. 檔案已建立。 + + Printing... 列å°ä¸­... + Context: %1 內文:%1 + finished å·²å®Œæˆ + unresolved 未解決 + obsolete 已棄用 + + Printing... (page %1) 列å°ä¸­...(第 %1 é ï¼‰ + + Printing completed 列å°å·²å®Œæˆ + + Printing aborted 列å°å·²ä¸­æ­¢ + Search wrapped. æœå°‹æŠ˜å›žã€‚ + + + + + + + + + + Qt Linguist Qt 語言家 + + Cannot find the string '%1'. 無法找到字串 %1。 @@ -1063,244 +1262,311 @@ All files (*) + Search And Translate in '%1' - Qt Linguist 在 %1 å…§æœå°‹ä¸¦ç¿»è­¯ ─ Qt 語言家 + + + Translate - Qt Linguist 翻譯 ─ Qt 語言家 + Translated %n entry(s) 已翻譯 %n 個æ¢ç›® + No more occurrences of '%1'. Start over? 找ä¸åˆ°æ›´å¤šçš„ %1。è¦å¾žé ­é–‹å§‹å—Žï¼Ÿ + Create New Phrase Book 建立新的片語書 + Qt phrase books (*.qph) All files (*) Qt 片語書 (*.qph) 所有檔案 (*) + Phrase book created. 片語書已建立。 + Open Phrase Book 開啟片語書 + Qt phrase books (*.qph);;All files (*) Qt 片語書 (*.qph);;所有檔案 (*) + %n phrase(s) loaded. 已載入 %n 個片語。 + + + Add to phrase book 新增到片語書 + No appropriate phrasebook found. 找ä¸åˆ°åˆé©çš„片語書。 + Adding entry to phrasebook %1 新增項目到片語書 %1 + Select phrase book to add to é¸å–è¦æ–°å¢žåˆ°å“ªå€‹ç‰‡èªžæ›¸ + Unable to launch Qt Assistant (%1) 無法啟動 Qt å°å¹«æ‰‹ï¼ˆ%1) + Version %1 版本 %1 Open Source Edition - 開放æºç¢¼ç‰ˆæœ¬ + 開放æºç¢¼ç‰ˆæœ¬ This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing. - 此版本的 Qt 語言家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚<br/><br/>您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <tt>http://qtsoftware.com/company/model.html</tt>。 + 此版本的 Qt 語言家是 Qt 開放æºç¢¼ç‰ˆæœ¬çš„一部份,åªèƒ½ç”¨æ–¼é–‹ç™¼é–‹æ”¾æºç¢¼çš„應用程å¼ã€‚Qt 為一個跨平å°çš„,強大的 C++ 應用程å¼é–‹ç™¼æ¡†æž¶ã€‚<br/><br/>您需è¦å•†æ¥­ç‰ˆçš„ Qt 授權æ‰èƒ½ç™¼å±•ç§æœ‰ï¼ˆå°é–‰ï¼‰æ‡‰ç”¨ç¨‹å¼è»Ÿé«”。關於 Qt 授權的概è¦ï¼Œè«‹åƒè€ƒ <tt>http://qtsoftware.com/company/model.html</tt>。 This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution. - 此程å¼ä»¥ Qt %1授權åŒæ„書授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt %1授權åŒæ„書授權給您。詳情請åƒç…§ LICENSE 檔。 This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution. - 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + 此程å¼ä»¥ Qt 商業授權åŒæ„書(Qt Commerical License Agreement)授權給您。詳情請åƒç…§ LICENSE 檔。 + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt 語言家是一套新增 Qt 應用程å¼çš„翻譯的工具。</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> + Do you want to save the modified files? 您è¦å„²å­˜å·²è®Šæ›´çš„檔案嗎? + Do you want to save '%1'? 您確定è¦å„²å­˜ %1 嗎? + Qt Linguist[*] Qt 語言家 [*] + %1[*] - Qt Linguist %1 [*] ─ Qt 語言家 + + No untranslated translation units left. 沒有任何未翻譯的翻譯單ä½ã€‚ + &Window 視窗(&W) + Minimize 最å°åŒ– + Ctrl+M Ctrl+M + Display the manual for %1. 顯示 %1 的手冊。 + Display information about %1. 顯示 %1 的資訊。 + &Save '%1' 儲存 '%1' (&S) + Save '%1' &As... å¦å­˜ '%1' 為(&A)... + Release '%1' 釋出 '%1' + Release '%1' As... 釋出 '%1' 為... + &Close '%1' 關閉 '%1'(&C) + + &Close 關閉(&C) + Save All 全部儲存 + + &Release All 全部釋出(&R) + Close All 全部關閉 + Translation File &Settings for '%1'... %1 的翻譯檔設定(&S)... + &Batch Translation of '%1'... %1 的批次翻譯(&B)... + Search And &Translate in '%1'... 在 %1 å…§æœå°‹ä¸¦ç¿»è­¯(&T)... + Search And &Translate... æœå°‹ä¸¦ç¿»è­¯(&T)... + + File 檔案 + + Edit 編輯 + + Translation 翻譯 + + Validation ç¢ºèª + + Help 說明 + Cannot read from phrase book '%1'. 無法從片語書 %1 中讀å–。 + Close this phrase book. 關閉片語書。 + Enables you to add, modify, or delete entries in this phrase book. å…許您從此片語書中新增ã€è®Šæ›´æˆ–移除片語。 + Print the entries in this phrase book. 列å°æ­¤ç‰‡èªžæ›¸ä¸­çš„æ¢ç›®ã€‚ + Cannot create phrase book '%1'. 無法建立片語書 %1。 + Do you want to save phrase book '%1'? 您è¦å„²å­˜ç‰‡èªžæ›¸ %1 嗎? + All 全部 + Open/Refresh Form &Preview é–‹å•Ÿ/刷新表單é è¦½(&P) + Form Preview Tool 表單é è¦½å·¥å…· + F5 F5 @@ -1321,42 +1587,54 @@ All files (*) 最近開啟的檔案(&C) + &Open... é–‹å•Ÿ(&O)... + &Print... 列å°(&P)... + &Find... 尋找(&F)... + &New Phrase Book... 新增片語書(&N)... + &Open Phrase Book... 開啟片語書(&O)... + &Reset Sorting é‡ç½®æŽ’åº(&R) + Display translation statistics. 顯示翻譯統計。 + &Search And Translate... æœå°‹ä¸¦ç¿»è­¯(&S)... + + &Batch Translation... 批次翻譯(&B)... + + Translation File &Settings... 翻譯檔案設定(&S)... @@ -1369,94 +1647,117 @@ All files (*) 編輯è¦é¡¯ç¤ºå“ªä¸€ç¨®èªžè¨€ã€‚ + &Add to Phrase Book 新增到片語書(&A) + Ctrl+T Ctrl+T + Previous unfinished item. å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Recently Opened &Files 最近開啟的檔案(&F) + Save 儲存 + Print a list of all the translation units in the current translation source file. 列å°ç›®å‰ç¿»è­¯æºç¢¼æª”中所有的起翻譯單ä½ã€‚ + Undo the last editing operation performed on the current translation. 復原上次å°ç›®å‰ç¿»è­¯åŸ·è¡Œçš„的編輯動作。 + Move to the previous unfinished item. 移到å‰ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Next unfinished item. 下一個未完æˆçš„æ¢ç›®ã€‚ + Move to the next unfinished item. 移到下一個未完æˆçš„æ¢ç›®ã€‚ + Move to previous item. 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Move to the previous item. 移到å‰ä¸€å€‹æ¢ç›®ã€‚ + Next item. 下一個æ¢ç›®ã€‚ + Move to the next item. 移到下一個æ¢ç›®ã€‚ + Mark item as done and move to the next unfinished item. 標記此æ¢ç›®ç‚ºå®Œæˆï¼Œä¸¦ç§»åˆ°ä¸‹ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Mark this item as done and move to the next unfinished item. 標記此æ¢ç›®ç‚ºå®Œæˆï¼Œä¸¦ç§»åˆ°ä¸‹ä¸€å€‹æœªå®Œæˆçš„æ¢ç›®ã€‚ + Copy from source text è¤‡è£½åŽŸå§‹è¨Šæ¯ + Toggle the validity check of accelerators. 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ã€‚ + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦è¦æª¢æŸ¥å¿«æ·éµæ˜¯å¦æœ‰åŠ å…¥ç¿»è­¯ä¸­ï¼Œä¹Ÿå°±æ˜¯æª¢æŸ¥æºç¢¼ä¸­çš„å¿«æ·éµç¬¦è™Ÿæ•¸é‡èˆ‡ç¿»è­¯æ–‡å­—中是å¦ç›¸åŒã€‚若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of ending punctuation. 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。 + Close 關閉 + &Close All 全部關閉(&C) + Ctrl+W Ctrl+W @@ -1465,21 +1766,35 @@ All files (*) 切æ›æ˜¯å¦è¦æª¢æŸ¥çµæŸçš„標點。若是ä¸ç›¸ç¬¦ï¼Œå‰‡æœƒåœ¨è­¦å‘Šè¦–窗中顯示訊æ¯ã€‚ + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. 切æ›æª¢æŸ¥æ˜¯å¦ä½¿ç”¨å»ºè­°çš„片語。若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of place markers. 切æ›æ˜¯å¦æª¢æŸ¥åƒæ•¸ç¬¦è™Ÿçš„正確性。 + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦æª¢æŸ¥åƒæ•¸ç¬¦è™Ÿçš„正確性。也就是æºç¢¼ä¸­çš„ %1,%2 等是å¦èˆ‡ç¿»è­¯æ–‡å­—中的相符。若是沒有,則會在警告視窗中顯示訊æ¯ã€‚ + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. 切æ›æ˜¯å¦æª¢æŸ¥çµæŸçš„標點。如果檢查çµæžœä¸æ­£ç¢ºï¼Œæœƒåœ¨è­¦å‘Šè¦–窗中顯示訊æ¯ã€‚ + + + Ctrl+J + + + + + Ctrl+Shift+J + + MessageEditor @@ -1520,71 +1835,87 @@ All files (*) 片語與猜測: - + German å¾·æ–‡ + Japanese 日文 + French 法文 + Polish 波蘭文 + Chinese 中文 + This whole panel allows you to view and edit the translation of some source text. 這整個é¢æ¿å¯ä»¥è®“您檢視與編輯æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯檔。 + Source text 原始訊æ¯æ–‡å­— + This area shows the source text. æ­¤å€åŸŸé¡¯ç¤ºåŽŸå§‹è¨Šæ¯æ–‡å­—。 + Source text (Plural) 原始訊æ¯æ–‡å­—(複數型) + This area shows the plural form of the source text. æ­¤å€åŸŸé¡¯ç¤ºåŽŸå§‹è¨Šæ¯æ–‡å­—的複數型。 + Developer comments 開發者æ示 + This area shows a comment that may guide you, and the context in which the text occurs. æ­¤å€åŸŸé¡¯ç¤ºè¨»è§£ï¼Œèªªæ˜Žæ­¤æ–‡å­—的內容å”助您翻譯。 + Here you can enter comments for your own use. They have no effect on the translated applications. 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æ‚¨è‡ªå·±çš„註解。它們ä¸æœƒå°æ‡‰ç”¨ç¨‹å¼çš„訊æ¯é€ æˆå½±éŸ¿ã€‚ + %1 translation (%2) %1 翻譯(%2) + This is where you can enter or modify the translation of the above source text. 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æˆ–變更æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯。 + %1 translation %1 翻譯 + %1 translator comments %1 翻譯註解 @@ -1605,6 +1936,7 @@ All files (*) 您å¯ä»¥åœ¨æ­¤è¼¸å…¥æˆ–變更æŸäº›åŽŸå§‹è¨Šæ¯çš„翻譯。 + '%1' Line: %2 '%1' @@ -1634,19 +1966,22 @@ Line: %2 索引 - + Completion status for %1 %1 的完æˆç‹€æ…‹ + <file header> <檔案標頭> + <context comment> <內文註解> + <unnamed context> <未命å內文> @@ -1680,19 +2015,22 @@ Line: %2 PhraseBookBox - + %1[*] - Qt Linguist %1 [*] ─ Qt 語言家 + Qt Linguist Qt 語言家 + Cannot save phrase book '%1'. 無法儲存片語書 %1。 + Edit Phrase Book 編輯片語書 @@ -1701,26 +2039,32 @@ Line: %2 此視窗讓您å¯ä»¥æ–°å¢žã€è®Šæ›´èˆ‡åˆªé™¤ç‰‡èªžã€‚ + &Translation: 翻譯(&T): + This is the phrase in the target language corresponding to the source phrase. 這是跟原始訊æ¯ç›¸é—œçš„目標語言的片語。 + S&ource phrase: 原始訊æ¯ç‰‡èªž(&O): + This is a definition for the source phrase. 這是原始訊æ¯ç‰‡èªžçš„定義。 + This is the phrase in the source language. 這是原始語言的片語。 + &Definition: 定義(&D): @@ -1729,6 +2073,7 @@ Line: %2 新增片語(&N) + Click here to add the phrase to the phrase book. 點é¸é€™è£¡å°‡ç‰‡èªžæ–°å¢žåˆ°ç‰‡èªžæ›¸ä¸­ã€‚ @@ -1741,38 +2086,47 @@ Line: %2 點é¸é€™è£¡ä»¥å¾žç‰‡èªžæ›¸ä¸­ç§»é™¤ç‰‡èªžã€‚ + &Save 儲存(&S) + Click here to save the changes made. 點擊這裡以儲存變更。 + This window allows you to add, modify, or delete entries in a phrase book. 此視窗讓您å¯ä»¥æ–°å¢žã€è®Šæ›´èˆ‡åˆªé™¤ç‰‡èªžæ›¸ä¸­çš„æ¢ç›®ã€‚ + &New Entry æ–°æ¢ç›®(&N) + Click here to remove the entry from the phrase book. 點擊此處以從片語書中移除æ¢ç›®ã€‚ + &Remove Entry 移除æ¢ç›®(&R) + Settin&gs... 設定(&G)... + Close 關閉 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 @@ -1789,15 +2143,17 @@ Line: %2 PhraseModel - + Source phrase 原始片語 + Translation 翻譯 + Definition 定義 @@ -1805,19 +2161,22 @@ Line: %2 PhraseView - + Insert æ’å…¥ + Edit 編輯 + Guess (%1) 猜測(%1) + Guess 猜測 @@ -1825,70 +2184,90 @@ Line: %2 QObject - + Compiled Qt translations 已編譯的 Qt 翻譯 + Translation files (%1);; 翻譯檔(%1): + All files (*) 所有檔案(*) - + + + + + + + Qt Linguist Qt 語言家 - + C++ source files C++ 程å¼æª” - + Java source files Java 程å¼æª” - + GNU Gettext localization files GNU Gettext 地域化檔案 - + Qt Script source files Qt 文稿程å¼æª” - + Qt translation sources (format 1.1) Qt 翻譯æºç¢¼æª”(1.1 æ ¼å¼ï¼‰ + Qt translation sources (format 2.0) Qt 翻譯æºç¢¼æª”(2.0 æ ¼å¼ï¼‰ + + Qt translation sources (latest format) + + + Qt translation sources - Qt 翻譯æºç¢¼ + Qt 翻譯æºç¢¼ - + Qt Designer form files Qt 設計器表單檔 + Qt Jambi form files Qt Jambi 表單檔 - + XLIFF localization files XLIFF 地域化檔案 + + + Qt Linguist 'Phrase Book' + + QtWindowListMenu @@ -1927,15 +2306,17 @@ Line: %2 SourceCodeView - + <i>Source code not available</i> <i>沒有原始碼</i> + <i>File %1 not available</i> <i>沒有檔案 %1</i> + <i>File %1 not readable</i> <i>檔案 %1 無法讀å–</i> @@ -1962,6 +2343,7 @@ Line: %2 Statistics + Statistics 統計 @@ -1970,30 +2352,37 @@ Line: %2 關閉(&C) + Translation 翻譯 + Source ä¾†æº + 0 0 + Words: 單字: + Characters: 字元: + Characters (with spaces): 字元(å«ç©ºç™½ï¼‰ï¼š + Close 關閉 @@ -2467,7 +2856,7 @@ All files (*) 您è¦å„²å­˜ç‰‡èªžæ›¸ %1 嗎? - + This is the application's main window. @@ -2480,58 +2869,72 @@ All files (*) Qt 語言家 + This window allows you to search for some text in the translation source file. 此視窗讓您æœå°‹ç¿»è­¯æºç¢¼æª”中的一些文字。 + Type in the text to search for. 請輸入è¦æœå°‹çš„文字。 + Find &source text: 尋找原始訊æ¯(&S): + &Translate to: 翻譯為(&T): + Search options æœå°‹é¸é … + Texts such as 'TeX' and 'tex' are considered as different when checked. 勾é¸æ­¤é …目的話,TeX 與 tex 會被èªç‚ºæ˜¯å…©å€‹ä¸åŒçš„字串。 + Match &case 符åˆå¤§å°å¯«(&C) + Mark new translation as &finished 將新翻譯標記為完æˆ(&F) + Click here to find the next occurrence of the text you typed in. 點é¸é€™è£¡ä»¥å°‹æ‰¾ä¸‹ä¸€ç­†ç¬¦åˆçš„字串。 + Find Next 尋找下一個 + Translate 翻譯 + Translate All 全部翻譯 + Click here to close this window. 點é¸é€™è£¡ä»¥é—œé–‰è¦–窗。 + Cancel å–消 @@ -2558,27 +2961,33 @@ All files (*) TranslationSettingsDialog - + Any Country 任何國家 + + Settings for '%1' - Qt Linguist %1 的設定 ─ Qt 語言家 + Source language 原始語言 + Language 語言 + Country/Region 國家/åœ°å€ + Target language 目標語言 diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts index 76a1956..b9c1adc 100644 --- a/translations/qt_ar.ts +++ b/translations/qt_ar.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True صحيح @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File نسخ أو تحريك ملÙÙ‘ @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) جميع الملÙّات (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open Ùتح @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +573,7 @@ to Q3MainWindow - + Line up تصÙÙŠÙ @@ -586,7 +586,7 @@ to Q3NetworkProtocol - + Operation stopped by the user أوقÙت العمليّة من طر٠المستعمل @@ -594,7 +594,7 @@ to Q3ProgressDialog - + Cancel إلغاء @@ -603,7 +603,7 @@ to Q3TabDialog - + OK مواÙقة @@ -632,7 +632,7 @@ to Q3TextEdit - + &Undo &تراجع @@ -671,7 +671,7 @@ to Q3TitleBar - + System @@ -739,7 +739,7 @@ to Q3ToolBar - + More... أكثر... @@ -747,7 +747,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +799,7 @@ to Q3Wizard - + &Cancel &إلغاء @@ -827,9 +827,9 @@ to QAbstractSocket - - - + + + Host not found @@ -872,7 +872,7 @@ to QAbstractSpinBox - + &Step up @@ -890,13 +890,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. RTL - + Executable '%1' requires Qt %2, found Qt %3. البرنامج '%1' يتطلّب Qt %2ØŒ تمّ إيجاد Qt %3. @@ -906,7 +906,7 @@ to خطأ: مكتبة Qt غير مواÙقة - + Activate @@ -942,7 +942,7 @@ to QCheckBox - + Uncheck @@ -960,7 +960,7 @@ to QColorDialog - + Hu&e: ال&صّبغة: @@ -1034,13 +1034,13 @@ to QComboBox - + Open Ùتح - + False خاطئ @@ -1058,7 +1058,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1079,12 +1079,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1102,8 +1102,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1118,7 +1118,7 @@ to - + Unable to fetch record %1 @@ -1136,7 +1136,7 @@ to QDateTimeEdit - + AM @@ -1159,7 +1159,7 @@ to QDial - + QDial @@ -1177,7 +1177,7 @@ to QDialog - + What's This? ما هذا؟ @@ -1190,9 +1190,9 @@ to QDialogButtonBox - + - + OK مواÙقة @@ -1315,7 +1315,7 @@ to QDirModel - + Name الإسم @@ -1345,7 +1345,7 @@ to QDockWidget - + Close إغلاق @@ -1376,7 +1376,7 @@ to QErrorMessage - + &Show this message again Ø£&عرض مجدّداهذاالبلاغ @@ -1404,13 +1404,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1433,8 +1438,8 @@ to QFileDialog - - + + All Files (*) جميع الملÙّات (*) @@ -1457,13 +1462,13 @@ to معاينة Ù…Ùصّلة - + File ملÙÙ‘ - + Open Ùتح @@ -1473,26 +1478,26 @@ to Ø­Ùظ تحت - + - + &Open &Ùتح - + &Save &Ø­Ùظ - + Recent Places - + &Rename ت&غيير الإسم @@ -1507,33 +1512,33 @@ to ع&رض الملÙّات المخÙية - + New Folder دليل جديد - + Find Directory إيجاد الدّليل - + Directories دلائل - + All Files (*.*) جميع الملÙّات (*.*) - - + + Directory: دليل: - + %1 already exists. Do you want to replace it? @@ -1564,14 +1569,14 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1597,7 +1602,7 @@ Do you want to delete it anyway? - + Show @@ -1613,19 +1618,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: Ø¥&سم الملÙÙ‘: @@ -1645,7 +1650,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1707,7 +1712,7 @@ Do you want to delete it anyway? - + My Computer @@ -1720,7 +1725,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1937,7 +1942,7 @@ Do you want to delete it anyway? QFontDialog - + &Font ال&خطّ @@ -1986,7 +1991,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found تمّ إيجاد المضي٠%1 @@ -1996,7 +2001,7 @@ Do you want to delete it anyway? تمّ إيجاد المضي٠- + Connected to host %1 @@ -2132,7 +2137,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error خطأ مجهول @@ -2140,11 +2145,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2170,13 +2175,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused رÙض الوصل - + Host %1 not found @@ -2189,12 +2194,12 @@ Do you want to delete it anyway? طول المحتوى خاطئ - + HTTPS connection requested but SSL support not compiled in - + @@ -2233,21 +2238,21 @@ Do you want to delete it anyway? وصل مغلق - - + + Unknown error خطأ مجهول - + Request aborted تمّ إبطال الطّلب - + No server set to connect to ليس هناك أيّ خادم للوصل @@ -2265,7 +2270,12 @@ Do you want to delete it anyway? صديرة استجابة الHTTP غير صالحة - + + Unknown authentication method + + + + @@ -2288,7 +2298,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2369,7 +2379,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2392,7 +2402,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2412,7 +2422,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2482,7 +2492,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2502,7 +2512,7 @@ Do you want to delete it anyway? - + Unknown error خطأ مجهول @@ -2510,7 +2520,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2533,7 +2543,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2541,7 +2551,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2572,7 +2582,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2587,8 +2597,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2608,7 +2618,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &تراجع @@ -2646,8 +2656,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2663,7 +2673,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2671,8 +2681,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2685,7 +2695,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2742,7 +2752,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2752,7 +2762,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2770,7 +2780,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2785,7 +2795,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2830,7 +2840,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2838,7 +2848,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2931,7 +2941,7 @@ Do you want to delete it anyway? QMenu - + Close إغلاق @@ -2988,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2996,22 +3006,22 @@ Do you want to delete it anyway? مواÙقة - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help مساعدة - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -3020,21 +3030,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3042,7 +3042,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3224,7 +3224,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3252,7 +3252,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3265,7 +3265,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3273,7 +3273,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3282,7 +3282,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3311,7 +3311,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3338,18 +3338,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3357,7 +3351,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3367,7 +3361,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3390,19 +3384,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3412,19 +3406,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3442,12 +3436,12 @@ Do you want to delete it anyway? QObject - + Home منزل - + Operation not supported on %1 @@ -3457,7 +3451,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3482,7 +3476,7 @@ Do you want to delete it anyway? - + No host name given @@ -3491,7 +3485,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name الإسم @@ -3504,7 +3498,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3524,7 +3518,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3537,12 +3531,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3550,7 +3544,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3666,7 +3660,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected موصل محليّا @@ -3683,7 +3677,7 @@ Do you want to delete it anyway? مجهول - + OK مواÙقة @@ -3700,7 +3694,7 @@ Do you want to delete it anyway? الطّابعة - + Print all طباعة الجميع @@ -3880,7 +3874,7 @@ Do you want to delete it anyway? - + Print @@ -4128,13 +4122,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4412,8 +4406,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4442,7 +4436,7 @@ Please choose a different file name. - + @@ -4462,6 +4456,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4470,7 +4469,7 @@ Please choose a different file name. QProgressDialog - + Cancel إلغاء @@ -4494,7 +4493,7 @@ Please choose a different file name. QRegExp - + no error occurred لم يحدث هناك أيّ خطأ @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4565,12 +4564,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4578,7 +4577,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4641,12 +4640,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4656,7 +4655,7 @@ Please choose a different file name. - + Right edge @@ -4666,7 +4665,7 @@ Please choose a different file name. - + Page left @@ -4677,7 +4676,7 @@ Please choose a different file name. - + Page right @@ -4688,7 +4687,7 @@ Please choose a different file name. - + Scroll left @@ -4698,7 +4697,7 @@ Please choose a different file name. - + Scroll right @@ -4726,7 +4725,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4737,7 +4736,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4747,8 +4746,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4826,7 +4825,7 @@ Please choose a different file name. QShortcut - + Space Ùراغ @@ -5407,7 +5406,7 @@ Please choose a different file name. QSql - + Delete حذ٠@@ -5464,7 +5463,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5523,7 +5522,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5553,7 +5552,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5579,7 +5578,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5587,7 +5586,7 @@ Please choose a different file name. QTextControl - + &Undo &تراجع @@ -5645,7 +5644,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5653,7 +5652,7 @@ Please choose a different file name. QUndoGroup - + Undo تراجع @@ -5666,7 +5665,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5674,7 +5673,7 @@ Please choose a different file name. QUndoStack - + Undo تراجع @@ -5745,7 +5744,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6155,7 +6154,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6231,6 +6230,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6299,11 +6303,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ما هذا؟ @@ -6311,7 +6325,7 @@ Please choose a different file name. QWidget - + * @@ -6319,7 +6333,7 @@ Please choose a different file name. QWizard - + < &Back < &رجوع @@ -6381,7 +6395,7 @@ Please choose a different file name. QWorkspace - + &Restore ا&ستعاد @@ -6451,7 +6465,7 @@ Please choose a different file name. QXml - + no error occurred لم يحدث هناك أيّ خطأ @@ -6569,8 +6583,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6754,7 +6768,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6764,12 +6778,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6819,7 +6833,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6830,7 +6844,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6845,17 +6859,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6886,17 +6900,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6906,7 +6920,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6916,7 +6930,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6926,7 +6940,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6936,7 +6950,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6946,7 +6960,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6971,7 +6985,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6981,7 +6995,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6991,12 +7005,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7006,7 +7020,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7016,7 +7030,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7026,33 +7040,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7066,7 +7080,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7081,27 +7095,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7116,7 +7130,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7151,17 +7165,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7171,12 +7185,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7186,17 +7200,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7217,7 +7231,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7499,7 +7513,7 @@ Please choose a different file name. - + empty @@ -7524,7 +7538,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7539,7 +7553,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7549,12 +7563,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7569,13 +7583,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7594,12 +7608,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7609,12 +7623,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7669,7 +7683,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7744,7 +7758,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 640ad40..4806231 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Das Audiogerät <b>%1</b> funktioniert nicht.<br/>Es wird stattdessen <b>%2</b> verwendet.</html> @@ -23,7 +22,7 @@ CloseButton - + Close Tab Schließen @@ -81,7 +80,7 @@ Die Audio- und Video-Unterstützung wurde abgeschaltet Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -95,24 +94,24 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Es sind nicht alle erforderlichen Codecs installiert. Um diesen Inhalt abzuspielen, muss der folgende Codec installiert werden: %0 - - + + - - - - + + + + Could not open media source. Die Medienquelle konnte nicht geöffnet werden. - + Invalid source type. Ungültiger Typ der Medienquelle. - + Could not locate media source. Die Medienquelle konnte nicht gefunden werden. @@ -146,7 +145,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3Accel - + %1, %2 not defined %1, %2 sind nicht definiert @@ -159,7 +158,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3DataTable - + True Wahr @@ -187,7 +186,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa Q3FileDialog - + Copy or Move a File Datei kopieren oder verschieben @@ -212,7 +211,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa - + All Files (*) Alle Dateien (*) @@ -352,7 +351,7 @@ Bitte prüfen Sie die Gstreamer-Installation und stellen Sie sicher, dass das Pa - + Open Öffnen @@ -520,7 +519,7 @@ Datei konnte nicht gefunden werden. Q3LocalFs - + Could not read directory %1 @@ -570,7 +569,7 @@ nach Q3MainWindow - + Line up Ausrichten @@ -583,7 +582,7 @@ nach Q3NetworkProtocol - + Operation stopped by the user Operation von Benutzer angehalten @@ -591,7 +590,7 @@ nach Q3ProgressDialog - + Cancel Abbrechen @@ -600,7 +599,7 @@ nach Q3TabDialog - + OK OK @@ -629,7 +628,7 @@ nach Q3TextEdit - + &Undo &Rückgängig @@ -668,7 +667,7 @@ nach Q3TitleBar - + System System @@ -736,7 +735,7 @@ nach Q3ToolBar - + More... Mehr... @@ -744,7 +743,7 @@ nach Q3UrlOperator - + The protocol `%1' is not supported @@ -796,7 +795,7 @@ nach Q3Wizard - + &Cancel &Abbrechen @@ -824,9 +823,9 @@ nach QAbstractSocket - - - + + + Host not found Rechner konnte nicht gefunden werden @@ -869,7 +868,7 @@ nach QAbstractSpinBox - + &Step up &Inkrementieren @@ -887,13 +886,13 @@ nach QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden. @@ -903,7 +902,7 @@ nach Qt Bibliothek ist inkompatibel - + Activate Aktivieren @@ -939,7 +938,7 @@ nach QCheckBox - + Uncheck Löschen @@ -957,7 +956,7 @@ nach QColorDialog - + Hu&e: Farb&ton: @@ -1015,13 +1014,13 @@ nach QComboBox - + Open Öffnen - + False Falsch @@ -1039,7 +1038,7 @@ nach QCoreApplication - + %1: key is empty QSystemSemaphore %1: Ungültige Schlüsselangabe (leer) @@ -1060,12 +1059,12 @@ nach QDB2Driver - + Unable to connect Es kann keine Verbindung aufgebaut werden - + Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) @@ -1083,8 +1082,8 @@ nach QDB2Result - - + + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -1099,7 +1098,7 @@ nach Die Variable konnte nicht gebunden werden - + Unable to fetch record %1 Der Datensatz %1 konnte nicht abgeholt werden @@ -1117,7 +1116,7 @@ nach QDateTimeEdit - + AM AM @@ -1140,7 +1139,7 @@ nach QDial - + QDial QDial @@ -1158,7 +1157,7 @@ nach QDialog - + What's This? Direkthilfe @@ -1171,9 +1170,9 @@ nach QDialogButtonBox - + - + OK OK @@ -1296,7 +1295,7 @@ nach QDirModel - + Name Name @@ -1326,7 +1325,7 @@ nach QDockWidget - + Close Schließen @@ -1357,7 +1356,7 @@ nach QErrorMessage - + &Show this message again Diese Meldung noch einmal an&zeigen @@ -1385,13 +1384,18 @@ nach QFile - - + + Destination file exists Die Zieldatei existiert bereits - + + Cannot remove source file + + + + Cannot open %1 for input %1 konnte nicht zum Lesen geöffnet werden @@ -1414,8 +1418,8 @@ nach QFileDialog - - + + All Files (*) Alle Dateien (*) @@ -1438,13 +1442,13 @@ nach Details - + File Datei - + Open Öffnen @@ -1454,26 +1458,26 @@ nach Speichern unter - + - + &Open &Öffnen - + &Save S&peichern - + Recent Places Zuletzt besucht - + &Rename &Umbenennen @@ -1488,33 +1492,33 @@ nach &Versteckte Dateien anzeigen - + New Folder Neues Verzeichnis - + Find Directory Verzeichnis suchen - + Directories Verzeichnisse - + All Files (*.*) Alle Dateien (*.*) - - + + Directory: Verzeichnis: - + %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. @@ -1548,7 +1552,7 @@ Stellen Sie sicher, dass der Dateiname richtig ist. - + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1561,7 @@ Das Verzeichnis konnte nicht gefunden werden. Stellen Sie sicher, dass der Verzeichnisname richtig ist. - + '%1' is write protected. Do you want to delete it anyway? '%1' ist schreibgeschützt. @@ -1584,7 +1588,7 @@ Möchten sie die Datei trotzdem löschen? Unbekannt - + Show Anzeigen @@ -1600,19 +1604,19 @@ Möchten sie die Datei trotzdem löschen? &Neues Verzeichnis - + &Choose &Auswählen - + Remove Löschen - - + + File &name: Datei&name: @@ -1632,7 +1636,7 @@ Möchten sie die Datei trotzdem löschen? QFileSystemModel - + %1 TB %1 TB @@ -1694,7 +1698,7 @@ Möchten sie die Datei trotzdem löschen? Änderungsdatum - + My Computer Mein Computer @@ -1707,7 +1711,7 @@ Möchten sie die Datei trotzdem löschen? QFontDatabase - + Normal Normal @@ -1924,7 +1928,7 @@ Möchten sie die Datei trotzdem löschen? QFontDialog - + &Font &Schriftart @@ -1973,7 +1977,7 @@ Möchten sie die Datei trotzdem löschen? QFtp - + Host %1 found Rechner %1 gefunden @@ -1983,7 +1987,7 @@ Möchten sie die Datei trotzdem löschen? Rechner gefunden - + Connected to host %1 @@ -2119,7 +2123,7 @@ Möchten sie die Datei trotzdem löschen? QHostInfo - + Unknown error Unbekannter Fehler @@ -2127,11 +2131,11 @@ Möchten sie die Datei trotzdem löschen? QHostInfoAgent - + - + @@ -2157,13 +2161,13 @@ Möchten sie die Datei trotzdem löschen? QHttp - - + + Connection refused Verbindung verweigert - + Host %1 not found @@ -2215,21 +2219,21 @@ Möchten sie die Datei trotzdem löschen? Verbindung beendet - - + + Unknown error Unbekannter Fehler - + Request aborted Anfrage wurde abgebrochen - + No server set to connect to Für die Verbindung wurde kein Server-Rechner angegeben @@ -2247,7 +2251,12 @@ Möchten sie die Datei trotzdem löschen? Der Kopfteil der HTTP-Antwort ist ungültig - + + Unknown authentication method + + + + @@ -2295,12 +2304,12 @@ Möchten sie die Datei trotzdem löschen? Es wurde ein unbekanntes Protokoll angegeben - + Connection refused (or timed out) Verbindung verweigert oder Zeitlimit überschritten - + HTTPS connection requested but SSL support not compiled in Die angeforderte HTTPS-Verbindung kann nicht aufgebaut werden, da keine SSL-Unterstützung vorhanden ist @@ -2356,7 +2365,7 @@ Möchten sie die Datei trotzdem löschen? QIBaseDriver - + Error opening database Die Datenbankverbindung konnte nicht geöffnet werden @@ -2379,7 +2388,7 @@ Möchten sie die Datei trotzdem löschen? QIBaseResult - + Unable to create BLOB Es konnte kein BLOB erzeugt werden @@ -2399,7 +2408,7 @@ Möchten sie die Datei trotzdem löschen? Der BLOB konnte nicht gelesen werden - + Could not find array Das Feld konnte nicht gefunden werden @@ -2469,7 +2478,7 @@ Möchten sie die Datei trotzdem löschen? QIODevice - + Permission denied Zugriff verweigert @@ -2489,7 +2498,7 @@ Möchten sie die Datei trotzdem löschen? Kein freier Speicherplatz auf dem Gerät vorhanden - + Unknown error Unbekannter Fehler @@ -2497,7 +2506,7 @@ Möchten sie die Datei trotzdem löschen? QInputContext - + XIM XIM @@ -2520,7 +2529,7 @@ Möchten sie die Datei trotzdem löschen? QInputDialog - + Enter a value: Geben Sie einen Wert ein: @@ -2528,7 +2537,7 @@ Möchten sie die Datei trotzdem löschen? QLibrary - + Could not mmap '%1': %2 Operation mmap fehlgeschlagen für '%1': %2 @@ -2559,7 +2568,7 @@ Möchten sie die Datei trotzdem löschen? - + The shared library was not found. Die dynamische Bibliothek konnte nicht gefunden werden. @@ -2574,8 +2583,8 @@ Möchten sie die Datei trotzdem löschen? Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (Im Debug- und Release-Modus erstellte Bibliotheken können nicht zusammen verwendet werden.) - - + + Cannot load library %1: %2 Die Library %1 kann nicht geladen werden: %2 @@ -2595,7 +2604,7 @@ Möchten sie die Datei trotzdem löschen? QLineEdit - + Select All Alles auswählen @@ -2633,8 +2642,8 @@ Möchten sie die Datei trotzdem löschen? QLocalServer - - + + %1: Name error %1: Fehlerhafter Name @@ -2650,7 +2659,7 @@ Möchten sie die Datei trotzdem löschen? - + %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -2658,8 +2667,8 @@ Möchten sie die Datei trotzdem löschen? QLocalSocket - - + + %1: Connection refused %1: Der Aufbau einer Verbindung wurde verweigert @@ -2672,7 +2681,7 @@ Möchten sie die Datei trotzdem löschen? - + %1: Invalid name %1: Ungültiger Name @@ -2729,7 +2738,7 @@ Möchten sie die Datei trotzdem löschen? QMYSQLDriver - + Unable to open database ' Die Datenbankverbindung konnte nicht geöffnet werden ' @@ -2739,7 +2748,7 @@ Möchten sie die Datei trotzdem löschen? Es kann keine Verbindung aufgebaut werden - + Unable to begin transaction Es konnte keine Transaktion gestartet werden @@ -2757,7 +2766,7 @@ Möchten sie die Datei trotzdem löschen? QMYSQLResult - + Unable to fetch data Es konnten keine Daten abgeholt werden @@ -2772,7 +2781,7 @@ Möchten sie die Datei trotzdem löschen? Das Ergebnis konnte nicht gespeichert werden - + Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -2817,7 +2826,7 @@ Möchten sie die Datei trotzdem löschen? QMdiArea - + (Untitled) (Unbenannt) @@ -2825,7 +2834,7 @@ Möchten sie die Datei trotzdem löschen? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2918,7 +2927,7 @@ Möchten sie die Datei trotzdem löschen? QMenu - + Close Schließen @@ -2940,7 +2949,7 @@ Möchten sie die Datei trotzdem löschen? QMessageBox - + @@ -2948,22 +2957,26 @@ Möchten sie die Datei trotzdem löschen? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Ãœber Qt - + Help Hilfe - <p>This program uses Qt version %1.</p> - <p>Dieses Programm verwendet Qt-Version %1.</p> + <p>Dieses Programm verwendet Qt-Version %1.</p> - + Show Details... Details einblenden... @@ -2972,21 +2985,11 @@ Möchten sie die Datei trotzdem löschen? Hide Details... Details ausblenden... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM Eingabemethode auswählen @@ -2994,7 +2997,7 @@ Möchten sie die Datei trotzdem löschen? QMultiInputContextPlugin - + Multiple input method switcher Umschalter für Eingabemethoden @@ -3007,7 +3010,7 @@ Möchten sie die Datei trotzdem löschen? QNativeSocketEngine - + The remote host closed the connection Der entfernte Rechner hat die Verbindung geschlossen @@ -3140,7 +3143,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessCacheBackend - + Error opening %1 %1 konnte nicht geöffnet werden @@ -3148,7 +3151,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessFileBackend - + Request for opening non-local file %1 Anforderung zum Öffnen einer Datei über Netzwerk %1 @@ -3176,7 +3179,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessFtpBackend - + No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -3186,7 +3189,7 @@ Möchten sie die Datei trotzdem löschen? %1 kann nicht geöffnet werden: Es handelt sich um ein Verzeichnis - + Logging in to %1 failed: authentication required Die Anmeldung bei %1 schlug fehl: Es ist eine Authentifizierung erforderlich @@ -3204,7 +3207,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkAccessHttpBackend - + No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -3217,7 +3220,7 @@ Möchten sie die Datei trotzdem löschen? Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2 - + Protocol "%1" is unknown Das Protokoll "%1" ist unbekannt @@ -3225,7 +3228,7 @@ Möchten sie die Datei trotzdem löschen? QNetworkReplyImpl - + Operation canceled Operation abgebrochen @@ -3234,7 +3237,7 @@ Möchten sie die Datei trotzdem löschen? QOCIDriver - + Unable to logon Logon-Vorgang fehlgeschlagen @@ -3263,7 +3266,7 @@ Möchten sie die Datei trotzdem löschen? QOCIResult - + Unable to bind column for batch execute @@ -3290,18 +3293,16 @@ Möchten sie die Datei trotzdem löschen? Der Befehl konnte nicht initialisiert werden - - + Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute select statement - Die 'select'-Abfrage konnte nicht ausgeführt werden + Die 'select'-Abfrage konnte nicht ausgeführt werden - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -3309,7 +3310,7 @@ Möchten sie die Datei trotzdem löschen? QODBCDriver - + Unable to connect Es kann keine Verbindung aufgebaut werden @@ -3319,7 +3320,7 @@ Möchten sie die Datei trotzdem löschen? Es kann keine Verbindung aufgebaut werden weil der Treiber die benötigte Funktionalität nicht vollständig unterstützt - + Unable to disable autocommit 'autocommit' konnte nicht deaktiviert werden @@ -3342,19 +3343,19 @@ Möchten sie die Datei trotzdem löschen? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 'SQL_CURSOR_STATIC' konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden - + Unable to fetch next Der nächste Datensatz konnte nicht abgeholt werden @@ -3364,19 +3365,19 @@ Möchten sie die Datei trotzdem löschen? Der Befehl konnte nicht initialisiert werden - + Unable to bind variable Die Variable konnte nicht gebunden werden - - + + Unable to fetch last Der letzte Datensatz konnte nicht abgeholt werden - + Unable to fetch Es konnten keine Daten abgeholt werden @@ -3394,12 +3395,12 @@ Möchten sie die Datei trotzdem löschen? QObject - + Home Pos1 - + Operation not supported on %1 Diese Operation wird von %1 nicht unterstützt @@ -3409,7 +3410,7 @@ Möchten sie die Datei trotzdem löschen? Ungültiger URI: %1 - + Write error writing to %1: %2 Fehler beim Schreiben zur Datei %1: %2 @@ -3434,7 +3435,7 @@ Möchten sie die Datei trotzdem löschen? Protokollfehler: Ein leeres Datenpaket wurde empfangen - + No host name given Es wurde kein Hostname angegeben @@ -3443,7 +3444,7 @@ Möchten sie die Datei trotzdem löschen? QPPDOptionsModel - + Name Name @@ -3456,7 +3457,7 @@ Möchten sie die Datei trotzdem löschen? QPSQLDriver - + Unable to connect Es kann keine Verbindung aufgebaut werden @@ -3476,7 +3477,7 @@ Möchten sie die Datei trotzdem löschen? Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - + Unable to subscribe Die Registrierung schlug fehl @@ -3489,12 +3490,12 @@ Möchten sie die Datei trotzdem löschen? QPSQLResult - + Unable to create query Es konnte keine Abfrage erzeugt werden - + Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -3502,7 +3503,7 @@ Möchten sie die Datei trotzdem löschen? QPageSetupWidget - + Centimeters (cm) Zentimeter (cm) @@ -3618,7 +3619,7 @@ Möchten sie die Datei trotzdem löschen? QPrintDialog - + locally connected direkt verbunden @@ -3635,12 +3636,12 @@ Möchten sie die Datei trotzdem löschen? unbekannt - + OK OK - + Print all Alles drucken @@ -3805,7 +3806,7 @@ Möchten sie die Datei trotzdem löschen? Auswahl drucken - + Print @@ -4047,7 +4048,7 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPreviewDialog - + %1% %1% @@ -4147,7 +4148,7 @@ Bitte wählen Sie einen anderen Dateinamen. PostScript exportieren - + Page Setup Seite einrichten @@ -4320,8 +4321,8 @@ Bitte wählen Sie einen anderen Dateinamen. QProcess - - + + Could not open input redirection for reading Die Eingabeumleitung konnte nicht zum Lesen geöffnet werden @@ -4350,7 +4351,7 @@ Bitte wählen Sie einen anderen Dateinamen. Zeitüberschreitung - + @@ -4370,6 +4371,11 @@ Bitte wählen Sie einen anderen Dateinamen. Der Prozess ist abgestürzt + + No program defined + + + Process failed to start Das Starten des Prozesses schlug fehl @@ -4378,7 +4384,7 @@ Bitte wählen Sie einen anderen Dateinamen. QProgressDialog - + Cancel Abbrechen @@ -4402,7 +4408,7 @@ Bitte wählen Sie einen anderen Dateinamen. QRegExp - + no error occurred kein Fehler @@ -4450,7 +4456,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Driver - + Error to open database Die Datenbankverbindung konnte nicht geöffnet werden @@ -4473,12 +4479,12 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Result - + Unable to fetch results Das Ergebnis konnte nicht abgeholt werden - + Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -4486,7 +4492,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteDriver - + Error opening database Die Datenbankverbindung konnte nicht geöffnet werden @@ -4549,12 +4555,12 @@ Bitte wählen Sie einen anderen Dateinamen. QScrollBar - + Scroll here Hierher scrollen - + Left edge Linker Rand @@ -4564,7 +4570,7 @@ Bitte wählen Sie einen anderen Dateinamen. Anfang - + Right edge Rechter Rand @@ -4574,7 +4580,7 @@ Bitte wählen Sie einen anderen Dateinamen. Ende - + Page left Eine Seite nach links @@ -4585,7 +4591,7 @@ Bitte wählen Sie einen anderen Dateinamen. Eine Seite nach oben - + Page right Eine Seite nach rechts @@ -4596,7 +4602,7 @@ Bitte wählen Sie einen anderen Dateinamen. Eine Seite nach unten - + Scroll left Nach links scrollen @@ -4606,7 +4612,7 @@ Bitte wählen Sie einen anderen Dateinamen. Nach oben scrollen - + Scroll right Nach rechts scrollen @@ -4634,13 +4640,13 @@ Bitte wählen Sie einen anderen Dateinamen. QSharedMemory - + %1: create size is less then 0 %1: Die Größenangabe für die Erzeugung ist kleiner als Null - + %1: unable to lock %1: Sperrung fehlgeschlagen @@ -4650,8 +4656,8 @@ Bitte wählen Sie einen anderen Dateinamen. %1: Die Sperrung konnte nicht aufgehoben werden - - + + %1: permission denied %1: Zugriff verweigert @@ -4734,7 +4740,7 @@ Bitte wählen Sie einen anderen Dateinamen. QShortcut - + Space Leertaste @@ -5315,7 +5321,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSql - + Delete Löschen @@ -5372,7 +5378,7 @@ Bitte wählen Sie einen anderen Dateinamen. QSslSocket - + Unable to write data: %1 Die Daten konnten nicht geschrieben werden: %1 @@ -5436,7 +5442,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + %1: out of resources %1: Keine Ressourcen mehr verfügbar @@ -5461,7 +5467,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTDSDriver - + Unable to open connection Die Datenbankverbindung konnte nicht geöffnet werden @@ -5487,7 +5493,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTcpServer - + Operation on socket is not supported Diese Socketoperation wird nicht unterstützt @@ -5495,7 +5501,7 @@ Bitte wählen Sie einen anderen Dateinamen. QTextControl - + &Undo &Rückgängig @@ -5553,7 +5559,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUdpSocket - + This platform does not support IPv6 Diese Plattform unterstützt kein IPv6 @@ -5561,7 +5567,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoGroup - + Undo Rückgängig @@ -5574,7 +5580,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoModel - + <empty> <leer> @@ -5582,7 +5588,7 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoStack - + Undo Rückgängig @@ -5653,7 +5659,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWebFrame - + Request cancelled Anfrage wurde abgebrochen @@ -6064,7 +6070,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + JavaScript Alert - %1 JavaScript-Hinweis - %1 @@ -6140,6 +6146,11 @@ Bitte wählen Sie einen anderen Dateinamen. + Select all + + + + Select to the next character Bis zum folgenden Zeichen markieren @@ -6208,11 +6219,21 @@ Bitte wählen Sie einen anderen Dateinamen. Delete to the end of the word Bis zum Ende des Wortes löschen + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Direkthilfe @@ -6220,7 +6241,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWidget - + * * @@ -6228,7 +6249,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWizard - + Cancel Abbrechen @@ -6286,7 +6307,7 @@ Bitte wählen Sie einen anderen Dateinamen. QWorkspace - + &Restore Wieder&herstellen @@ -6356,7 +6377,7 @@ Bitte wählen Sie einen anderen Dateinamen. QXml - + no error occurred kein Fehler @@ -6474,8 +6495,8 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlStream - - + + Extra content at end of document. Ãœberzähliger Inhalt nach Ende des Dokumentes. @@ -6659,38 +6680,38 @@ Bitte wählen Sie einen anderen Dateinamen. QtXmlPatterns - + At least one component must be present. Es muss mindestens eine Komponente vorhanden sein. - + No operand in an integer division, %1, can be %2. Bei der Ganzzahldivision %1 darf kein Operand %2 sein. - + %1 is not a valid value of type %2. %1 ist kein gültiger Wert des Typs %2. - + When casting to %1 from %2, the source value cannot be %3. Bei einer "cast"-Operation von %1 zu %2 darf der Wert nicht %3 sein. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Der effektive Boolesche Wert einer Sequenz aus zwei oder mehreren atomaren Werten kann nicht berechnet werden. - + Operator %1 is not available between atomic values of type %2 and %3. Der Operator %1 kann auf atomare Werte der Typen %2 und %3 nicht angewandt werden. - + It is not possible to cast from %1 to %2. Es kann keine "cast"-Operation von %1 zu %2 durchgeführt werden. @@ -6715,33 +6736,33 @@ Bitte wählen Sie einen anderen Dateinamen. Mit dem Typ %1 können keine Vergleichsoperationen durchgeführt werden. - + The data of a processing instruction cannot contain the string %1 Die Daten einer Processing-Anweisung dürfen nicht die Zeichenkette %1 enthalten - - + + %1 is an invalid %2 %1 ist kein gültiges %2 - + %1 is not a valid XML 1.0 character. %1 ist kein gültiges XML 1.0 Zeichen. - + The first argument to %1 cannot be of type %2. Das erste Argument von %1 kann nicht vom Typ %2 sein. - + %1 was called. %1 wurde gerufen. - + In the replacement string, %1 must be followed by at least one digit when not escaped. In der Ersetzung muss auf %1 eine Ziffer folgen, wenn es nicht durch ein Escape-Zeichen geschützt ist. @@ -6751,7 +6772,7 @@ Bitte wählen Sie einen anderen Dateinamen. In der Ersetzung kann %1 nur verwendet werden, um sich selbst oder %2 schützen, nicht jedoch für %3 - + %1 matches newline characters Der Ausdruck '%1' schließt Zeilenvorschübe ein @@ -6766,12 +6787,12 @@ Bitte wählen Sie einen anderen Dateinamen. %1 ist kein gültiger regulärer Ausdruck: %2 - + It will not be possible to retrieve %1. %1 kann nicht bestimmt werden. - + The default collection is undefined Für eine Kollektion ist keine Vorgabe definiert @@ -6781,12 +6802,12 @@ Bitte wählen Sie einen anderen Dateinamen. %1 kann nicht bestimmt werden - + The item %1 did not match the required type %2. Das Element %1 entspricht nicht dem erforderlichen Typ %2. - + %1 is an unknown schema type. %1 ist ein unbekannter Schema-Typ. @@ -6802,7 +6823,7 @@ Bitte wählen Sie einen anderen Dateinamen. Die Initialisierung der Variable %1 hängt von ihrem eigenem Wert ab - + The variable %1 is unused Die Variable %1 wird nicht verwendet @@ -6923,7 +6944,7 @@ Bitte wählen Sie einen anderen Dateinamen. %1 befindet sich nicht unter den Attributdeklarationen im Bereich. Schema-Import wird nicht unterstützt. - + empty leer @@ -6948,27 +6969,27 @@ Bitte wählen Sie einen anderen Dateinamen. kein oder mehrere - + The focus is undefined. Es ist kein Fokus definiert. - + An attribute by name %1 has already been created. Es wurde bereits ein Attribut mit dem Namen %1 erzeugt. - + Network timeout. Das Zeitlimit der Netzwerkoperation wurde überschritten. - + Element %1 can't be serialized because it appears outside the document element. Das Element %1 kann nicht serialisiert werden, da es außerhalb des Dokumentenelements erscheint. - + Year %1 is invalid because it begins with %2. %1 ist keine gültige Jahresangabe, da es mit %2 beginnt. @@ -7013,7 +7034,7 @@ Bitte wählen Sie einen anderen Dateinamen. Bei Vorhandensein eines %1-Begrenzers muss mindestens eine Komponente vorhanden sein. - + Dividing a value of type %1 by %2 (not-a-number) is not allowed. Die Division eines Werts des Typs %1 durch %2 (kein numerischer Wert) ist nicht zulässig. @@ -7029,12 +7050,12 @@ Bitte wählen Sie einen anderen Dateinamen. Die Multiplikation eines Werts des Typs %1 mit %2 oder %3 (positiv oder negativ unendlich) ist nicht zulässig. - + A value of type %1 cannot have an Effective Boolean Value. Ein Wert des Typs %1 kann keinen effektiven Booleschen Wert haben. - + Value %1 of type %2 exceeds maximum (%3). Der Wert %1 des Typs %2 überschreitet das Maximum (%3). @@ -7044,7 +7065,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Wert %1 des Typs %2 unterschreitet das Minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Die Stellenzahl eines Wertes des Typs %1 muss geradzahlig sein. Das ist bei %2 nicht der Fall. @@ -7054,7 +7075,7 @@ Bitte wählen Sie einen anderen Dateinamen. %1 ist kein gültiger Wert des Typs %2. - + Operator %1 cannot be used on type %2. Der Operator %1 kann nicht auf den Typ %2 angewandt werden. @@ -7064,7 +7085,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Operator %1 kann nicht auf atomare Werte der Typen %2 und %3 angewandt werden. - + The namespace URI in the name for a computed attribute cannot be %1. Der Namensraum-URI im Namen eines berechneten Attributes darf nicht %1 sein @@ -7074,7 +7095,7 @@ Bitte wählen Sie einen anderen Dateinamen. Der Name eines berechneten Attributes darf keinen Namensraum-URI %1 mit dem lokalen Namen %2 haben. - + Type error in cast, expected %1, received %2. Typfehler bei "cast"-Operation; es wurde %1 erwartet, aber %2 empfangen. @@ -7084,7 +7105,7 @@ Bitte wählen Sie einen anderen Dateinamen. Bei einer "cast"-Operation zum Typ %1 oder abgeleitetenTypen muss der Quellwert ein Zeichenketten-Literal oder ein Wert gleichen Typs sein. Der Typ %2 ist ungültig. - + A comment cannot contain %1 Ein Kommentar darf nicht'%1 enthalten @@ -7094,12 +7115,12 @@ Bitte wählen Sie einen anderen Dateinamen. Ein Kommentar darf nicht auf %1 enden. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Ein Attributknoten darf nicht als Kind eines Dokumentknotens erscheinen. Es erschien ein Attributknoten mit dem Namen %1. - + A library module cannot be evaluated directly. It must be imported from a main module. Ein Bibliotheksmodul kann nicht direkt ausgewertet werden, er muss von einem Hauptmodul importiert werden. @@ -7109,7 +7130,7 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert keine Vorlage mit dem Namen %1. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Werte des Typs %1 dürfen keine Prädikate sein. Für Prädikate sind nur numerische oder effektiv Boolesche Typen zulässig. @@ -7119,17 +7140,17 @@ Bitte wählen Sie einen anderen Dateinamen. Ein positionales Prädikat muss sich als einfacher, numerischer Wert auswerten lassen. - + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ist kein gültiger Zielname einer Processing-Anweisung, es muss ein %2 Wert wie zum Beispiel %3 sein. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Der letzte Schritt eines Pfades kann entweder nur Knoten oder nur atomare Werte enthalten. Sie dürfen nicht zusammen auftreten. - + No namespace binding exists for the prefix %1 Es existiert keine Namensraum-Bindung für den Präfix %1 @@ -7139,7 +7160,7 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert keine Namensraum-Bindung für den Präfix %1 in %2 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Das erste Argument von %1 darf nicht vom Typ %2 sein; es muss numerisch, xs:yearMonthDuration oder xs:dayTimeDuration sein. @@ -7154,7 +7175,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das zweite Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Wenn beide Werte mit Zeitzonen angegeben werden, müssen diese übereinstimmen. %1 und %2 sind daher unzulässig. @@ -7184,17 +7205,17 @@ Bitte wählen Sie einen anderen Dateinamen. Es kann kein Präfix angegeben werden, wenn das erste Argument leer oder eine leere Zeichenkette (kein Namensraum) ist. Es wurde der Präfix %1 angegeben. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Die Normalisierungsform %1 wird nicht unterstützt. Die unterstützten Normalisierungsformen sind %2, %3, %4 and %5, und "kein" (eine leere Zeichenkette steht für "keine Normalisierung"). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Eine Zeitzonen-Differenz muss im Bereich %1..%2 (einschließlich) liegen. %3 liegt außerhalb des Bereiches. - + Required cardinality is %1; got cardinality %2. Die erforderliche Kardinalität ist %1 (gegenwärtig %2). @@ -7349,12 +7370,12 @@ Bitte wählen Sie einen anderen Dateinamen. Attribute dürfen nicht auf andere Knoten folgen. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Es wird nur Unicode Codepoint Collation unterstützt (%1). %2 wird nicht unterstützt. - + An %1-attribute with value %2 has already been declared. Das Element hat bereits ein Attribut mit dem Namen %1 mit dem Wert %2. @@ -7399,7 +7420,7 @@ Bitte wählen Sie einen anderen Dateinamen. %2 ist kein gültiger Zielname einer Processing-Anweisung, da dieser nicht %1 sein darf (ungeachtet der Groß/Kleinschreibung). - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 hat nur %n Argument; die Angabe %2 ist daher ungültig. @@ -7415,7 +7436,7 @@ Bitte wählen Sie einen anderen Dateinamen. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Der übergeordnete Knoten des zweiten Arguments der Funktion %1 muss ein Dokumentknoten sein, was bei %2 nicht der Fall ist. @@ -7461,7 +7482,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das Attributelement %1 kann nicht serialisiert werden, da es auf der höchsten Ebene erscheint. - + %1 is an unsupported encoding. Das Encoding %1 wird nicht unterstützt. @@ -7476,14 +7497,18 @@ Bitte wählen Sie einen anderen Dateinamen. Der Code-Punkt %1 aus %2 mit Encoding %3 ist kein gültiges XML-Zeichen. - + Ambiguous rule match. Mehrdeutige Regel. - In a namespace constructor, the value for a namespace value cannot be an empty string. - Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. + Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7501,12 +7526,12 @@ Bitte wählen Sie einen anderen Dateinamen. An %2 kann nur der Präfix %1 gebunden werden (und umgekehrt). - + Circularity detected Es wurde eine zirkuläre Abhängigkeit festgestellt. - + The parameter %1 is required, but no corresponding %2 is supplied. Es wurde kein entsprechendes %2 für den erforderlichen Parameter %1 angegeben. @@ -7516,12 +7541,12 @@ Bitte wählen Sie einen anderen Dateinamen. Es existiert kein entsprechendes %2 für den übergebenen Parameter %1. - + The URI cannot have a fragment Der URI darf kein Fragment enthalten. - + Element %1 is not allowed at this location. Das Element %1 darf nicht an dieser Stelle stehen. @@ -7576,7 +7601,7 @@ Bitte wählen Sie einen anderen Dateinamen. Im %1-Attribut des Elements %2 muss mindestens ein Modus angegeben werden. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. Das Element %2 kann nur die Standardattribute haben, nicht jedoch %1. @@ -7651,7 +7676,7 @@ Bitte wählen Sie einen anderen Dateinamen. Das Element %1 kann keine Kindelemente haben. - + Element %1 cannot have a sequence constructor. Das Element %1 kann keinen Sequenzkonstruktor haben. diff --git a/translations/qt_es.ts b/translations/qt_es.ts index 294b009..f9299cb 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined La secuencia %1, %2 no está definida @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Verdadero @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copiar o mover un fichero @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Todos los ficheros (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Abrir @@ -527,7 +527,7 @@ Compruebe la ruta y el nombre del fichero. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ a Q3MainWindow - + Line up Alinear @@ -590,7 +590,7 @@ a Q3NetworkProtocol - + Operation stopped by the user Operación detenida por el usuario @@ -598,7 +598,7 @@ a Q3ProgressDialog - + Cancel Cancelar @@ -607,7 +607,7 @@ a Q3TabDialog - + OK Aceptar @@ -636,7 +636,7 @@ a Q3TextEdit - + &Undo &Deshacer @@ -675,7 +675,7 @@ a Q3TitleBar - + System Sistema @@ -743,7 +743,7 @@ a Q3ToolBar - + More... Más... @@ -751,7 +751,7 @@ a Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ a Q3Wizard - + &Cancel &Cancelar @@ -831,9 +831,9 @@ a QAbstractSocket - - - + + + Host not found Equipo no encontrado @@ -876,7 +876,7 @@ a QAbstractSpinBox - + &Step up &Aumentar @@ -894,12 +894,12 @@ a QApplication - + Activate Activar - + Executable '%1' requires Qt %2, found Qt %3. El ejecutable «%1» requiere Qt %2 (se encontró Qt %3). @@ -909,7 +909,7 @@ a Error: biblioteca Qt incompatible - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ a QCheckBox - + Uncheck Desmarcar @@ -964,7 +964,7 @@ a QColorDialog - + Hu&e: &Tono: @@ -1038,13 +1038,13 @@ a QComboBox - + Open Abrir - + False Falso @@ -1062,7 +1062,7 @@ a QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ a QDB2Driver - + Unable to connect Imposible establecer una conexión - + Unable to commit transaction Incapaz de enviar la transacción @@ -1106,8 +1106,8 @@ a QDB2Result - - + + Unable to execute statement Imposible ejecutar la instrucción @@ -1122,7 +1122,7 @@ a No es posible ligar la variable - + Unable to fetch record %1 Imposible obtener el registro %1 @@ -1140,7 +1140,7 @@ a QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ a QDial - + QDial QDial @@ -1181,7 +1181,7 @@ a QDialog - + What's This? ¿Qué es esto? @@ -1194,9 +1194,9 @@ a QDialogButtonBox - + - + OK Aceptar @@ -1319,7 +1319,7 @@ a QDirModel - + Name Nombre @@ -1355,7 +1355,7 @@ a QDockWidget - + Close Cerrar @@ -1386,7 +1386,7 @@ a QErrorMessage - + Debug Message: Mensaje de depuración: @@ -1414,13 +1414,18 @@ a QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1443,37 +1448,37 @@ a QFileDialog - - + + All Files (*) Todos los ficheros (*) - + Directories Directorios - + &Open &Abrir - + &Save &Guardar - + Open Abrir - + %1 already exists. Do you want to replace it? El fichero %1 ya existe. @@ -1494,7 +1499,7 @@ Verifique que el nombre del fichero es correcto. Mi equipo - + &Rename Cambia&r de nombre @@ -1540,7 +1545,7 @@ Verifique que el nombre del fichero es correcto. - + Directory: Directorio: @@ -1553,8 +1558,8 @@ Fichero no encontrado. Compruebe que el nombre del fichero es correcto - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1563,7 +1568,7 @@ Directorio no encontrado. Verique que el nombre del directorio es correcto. - + '%1' is write protected. Do you want to delete it anyway? «%1» está protegido contra escritura. @@ -1580,22 +1585,22 @@ Do you want to delete it anyway? No fue posible borrar el directorio. - + Recent Places - + All Files (*.*) Todos los ficheros (*.*) - + Save As Guardar como - + Drive Unidad @@ -1627,29 +1632,29 @@ Do you want to delete it anyway? Siguiente (histórico) - + New Folder Nueva carpeta - + &New Folder &Nueva carpeta - + &Choose &Seleccionar - + Remove Eliminar - - + + File &name: &Nombre de fichero: @@ -1669,7 +1674,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB %1 TiB @@ -1731,7 +1736,7 @@ All other platforms Última modificación - + My Computer Mi equipo @@ -1750,7 +1755,7 @@ All other platforms QFontDatabase - + Normal @@ -1967,7 +1972,7 @@ All other platforms QFontDialog - + &Font &Tipo de letra @@ -2016,8 +2021,8 @@ All other platforms QFtp - - + + Not connected No conectado @@ -2162,7 +2167,7 @@ All other platforms QHostInfo - + Unknown error Error desconocido @@ -2170,11 +2175,11 @@ All other platforms QHostInfoAgent - + - + @@ -2200,26 +2205,26 @@ All other platforms QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Error desconocido - + Request aborted Solicitud interrumpida - + No server set to connect to No se ha indicado ningún servidor al que conectarse @@ -2237,18 +2242,23 @@ All other platforms El servidor cerró la conexión inesperadamente - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Conexión rechazada - + Host %1 not found @@ -2269,7 +2279,7 @@ All other platforms Cabecera de respuesta HTTP no válida - + @@ -2318,7 +2328,7 @@ All other platforms Se precisa autenticación - + Connection refused (or timed out) @@ -2399,7 +2409,7 @@ All other platforms QIBaseDriver - + Error opening database Error al abrir la base de datos @@ -2422,7 +2432,7 @@ All other platforms QIBaseResult - + Unable to create BLOB Imposible crear un BLOB @@ -2442,7 +2452,7 @@ All other platforms Imposible leer el BLOB - + Could not find array No fue posible encontrar la tabla @@ -2512,7 +2522,7 @@ All other platforms QIODevice - + Permission denied Permiso denegado @@ -2532,7 +2542,7 @@ All other platforms No queda espacio en el dispositivo - + Unknown error Error desconocido @@ -2540,7 +2550,7 @@ All other platforms QInputContext - + XIM XIM @@ -2563,7 +2573,7 @@ All other platforms QInputDialog - + Enter a value: @@ -2583,7 +2593,7 @@ All other platforms QLibrary::resolve_sys: Símbolo «%1» no definido en %2 (%3) - + Could not mmap '%1': %2 No fu posible establecer la proyección en memoria de «%1»: %2 @@ -2614,7 +2624,7 @@ All other platforms - + The shared library was not found. No se ha encontrado la biblioteca compartida. @@ -2629,8 +2639,8 @@ All other platforms El complemento «%1» usa una biblioteca Qt incompatible. (No se pueden mezclar las bibliotecas «debug» y «release».) - - + + Cannot load library %1: %2 @@ -2650,7 +2660,7 @@ All other platforms QLineEdit - + &Undo &Deshacer @@ -2688,8 +2698,8 @@ All other platforms QLocalServer - - + + %1: Name error @@ -2705,7 +2715,7 @@ All other platforms - + %1: Unknown error %2 @@ -2713,8 +2723,8 @@ All other platforms QLocalSocket - - + + %1: Connection refused @@ -2727,7 +2737,7 @@ All other platforms - + %1: Invalid name @@ -2784,7 +2794,7 @@ All other platforms QMYSQLDriver - + Unable to open database ' Imposible abrir la base de datos ' @@ -2794,7 +2804,7 @@ All other platforms No es posible establecer una conexión - + Unable to begin transaction No es posible iniciar la transacción @@ -2812,7 +2822,7 @@ All other platforms QMYSQLResult - + Unable to fetch data No es posible obtener los datos @@ -2827,7 +2837,7 @@ All other platforms No es posible almacenar el resultado - + Unable to prepare statement No es posible preparar la instrucción @@ -2872,7 +2882,7 @@ All other platforms QMdiArea - + (Untitled) @@ -2880,7 +2890,7 @@ All other platforms QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2973,7 +2983,7 @@ All other platforms QMenu - + Close Cerrar @@ -3046,7 +3056,7 @@ All other platforms QMessageBox - + Help Ayuda @@ -3059,21 +3069,25 @@ All other platforms Aceptar - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Acerca de Qt - <p>This program uses Qt version %1.</p> - <p>Este programa utiliza la versión %1 de Qt.</p> + <p>Este programa utiliza la versión %1 de Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Acerca de Qt</h3>%1<p>Qt es un toolkit en C++ para desarrollo de aplicaciones multiplataforma.</p><p>Qt proporciona portabilidad del código entre MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux y todas las variantes comerciales de Unix importantes. Qt también está disponible para sistemas empotrados bajo el nombre Qtopia Core.</p><p>Qt es un producto de Trolltech. Visite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para obtener más información.</p> - + Show Details... Mostrar los detalles... @@ -3083,20 +3097,14 @@ All other platforms Ocultar los detalles... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> + <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> QMultiInputContext - + Select IM Seleccionar IM @@ -3104,7 +3112,7 @@ All other platforms QMultiInputContextPlugin - + Multiple input method switcher Seleccionador de varios métodos de entrada @@ -3117,7 +3125,7 @@ All other platforms QNativeSocketEngine - + The remote host closed the connection El equipo remoto ha cerrado la conexión @@ -3250,7 +3258,7 @@ All other platforms QNetworkAccessCacheBackend - + Error opening %1 @@ -3258,7 +3266,7 @@ All other platforms QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3286,7 +3294,7 @@ All other platforms QNetworkAccessFtpBackend - + No suitable proxy found @@ -3296,7 +3304,7 @@ All other platforms - + Logging in to %1 failed: authentication required @@ -3314,7 +3322,7 @@ All other platforms QNetworkAccessHttpBackend - + No suitable proxy found @@ -3327,7 +3335,7 @@ All other platforms - + Protocol "%1" is unknown @@ -3335,7 +3343,7 @@ All other platforms QNetworkReplyImpl - + Operation canceled @@ -3344,7 +3352,7 @@ All other platforms QOCIDriver - + Unable to logon No es posible abrir sesión @@ -3373,7 +3381,7 @@ All other platforms QOCIResult - + Unable to bind column for batch execute @@ -3400,18 +3408,16 @@ All other platforms No es posible preparar la instrucción - - + Unable to bind value No es posible ligar el valor - Unable to execute select statement - No es posible ejecutar la instrucción select + No es posible ejecutar la instrucción select - + Unable to execute statement No es posible ejecutar la instrucción @@ -3419,7 +3425,7 @@ All other platforms QODBCDriver - + Unable to connect No es posible establecer una conexión @@ -3429,7 +3435,7 @@ All other platforms No es posible conectarse - El controlador no ofrece todas las funciones necesarias - + Unable to disable autocommit No es posible inhabilitar el envío automático @@ -3452,19 +3458,19 @@ All other platforms QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: No es posible establecer «SQL_CURSOR_STATIC» como atributo de instrucción. Compruebe la configuración de su controlador ODBC - + Unable to execute statement No es posible ejecutar la instrucción - + Unable to fetch next No es posible obtener el siguiente @@ -3474,19 +3480,19 @@ All other platforms No es posible preparar la instrucción - + Unable to bind variable No es posible ligar la variable - - + + Unable to fetch last - + Unable to fetch @@ -3504,12 +3510,12 @@ All other platforms QObject - + Home Inicio - + Operation not supported on %1 @@ -3519,7 +3525,7 @@ All other platforms - + Write error writing to %1: %2 @@ -3544,7 +3550,7 @@ All other platforms - + No host name given @@ -3553,7 +3559,7 @@ All other platforms QPPDOptionsModel - + Name Nombre @@ -3566,7 +3572,7 @@ All other platforms QPSQLDriver - + Unable to connect No es posible establecer conexión @@ -3586,7 +3592,7 @@ All other platforms No fue posible anular la transacción - + Unable to subscribe @@ -3599,12 +3605,12 @@ All other platforms QPSQLResult - + Unable to create query No es posible crear la consulta - + Unable to prepare statement @@ -3612,7 +3618,7 @@ All other platforms QPageSetupWidget - + Centimeters (cm) @@ -3728,7 +3734,7 @@ All other platforms QPrintDialog - + locally connected conectado localmente @@ -3749,7 +3755,7 @@ All other platforms Imprimir en color si es posible - + Print all Imprimir todo @@ -3934,7 +3940,7 @@ All other platforms Sobre US Common #10 (105 x 241 mm) - + OK Aceptar @@ -3955,7 +3961,7 @@ All other platforms Fuente del papel: - + Print @@ -4257,13 +4263,13 @@ Elija un nombre de fichero diferente. QPrintPreviewDialog - + Page Setup - + %1% @@ -4545,8 +4551,8 @@ Elija un nombre de fichero diferente. QProcess - - + + Could not open input redirection for reading @@ -4575,7 +4581,7 @@ Elija un nombre de fichero diferente. - + @@ -4595,6 +4601,11 @@ Elija un nombre de fichero diferente. + + No program defined + + + Process failed to start @@ -4603,7 +4614,7 @@ Elija un nombre de fichero diferente. QProgressDialog - + Cancel Cancelar @@ -4627,7 +4638,7 @@ Elija un nombre de fichero diferente. QRegExp - + no error occurred no se ha producido ningún error @@ -4675,7 +4686,7 @@ Elija un nombre de fichero diferente. QSQLite2Driver - + Error to open database Error al abrir la base de datos @@ -4698,12 +4709,12 @@ Elija un nombre de fichero diferente. QSQLite2Result - + Unable to fetch results No es posible obtener los resultados - + Unable to execute statement No es posible ejecutar la instrucción @@ -4711,7 +4722,7 @@ Elija un nombre de fichero diferente. QSQLiteDriver - + Error opening database Error al abrir la base de datos @@ -4778,12 +4789,12 @@ Elija un nombre de fichero diferente. QScrollBar - + Scroll here Desplazar hasta aquí - + Left edge Borde izquierdo @@ -4793,7 +4804,7 @@ Elija un nombre de fichero diferente. Parte superior - + Right edge Borde derecho @@ -4803,7 +4814,7 @@ Elija un nombre de fichero diferente. Parte inferior - + Page left Una página a la izquierda @@ -4814,7 +4825,7 @@ Elija un nombre de fichero diferente. Una página hacia arriba - + Page right Una página a la derecha @@ -4825,7 +4836,7 @@ Elija un nombre de fichero diferente. Una página hacia abajo - + Scroll left Desplazar hacia la izquierda @@ -4835,7 +4846,7 @@ Elija un nombre de fichero diferente. Desplazar hacia arriba - + Scroll right Desplazar hacia la derecha @@ -4863,7 +4874,7 @@ Elija un nombre de fichero diferente. QSharedMemory - + %1: unable to set key on lock @@ -4874,7 +4885,7 @@ Elija un nombre de fichero diferente. - + %1: unable to lock @@ -4884,8 +4895,8 @@ Elija un nombre de fichero diferente. - - + + %1: permission denied @@ -4963,7 +4974,7 @@ Elija un nombre de fichero diferente. QShortcut - + Space Espacio @@ -5548,7 +5559,7 @@ Elija un nombre de fichero diferente. QSql - + Delete Borrar @@ -5605,7 +5616,7 @@ Elija un nombre de fichero diferente. QSslSocket - + Unable to write data: %1 No es posible escribir los datos: %1 @@ -5668,7 +5679,7 @@ Elija un nombre de fichero diferente. QSystemSemaphore - + %1: out of resources @@ -5698,7 +5709,7 @@ Elija un nombre de fichero diferente. QTDSDriver - + Unable to open connection No es posible abrir la conexión @@ -5728,7 +5739,7 @@ Elija un nombre de fichero diferente. Operación socket no admitida - + Operation on socket is not supported @@ -5736,7 +5747,7 @@ Elija un nombre de fichero diferente. QTextControl - + &Undo &Deshacer @@ -5794,7 +5805,7 @@ Elija un nombre de fichero diferente. QUdpSocket - + This platform does not support IPv6 La plataforma no contempla IPv6 @@ -5802,7 +5813,7 @@ Elija un nombre de fichero diferente. QUndoGroup - + Undo Deshacer @@ -5815,7 +5826,7 @@ Elija un nombre de fichero diferente. QUndoModel - + <empty> <vacío> @@ -5823,7 +5834,7 @@ Elija un nombre de fichero diferente. QUndoStack - + Undo Deshacer @@ -5894,7 +5905,7 @@ Elija un nombre de fichero diferente. QWebFrame - + Request cancelled @@ -6305,7 +6316,7 @@ Elija un nombre de fichero diferente. - + JavaScript Alert - %1 @@ -6381,6 +6392,11 @@ Elija un nombre de fichero diferente. + Select all + + + + Select to the next character @@ -6449,11 +6465,21 @@ Elija un nombre de fichero diferente. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ¿Qué es esto? @@ -6461,7 +6487,7 @@ Elija un nombre de fichero diferente. QWidget - + * * @@ -6469,7 +6495,7 @@ Elija un nombre de fichero diferente. QWizard - + Go Back Precedente @@ -6531,7 +6557,7 @@ Elija un nombre de fichero diferente. QWorkspace - + &Restore &Restaurar @@ -6601,7 +6627,7 @@ Elija un nombre de fichero diferente. QXml - + no error occurred no se ha producido ningún error @@ -6719,8 +6745,8 @@ Elija un nombre de fichero diferente. QXmlStream - - + + Extra content at end of document. Contenido extra al final del documento. @@ -6908,7 +6934,7 @@ Elija un nombre de fichero diferente. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6918,12 +6944,12 @@ Elija un nombre de fichero diferente. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6933,7 +6959,7 @@ Elija un nombre de fichero diferente. - + Year %1 is invalid because it begins with %2. @@ -6973,7 +6999,7 @@ Elija un nombre de fichero diferente. - + At least one component must be present. @@ -6984,7 +7010,7 @@ Elija un nombre de fichero diferente. - + No operand in an integer division, %1, can be %2. @@ -6999,17 +7025,17 @@ Elija un nombre de fichero diferente. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7040,17 +7066,17 @@ Elija un nombre de fichero diferente. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7060,7 +7086,7 @@ Elija un nombre de fichero diferente. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7070,7 +7096,7 @@ Elija un nombre de fichero diferente. - + Operator %1 cannot be used on type %2. @@ -7080,7 +7106,7 @@ Elija un nombre de fichero diferente. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7090,7 +7116,7 @@ Elija un nombre de fichero diferente. - + Type error in cast, expected %1, received %2. @@ -7100,7 +7126,7 @@ Elija un nombre de fichero diferente. - + No casting is possible with %1 as the target type. @@ -7125,7 +7151,7 @@ Elija un nombre de fichero diferente. - + A comment cannot contain %1 @@ -7135,7 +7161,7 @@ Elija un nombre de fichero diferente. - + No comparisons can be done involving the type %1. @@ -7145,12 +7171,12 @@ Elija un nombre de fichero diferente. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7160,7 +7186,7 @@ Elija un nombre de fichero diferente. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7170,7 +7196,7 @@ Elija un nombre de fichero diferente. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7180,33 +7206,33 @@ Elija un nombre de fichero diferente. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7222,7 +7248,7 @@ Elija un nombre de fichero diferente. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7237,27 +7263,27 @@ Elija un nombre de fichero diferente. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7272,7 +7298,7 @@ Elija un nombre de fichero diferente. - + %1 matches newline characters @@ -7307,17 +7333,17 @@ Elija un nombre de fichero diferente. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7327,12 +7353,12 @@ Elija un nombre de fichero diferente. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7342,17 +7368,17 @@ Elija un nombre de fichero diferente. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7373,7 +7399,7 @@ Elija un nombre de fichero diferente. - + The variable %1 is unused @@ -7655,7 +7681,7 @@ Elija un nombre de fichero diferente. - + empty @@ -7680,7 +7706,7 @@ Elija un nombre de fichero diferente. - + Required type is %1, but %2 was found. @@ -7695,7 +7721,7 @@ Elija un nombre de fichero diferente. - + It's not possible to add attributes after any other kind of node. @@ -7705,12 +7731,12 @@ Elija un nombre de fichero diferente. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7725,13 +7751,13 @@ Elija un nombre de fichero diferente. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7750,12 +7776,12 @@ Elija un nombre de fichero diferente. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7765,12 +7791,12 @@ Elija un nombre de fichero diferente. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7825,7 +7851,7 @@ Elija un nombre de fichero diferente. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7900,7 +7926,7 @@ Elija un nombre de fichero diferente. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 2408e8b..a035963 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Le dispositif audio <b>%1</b> ne fonctionne pas.<br/>Utilisation de <b>%2</b>.</html> @@ -65,7 +64,7 @@ CloseButton - + Close Tab Fermer l'onglet @@ -189,7 +188,7 @@ Le support audio et vidéo est désactivé Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -234,24 +233,24 @@ have libgstreamer-plugins-base installed. Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0 - - + + - - - - + + + + Could not open media source. Impossible d'ouvrir le média source. - + Invalid source type. Type de source invalide. - + Could not locate media source. Impossible de localiser le média source. @@ -285,7 +284,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined La séquence %1, %2 n'est pas définie @@ -298,7 +297,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Vrai @@ -326,7 +325,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copie ou déplace un fichier @@ -351,7 +350,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Tous les fichiers (*) @@ -491,7 +490,7 @@ have libgstreamer-plugins-base installed. - + Open Ouvrir @@ -659,7 +658,7 @@ Vérifier le chemin et le nom du fichier. Q3LocalFs - + Could not read directory %1 @@ -709,7 +708,7 @@ en Q3MainWindow - + Line up Aligner @@ -722,7 +721,7 @@ en Q3NetworkProtocol - + Operation stopped by the user Opération interrompue par l'utilisateur @@ -730,7 +729,7 @@ en Q3ProgressDialog - + Cancel Annuler @@ -739,7 +738,7 @@ en Q3TabDialog - + OK OK @@ -768,7 +767,7 @@ en Q3TextEdit - + &Undo &Annuler @@ -807,7 +806,7 @@ en Q3TitleBar - + System Système @@ -875,7 +874,7 @@ en Q3ToolBar - + More... Reste... @@ -883,7 +882,7 @@ en Q3UrlOperator - + The protocol `%1' is not supported @@ -935,7 +934,7 @@ en Q3Wizard - + &Cancel &Annuler @@ -963,9 +962,9 @@ en QAbstractSocket - - - + + + Host not found Hôte introuvable @@ -1008,7 +1007,7 @@ en QAbstractSpinBox - + &Step up &Augmenter @@ -1026,13 +1025,13 @@ en QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. L'exécutable '%1' requiert Qt %2 (Qt %3 présent). @@ -1042,7 +1041,7 @@ en Erreur : bibliothèque Qt incompatible - + Activate Activer @@ -1078,7 +1077,7 @@ en QCheckBox - + Uncheck Décocher @@ -1096,7 +1095,7 @@ en QColorDialog - + Hu&e: &Teinte : @@ -1170,13 +1169,13 @@ en QComboBox - + Open Ouvrir - + False Faux @@ -1219,7 +1218,7 @@ en %1: erreur inconnue %2 - + %1: key is empty QSystemSemaphore %1: clé vide @@ -1240,12 +1239,12 @@ en QDB2Driver - + Unable to connect Incapable d'établir une connexion - + Unable to commit transaction Incapable de soumettre la transaction @@ -1263,8 +1262,8 @@ en QDB2Result - - + + Unable to execute statement Impossible d'exécuter la requête @@ -1279,7 +1278,7 @@ en Impossible d'attacher la variable - + Unable to fetch record %1 Impossible de récupérer l'enregistrement %1 @@ -1297,7 +1296,7 @@ en QDateTimeEdit - + AM AM @@ -1320,7 +1319,7 @@ en QDial - + QDial @@ -1338,7 +1337,7 @@ en QDialog - + What's This? Qu'est-ce que c'est ? @@ -1351,9 +1350,9 @@ en QDialogButtonBox - + - + OK OK @@ -1476,7 +1475,7 @@ en QDirModel - + Name Nom @@ -1506,7 +1505,7 @@ en QDockWidget - + Close Fermer @@ -1537,7 +1536,7 @@ en QErrorMessage - + &Show this message again &Afficher ce message de nouveau @@ -1565,13 +1564,18 @@ en QFile - - + + Destination file exists Le fichier destination existe - + + Cannot remove source file + + + + Cannot open %1 for input Impossible d'ouvrir %1 pour lecture @@ -1612,26 +1616,26 @@ en Affichage détaillé - + Open Ouvrir - + - + &Open &Ouvrir - + &Save &Enregistrer - + &Rename &Renommer @@ -1646,23 +1650,23 @@ en Afficher les fic&hiers cachés - + Directories Dossiers - + Recent Places Emplacements récents - - + + All Files (*) Tous les fichiers (*) - + %1 already exists. Do you want to replace it? Le fichier %1 existe déjà. Voulez-vous l'écraser ? @@ -1694,8 +1698,8 @@ Veuillez vérifier que le nom du fichier est correct. Fichiers de type : - - + + Directory: Dossier : @@ -1708,8 +1712,8 @@ Fichier introuvable. Veuillez vérifier que le nom du fichier est correct - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1718,7 +1722,7 @@ Dossier introuvable. Veuillez vérifier que le nom du dossier est correct. - + '%1' is write protected. Do you want to delete it anyway? '%1' est protégé en écriture. @@ -1735,17 +1739,17 @@ Voulez-vous quand même le supprimer? Impossible de supprimer le dossier. - + All Files (*.*) Tous les fichiers (*.*) - + Save As Enregistrer sous - + Drive Unité @@ -1777,29 +1781,29 @@ Voulez-vous quand même le supprimer? Successeur - + New Folder Nouveau dossier - + &New Folder &Nouveau dossier - + &Choose &Choisir - + Remove Supprimer - - + + File &name: &Nom de fichier : @@ -1819,7 +1823,7 @@ Voulez-vous quand même le supprimer? QFileSystemModel - + %1 TB %1 To @@ -1881,7 +1885,7 @@ Voulez-vous quand même le supprimer? Dernière modification - + My Computer Mon ordinateur @@ -1894,7 +1898,7 @@ Voulez-vous quand même le supprimer? QFontDatabase - + Normal @@ -2111,7 +2115,7 @@ Voulez-vous quand même le supprimer? QFontDialog - + &Font &Police @@ -2160,7 +2164,7 @@ Voulez-vous quand même le supprimer? QFtp - + Host %1 found Hôte %1 trouvé @@ -2170,7 +2174,7 @@ Voulez-vous quand même le supprimer? Hôte trouvé - + Connected to host %1 @@ -2306,7 +2310,7 @@ Voulez-vous quand même le supprimer? QHostInfo - + Unknown error Erreur inconnue @@ -2314,11 +2318,11 @@ Voulez-vous quand même le supprimer? QHostInfoAgent - + - + @@ -2344,13 +2348,13 @@ Voulez-vous quand même le supprimer? QHttp - - + + Connection refused Connexion refusée - + Host %1 not found @@ -2402,21 +2406,21 @@ Voulez-vous quand même le supprimer? Connexion arrêtée - - + + Unknown error Erreur inconnue - + Request aborted Requête interrompue - + No server set to connect to Aucun serveur spécifié @@ -2434,7 +2438,12 @@ Voulez-vous quand même le supprimer? Entête de réponse HTTP invalide - + + Unknown authentication method + + + + @@ -2482,12 +2491,12 @@ Voulez-vous quand même le supprimer? le handshake SSL a échoué - + Connection refused (or timed out) Connexion refusée (ou délai expiré) - + HTTPS connection requested but SSL support not compiled in Connexion HTTPS requise mais le support SSL n'est pas compilé @@ -2543,7 +2552,7 @@ Voulez-vous quand même le supprimer? QIBaseDriver - + Error opening database Erreur d'ouverture de la base de données @@ -2566,7 +2575,7 @@ Voulez-vous quand même le supprimer? QIBaseResult - + Unable to create BLOB Impossible de créer un BLOB @@ -2586,7 +2595,7 @@ Voulez-vous quand même le supprimer? Impossible de lire le BLOB - + Could not find array Impossible de trouver le tableau @@ -2656,7 +2665,7 @@ Voulez-vous quand même le supprimer? QIODevice - + Permission denied Accès refusé @@ -2676,7 +2685,7 @@ Voulez-vous quand même le supprimer? Aucun espace disponible sur le périphérique - + Unknown error Erreur inconnue @@ -2684,7 +2693,7 @@ Voulez-vous quand même le supprimer? QInputContext - + XIM XIM @@ -2707,7 +2716,7 @@ Voulez-vous quand même le supprimer? QInputDialog - + Enter a value: Entrer une valeur : @@ -2727,7 +2736,7 @@ Voulez-vous quand même le supprimer? QLibrary::resolve_sys: Symbole "%1" non défini dans %2 (%3) - + Could not mmap '%1': %2 Impossible d'établir la projection en mémoire de '%1' : %2 @@ -2758,7 +2767,7 @@ Voulez-vous quand même le supprimer? - + The shared library was not found. La bibliothèque partagée est introuvable. @@ -2773,8 +2782,8 @@ Voulez-vous quand même le supprimer? Le plugin '%1' utilise une bibliothèque Qt incompatible. (Il est impossible de mélanger des bibliothèques 'debug' et 'release'.) - - + + Cannot load library %1: %2 Impossible de charger la bibliothèque %1 : %2 @@ -2794,7 +2803,7 @@ Voulez-vous quand même le supprimer? QLineEdit - + Select All Tout sélectionner @@ -2832,8 +2841,8 @@ Voulez-vous quand même le supprimer? QLocalServer - - + + %1: Name error %1: Erreur de nom @@ -2849,7 +2858,7 @@ Voulez-vous quand même le supprimer? - + %1: Unknown error %2 %1: Erreur inconnue %2 @@ -2857,8 +2866,8 @@ Voulez-vous quand même le supprimer? QLocalSocket - - + + %1: Connection refused %1: Connexion refusée @@ -2871,7 +2880,7 @@ Voulez-vous quand même le supprimer? - + %1: Invalid name %1: Nom invalide @@ -2928,7 +2937,7 @@ Voulez-vous quand même le supprimer? QMYSQLDriver - + Unable to open database ' Impossible d'ouvrir la base de données ' @@ -2938,7 +2947,7 @@ Voulez-vous quand même le supprimer? Impossible d'établir une connexion - + Unable to begin transaction Impossible de démarrer la transaction @@ -2956,7 +2965,7 @@ Voulez-vous quand même le supprimer? QMYSQLResult - + Unable to fetch data Impossible de récuperer des données @@ -2971,7 +2980,7 @@ Voulez-vous quand même le supprimer? Impossible de stocker le résultat - + Unable to prepare statement Impossible de préparer l'instruction @@ -3016,7 +3025,7 @@ Voulez-vous quand même le supprimer? QMdiArea - + (Untitled) (Sans titre) @@ -3024,7 +3033,7 @@ Voulez-vous quand même le supprimer? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -3117,7 +3126,7 @@ Voulez-vous quand même le supprimer? QMenu - + Close Fermer @@ -3190,7 +3199,7 @@ Voulez-vous quand même le supprimer? QMessageBox - + @@ -3198,26 +3207,30 @@ Voulez-vous quand même le supprimer? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt À propos de Qt - + Help Aide - <p>This program uses Qt version %1.</p> - <p>Ce programme utilise la version %1 de Qt.</p> + <p>Ce programme utilise la version %1 de Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>A propos de Qt</h3>%1<p>Qt est un toolkit C++ pour le développement d'applications multi-platformes.</p><p>Qt fournit la portabilité du code source pour MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux et toutes les variantes commerciales majeures d'Unix. Qt est aussi disponible pour les systèmes embarqués sous le nom Qtopia Core.</p><p>Qt est un produit de Trolltech. <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - + Show Details... Montrer les détails... @@ -3227,14 +3240,12 @@ Voulez-vous quand même le supprimer? Cacher les détails... - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> + <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> + <p>Ce programme utilise Qt Open Source Edition version %1.</p><p>Qt Open Source Edition est prévu pour le développement d'applications Open Source. Vous devez avoir un license commerciale de Qt pour développer des applications propiétaires (Closed Source).</p><p>Vous pouvez aller sur <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> pour plus d'informations sur les licenses Qt.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -3244,7 +3255,7 @@ Voulez-vous quand même le supprimer? QMultiInputContext - + Select IM Sélectionner IM @@ -3252,7 +3263,7 @@ Voulez-vous quand même le supprimer? QMultiInputContextPlugin - + Multiple input method switcher Sélectionneur de méthode de saisie @@ -3265,7 +3276,7 @@ Voulez-vous quand même le supprimer? QNativeSocketEngine - + The remote host closed the connection L'hôte distant a fermé la connexion @@ -3398,7 +3409,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessCacheBackend - + Error opening %1 Erreur lors de l'ouverture de %1 @@ -3406,7 +3417,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessFileBackend - + Request for opening non-local file %1 Requête d'ouverture de fichier distant %1 @@ -3434,7 +3445,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessFtpBackend - + No suitable proxy found Aucun proxy trouvé @@ -3444,7 +3455,7 @@ Voulez-vous quand même le supprimer? Impossible d'ouvrir %1 : le chemin est un dossier - + Logging in to %1 failed: authentication required Connexion à %1 a échoué : authentification requise @@ -3462,7 +3473,7 @@ Voulez-vous quand même le supprimer? QNetworkAccessHttpBackend - + No suitable proxy found Aucun proxy trouvé @@ -3475,7 +3486,7 @@ Voulez-vous quand même le supprimer? Erreur lors du téléchargement de %1 - le serveur a répondu: %2 - + Protocol "%1" is unknown Le protocole "%1" est inconnu @@ -3483,7 +3494,7 @@ Voulez-vous quand même le supprimer? QNetworkReplyImpl - + Operation canceled Opération annulée @@ -3492,7 +3503,7 @@ Voulez-vous quand même le supprimer? QOCIDriver - + Unable to logon Impossible d'ouvrir une session @@ -3521,7 +3532,7 @@ Voulez-vous quand même le supprimer? QOCIResult - + Unable to bind column for batch execute @@ -3548,18 +3559,16 @@ Voulez-vous quand même le supprimer? Impossible de préparer la requête - - + Unable to bind value Impossible d'attacher la valeur - Unable to execute select statement - Impossible d'exéctuer la requête select + Impossible d'exéctuer la requête select - + Unable to execute statement Impossible d'exéctuer la requête @@ -3567,7 +3576,7 @@ Voulez-vous quand même le supprimer? QODBCDriver - + Unable to connect Incapable d'établir une connexion @@ -3577,7 +3586,7 @@ Voulez-vous quand même le supprimer? Impossible de se connecter - Le pilote ne supporte pas toutes les fonctionnalités nécessaires - + Unable to disable autocommit Impossible de désactiver l'autocommit @@ -3600,19 +3609,19 @@ Voulez-vous quand même le supprimer? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Impossible d'utiliser 'SQL_CURSOR_STATIC' comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC - + Unable to execute statement Impossible d'exéctuer la requête - + Unable to fetch next Impossible de récupérer le suivant @@ -3622,19 +3631,19 @@ Voulez-vous quand même le supprimer? Impossible de préparer la requête - + Unable to bind variable Impossible d'attacher la variable - - + + Unable to fetch last Impossible de récupérer le dernier - + Unable to fetch Impossible de récupérer @@ -3652,12 +3661,12 @@ Voulez-vous quand même le supprimer? QObject - + Home Début - + Operation not supported on %1 Opération non supportée sur %1 @@ -3667,7 +3676,7 @@ Voulez-vous quand même le supprimer? URI invalide : %1 - + Write error writing to %1: %2 Erreur d'écriture sur %1 : %2 @@ -3692,7 +3701,7 @@ Voulez-vous quand même le supprimer? Erreur de protocole: paquet de taille 0 reçu - + No host name given Nom d'hôte manquant @@ -3701,7 +3710,7 @@ Voulez-vous quand même le supprimer? QPPDOptionsModel - + Name Nom @@ -3714,7 +3723,7 @@ Voulez-vous quand même le supprimer? QPSQLDriver - + Unable to connect Impossible d'établir une connexion @@ -3734,7 +3743,7 @@ Voulez-vous quand même le supprimer? Impossible d'annuler la transaction - + Unable to subscribe Impossible de s'inscrire @@ -3747,12 +3756,12 @@ Voulez-vous quand même le supprimer? QPSQLResult - + Unable to create query Impossible de créer la requête - + Unable to prepare statement Impossible de préparer la requête @@ -3760,7 +3769,7 @@ Voulez-vous quand même le supprimer? QPageSetupWidget - + Centimeters (cm) Centimètres (cm) @@ -3876,7 +3885,7 @@ Voulez-vous quand même le supprimer? QPrintDialog - + locally connected connecté en local @@ -3887,7 +3896,7 @@ Voulez-vous quand même le supprimer? inconnu - + OK OK @@ -3900,7 +3909,7 @@ Voulez-vous quand même le supprimer? Imprimer en couleur si possible - + Print all Imprimer tout @@ -4103,7 +4112,7 @@ Voulez-vous quand même le supprimer? Source du papier : - + Print @@ -4405,7 +4414,7 @@ Veuillez choisir un nom de fichier différent. QPrintPreviewDialog - + %1% %1% @@ -4505,7 +4514,7 @@ Veuillez choisir un nom de fichier différent. Exporter vers PostScript - + Page Setup Configuration de la page @@ -4693,8 +4702,8 @@ Veuillez choisir un nom de fichier différent. QProcess - - + + Could not open input redirection for reading Impossible d'ouvrir la redirection d'entrée en lecture @@ -4723,7 +4732,7 @@ Veuillez choisir un nom de fichier différent. Operation de processus a expiré - + @@ -4743,6 +4752,11 @@ Veuillez choisir un nom de fichier différent. Le processus à planté + + No program defined + + + Process failed to start Le processus n'a pas démarré @@ -4751,7 +4765,7 @@ Veuillez choisir un nom de fichier différent. QProgressDialog - + Cancel Annuler @@ -4775,7 +4789,7 @@ Veuillez choisir un nom de fichier différent. QRegExp - + no error occurred aucune erreur ne s'est produite @@ -4823,7 +4837,7 @@ Veuillez choisir un nom de fichier différent. QSQLite2Driver - + Error to open database Erreur à l'ouverture de la base de données @@ -4846,12 +4860,12 @@ Veuillez choisir un nom de fichier différent. QSQLite2Result - + Unable to fetch results Impossible de récupérer les résultats - + Unable to execute statement Impossible d'exécuter la requête @@ -4859,7 +4873,7 @@ Veuillez choisir un nom de fichier différent. QSQLiteDriver - + Error opening database Erreur lors de l'ouverture de la base de données @@ -4926,12 +4940,12 @@ Veuillez choisir un nom de fichier différent. QScrollBar - + Scroll here Défiler jusqu'ici - + Left edge Extrême gauche @@ -4941,7 +4955,7 @@ Veuillez choisir un nom de fichier différent. En haut - + Right edge Extrême droite @@ -4951,7 +4965,7 @@ Veuillez choisir un nom de fichier différent. En bas - + Page left Page précédente @@ -4962,7 +4976,7 @@ Veuillez choisir un nom de fichier différent. Page précédente - + Page right Page suivante @@ -4973,7 +4987,7 @@ Veuillez choisir un nom de fichier différent. Page suivante - + Scroll left Défiler vers la gauche @@ -4983,7 +4997,7 @@ Veuillez choisir un nom de fichier différent. Défiler vers le haut - + Scroll right Défiler vers la droite @@ -5011,7 +5025,7 @@ Veuillez choisir un nom de fichier différent. QSharedMemory - + %1: unable to set key on lock %1 : impossible d'affecter la clé au verrou @@ -5022,7 +5036,7 @@ Veuillez choisir un nom de fichier différent. - + %1: unable to lock %1 : impossible de vérrouiller @@ -5032,8 +5046,8 @@ Veuillez choisir un nom de fichier différent. %1 : impossible de déverrouiller - - + + %1: permission denied %1 : permission refusée @@ -5111,7 +5125,7 @@ Veuillez choisir un nom de fichier différent. QShortcut - + Space Espace @@ -5697,7 +5711,7 @@ Veuillez choisir un nom de fichier différent. QSql - + Delete Supprimer @@ -5754,7 +5768,7 @@ Veuillez choisir un nom de fichier différent. QSslSocket - + Unable to write data: %1 Impossible d'écrire les données : %1 @@ -5817,7 +5831,7 @@ Veuillez choisir un nom de fichier différent. QSystemSemaphore - + %1: out of resources %1: plus de ressources disponibles @@ -5847,7 +5861,7 @@ Veuillez choisir un nom de fichier différent. QTDSDriver - + Unable to open connection Impossible d'ouvrir la connexion @@ -5877,7 +5891,7 @@ Veuillez choisir un nom de fichier différent. Operation socket non supportée - + Operation on socket is not supported Opération sur le socket non supportée @@ -5885,7 +5899,7 @@ Veuillez choisir un nom de fichier différent. QTextControl - + &Undo &Annuler @@ -5943,7 +5957,7 @@ Veuillez choisir un nom de fichier différent. QUdpSocket - + This platform does not support IPv6 Cette plateforme ne supporte pas IPv6 @@ -5951,7 +5965,7 @@ Veuillez choisir un nom de fichier différent. QUndoGroup - + Undo Annuler @@ -5964,7 +5978,7 @@ Veuillez choisir un nom de fichier différent. QUndoModel - + <empty> <vide> @@ -5972,7 +5986,7 @@ Veuillez choisir un nom de fichier différent. QUndoStack - + Undo Annuler @@ -6043,7 +6057,7 @@ Veuillez choisir un nom de fichier différent. QWebFrame - + Request cancelled Requête annulée @@ -6459,7 +6473,7 @@ Veuillez choisir un nom de fichier différent. - + JavaScript Alert - %1 Alerte javascript - %1 @@ -6535,6 +6549,11 @@ Veuillez choisir un nom de fichier différent. + Select all + + + + Select to the next character Sélectionner le caractère suivant @@ -6603,11 +6622,21 @@ Veuillez choisir un nom de fichier différent. Delete to the end of the word Supprimer jusqu'à la fin du mot + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Qu'est-ce que c'est ? @@ -6615,7 +6644,7 @@ Veuillez choisir un nom de fichier différent. QWidget - + * * @@ -6623,7 +6652,7 @@ Veuillez choisir un nom de fichier différent. QWizard - + Go Back Précédent @@ -6685,7 +6714,7 @@ Veuillez choisir un nom de fichier différent. QWorkspace - + &Restore &Restaurer @@ -6755,7 +6784,7 @@ Veuillez choisir un nom de fichier différent. QXml - + no error occurred aucune erreur ne s'est produite @@ -6873,8 +6902,8 @@ Veuillez choisir un nom de fichier différent. QXmlStream - - + + Extra content at end of document. Conteny supplémentaire à la fin du document. @@ -7062,7 +7091,7 @@ Veuillez choisir un nom de fichier différent. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. Un attribute %1 avec la valeur %2 est déjà déclaré. @@ -7072,12 +7101,12 @@ Veuillez choisir un nom de fichier différent. Un attribute %1 doit avoir un %2 valide, %3 ne l'a pas. - + Network timeout. Le réseau ne répond pas. - + Element %1 can't be serialized because it appears outside the document element. L'élément %1 ne peut pas être sérialisé parce qu'il est hors de l'élément document. @@ -7086,7 +7115,7 @@ Veuillez choisir un nom de fichier différent. L'élément attribute %1 ne peut pas être sérialisé parce qu'il apparaît comme racine. - + Year %1 is invalid because it begins with %2. L'année %1 est invalide parce qu'elle commence par %2. @@ -7126,7 +7155,7 @@ Veuillez choisir un nom de fichier différent. Overflow : la date ne peut pas être représentée. - + At least one component must be present. Au moins un composant doit être présent. @@ -7137,7 +7166,7 @@ Veuillez choisir un nom de fichier différent. Au moins un composant doit apparaître après le délimiteur %1. - + No operand in an integer division, %1, can be %2. Pas d'opérande dans une division entière, %1, peut être %2. @@ -7152,17 +7181,17 @@ Veuillez choisir un nom de fichier différent. Le second opérande dans une division, %1, ne peut être nul (%2). - + %1 is not a valid value of type %2. %1 n'est pas une valeur valide du type %2. - + When casting to %1 from %2, the source value cannot be %3. En castant de %2 vers %1, la valeur source ne peut pas être %3. - + Integer division (%1) by zero (%2) is undefined. Division entière (%1) par zéro (%2) indéfinie. @@ -7193,17 +7222,17 @@ Veuillez choisir un nom de fichier différent. La multiplication d'une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite. - + A value of type %1 cannot have an Effective Boolean Value. Une valeur de type %1 ne peut pas avoir une Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques. - + Value %1 of type %2 exceeds maximum (%3). La valeur %1 de type %2 excède le maximum (%3). @@ -7213,7 +7242,7 @@ Veuillez choisir un nom de fichier différent. La valeur %1 de type %2 est inférieur au minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n'est pas conforme. @@ -7223,7 +7252,7 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas une valeur valide de type %2. - + Operator %1 cannot be used on type %2. L'opérateur %1 ne peut pas être utilisé pour le type %2. @@ -7233,7 +7262,7 @@ Veuillez choisir un nom de fichier différent. L'opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3. - + The namespace URI in the name for a computed attribute cannot be %1. L'URI de namespace dans le nom d'un attribut calculé ne peut pas être %1. @@ -7243,7 +7272,7 @@ Veuillez choisir un nom de fichier différent. Le nom d'un attribut calculé ne peut pas avoir l'URI de namespace %1 avec le nom local %2. - + Type error in cast, expected %1, received %2. Erreur de type lors du cast, attendu %1 mais reçu %2. @@ -7253,7 +7282,7 @@ Veuillez choisir un nom de fichier différent. En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n'est pas autorisé. - + No casting is possible with %1 as the target type. Aucun cast n'est possible avec %1 comme type de destination. @@ -7278,7 +7307,7 @@ Veuillez choisir un nom de fichier différent. Echec en castant de %1 ver %2 : %3 - + A comment cannot contain %1 Un commentaire ne peut pas contenir %1 @@ -7288,7 +7317,7 @@ Veuillez choisir un nom de fichier différent. Un commentaire ne peut pas finir par %1. - + No comparisons can be done involving the type %1. Aucune comparaison ne peut être faite avec le type %1. @@ -7298,12 +7327,12 @@ Veuillez choisir un nom de fichier différent. L'opérateur %1 n'est pas disponible entre valeurs atomiques de type %2 et %3. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Un noeuds attribut ne peut être un fils d'un noeuds document. C'est pourquoi l'attribut %1 est mal placé. - + A library module cannot be evaluated directly. It must be imported from a main module. Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d'un module principal. @@ -7313,7 +7342,7 @@ Veuillez choisir un nom de fichier différent. Aucun template nommé %1 n'existe. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value. @@ -7323,7 +7352,7 @@ Veuillez choisir un nom de fichier différent. Un prédicat de position doit être évalué en une unique valeur numérique. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide. @@ -7333,33 +7362,33 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux. - + The data of a processing instruction cannot contain the string %1 Les données d'une instruction de traitement ne peut contenir la chaîne %1 - + No namespace binding exists for the prefix %1 Aucun lien de namespace n'existe pour le préfixe %1 - + No namespace binding exists for the prefix %1 in %2 Aucun lien de namespace n'existe pour le préfixe %1 dans %2 - + %1 is an invalid %2 %1 est un ivalide %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 prend au maximum %n argument. %2 est donc invalide. @@ -7375,7 +7404,7 @@ Veuillez choisir un nom de fichier différent. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration. @@ -7390,27 +7419,27 @@ Veuillez choisir un nom de fichier différent. Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5. - + %1 is not a valid XML 1.0 character. %1 n'est pas un caractère XML 1.0 valide. - + The first argument to %1 cannot be of type %2. Le premier argument de %1 ne peut être du type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents. - + %1 was called. %1 a été appelé. - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement. @@ -7425,7 +7454,7 @@ Veuillez choisir un nom de fichier différent. Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3 - + %1 matches newline characters %1 correspond à des caractères de saut de ligne @@ -7460,17 +7489,17 @@ Veuillez choisir un nom de fichier différent. Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié. - + It will not be possible to retrieve %1. Il sera impossible de récupérer %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n'est pas un document. - + The default collection is undefined I'l n'y a pas de collection par défaut @@ -7480,12 +7509,12 @@ Veuillez choisir un nom de fichier différent. %1 ne peut pas être récupéré - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Le forme de normalisation %1 n'est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Un décalage de zone doit être dans l'intervalle %1..%2 inclus. %3 est hors de l'intervalle. @@ -7494,17 +7523,17 @@ Veuillez choisir un nom de fichier différent. %1 n'est pas un nombre complet de minutes. - + Required cardinality is %1; got cardinality %2. La cardinalité requise est %1; reçu %2. - + The item %1 did not match the required type %2. L'item %1 ne correspond pas au type requis %2. - + %1 is an unknown schema type. %1 est un type de schema inconnu. @@ -7525,7 +7554,7 @@ Veuillez choisir un nom de fichier différent. Aucun variable nommée %1 existe - + The variable %1 is unused La variable %1 est inutilisée @@ -7823,7 +7852,7 @@ Veuillez choisir un nom de fichier différent. Le nom d'une expression d'extension doit être dans un namespace. - + empty vide @@ -7848,7 +7877,7 @@ Veuillez choisir un nom de fichier différent. zéro ou plus - + Required type is %1, but %2 was found. Le type requis est %1, mais %2 a été reçu. @@ -7863,7 +7892,7 @@ Veuillez choisir un nom de fichier différent. Le focus est indéfini. - + It's not possible to add attributes after any other kind of node. Il est impossible d'ajouter des attributs après un autre type de noeuds. @@ -7873,7 +7902,7 @@ Veuillez choisir un nom de fichier différent. Un attribute de nom %1 a déjà été créé. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Seule le Unicode CodepointCollation est supporté (%1), %2 n'est pas supporté. @@ -7888,7 +7917,7 @@ Veuillez choisir un nom de fichier différent. L'attribut %1 ne peut pas être sérialisé car il apparaît à la racine. - + %1 is an unsupported encoding. %1 est un encodage non supporté. @@ -7903,14 +7932,18 @@ Veuillez choisir un nom de fichier différent. Le codepoint %1 dans %2 et utilisant l'encodage %3 est un caractère XML invalide. - + Ambiguous rule match. Corresonpdance aux règles ambigüe. - In a namespace constructor, the value for a namespace value cannot be an empty string. - Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. + Dans un cosntructeur de namespace, la valeur pour un namespace ne peut pas être une chaîne vide. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7928,12 +7961,12 @@ Veuillez choisir un nom de fichier différent. Seul le préfixe %1 peut être lié à %2, et vice versa. - + Circularity detected Circularité détectée - + The parameter %1 is required, but no corresponding %2 is supplied. Le paramètre %1 est requis, mais aucun %2 correspondant n'est fourni. @@ -7943,12 +7976,12 @@ Veuillez choisir un nom de fichier différent. Le paramètre %1 est passé mais aucun %2 correspondant n'existe. - + The URI cannot have a fragment L'URI ne peut pas avoir de fragments - + Element %1 is not allowed at this location. L'élément %1 n'est pas autorisé à cet emplacement. @@ -8003,7 +8036,7 @@ Veuillez choisir un nom de fichier différent. Au moins un mode doit être spécifié dans l'attribut %1 sur l'élément %2. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. L'attribut %1 ne peut pas apparaître sur l'élément %2. Seuls les attributs standard le peuvent. @@ -8078,7 +8111,7 @@ Veuillez choisir un nom de fichier différent. L'élément %1 ne peut pas avoir de fils. - + Element %1 cannot have a sequence constructor. L'élément %1 ne peut pas avoir un constructuer de séquence. diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index 45ddf03..ed8a3c3 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -1,10 +1,10 @@ - - + + QCLuceneResultWidget - + Search Results Ergebnisse @@ -32,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! Das "Collection File" ist noch nicht eingerichtet. @@ -111,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 Kann Datenbank nicht öffnen: '%1' '%2': %3 @@ -119,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! Der angegebene Namensraum existiert nicht! @@ -127,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! Kann Dokumentations-Datei nicht öffnen: %1: %2! @@ -135,7 +135,7 @@ QHelpGenerator - + Invalid help data! Ungültige Hilfe-Daten! @@ -180,7 +180,7 @@ Dokumentation erfolgreich generiert. - + Some tables already exist! Einige Tabellen existieren bereits! @@ -210,7 +210,7 @@ Kann Datei %1 nicht öffnen! Ãœberspringe sie. - + The filter %1 is already registered! Der Filter %1 is bereits registriert! @@ -243,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: Suche nach: @@ -286,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0 von 0 Treffern @@ -302,12 +302,12 @@ QObject - + Untitled Ohne Titel - + Unknown token. Unbekanntes Token. diff --git a/translations/qt_help_ja.ts b/translations/qt_help_ja.ts index 01ef482..5702cfd 100644 --- a/translations/qt_help_ja.ts +++ b/translations/qt_help_ja.ts @@ -1,9 +1,10 @@ - + + QCLuceneResultWidget - + Search Results @@ -31,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! @@ -110,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 @@ -118,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! @@ -126,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! @@ -134,7 +135,7 @@ QHelpGenerator - + Invalid help data! @@ -179,7 +180,7 @@ - + Some tables already exist! @@ -209,7 +210,7 @@ - + The filter %1 is already registered! @@ -242,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: @@ -285,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits @@ -301,12 +302,12 @@ QObject - + Untitled - + Unknown token. diff --git a/translations/qt_help_pl.ts b/translations/qt_help_pl.ts index 1b586bc..c85b46c 100644 --- a/translations/qt_help_pl.ts +++ b/translations/qt_help_pl.ts @@ -1,10 +1,10 @@ - - + + QCLuceneResultWidget - + Search Results Wyniki wyszukiwania @@ -32,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! Plik z kolekcjÄ… nie jest jeszcze ustawiony! @@ -115,7 +115,7 @@ Nie można otworzyć bazy danych! - + Cannot open database '%1' '%2': %3 Nie można otworzyć bazy danych '%1' '%2': %3 @@ -123,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! Podana przestrzeÅ„ nazw nie istnieje! @@ -131,7 +131,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! Nie można otworzyć pliku z dokumentacjÄ… %1: %2! @@ -147,7 +147,7 @@ QHelpGenerator - + Invalid help data! Niepoprawne dane pomocy! @@ -200,7 +200,7 @@ Dokumentacja zostaÅ‚a poprawnie wygenerowana. - + Some tables already exist! Niektóre tabele już istniejÄ…! @@ -230,7 +230,7 @@ Nie można otworzyć pliku %1! Zostaje on opuszczony. - + The filter %1 is already registered! Filtr %1 jest już zarejestrowany! @@ -263,7 +263,7 @@ QHelpSearchQueryWidget - + Search for: Wyszukaj: @@ -306,7 +306,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0 z 0 TrafieÅ„ @@ -322,7 +322,7 @@ QObject - + Untitled Nienazwany @@ -335,7 +335,7 @@ Nieznany znak w linii %1. Spodziewano siÄ™ "QtHelpProject"! - + Unknown token. Nieznany znak. diff --git a/translations/qt_help_tr_TR.ts b/translations/qt_help_tr_TR.ts new file mode 100644 index 0000000..7e2d8d1 --- /dev/null +++ b/translations/qt_help_tr_TR.ts @@ -0,0 +1,355 @@ + + + + + QCLuceneResultWidget + + + Search Results + + + + + Note: + + + + + The search results may not be complete since the documentation is still being indexed! + + + + + Your search did not match any documents. + + + + + (The reason for this might be that the documentation is still being indexed.) + + + + + QHelpCollectionHandler + + + The collection file is not set up yet! + + + + + Cannot load sqlite database driver! + + + + + + Cannot open collection file: %1 + + + + + Cannot create tables in file %1! + + + + + The specified collection file already exists! + + + + + Cannot create directory: %1 + + + + + Cannot copy collection file: %1 + + + + + Unknown filter! + + + + + Cannot register filter %1! + + + + + Cannot open documentation file %1! + + + + + Invalid documentation file! + + + + + The namespace %1 was not registered! + + + + + Namespace %1 already exists! + + + + + Cannot register namespace! + + + + + Cannot open database to optimize! + + + + + QHelpDBReader + + + Cannot open database '%1' '%2': %3 + + + + + QHelpEngineCore + + + The specified namespace does not exist! + + + + + QHelpEngineCorePrivate + + + Cannot open documentation file %1: %2! + + + + + QHelpGenerator + + + Invalid help data! + + + + + No output file name specified! + + + + + The file %1 cannot be overwritten! + + + + + Building up file structure... + + + + + Cannot open data base file %1! + + + + + Cannot register namespace %1! + + + + + Insert custom filters... + + + + + Insert help data for filter section (%1 of %2)... + + + + + Documentation successfully generated. + + + + + Some tables already exist! + + + + + Cannot create tables! + + + + + Cannot register virtual folder! + + + + + Insert files... + + + + + The file %1 does not exist! Skipping it. + + + + + Cannot open file %1! Skipping it. + + + + + The filter %1 is already registered! + + + + + Cannot register filter %1! + + + + + Insert indices... + + + + + Insert contents... + + + + + Cannot insert contents! + + + + + Cannot register contents! + + + + + QHelpSearchQueryWidget + + + Search for: + + + + + Search + + + + + Advanced search + + + + + words <B>similar</B> to: + + + + + <B>without</B> the words: + + + + + with <B>exact phrase</B>: + + + + + with <B>all</B> of the words: + + + + + with <B>at least one</B> of the words: + + + + + QHelpSearchResultWidget + + + 0 - 0 of 0 Hits + + + + + QHelpSearchResultWidgetPrivate + + + %1 - %2 of %3 Hits + + + + + QObject + + + Untitled + + + + + Unknown token. + + + + + Unknown token. Expected "QtHelpProject"! + + + + + Error in line %1: %2 + + + + + A virtual folder must not contain a '/' character! + + + + + A namespace must not contain a '/' character! + + + + + Missing namespace in QtHelpProject. + + + + + Missing virtual folder in QtHelpProject + + + + + Missing attribute in keyword at line %1. + + + + + The input file %1 could not be opened! + + + + diff --git a/translations/qt_help_untranslated.ts b/translations/qt_help_untranslated.ts index 01ef482..5702cfd 100644 --- a/translations/qt_help_untranslated.ts +++ b/translations/qt_help_untranslated.ts @@ -1,9 +1,10 @@ - + + QCLuceneResultWidget - + Search Results @@ -31,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! @@ -110,7 +111,7 @@ QHelpDBReader - + Cannot open database '%1' '%2': %3 @@ -118,7 +119,7 @@ QHelpEngineCore - + The specified namespace does not exist! @@ -126,7 +127,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! @@ -134,7 +135,7 @@ QHelpGenerator - + Invalid help data! @@ -179,7 +180,7 @@ - + Some tables already exist! @@ -209,7 +210,7 @@ - + The filter %1 is already registered! @@ -242,7 +243,7 @@ QHelpSearchQueryWidget - + Search for: @@ -285,7 +286,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits @@ -301,12 +302,12 @@ QObject - + Untitled - + Unknown token. diff --git a/translations/qt_help_zh_CN.ts b/translations/qt_help_zh_CN.ts index 0f2d3ed..cc100b7 100644 --- a/translations/qt_help_zh_CN.ts +++ b/translations/qt_help_zh_CN.ts @@ -1,11 +1,10 @@ - QCLuceneResultWidget - + Search Results æœç´¢ç»“æžœ @@ -33,7 +32,7 @@ QHelpCollectionHandler - + The collection file is not set up yet! 还没有设置收è—æ–‡ä»¶å‘¢ï¼ @@ -116,7 +115,7 @@ ä¸èƒ½æ‰“开数æ®åº“ï¼ - + Cannot open database '%1' '%2': %3 ä¸èƒ½æ‰“开数æ®åº““%1†“%2â€ï¼š%3 @@ -124,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! 指定的命å空间ä¸å­˜åœ¨ï¼ @@ -132,7 +131,7 @@ QHelpEngineCorePrivate - + Cannot open documentation file %1: %2! ä¸èƒ½æ‰“开文档文件%1:%2ï¼ @@ -144,7 +143,7 @@ QHelpGenerator - + Invalid help data! 无效的帮助数æ®ï¼ @@ -179,7 +178,7 @@ 文档已ç»è¢«æˆåŠŸç”Ÿæˆã€‚ - + Some tables already exist! 一些表格已ç»å­˜åœ¨ï¼ @@ -209,7 +208,7 @@ ä¸èƒ½æ‰“开文件 %1ï¼æ­£åœ¨å¿½ç•¥å®ƒã€‚ - + The filter %1 is already registered! 过滤器 %1 å·²ç»è¢«æ³¨å†Œï¼ @@ -239,7 +238,7 @@ ä¸èƒ½æ³¨å†Œå†…å®¹ï¼ - + The file %1 cannot be overwritten! 文件 %1 ä¸èƒ½è¢«è¦†ç›–ï¼ @@ -252,7 +251,7 @@ QHelpSearchQueryWidget - + Search for: æœç´¢ï¼š @@ -295,7 +294,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 次点击中的 0 - 0 @@ -311,7 +310,7 @@ QObject - + Untitled 未命åçš„ @@ -324,7 +323,7 @@ 在行 %1 的未知标记。需è¦â€œQtHelpProjectâ€ï¼ - + A virtual folder must not contain a '/' character! 虚拟文件夹必须ä¸åŒ…å«â€œ/â€œå­—ç¬¦ï¼ diff --git a/translations/qt_help_zh_TW.ts b/translations/qt_help_zh_TW.ts index e2609d7..2e9340e 100644 --- a/translations/qt_help_zh_TW.ts +++ b/translations/qt_help_zh_TW.ts @@ -1,26 +1,30 @@ - - + + QCLuceneResultWidget - + Search Results æœå°‹çµæžœ + Note: 備註: + The search results may not be complete since the documentation is still being indexed! æœå°‹çµæžœå¯èƒ½ä¸å®Œæ•´ï¼Œå› ç‚ºæ–‡ä»¶ä»åœ¨å»ºç´¢å¼•ä¸­ï¼ + Your search did not match any documents. 您的æœå°‹å­—串沒有出ç¾åœ¨ä»»ä½•æ–‡ä»¶ä¸­ã€‚ + (The reason for this might be that the documentation is still being indexed.) (有å¯èƒ½æ˜¯å› ç‚ºæ–‡ä»¶ä»åœ¨å»ºç´¢å¼•ä¸­ã€‚) @@ -28,63 +32,78 @@ QHelpCollectionHandler - + The collection file is not set up yet! 收集檔尚未設定。 + Cannot load sqlite database driver! 無法載入 sqlite 資料庫驅動程å¼ï¼ + + Cannot open collection file: %1 無法開啟收集檔:%1 + Cannot create tables in file %1! 無法在檔案 %1 裡建立表格。 + The specified collection file already exists! 指定的收集檔已存在。 + Cannot create directory: %1 無法建立目錄:%1 + Cannot copy collection file: %1 無法複製收集檔:%1 + Unknown filter! 未知的éŽæ¿¾å™¨ï¼ + Cannot register filter %1! 無法註冊éŽæ¿¾å™¨ %1。 + Cannot open documentation file %1! 無法開啟文件檔 %1。 + Invalid documentation file! ä¸åˆæ³•çš„æ–‡ä»¶æª”ï¼ + The namespace %1 was not registered! 命å空間 %1 尚未註冊。 + Namespace %1 already exists! 命å空間 %1 已存在。 + Cannot register namespace! 無法註冊命å空間。 + Cannot open database to optimize! 無法開啟資料庫以進行最佳化。 @@ -96,7 +115,7 @@ 無法開啟資料庫。 - + Cannot open database '%1' '%2': %3 無法開啟資料庫 '%1' '%2':%3 @@ -104,7 +123,7 @@ QHelpEngineCore - + The specified namespace does not exist! 指定的命å空間ä¸å­˜åœ¨ã€‚ @@ -112,6 +131,7 @@ QHelpEngineCorePrivate + Cannot open documentation file %1: %2! 無法開啟文件檔 %1':%2ï¼ @@ -127,11 +147,12 @@ QHelpGenerator - + Invalid help data! ä¸åˆæ³•çš„說明資料。 + No output file name specified! 沒有指定輸出檔å。 @@ -140,6 +161,7 @@ 檔案 %1 已存在。 + Building up file structure... 建立檔案çµæ§‹ä¸­... @@ -148,42 +170,52 @@ 無法開啟資料庫。 + Cannot register namespace %1! 無法註冊命å空間 %1。 + Insert custom filters... æ’入自訂éŽæ¿¾å™¨... + Insert help data for filter section (%1 of %2)... æ’å…¥éŽæ¿¾å™¨å€æ®µçš„說明資料(%1 / %2)... + Documentation successfully generated. 文件已æˆåŠŸç”¢ç”Ÿã€‚ + Some tables already exist! 有些表格已存在。 + Cannot create tables! 無法建立表格。 + Cannot register virtual folder! 無法註冊虛擬資料夾。 + Insert files... æ’入檔案... + The file %1 does not exist! Skipping it. 檔案 %1 ä¸å­˜åœ¨ï¼å°‡å¿½ç•¥å®ƒã€‚ + Cannot open file %1! Skipping it. 無法開啟檔案 %1。將忽略它。 @@ -192,34 +224,42 @@ 無法將檔案資料æ’入資料庫。 + The filter %1 is already registered! éŽæ¿¾å™¨ %1 已註冊。 + Cannot register filter %1! 無法註冊éŽæ¿¾å™¨ %1。 + Insert indices... æ’入索引... + Insert contents... æ’入內容... + Cannot insert contents! 無法æ’入內容。 + Cannot register contents! 無法註冊內容。 + The file %1 cannot be overwritten! 檔案 %1 無法被覆寫。 + Cannot open data base file %1! 無法開啟資料庫檔案 %1。 @@ -227,35 +267,42 @@ QHelpSearchQueryWidget - + Search for: æœå°‹ï¼š + Search æœå°‹ + Advanced search 進階æœå°‹ + words <B>similar</B> to: <B>相似於</B>這些單字: + <B>without</B> the words: <B>ä¸å«</B>這些單字: + with <B>exact phrase</B>: <B>完全符åˆ</B>此片語: + with <B>all</B> of the words: 包å«<B>所有</B>單字: + with <B>at least one</B> of the words: <B>至少符åˆä¸€å€‹</B>單字: @@ -263,7 +310,7 @@ QHelpSearchResultWidget - + 0 - 0 of 0 Hits 0 - 0/0 ç­†ç¬¦åˆ @@ -271,6 +318,7 @@ QHelpSearchResultWidgetPrivate + %1 - %2 of %3 Hits %1 - %2 / %3 ç­†ç¬¦åˆ @@ -278,7 +326,7 @@ QObject - + Untitled 未命å @@ -291,39 +339,47 @@ 第 %1 行有未知的符號。應該è¦æ˜¯ "QtHelpProject"。 - + A virtual folder must not contain a '/' character! 虛擬資料夾ä¸èƒ½å«æœ‰ / 字元。 + A namespace must not contain a '/' character! 命å空間ä¸èƒ½å«æœ‰ / 字元。 + Missing namespace in QtHelpProject. QtHelpProject 中沒有命å空間。 + Missing virtual folder in QtHelpProject QtHelpProject 中沒有虛擬資料夾。 + Missing attribute in keyword at line %1. 第 %1 行的關éµå­—中沒有屬性。 + The input file %1 could not be opened! 無法開啟輸入檔 %1。 + Unknown token. 未知的符號。 + Unknown token. Expected "QtHelpProject"! 未知的符號。應該為 "QtHelpProject"。 + Error in line %1: %2 第 %1 行發生錯誤:%2 diff --git a/translations/qt_iw.ts b/translations/qt_iw.ts index 3eea6dd..52ecc9a 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_iw.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True ×מת @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File העתק ×ו העבר קובץ @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) כל ×”×§×‘×¦×™× (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open פתח @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -570,7 +570,7 @@ to Q3MainWindow - + Line up סדר בשורה @@ -583,7 +583,7 @@ to Q3NetworkProtocol - + Operation stopped by the user הפעולה הופסקה על ידי המשתמש @@ -591,7 +591,7 @@ to Q3ProgressDialog - + Cancel ביטול @@ -600,7 +600,7 @@ to Q3TabDialog - + OK ×ישור @@ -629,7 +629,7 @@ to Q3TextEdit - + &Undo &בטל @@ -668,7 +668,7 @@ to Q3TitleBar - + System @@ -736,7 +736,7 @@ to Q3ToolBar - + More... @@ -744,7 +744,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -796,7 +796,7 @@ to Q3Wizard - + &Cancel @@ -824,9 +824,9 @@ to QAbstractSocket - - - + + + Host not found @@ -869,7 +869,7 @@ to QAbstractSpinBox - + &Step up @@ -887,13 +887,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. RTL - + Executable '%1' requires Qt %2, found Qt %3. @@ -903,7 +903,7 @@ to - + Activate @@ -939,7 +939,7 @@ to QCheckBox - + Uncheck @@ -957,7 +957,7 @@ to QColorDialog - + Hu&e: &גוון: @@ -1031,13 +1031,13 @@ to QComboBox - + Open פתח - + False שקר @@ -1055,7 +1055,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1076,12 +1076,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1099,8 +1099,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1115,7 +1115,7 @@ to - + Unable to fetch record %1 @@ -1133,7 +1133,7 @@ to QDateTimeEdit - + AM @@ -1156,7 +1156,7 @@ to QDial - + QDial @@ -1174,7 +1174,7 @@ to QDialog - + What's This? מה ×–×”? @@ -1187,9 +1187,9 @@ to QDialogButtonBox - + - + OK ×ישור @@ -1312,7 +1312,7 @@ to QDirModel - + Name ×©× @@ -1342,7 +1342,7 @@ to QDockWidget - + Close סגור @@ -1373,7 +1373,7 @@ to QErrorMessage - + &Show this message again &הצג הודעה זו שנית @@ -1401,13 +1401,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1430,8 +1435,8 @@ to QFileDialog - - + + All Files (*) כל ×”×§×‘×¦×™× (*) @@ -1454,13 +1459,13 @@ to תצוגת ×¤×¨×˜×™× - + File קובץ - + Open פתח @@ -1470,21 +1475,21 @@ to שמירה ×‘×©× - + - + &Open &פתח - + &Save &שמור - + &Rename ש&× ×” ×©× @@ -1499,27 +1504,27 @@ to הצג ×§×‘×¦×™× &×ž×•×¡×ª×¨×™× - + New Folder תיקיה חדשה - + Find Directory חפש ספריה - + Directories ספריות - + All Files (*.*) כל ×”×§×‘×¦×™× (*.*) - + %1 already exists. Do you want to replace it? @@ -1549,21 +1554,21 @@ Please verify the correct file name was given. - - + + Directory: - - + + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1579,7 +1584,7 @@ Do you want to delete it anyway? - + Recent Places @@ -1594,7 +1599,7 @@ Do you want to delete it anyway? - + Show @@ -1610,19 +1615,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: &×©× ×”×§×•×‘×¥: @@ -1642,7 +1647,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1704,7 +1709,7 @@ Do you want to delete it anyway? - + My Computer @@ -1717,7 +1722,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1934,7 +1939,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &גופן @@ -1983,7 +1988,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found המ×רח %1 × ×ž×¦× @@ -1993,7 +1998,7 @@ Do you want to delete it anyway? המ×רח × ×ž×¦× - + Connected to host %1 @@ -2120,7 +2125,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error @@ -2128,11 +2133,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2158,13 +2163,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused החיבור נדחה - + Host %1 not found @@ -2177,12 +2182,12 @@ Do you want to delete it anyway? ×ורך תוכן שגוי - + HTTPS connection requested but SSL support not compiled in - + @@ -2221,21 +2226,21 @@ Do you want to delete it anyway? החיבור נסגר - - + + Unknown error - + Request aborted - + No server set to connect to @@ -2253,7 +2258,12 @@ Do you want to delete it anyway? - + + Unknown authentication method + + + + @@ -2276,7 +2286,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2357,7 +2367,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2380,7 +2390,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2400,7 +2410,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2470,7 +2480,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2490,7 +2500,7 @@ Do you want to delete it anyway? - + Unknown error @@ -2498,7 +2508,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2521,7 +2531,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2529,7 +2539,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2560,7 +2570,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2575,8 +2585,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2596,7 +2606,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &בטל @@ -2634,8 +2644,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2651,7 +2661,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2659,8 +2669,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2673,7 +2683,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2730,7 +2740,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2740,7 +2750,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2758,7 +2768,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2773,7 +2783,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2818,7 +2828,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2826,7 +2836,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2919,7 +2929,7 @@ Do you want to delete it anyway? QMenu - + Close סגור @@ -2948,7 +2958,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2956,22 +2966,22 @@ Do you want to delete it anyway? ×ישור - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help עזרה - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -2980,21 +2990,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3002,7 +3002,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3015,7 +3015,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3148,7 +3148,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3156,7 +3156,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3184,7 +3184,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3194,7 +3194,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3212,7 +3212,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3225,7 +3225,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3233,7 +3233,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3242,7 +3242,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3271,7 +3271,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3298,18 +3298,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3317,7 +3311,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3327,7 +3321,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3350,19 +3344,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3372,19 +3366,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3402,12 +3396,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3417,7 +3411,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3442,7 +3436,7 @@ Do you want to delete it anyway? - + No host name given @@ -3451,7 +3445,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name ×©× @@ -3464,7 +3458,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3484,7 +3478,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3497,12 +3491,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3510,7 +3504,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3626,7 +3620,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected מחוברת מקומית @@ -3643,7 +3637,7 @@ Do you want to delete it anyway? ×œ× ×™×“×•×¢ - + OK ×ישור @@ -3660,7 +3654,7 @@ Do you want to delete it anyway? מדפסת - + Print all הדפס הכל @@ -3840,7 +3834,7 @@ Do you want to delete it anyway? - + Print @@ -4092,13 +4086,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4376,8 +4370,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4406,7 +4400,7 @@ Please choose a different file name. - + @@ -4426,6 +4420,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4434,7 +4433,7 @@ Please choose a different file name. QProgressDialog - + Cancel ביטול @@ -4458,7 +4457,7 @@ Please choose a different file name. QRegExp - + no error occurred ×œ× ×ירעה כל שגי××” @@ -4506,7 +4505,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4529,12 +4528,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4605,12 +4604,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4620,7 +4619,7 @@ Please choose a different file name. - + Right edge @@ -4630,7 +4629,7 @@ Please choose a different file name. - + Page left @@ -4641,7 +4640,7 @@ Please choose a different file name. - + Page right @@ -4652,7 +4651,7 @@ Please choose a different file name. - + Scroll left @@ -4662,7 +4661,7 @@ Please choose a different file name. - + Scroll right @@ -4690,7 +4689,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4701,7 +4700,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4711,8 +4710,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4790,7 +4789,7 @@ Please choose a different file name. QShortcut - + Space רווח @@ -5371,7 +5370,7 @@ Please choose a different file name. QSql - + Delete מחק @@ -5428,7 +5427,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5487,7 +5486,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5517,7 +5516,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5543,7 +5542,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5551,7 +5550,7 @@ Please choose a different file name. QTextControl - + &Undo &בטל @@ -5609,7 +5608,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5617,7 +5616,7 @@ Please choose a different file name. QUndoGroup - + Undo בטל @@ -5630,7 +5629,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5638,7 +5637,7 @@ Please choose a different file name. QUndoStack - + Undo בטל @@ -5709,7 +5708,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6119,7 +6118,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6195,6 +6194,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6263,11 +6267,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? מה ×–×”? @@ -6275,7 +6289,7 @@ Please choose a different file name. QWidget - + * @@ -6283,7 +6297,7 @@ Please choose a different file name. QWizard - + Cancel ביטול @@ -6341,7 +6355,7 @@ Please choose a different file name. QWorkspace - + &Restore ש&חזר @@ -6411,7 +6425,7 @@ Please choose a different file name. QXml - + no error occurred ×œ× ×ירעה כל שגי××” @@ -6529,8 +6543,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6714,7 +6728,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6724,12 +6738,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6739,7 +6753,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6790,7 +6804,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6805,17 +6819,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6846,17 +6860,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6866,7 +6880,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6876,7 +6890,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6886,7 +6900,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6896,7 +6910,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6906,7 +6920,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6931,7 +6945,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6941,7 +6955,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6951,12 +6965,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -6966,7 +6980,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -6976,7 +6990,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -6986,33 +7000,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7026,7 +7040,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7041,27 +7055,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7076,7 +7090,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7111,17 +7125,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7131,12 +7145,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7146,17 +7160,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7177,7 +7191,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7459,7 +7473,7 @@ Please choose a different file name. - + empty @@ -7484,7 +7498,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7499,7 +7513,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7509,12 +7523,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7529,13 +7543,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7554,12 +7568,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7569,12 +7583,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7629,7 +7643,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7704,7 +7718,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts index de76cf1..f3e7584 100644 --- a/translations/qt_ja_JP.ts +++ b/translations/qt_ja_JP.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 ã¯å®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“ @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True True @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + All Files (*.*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*.*) @@ -209,7 +209,7 @@ have libgstreamer-plugins-base installed. ディレクトリをé¸æŠž - + Copy or Move a File ファイルをコピーã¾ãŸã¯ç§»å‹• @@ -234,7 +234,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*) @@ -527,7 +527,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ to Q3MainWindow - + Line up 整列 @@ -590,7 +590,7 @@ to Q3NetworkProtocol - + Operation stopped by the user æ“作ãŒãƒ¦ãƒ¼ã‚¶ã«ã‚ˆã£ã¦åœæ­¢ã•ã‚Œã¾ã—㟠@@ -598,7 +598,7 @@ to Q3ProgressDialog - + Cancel キャンセル @@ -607,7 +607,7 @@ to Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ to Q3TextEdit - + &Undo å…ƒã«æˆ»ã™(&U) @@ -675,7 +675,7 @@ to Q3TitleBar - + System システム @@ -743,7 +743,7 @@ to Q3ToolBar - + More... ãã®ä»–... @@ -751,7 +751,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ to Q3Wizard - + &Cancel キャンセル(&C) @@ -831,9 +831,9 @@ to QAbstractSocket - - - + + + Host not found ホストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠@@ -876,7 +876,7 @@ to QAbstractSpinBox - + &Step up 上(&S) @@ -894,7 +894,7 @@ to QApplication - + Activate アクティブ㫠@@ -904,7 +904,7 @@ to メインウィンドウをアクティブã«ã™ã‚‹ - + Executable '%1' requires Qt %2, found Qt %3. 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ« '%1' ã«ã¯ Qt %2 ãŒå¿…è¦ã§ã™ã€‚Qt %3 ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ @@ -914,7 +914,7 @@ to 互æ›æ€§ã®ãªã„Qtライブラリエラー - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ to QCheckBox - + Uncheck é¸æŠžè§£é™¤ @@ -964,7 +964,7 @@ to QColorDialog - + Hu&e: 色相(&E): @@ -1038,13 +1038,13 @@ to QComboBox - + Open オープン - + False False @@ -1062,7 +1062,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ to QDB2Driver - + Unable to connect 接続ã§ãã¾ã›ã‚“ - + Unable to commit transaction トランザクションをコミットã§ãã¾ã›ã‚“ @@ -1106,8 +1106,8 @@ to QDB2Result - - + + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -1122,7 +1122,7 @@ to 変数をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - + Unable to fetch record %1 レコード %1 をフェッãƒã§ãã¾ã›ã‚“ @@ -1140,7 +1140,7 @@ to QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ to QDial - + QDial @@ -1181,7 +1181,7 @@ to QDialog - + What's This? ヒント @@ -1194,9 +1194,9 @@ to QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ to QDirModel - + Name åå‰ @@ -1349,7 +1349,7 @@ to QDockWidget - + Close é–‰ã˜ã‚‹ @@ -1380,7 +1380,7 @@ to QErrorMessage - + Debug Message: デãƒãƒƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸: @@ -1408,13 +1408,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,44 +1442,44 @@ to QFileDialog - - + + All Files (*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*) - + Directories ディレクトリ - - + + Directory: ディレクトリ: - - + + File &name: ファイルå: - + &Open オープン(&O) - + &Save ä¿å­˜(&S) - + Open オープン @@ -1491,7 +1496,7 @@ Please verify the correct file name was given æ­£ã—ã„ファイルåãŒå…¥åŠ›ã•ã‚ŒãŸã‹ã©ã†ã‹ç¢ºèªã—ã¦ãã ã•ã„ - + %1 already exists. Do you want to replace it? %1ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚ @@ -1513,7 +1518,7 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. @@ -1526,7 +1531,7 @@ Please verify the correct directory name was given. ソート - + &Rename åå‰ã®å¤‰æ›´(&R) @@ -1603,7 +1608,7 @@ Please verify the correct directory name was given. ファイルã®ç¨®é¡ž: - + Drive ドライブ @@ -1619,7 +1624,7 @@ Please verify the correct directory name was given. ä¸æ˜Ž - + All Files (*.*) ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*.*) @@ -1637,7 +1642,7 @@ Please verify the correct directory name was given. ディレクトリをé¸æŠž - + '%1' is write protected. Do you want to delete it anyway? '%1' ã¯æ›¸ãè¾¼ã¿ãŒç¦æ­¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -1654,7 +1659,7 @@ Do you want to delete it anyway? ディレクトリを削除ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ - + Find Directory ディレクトリã®æ¤œç´¢ @@ -1669,18 +1674,18 @@ Do you want to delete it anyway? - + &Choose - + New Folder æ–°ã—ã„フォルダ - + Recent Places @@ -1691,7 +1696,7 @@ Do you want to delete it anyway? 進む - + Remove @@ -1699,7 +1704,7 @@ Do you want to delete it anyway? QFileSystemModel - + Name åå‰ @@ -1761,7 +1766,7 @@ Do you want to delete it anyway? - + My Computer マイ コンピュータ @@ -1774,7 +1779,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1991,7 +1996,7 @@ Do you want to delete it anyway? QFontDialog - + &Font フォント(&F) @@ -2040,8 +2045,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected 未接続ã§ã™ @@ -2186,7 +2191,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ @@ -2194,11 +2199,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2224,26 +2229,26 @@ Do you want to delete it anyway? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ - + Request aborted è¦æ±‚ãŒä¸­æ­¢ã•ã‚Œã¾ã—㟠- + No server set to connect to 接続ãŒè¨­å®šã•ã‚Œã¦ã„るサーãƒãŒã‚ã‚Šã¾ã›ã‚“ @@ -2261,18 +2266,23 @@ Do you want to delete it anyway? サーãƒã®æŽ¥ç¶šãŒäºˆæœŸã›ãšé–‰ã˜ã‚‰ã‚Œã¾ã—㟠- + + Unknown authentication method + + + + Error writing response to device - + Connection refused 接続ãŒæ‹’å¦ã•ã‚Œã¾ã—㟠- + Host %1 not found @@ -2293,7 +2303,7 @@ Do you want to delete it anyway? 無効ãªHTTP応答ヘッダã§ã™ - + @@ -2342,7 +2352,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2423,7 +2433,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -2446,7 +2456,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB ãƒã‚¤ãƒŠãƒªãƒ©ãƒ¼ã‚¸ã‚ªãƒ–ジェクトを作æˆã§ãã¾ã›ã‚“ @@ -2466,7 +2476,7 @@ Do you want to delete it anyway? ãƒã‚¤ãƒŠãƒªãƒ©ãƒ¼ã‚¸ã‚ªãƒ–ジェクトを読ã¿è¾¼ã‚ã¾ã›ã‚“ - + Could not find array é…列ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—㟠@@ -2536,7 +2546,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied 許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“ @@ -2556,7 +2566,7 @@ Do you want to delete it anyway? デãƒã‚¤ã‚¹ã®æ®‹ã‚Šå®¹é‡ãŒã‚ã‚Šã¾ã›ã‚“ - + Unknown error ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ @@ -2564,7 +2574,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2587,7 +2597,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2595,7 +2605,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 '%1' をメモリã«ãƒžãƒƒãƒ”ングã§ãã¾ã›ã‚“ã§ã—ãŸ: %2 @@ -2638,7 +2648,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2653,8 +2663,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2674,7 +2684,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo å…ƒã«æˆ»ã™(&U) @@ -2712,8 +2722,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2729,7 +2739,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2737,8 +2747,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2751,7 +2761,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2808,7 +2818,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' データベースをオープンã§ãã¾ã›ã‚“ ' @@ -2818,7 +2828,7 @@ Do you want to delete it anyway? 接続ã§ãã¾ã›ã‚“ - + Unable to begin transaction トランザクションを開始ã§ãã¾ã›ã‚“ @@ -2836,7 +2846,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data データをフェッãƒã§ãã¾ã›ã‚“ @@ -2851,7 +2861,7 @@ Do you want to delete it anyway? 実行çµæžœã‚’記録ã§ãã¾ã›ã‚“ - + Unable to prepare statement プリペアステートメントを使ãˆã¾ã›ã‚“ @@ -2896,7 +2906,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2904,7 +2914,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2997,7 +3007,7 @@ Do you want to delete it anyway? QMenu - + Close é–‰ã˜ã‚‹ @@ -3026,7 +3036,7 @@ Do you want to delete it anyway? QMessageBox - + Help ヘルプ @@ -3046,28 +3056,21 @@ Do you want to delete it anyway? <p>Qtã¯Trolltechã®å•†å“ã§ã™ã€‚詳細ã¯<tt>http://qtsoftware.com/qt/</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt version %1.</p> - <p>ã“ã®ãƒ—ログラム㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> + <p>ã“ã®ãƒ—ログラム㯠Qt ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>ã“ã®ãƒ—ログラム㯠Qt オープンソース版ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> + <p>ã“ã®ãƒ—ログラム㯠Qt オープンソース版ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %1 を使用ã—ã¦ã„ã¾ã™ã€‚</p> <p>Qt オープンソース版ã¯ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºç”¨ã§ã™ã€‚ソースコードを公開ã—ãªã„商用アプリケーションを開発ã™ã‚‹ã«ã¯å•†ç”¨ç‰ˆã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚</p><p>Qtã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«ã¤ã„ã¦ã¯<tt>http://qtsoftware.com/company/model.html</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - + About Qt Qt ã«ã¤ã„㦠- + Show Details... 詳細を表示... @@ -3076,11 +3079,16 @@ Do you want to delete it anyway? Hide Details... 詳細を隠ã™... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext - + Select IM 入力メソッドをé¸æŠž @@ -3088,7 +3096,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 複数ã®å…¥åŠ›ãƒ¡ã‚½ãƒƒãƒ‰ã‚’切り替㈠@@ -3101,7 +3109,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + Unable to initialize non-blocking socket ノンブロッキングソケットをåˆæœŸåŒ–ã§ãã¾ã›ã‚“ @@ -3234,7 +3242,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3242,7 +3250,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3270,7 +3278,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3280,7 +3288,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3298,7 +3306,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3311,7 +3319,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3319,7 +3327,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3328,7 +3336,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to initialize QOCIDriver åˆæœŸåŒ–ã§ãã¾ã›ã‚“ @@ -3357,7 +3365,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3384,18 +3392,16 @@ Do you want to delete it anyway? プリペアステートメントを使ãˆã¾ã›ã‚“ - - + Unable to bind value 値をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - Unable to execute select statement - SELECT ステートメントを実行ã§ãã¾ã›ã‚“ + SELECT ステートメントを実行ã§ãã¾ã›ã‚“ - + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -3403,7 +3409,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect 接続ã§ãã¾ã›ã‚“ @@ -3413,7 +3419,7 @@ Do you want to delete it anyway? 接続ã§ãã¾ã›ã‚“ - ドライãƒã¯å…¨ã¦ã®å¿…è¦ãªæ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ - + Unable to disable autocommit オートコミットを無効ã«ã§ãã¾ã›ã‚“ @@ -3436,13 +3442,13 @@ Do you want to delete it anyway? QODBCResult - - + + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ - + Unable to fetch next 次ã®ãƒ¬ã‚³ãƒ¼ãƒ‰ã‚’フェッãƒã§ãã¾ã›ã‚“ @@ -3452,12 +3458,12 @@ Do you want to delete it anyway? プリペアステートメントを使ãˆã¾ã›ã‚“ - + Unable to bind variable 変数をãƒã‚¤ãƒ³ãƒ‰ã§ãã¾ã›ã‚“ - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ステートメントã®å±žæ€§ã¨ã—㦠'SQL_CURSOR_STATUS' を設定ã§ãã¾ã›ã‚“。ODBC ドライãƒã®æ§‹æˆã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。 @@ -3465,12 +3471,12 @@ Do you want to delete it anyway? - + Unable to fetch last - + Unable to fetch @@ -3496,12 +3502,12 @@ Do you want to delete it anyway? True - + Home ホーム - + Operation not supported on %1 @@ -3511,7 +3517,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3536,7 +3542,7 @@ Do you want to delete it anyway? - + No host name given @@ -3545,7 +3551,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name åå‰ @@ -3558,7 +3564,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect 接続ã§ãã¾ã›ã‚“ @@ -3578,7 +3584,7 @@ Do you want to delete it anyway? トランザクションをロールãƒãƒƒã‚¯ã§ãã¾ã›ã‚“ã§ã—㟠- + Unable to subscribe @@ -3591,12 +3597,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query クエリーを作æˆã§ãã¾ã›ã‚“ - + Unable to prepare statement プリペアステートメントを使ãˆã¾ã›ã‚“ @@ -3604,7 +3610,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3732,7 +3738,7 @@ Do you want to delete it anyway? 給紙装置: - + OK OK @@ -3749,7 +3755,7 @@ Do you want to delete it anyway? 横 - + locally connected ローカルã«æŽ¥ç¶šã—ã¦ã„ã¾ã™ @@ -3778,7 +3784,7 @@ Do you want to delete it anyway? å‚ç…§... - + Print all ã™ã¹ã¦å°åˆ· @@ -3998,7 +4004,7 @@ Do you want to delete it anyway? 両é¢å°åˆ· - + Print @@ -4248,13 +4254,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4536,8 +4542,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4566,7 +4572,7 @@ Please choose a different file name. - + @@ -4586,6 +4592,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4594,7 +4605,7 @@ Please choose a different file name. QProgressDialog - + Cancel キャンセル @@ -4618,7 +4629,7 @@ Please choose a different file name. QRegExp - + no error occurred エラーã¯ç™ºç”Ÿã—ã¾ã›ã‚“ã§ã—㟠@@ -4666,7 +4677,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -4689,12 +4700,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results 実行çµæžœã‚’フェッãƒã§ãã¾ã›ã‚“ - + Unable to execute statement ステートメントを実行ã§ãã¾ã›ã‚“ @@ -4702,7 +4713,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database データベースã®ã‚ªãƒ¼ãƒ—ンã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠@@ -4769,12 +4780,12 @@ Please choose a different file name. QScrollBar - + Scroll here ã“ã“ã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« - + Left edge 左端 @@ -4784,7 +4795,7 @@ Please choose a different file name. 上端 - + Right edge å³ç«¯ @@ -4794,7 +4805,7 @@ Please choose a different file name. 下端 - + Page left 1ページ左ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4805,7 +4816,7 @@ Please choose a different file name. 1ページ戻る - + Page right 1ページå³ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4816,7 +4827,7 @@ Please choose a different file name. 1ページ進む - + Scroll left å·¦ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4826,7 +4837,7 @@ Please choose a different file name. 上ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« - + Scroll right å³ã¸ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ« @@ -4854,7 +4865,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4865,7 +4876,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4875,8 +4886,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4954,7 +4965,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5540,7 +5551,7 @@ Please choose a different file name. QSql - + Delete 削除 @@ -5597,7 +5608,7 @@ Please choose a different file name. QSslSocket - + Error creating SSL context (%1) @@ -5656,7 +5667,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5686,7 +5697,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection 接続をオープンã§ãã¾ã›ã‚“ @@ -5716,7 +5727,7 @@ Please choose a different file name. ソケットæ“作ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ - + Operation on socket is not supported @@ -5724,7 +5735,7 @@ Please choose a different file name. QTextControl - + &Undo å…ƒã«æˆ»ã™(&U) @@ -5782,7 +5793,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 ã“ã®ãƒ—ラットフォーム㯠IPv6 をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ @@ -5790,7 +5801,7 @@ Please choose a different file name. QUndoGroup - + Undo å…ƒã«æˆ»ã™ @@ -5803,7 +5814,7 @@ Please choose a different file name. QUndoModel - + <empty> <空> @@ -5811,7 +5822,7 @@ Please choose a different file name. QUndoStack - + Undo å…ƒã«æˆ»ã™ @@ -5882,7 +5893,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6292,7 +6303,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6368,6 +6379,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6436,11 +6452,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ヒント @@ -6448,7 +6474,7 @@ Please choose a different file name. QWidget - + * * @@ -6456,7 +6482,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6514,7 +6540,7 @@ Please choose a different file name. QWorkspace - + &Restore å…ƒã«æˆ»ã™(&R) @@ -6584,7 +6610,7 @@ Please choose a different file name. QXml - + no error occurred エラーã¯ç™ºç”Ÿã—ã¾ã›ã‚“ã§ã—㟠@@ -6702,8 +6728,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6887,7 +6913,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6897,12 +6923,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6912,7 +6938,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6952,7 +6978,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6963,7 +6989,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6978,17 +7004,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7019,17 +7045,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7039,7 +7065,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7049,7 +7075,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7059,7 +7085,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7069,7 +7095,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7079,7 +7105,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7104,7 +7130,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7114,7 +7140,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7124,12 +7150,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7139,7 +7165,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7149,7 +7175,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7159,33 +7185,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7199,7 +7225,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7214,27 +7240,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7249,7 +7275,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7284,17 +7310,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7304,12 +7330,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7319,17 +7345,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7350,7 +7376,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7632,7 +7658,7 @@ Please choose a different file name. - + empty @@ -7657,7 +7683,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7672,7 +7698,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7682,12 +7708,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7702,13 +7728,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7727,12 +7753,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7742,12 +7768,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7802,7 +7828,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7877,7 +7903,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts index b7b9cb7..efc8401 100644 --- a/translations/qt_pl.ts +++ b/translations/qt_pl.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>UrzÄ…dzenie dźwiÄ™kowe <b>%1</b> nie dziaÅ‚a.<br/>Przywracanie do <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab Zamknij kartÄ™ @@ -80,7 +80,7 @@ ObsÅ‚uga dźwiÄ™ku i wideo zostaÅ‚a wyÅ‚Ä…czona Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -96,24 +96,24 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższego kodeka: %0 - - + + - - - - + + + + Could not open media source. Nie można otworzyć źródÅ‚a mediów. - + Invalid source type. Niepoprawny typ źródÅ‚a. - + Could not locate media source. Nie można znaleźć źródÅ‚a mediów. @@ -147,7 +147,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3Accel - + %1, %2 not defined %1, %2 nie okreÅ›lone @@ -160,7 +160,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3DataTable - + Delete Skasuj @@ -188,7 +188,7 @@ zainstalowaÅ‚eÅ› libgstreamer-plugins-base. Q3FileDialog - + %1 File not found. Check path and filename. @@ -205,7 +205,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. - + All Files (*) Wszystkie pliki (*) @@ -360,7 +360,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. - + Open Otwórz @@ -521,7 +521,7 @@ Sprawdź Å›cieżkÄ™ i nazwÄ™ pliku. Q3LocalFs - + Could not create directory %1 Nie można utworzyć katalogu @@ -571,7 +571,7 @@ na Q3MainWindow - + Customize... Ustawienia użytkownika... @@ -584,7 +584,7 @@ na Q3NetworkProtocol - + Operation stopped by the user Operacja zatrzymana przez użytkownika @@ -592,7 +592,7 @@ na Q3ProgressDialog - + Cancel Anuluj @@ -601,7 +601,7 @@ na Q3TabDialog - + Apply Zatwierdź @@ -630,7 +630,7 @@ na Q3TextEdit - + Clear Wyczyść @@ -669,7 +669,7 @@ na Q3TitleBar - + Close Zamknij okno @@ -737,7 +737,7 @@ na Q3ToolBar - + More... WiÄ™cej... @@ -745,7 +745,7 @@ na Q3UrlOperator - + (unknown) (nieznany) @@ -797,7 +797,7 @@ na Q3Wizard - + < &Back < &Wstecz @@ -825,9 +825,9 @@ na QAbstractSocket - - - + + + Connection refused PoÅ‚Ä…czenie odrzucone @@ -870,7 +870,7 @@ na QAbstractSpinBox - + Step &down Krok w &dół @@ -888,7 +888,7 @@ na QApplication - + Activate Uaktywnij @@ -898,7 +898,7 @@ na Uaktywnia główne okno programu - + Executable '%1' requires Qt %2, found Qt %3. Program '%1' wymaga do uruchomienia Qt %2, znaleziono Qt %3. @@ -908,7 +908,7 @@ na Niekompatybilność biblioteki Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -940,7 +940,7 @@ na QCheckBox - + Check Zaznacz @@ -958,7 +958,7 @@ na QColorDialog - + &Add to Custom Colors &Dodaj do wÅ‚asnych kolorów @@ -1016,13 +1016,13 @@ na QComboBox - + Open Otwórz - + False FaÅ‚sz @@ -1065,7 +1065,7 @@ na %1: nieznany bÅ‚Ä…d %2 - + %1: key is empty QSystemSemaphore %1: klucz jest pusty @@ -1086,12 +1086,12 @@ na QDB2Driver - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia - + Unable to commit transaction Nie można dokonać transakcji @@ -1109,8 +1109,8 @@ na QDB2Result - - + + Unable to execute statement Nie można wykonać polecenia @@ -1125,7 +1125,7 @@ na Nie można powiÄ…zać zmiennej - + Unable to fetch record %1 Nie można pobrać rekordu %1 @@ -1143,7 +1143,7 @@ na QDateTimeEdit - + am am @@ -1166,7 +1166,7 @@ na QDial - + QDial QDial @@ -1184,7 +1184,7 @@ na QDialog - + What's This? Co to jest? @@ -1197,7 +1197,7 @@ na QDialogButtonBox - + Abort Przerwij @@ -1267,7 +1267,7 @@ na Ni&e dla wszystkich - + OK @@ -1322,7 +1322,7 @@ na QDirModel - + Date Modified Data modyfikacji @@ -1352,7 +1352,7 @@ na QDockWidget - + Close Zamknij @@ -1383,7 +1383,7 @@ na QErrorMessage - + Debug Message: Komunikat dla programisty: @@ -1411,13 +1411,18 @@ na QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1440,22 +1445,22 @@ na QFileDialog - + %1 already exists. Do you want to replace it? %1 już istnieje. Czy chcesz zamienić? - + '%1' is write protected. Do you want to delete it anyway? '%1' jest zabezpieczony przed zapisem. Czy na pewno chcesz go skasować? - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1464,7 +1469,7 @@ Katalog nie znaleziony. Sprawdź podanÄ… nazwÄ™ katalogu. - + %1 File not found. Please verify the correct file name was given. @@ -1473,12 +1478,12 @@ Plik nie znaleziony. ProszÄ™ o sprawdzenie podanej nazwy pliku. - + Are sure you want to delete '%1'? Czy na pewno chcesz skasować '%1'? - + Recent Places @@ -1489,12 +1494,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Powrót - + Could not delete directory. Nie można skasować katalogu. - + &Delete &Skasuj @@ -1505,18 +1510,18 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Szczegóły - + Directories Katalogi - - + + Directory: Katalog: - + Drive UrzÄ…dzenie @@ -1546,7 +1551,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + &Open &Otwórz @@ -1558,18 +1563,18 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Katalog wyżej - + &Rename &ZmieÅ„ nazwÄ™ - + &Save &Zachowaj - + Show &hidden files Pokaż &ukryte pliki @@ -1594,7 +1599,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Znajdź katalog - + All Files (*.*) Wszystkie pliki (*.*) @@ -1610,35 +1615,35 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Do przodu - + New Folder Nowy katalog - + &New Folder &Nowy katalog - + &Choose &Wybierz - + Remove UsuÅ„ - - + + All Files (*) Wszystkie pliki (*) - - + + File &name: Nazwa &pliku: @@ -1658,7 +1663,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFileSystemModel - + %1 TB %1 TB @@ -1720,7 +1725,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Data modyfikacji - + My Computer Mój komputer @@ -1733,7 +1738,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFontDatabase - + Normal Normalny @@ -1952,7 +1957,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFontDialog - + Effects Efekty @@ -2001,8 +2006,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QFtp - - + + Changing directory failed: %1 Zmiana katalogu zakoÅ„czona bÅ‚Ä™dem: @@ -2147,7 +2152,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHostInfo - + Unknown error Nieznany bÅ‚Ä…d @@ -2155,11 +2160,11 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHostInfoAgent - + - + @@ -2185,7 +2190,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QHttp - + Connected to host PodÅ‚Ä…czony do hosta @@ -2195,7 +2200,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. PodÅ‚Ä…czony do hosta %1 - + Connection closed PoÅ‚Ä…czenie zakoÅ„czone @@ -2217,7 +2222,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Host %1 znaleziony - + Host %1 not found @@ -2237,7 +2242,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Komenda HTTP zakoÅ„czona bÅ‚Ä™dem - + @@ -2245,7 +2250,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Niepoprawne ciaÅ‚o HTTP - + Invalid HTTP response header Niepoprawny nagłówek odpowiedzi HTTP @@ -2257,38 +2262,43 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Brak serwera do podÅ‚Ä…czenia - + Request aborted Komenda przerwana - + Server closed connection unexpectedly Serwer niespodziewanie zakoÅ„czyÅ‚ poÅ‚Ä…czenie - - + + Unknown error Nieznany bÅ‚Ä…d - + HTTPS connection requested but SSL support not compiled in Zażądano poÅ‚Ä…czenia HTTPS lecz obsÅ‚uga SSL nie jest wkompilowana - + Wrong content length BÅ‚Ä™dna dÅ‚ugość zawartoÅ›ci - + + Unknown authentication method + + + + Proxy authentication required Wymagana autoryzacja poÅ›rednika @@ -2328,7 +2338,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. NawiÄ…zanie sesji SSL nie powiodÅ‚o siÄ™ - + Connection refused (or timed out) PoÅ‚Ä…czenie odrzucone (przekroczony czas poÅ‚Ä…czenia) @@ -2384,7 +2394,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIBaseDriver - + Could not start transaction Nie można rozpocząć transakcji @@ -2407,7 +2417,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIBaseResult - + Could not allocate statement Nie można zaallokować polecenia @@ -2469,17 +2479,17 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można dokonać transakcji - + Unable to create BLOB Nie można utworzyć obiektu typu BLOB - + Unable to execute query Nie można wykonać zapytania - + Unable to open BLOB Nie można otworzyć obiektu typu BLOB @@ -2497,7 +2507,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QIODevice - + No space left on device Brak wolnego miejsca na urzÄ…dzeniu @@ -2517,7 +2527,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Zbyt wiele otwartych plików - + Unknown error Nieznany bÅ‚Ä…d @@ -2525,7 +2535,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QInputContext - + Mac OS X input method Metoda wprowadzania Mac OS X @@ -2548,7 +2558,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QInputDialog - + Enter a value: Podaj wartość: @@ -2556,7 +2566,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLibrary - + Could not mmap '%1': %2 Nie można wykonać przypisania '%1': %2 @@ -2587,7 +2597,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + The shared library was not found. Biblioteka współdzielona niedostÄ™pna. @@ -2602,8 +2612,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Wtyczka "%1" używa innej wersji biblioteki Qt. (Nie można Å‚Ä…czyć bibliotek zwykÅ‚ych i debugowych.) - - + + Cannot load library %1: %2 Nie można zaÅ‚adować biblioteki %1: %2 @@ -2623,7 +2633,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLineEdit - + &Copy S&kopiuj @@ -2661,8 +2671,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLocalServer - - + + %1: Name error %1: BÅ‚Ä…d nazwy @@ -2678,7 +2688,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + %1: Unknown error %2 %1: Nieznany bÅ‚Ä…d %2 @@ -2686,8 +2696,8 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QLocalSocket - - + + %1: Connection refused %1: Odmowa poÅ‚Ä…czenia @@ -2700,7 +2710,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + %1: Invalid name %1: Niepoprawna nazwa @@ -2757,7 +2767,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMYSQLDriver - + Unable to begin transaction Nie można rozpocząć transakcji @@ -2767,7 +2777,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można potwierdzić transakcji - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia @@ -2777,7 +2787,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można otworzyć bazy danych ' - + Unable to rollback transaction Nie można wycofać transakcji @@ -2785,7 +2795,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMYSQLResult - + Unable to bind outvalues Nie można powiÄ…zać wartoÅ›ci zewnÄ™trznych @@ -2796,22 +2806,22 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można powiÄ…zać wartoÅ›ci - + Unable to execute query Nie można wykonać zapytania - + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch data Nie można pobrać danych - + Unable to prepare statement Nie można przygotować polecenia @@ -2822,12 +2832,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można skasować polecenia - + Unable to store result Nie można zachować wyników - + Unable to store statement results Nie można zachować wyników polecenia @@ -2845,7 +2855,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMdiArea - + (Untitled) (Nienazwany) @@ -2853,7 +2863,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2946,7 +2956,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMenu - + Close Zamknij @@ -2968,27 +2978,24 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMessageBox - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p> Ten program używa Qt Open Source Edition w wersji %1.</p><p>Qt Open Source Edition jest przeznaczone do pisania aplikacji z otwartym kodem źródÅ‚owym. W przypadku aplikacji zamkniÄ™tych (bez kodu źródÅ‚owego) wymagana jest licencja komercyjna Qt.</p><p>Strona <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> opisuje sposób licencjonowania Qt.</p> + <p> Ten program używa Qt Open Source Edition w wersji %1.</p><p>Qt Open Source Edition jest przeznaczone do pisania aplikacji z otwartym kodem źródÅ‚owym. W przypadku aplikacji zamkniÄ™tych (bez kodu źródÅ‚owego) wymagana jest licencja komercyjna Qt.</p><p>Strona <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> opisuje sposób licencjonowania Qt.</p> - <p>This program uses Qt version %1.</p> - <p> Ten program używa Qt w wersji %1.</p> + <p> Ten program używa Qt w wersji %1.</p> - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>Informacje o Qt</h3>%1<p>Qt jest bibliotekÄ… C++ do tworzenia przenoÅ›nego oprogramowania.</p><p>Qt umożliwia pisanie przenoÅ›nego kodu zarówno dla MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux jak i dla wszystkich głównych komercyjnych wariantów Unix'ów. Qt jest również dostÄ™pne dla urzÄ…dzeÅ„ specjalizowanych i przenoÅ›nych jako Qt dla Embedded Linux lub jako Qt dla Windows CE.</p><p>Producentem Qt jest Nokia. WiÄ™cej informacji na stronie <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> + <h3>Informacje o Qt</h3>%1<p>Qt jest bibliotekÄ… C++ do tworzenia przenoÅ›nego oprogramowania.</p><p>Qt umożliwia pisanie przenoÅ›nego kodu zarówno dla MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux jak i dla wszystkich głównych komercyjnych wariantów Unix'ów. Qt jest również dostÄ™pne dla urzÄ…dzeÅ„ specjalizowanych i przenoÅ›nych jako Qt dla Embedded Linux lub jako Qt dla Windows CE.</p><p>Producentem Qt jest Nokia. WiÄ™cej informacji na stronie <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + About Qt Informacje o Qt - + Help Pomoc @@ -3006,7 +3013,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + Show Details... Pokaż szczegóły... @@ -3014,7 +3026,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMultiInputContext - + Select IM Wybierz metodÄ™ wprowadzania @@ -3022,7 +3034,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QMultiInputContextPlugin - + Multiple input method switcher PrzeÅ‚Ä…cznik metody wprowadzania @@ -3035,7 +3047,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNativeSocketEngine - + Another socket is already listening on the same port Inne gniazdo nasÅ‚uchuje już na tym porcie @@ -3168,7 +3180,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessCacheBackend - + Error opening %1 BÅ‚Ä…d otwierania %1 @@ -3176,7 +3188,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessFileBackend - + Request for opening non-local file %1 Żądanie otwarcia zdalnego pliku %1 @@ -3204,7 +3216,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessFtpBackend - + No suitable proxy found Nie odnaleziono odpowiedniego poÅ›rednika @@ -3214,7 +3226,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można otworzyć %1: jest to katalog - + Logging in to %1 failed: authentication required BÅ‚Ä…d podczas logowania do %1: wymagana autoryzacja @@ -3232,7 +3244,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkAccessHttpBackend - + No suitable proxy found Nie odnaleziono odpowiedniego poÅ›rednika @@ -3245,7 +3257,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. BÅ‚Ä…d podczas pobierania %1 - odpowiedź serwera: %2 - + Protocol "%1" is unknown Protokół "%1" nie jest znany @@ -3253,7 +3265,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QNetworkReplyImpl - + Operation canceled Operacja anulowana @@ -3262,7 +3274,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QOCIDriver - + Unable to initialize QOCIDriver Nie można dokonać inicjalizacji @@ -3291,7 +3303,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QOCIResult - + Unable to bind column for batch execute @@ -3318,18 +3330,16 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można przygotować polecenia - - + Unable to bind value Nie można powiÄ…zać wartoÅ›ci - Unable to execute select statement - Nie można wykonać polecenia select + Nie można wykonać polecenia select - + Unable to execute statement Nie można wykonać polecenia @@ -3337,12 +3347,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QODBCDriver - + Unable to commit transaction Nie można potwierdzić transakcji - + Unable to connect Nie można nawiÄ…zać poÅ‚Ä…czenia @@ -3352,7 +3362,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można nawiÄ…zać poÅ‚Ä…czenia - sterownik nie obsÅ‚uguje caÅ‚ej potrzebnej funkcjonalnoÅ›ci - + Unable to disable autocommit Nie można wyÅ‚Ä…czyć trybu automatycznego dokonywania transakcji @@ -3370,24 +3380,24 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Nie można ustawić 'SQL_CURSOR_STATIC' jako atrybutu polecenia. ProszÄ™ sprawdzić konfiguracje sterownika ODBC - + Unable to bind variable Nie można powiÄ…zać zmiennej - - + + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch next Nie można pobrać kolejnych danych @@ -3399,12 +3409,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - + Unable to fetch last Nie można pobrać ostatnich danych - + Unable to fetch Nie można pobrać @@ -3422,12 +3432,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QObject - + Home Strona startowa - + Operation not supported on %1 Operacja nieobsÅ‚ugiwana na %1 @@ -3437,7 +3447,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Niepoprawny URI: %1 - + Write error writing to %1: %2 BÅ‚Ä…d w trakcie zapisywania do %1: %2 @@ -3462,7 +3472,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. BÅ‚Ä…d protokoÅ‚u: otrzymano pakiet o zerowym rozmiarze - + No host name given Nie podano nazwy hosta @@ -3471,7 +3481,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPPDOptionsModel - + Name Nazwa @@ -3484,7 +3494,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPSQLDriver - + Could not begin transaction Nie można rozpocząć transakcji @@ -3504,7 +3514,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Nie można nawiÄ…zać poÅ‚Ä…czenia - + Unable to subscribe Nie można wykonać subskrypcji @@ -3517,12 +3527,12 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPSQLResult - + Unable to create query Nie można utworzyć zapytania - + Unable to prepare statement Nie można przygotować wyrażenia @@ -3530,7 +3540,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPageSetupWidget - + Centimeters (cm) Centymetry (cm) @@ -3646,7 +3656,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. QPrintDialog - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3696,7 +3706,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. A9 (37 x 52 mm) - + Aliases: %1 Aliasy: %1 @@ -3772,7 +3782,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. podÅ‚Ä…czony lokalnie - + OK OK @@ -3828,7 +3838,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. US Common #10 Envelope (105 x 241 mm) - + Print @@ -4075,7 +4085,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QPrintPreviewDialog - + %1% %1% @@ -4175,7 +4185,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + Page Setup Ustawienia strony @@ -4348,8 +4358,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QProcess - - + + Could not open input redirection for reading @@ -4378,7 +4388,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + @@ -4398,6 +4408,11 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. + + No program defined + + + Process failed to start @@ -4406,7 +4421,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QProgressDialog - + Cancel Anuluj @@ -4430,7 +4445,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QRegExp - + bad char class syntax niepoprawna skÅ‚adnia klasy znakowej @@ -4478,7 +4493,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLite2Driver - + Error to open database Nie można otworzyć bazy danych @@ -4501,12 +4516,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLite2Result - + Unable to execute statement Nie można wykonać polecenia - + Unable to fetch results Nie można pobrać wyników @@ -4514,7 +4529,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSQLiteDriver - + Error closing database BÅ‚Ä…d zamykania bazy danych @@ -4577,12 +4592,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QScrollBar - + Bottom W dół - + Left edge Lewa krawÄ™dź @@ -4597,23 +4612,23 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Linia w górÄ™ - + Page down Strona w dół - + Page left Strona w lewo - + Page right Strona w prawo - + Page up Strona do góry @@ -4624,37 +4639,37 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Pozycja - + Right edge Prawa krawÄ™dź - + Scroll down PrzewiÅ„ w dół - + Scroll here PrzewiÅ„ tutaj - + Scroll left PrzewiÅ„ w lewo - + Scroll right PrzewiÅ„ w prawo - + Scroll up PrzewiÅ„ do góry - + Top Do góry @@ -4662,13 +4677,13 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSharedMemory - + %1: create size is less then 0 %1: rozmiar przy tworzeniu mniejszy od 0 - + %1: unable to lock %1: nie można zablokować @@ -4678,8 +4693,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. %1: nie można odblokować - - + + %1: permission denied %1: brak dostÄ™pu @@ -4762,7 +4777,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QShortcut - + + + @@ -5343,7 +5358,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSql - + Cancel Anuluj @@ -5400,7 +5415,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSslSocket - + Unable to write data: %1 Nie można zapisać danych: %1 @@ -5459,7 +5474,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QSystemSemaphore - + %1: out of resources %1: zasoby wyczerpane @@ -5489,7 +5504,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTDSDriver - + Unable to open connection Nie można otworzyć poÅ‚Ä…czenia @@ -5515,7 +5530,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTcpServer - + Operation on socket is not supported Operacja na gnieździe nieobsÅ‚ugiwana @@ -5523,7 +5538,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QTextControl - + &Copy S&kopiuj @@ -5581,7 +5596,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUdpSocket - + This platform does not support IPv6 Ta platforma nie obsÅ‚uguje IPv6 @@ -5589,7 +5604,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoGroup - + Redo Przywróć @@ -5602,7 +5617,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoModel - + <empty> <pusty> @@ -5610,7 +5625,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QUndoStack - + Redo Przywróć @@ -5681,7 +5696,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWebFrame - + Request cancelled ProÅ›ba anulowana @@ -6093,7 +6108,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + JavaScript Alert - %1 @@ -6169,6 +6184,11 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. + Select all + + + + Select to the next character @@ -6237,11 +6257,21 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Co to jest? @@ -6249,7 +6279,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWidget - + * * @@ -6257,7 +6287,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWizard - + Go Back Wróć @@ -6319,7 +6349,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QWorkspace - + %1 - [%2] %1 - [%2] @@ -6389,7 +6419,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QXml - + encoding declaration or standalone declaration expected while reading the XML declaration oczekiwano deklaracji "encoding" lub "standalone" podczas odczytywania deklaracji XML @@ -6507,8 +6537,8 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QXmlStream - - + + Extra content at end of document. Dodatkowa treść na koÅ„cu dokumentu. @@ -6692,12 +6722,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. QtXmlPatterns - + Network timeout. Przekroczony czas poÅ‚Ä…czenia. - + Element %1 can't be serialized because it appears outside the document element. Element %1 nie może być zserializowany ponieważ pojawiÅ‚ siÄ™ poza elementem "document". @@ -6707,7 +6737,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Atrybut %1 nie może być zserializowany ponieważ pojawiÅ‚ siÄ™ na najwyższym poziomie. - + Year %1 is invalid because it begins with %2. Rok %1 jest niepoprawny ponieważ rozpoczyna siÄ™: %2. @@ -6747,7 +6777,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. PrzepeÅ‚nienie: Data nie może być wyrażona. - + At least one component must be present. Przynajmniej jeden komponent musi być obecny. @@ -6758,22 +6788,22 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przynajmniej jeden komponent musi wystÄ…pić po nawiasie %1. - + No operand in an integer division, %1, can be %2. Å»aden skÅ‚adnik dzielenia %1 nie może być %2. - + %1 is not a valid value of type %2. %1 nie jest poprawnÄ… wartoÅ›ciÄ… dla typu %2. - + When casting to %1 from %2, the source value cannot be %3. W rzutowaniu %1 na %2 wartość źródÅ‚owa nie może być %3. - + Dividing a value of type %1 by %2 (not-a-number) is not allowed. Dzielenie wartoÅ›ci typu %1 przez %2 (typ nienumeryczny) jest niedozwolone. @@ -6789,17 +6819,17 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Mnożenie wartoÅ›ci typu %1 przez %2 lub %3 (plus lub minus nieskoÅ„czoność) jest niedozwolone. - + A value of type %1 cannot have an Effective Boolean Value. Wartość typu %1 nie może posiadać efektywnej wartoÅ›ci boolowskiej (EBV). - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Efektywna wartość boolowska (EBV) nie może być obliczona dla sekwencji zawierajÄ…cej dwie lub wiÄ™cej wartoÅ›ci atomowe. - + Value %1 of type %2 exceeds maximum (%3). Wartość %1 typu %2 przekracza maksimum (%3). @@ -6809,7 +6839,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wartość %1 typu %2 jest poniżej minimum (%3). - + A value of type %1 must contain an even number of digits. The value %2 does not. Wartość typu %1 musi zawierać parzystÄ… liczbÄ™ cyfr. Wartość %2 nie zawiera. @@ -6819,7 +6849,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wartość %1 nie jest poprawna jako wartość typu %2. - + Operator %1 cannot be used on type %2. Operator %1 nie może być użyty dla typu %2. @@ -6829,7 +6859,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Operator %1 nie może być użyty dla atomowych wartoÅ›ci typu %2 i %3. - + The namespace URI in the name for a computed attribute cannot be %1. PrzestrzeÅ„ nazw URI nie może być %1 w nazwie dla obliczonego atrybutu. @@ -6839,7 +6869,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Nazwa dla wyliczonego atrybutu nie może mieć przestrzeni nazw URI %1 z lokalnÄ… nazwÄ… %2. - + Type error in cast, expected %1, received %2. BÅ‚Ä…d typów w rzutowaniu: spodziewano siÄ™ %1, otrzymano %2. @@ -6849,7 +6879,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Podczas rzutowania na %1 lub na typ pochodny, wartość źródÅ‚owa musi być tego samego typu lub musi być zapisem tekstowym. Typ %2 nie jest dozwolony. - + It is not possible to cast from %1 to %2. Nie można zrzutować %1 na %2. @@ -6869,7 +6899,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. BÅ‚Ä…d podczas rzutowania %1 na %2: %3 - + A comment cannot contain %1 Komentarz nie może zawierać %1 @@ -6879,7 +6909,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Komentarz nie może koÅ„czyć siÄ™: %1. - + No comparisons can be done involving the type %1. Å»adne porównania nie mogÄ… być wykonane dla typu %1. @@ -6889,12 +6919,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Operator %1 jest niedostÄ™pny pomiÄ™dzy atomowymi wartoÅ›ciami %2 i %3. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. WÄ™zeÅ‚ "attribute" nie może być dzieckiem wÄ™zÅ‚a "document". Dlatego atrybut %1 jest w zÅ‚ym miejscu. - + A library module cannot be evaluated directly. It must be imported from a main module. ModuÅ‚ biblioteki nie może być bezpoÅ›rednio oceniony. On musi być zaimportowany z głównego moduÅ‚u. @@ -6904,7 +6934,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Szablon o nazwie %1 nie istnieje. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Wartość typu %1 nie może być predykatem. Predykat musi być typu liczbowego lub EfektywnÄ… Wartość LogicznÄ…. @@ -6914,38 +6944,38 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Wynikiem predykatu pozycyjnego musi być pojedyÅ„cza wartość liczbowa. - + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 nie jest poprawnÄ… nazwÄ… docelowÄ… w instrukcji przetwarzania. Nazwa musi być wartoÅ›ciÄ… %2, np. %3. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Ostatni krok w Å›cieżce musi zawierać albo wezÅ‚y albo wartoÅ›ci atomowe. Nie może zawierać obu jednoczeÅ›nie. - + The data of a processing instruction cannot contain the string %1 Dane instrukcji przetwarzania nie mogÄ… zawierać ciÄ…gu %1 - + No namespace binding exists for the prefix %1 Å»adna przestrzeÅ„ nazw nie jest powiÄ…zana z przedrostkiem %1 - + No namespace binding exists for the prefix %1 in %2 Å»adna przestrzeÅ„ nazw nie jest powiÄ…zana z przedrostkiem %1 w %2 - + %1 is an invalid %2 %1 jest niepoprawnym %2 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Pierwszy argument w %1 nie może być typu %2. Musi on być typu liczbowego: xs:yearMonthDuration lub xs:dayTimeDuration. @@ -6960,27 +6990,27 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Drugi argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5. - + %1 is not a valid XML 1.0 character. %1 nie jest poprawnym znakiem XML 1.0. - + The first argument to %1 cannot be of type %2. Pierwszy argument dla %1 nie może być typu %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. JeÅ›li oba argumenty majÄ… przesuniÄ™cia strefowe, muszÄ… one być takie same. %1 i %2 nie sÄ… takie same. - + %1 was called. WywoÅ‚ano %1. - + %1 must be followed by %2 or %3, not at the end of the replacement string. Po %1 musi nastÄ™powac %2 lub %3, lecz nie na koÅ„cu zastÄ™pczego ciÄ…gu. @@ -6995,7 +7025,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. W zastÄ™pczym ciÄ…gu %1 może być użyte tylko do zabezpieczenia samej siebie lub %2, nigdy %3 - + %1 matches newline characters %1 dopasowaÅ‚o znak nowej linii @@ -7030,12 +7060,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. JeÅ›li pierwszy argument jest pustÄ… sekwencjÄ… lub zerowej dÅ‚ugoÅ›ci ciÄ…giem (przy braku przestrzeni nazw), przedrostek nie może wystÄ…pić. WystÄ…piÅ‚ przedrostek %1. - + It will not be possible to retrieve %1. Nie bÄ™dzie można odzyskać %1. - + The default collection is undefined DomyÅ›lna kolekcja jest niezdefiniowana @@ -7045,27 +7075,27 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. %1 nie może być odzyskane - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Znormalizowana forma %1 nie jest obsÅ‚ugiwana. ObsÅ‚ugiwanymi formami sÄ…: %2, %3, %4 i %5 oraz pusta forma (brak normalizacji). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. PrzesuniÄ™cie strefowe musi być w zakresie %1..%2 wÅ‚Ä…cznie. %3 jest poza tym zakresem. - + Required cardinality is %1; got cardinality %2. Wymagana liczność wynosi %1; otrzymano %2. - + The item %1 did not match the required type %2. Element %1 nie zostaÅ‚ dopasowany do wymaganego typu %2. - + %1 is an unknown schema type. %1 jest nieznanym typem schematu. @@ -7081,7 +7111,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Inicjalizacja zmiennej %1 zależy od niej samej - + The variable %1 is unused Zmienna %1 jest nieużywana @@ -7355,7 +7385,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Nazwa dodatkowego wyrażenia musi znajdować sie w przestrzeni nazw. - + empty pusty @@ -7380,7 +7410,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. zero lub wiÄ™cej - + Required type is %1, but %2 was found. Odnaleziono typ %2, lecz wymaganym typem jest %1. @@ -7395,7 +7425,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Focus jest niezdefiniowany. - + It's not possible to add attributes after any other kind of node. Dodanie atrybutu poza wÄ™zÅ‚ami nie jest możliwe. @@ -7405,12 +7435,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Atrybut o nazwie %1 zostaÅ‚ już utworzony. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. ObsÅ‚ugiwane jest jedynie "Unicode Codepoint Collation" (%1), %2 nie jest obsÅ‚ugiwane. - + An %1-attribute with value %2 has already been declared. Atrybut %1 o wartoÅ›ci %2 zostaÅ‚ już zadeklarowany. @@ -7455,7 +7485,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i maÅ‚ych liter. Dlatego nazwa %2 jest niepoprawna. - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 przyjmuje co najwyżej %n argument. %2 jest dlatego niepoprawne. @@ -7473,7 +7503,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. Głównym wÄ™zÅ‚em drugiego argumentu w funkcji %1 musi być wÄ™zeÅ‚ "document". %2 nie jest wÄ™zÅ‚em "document". @@ -7504,7 +7534,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Importy modułów muszÄ… pojawić siÄ™ przed deklaracjami funkcji, zmiennych i opcji. - + %1 is an unsupported encoding. NieobsÅ‚ugiwane kodowanie %1. @@ -7519,14 +7549,18 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. - + Ambiguous rule match. Dopasowano niejednoznacznÄ… reguÅ‚Ä™. - In a namespace constructor, the value for a namespace value cannot be an empty string. - W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciÄ…giem. + W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciÄ…giem. + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7544,12 +7578,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Tylko przedrostek %1 może być powiÄ…zany z %2 i vice versa. - + Circularity detected Wykryto cykl - + The parameter %1 is required, but no corresponding %2 is supplied. Wymagany jest parametr %1 lecz żaden odpowiadajÄ…cy mu %2 nie zostaÅ‚ dostarczony. @@ -7559,12 +7593,12 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przekazany jest parametr %1 lecz żaden odpowiadajÄ…cy mu %2 nie istnieje. - + The URI cannot have a fragment URI nie może posiadać fragmentu - + Element %1 is not allowed at this location. Element %1 jest niedozwolony w tym miejscu. @@ -7619,7 +7653,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Przynajmniej jeden tryb musi być okreÅ›lony w atrybucie %1 elementu %2. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. W elemencie %2 nie może wystÄ…pić atrybut %1. WystÄ…pić mogÄ… jedynie standardowe atrybuty. @@ -7694,7 +7728,7 @@ ProszÄ™ wybrać innÄ… nazwÄ™ pliku. Element %1 nie może posiadać potomków. - + Element %1 cannot have a sequence constructor. Element %1 nie może posiadać sekwencyjnego konstruktora. diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts index c04456a..5a93718 100644 --- a/translations/qt_pt.ts +++ b/translations/qt_pt.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 indefinido @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Verdadeiro @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Copiar ou Mover um Ficheiro @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Todos os Ficheiros (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Abrir @@ -527,7 +527,7 @@ Verifique a localização e o nome. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ para Q3MainWindow - + Line up Alinhar @@ -590,7 +590,7 @@ para Q3NetworkProtocol - + Operation stopped by the user Operação interrompida pelo utilizador @@ -598,7 +598,7 @@ para Q3ProgressDialog - + Cancel Cancelar @@ -607,7 +607,7 @@ para Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ para Q3TextEdit - + &Undo &Desfazer @@ -675,7 +675,7 @@ para Q3TitleBar - + System Sistema @@ -743,7 +743,7 @@ para Q3ToolBar - + More... Mais... @@ -751,7 +751,7 @@ para Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ para Q3Wizard - + &Cancel &Cancelar @@ -831,9 +831,9 @@ para QAbstractSocket - - - + + + Host not found Máquina desconhecida @@ -876,7 +876,7 @@ para QAbstractSpinBox - + &Step up &Passo acima @@ -894,12 +894,12 @@ para QApplication - + Activate Activar - + Executable '%1' requires Qt %2, found Qt %3. O executável '%1' requere Qt %2, Qt %3 encontrado. @@ -909,7 +909,7 @@ para Erro de Incompatibilidade da Biblioteca Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ para QCheckBox - + Uncheck Desactivar @@ -964,7 +964,7 @@ para QColorDialog - + Hu&e: C&or: @@ -1038,13 +1038,13 @@ para QComboBox - + Open Abrir - + False Falso @@ -1062,7 +1062,7 @@ para QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ para QDB2Driver - + Unable to connect Ligação não possível - + Unable to commit transaction Finalização de transacção não possível @@ -1106,8 +1106,8 @@ para QDB2Result - - + + Unable to execute statement Execução não possível @@ -1122,7 +1122,7 @@ para Ligação de variável não possível - + Unable to fetch record %1 Obtenção do registo %1 não possível @@ -1140,7 +1140,7 @@ para QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ para QDial - + QDial @@ -1181,7 +1181,7 @@ para QDialog - + What's This? O Que é Isto? @@ -1194,9 +1194,9 @@ para QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ para QDirModel - + Name Nome @@ -1349,7 +1349,7 @@ para QDockWidget - + Close Fechar @@ -1380,7 +1380,7 @@ para QErrorMessage - + Debug Message: Mensagem Depuração: @@ -1408,13 +1408,18 @@ para QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,37 +1442,37 @@ para QFileDialog - - + + All Files (*) Todos os Ficheiros (*) - + Directories Pastas - + &Open &Abrir - + &Save &Gravar - + Open Abrir - + %1 already exists. Do you want to replace it? %1 já existe. @@ -1488,7 +1493,7 @@ Por favor verifique o nome do ficheiro. O Meu Computador - + &Rename &Mudar o Nome @@ -1534,7 +1539,7 @@ Por favor verifique o nome do ficheiro. - + Directory: Pasta: @@ -1547,8 +1552,8 @@ Ficheiro não encontrado. Por favor verifique o nome do ficheiro - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1562,7 @@ Pasta não encontrada. Por favor verifique o nome da pasta. - + '%1' is write protected. Do you want to delete it anyway? '%1' está protegido contra escrita. @@ -1574,22 +1579,22 @@ Deseja apagar de qualquer forma? Não foi possível apagar a pasta. - + Recent Places - + All Files (*.*) Todos os Ficheiros (*.*) - + Save As Gravar Como - + Drive Unidade @@ -1621,29 +1626,29 @@ Deseja apagar de qualquer forma? Seguinte - + New Folder Nova Pasta - + &New Folder - + &Choose - + Remove - - + + File &name: &Nome do Ficheiro: @@ -1663,7 +1668,7 @@ Deseja apagar de qualquer forma? QFileSystemModel - + %1 TB @@ -1725,7 +1730,7 @@ Deseja apagar de qualquer forma? Data de Modificação - + My Computer O Meu Computador @@ -1738,7 +1743,7 @@ Deseja apagar de qualquer forma? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Deseja apagar de qualquer forma? QFontDialog - + &Font &Tipo de Letra @@ -2004,8 +2009,8 @@ Deseja apagar de qualquer forma? QFtp - - + + Not connected Desligado @@ -2150,7 +2155,7 @@ Deseja apagar de qualquer forma? QHostInfo - + Unknown error Erro desconhecido @@ -2158,11 +2163,11 @@ Deseja apagar de qualquer forma? QHostInfoAgent - + - + @@ -2188,26 +2193,26 @@ Deseja apagar de qualquer forma? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Erro desconhecido - + Request aborted Pedido abortado - + No server set to connect to Nenhum servidor para ligar @@ -2225,18 +2230,23 @@ Deseja apagar de qualquer forma? O servidor fechou a ligação inesperadamente - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Ligação recusada - + Host %1 not found @@ -2257,7 +2267,7 @@ Deseja apagar de qualquer forma? Cabeçalho de resposta HTTP inválido - + @@ -2306,7 +2316,7 @@ Deseja apagar de qualquer forma? - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Deseja apagar de qualquer forma? QIBaseDriver - + Error opening database Erro ao abrir a base de dados @@ -2410,7 +2420,7 @@ Deseja apagar de qualquer forma? QIBaseResult - + Unable to create BLOB Não foi possível criar o BLOB @@ -2430,7 +2440,7 @@ Deseja apagar de qualquer forma? Não foi possível ler o BLOB - + Could not find array Não foi possível encontrar o array @@ -2500,7 +2510,7 @@ Deseja apagar de qualquer forma? QIODevice - + Permission denied Permissão negada @@ -2520,7 +2530,7 @@ Deseja apagar de qualquer forma? Dispositivo sem espaço livre - + Unknown error Erro desconhecido @@ -2528,7 +2538,7 @@ Deseja apagar de qualquer forma? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Deseja apagar de qualquer forma? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Deseja apagar de qualquer forma? QLibrary::resolve_sys: Símbolo "%1" indefinido em %2 (%3) - + Could not mmap '%1': %2 Não foi possivel mapear '%1': %2 @@ -2602,7 +2612,7 @@ Deseja apagar de qualquer forma? - + The shared library was not found. @@ -2617,8 +2627,8 @@ Deseja apagar de qualquer forma? - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Deseja apagar de qualquer forma? QLineEdit - + &Undo &Desfazer @@ -2676,8 +2686,8 @@ Deseja apagar de qualquer forma? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Deseja apagar de qualquer forma? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Deseja apagar de qualquer forma? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Deseja apagar de qualquer forma? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Deseja apagar de qualquer forma? QMYSQLDriver - + Unable to open database ' Não foi possível abrir a base de dados ' @@ -2782,7 +2792,7 @@ Deseja apagar de qualquer forma? Não foi possível estabelecer a ligação - + Unable to begin transaction Não foi possível iniciar a transacção @@ -2800,7 +2810,7 @@ Deseja apagar de qualquer forma? QMYSQLResult - + Unable to fetch data Não foi possível obter dados @@ -2815,7 +2825,7 @@ Deseja apagar de qualquer forma? Não foi possível guardar o resultado - + Unable to prepare statement Não foi possível preparar a expressão @@ -2860,7 +2870,7 @@ Deseja apagar de qualquer forma? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Deseja apagar de qualquer forma? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Deseja apagar de qualquer forma? QMenu - + Close Fechar @@ -3034,7 +3044,7 @@ Deseja apagar de qualquer forma? QMessageBox - + Help Ajuda @@ -3047,21 +3057,25 @@ Deseja apagar de qualquer forma? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Acerca do Qt - <p>This program uses Qt version %1.</p> - <p>Este programa usa Qt versão %1.</p> + <p>Este programa usa Qt versão %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Acerca do Qt</h3>%1<p>Qt é um conjunto de ferramentas para desenvolvimento de aplicações multiplataforma.</p>O Qt oferece portabilidade de código fonte único em MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux e todas as principais variantes comerciais de Unix. O Qt está igualmente disponível para dispositivos embebidos como Qtopia Core.</p><p>O Qt é um produto Trolltech. Veja <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para mais informação.</p> - + Show Details... Mostrar Detalhes... @@ -3071,20 +3085,14 @@ Deseja apagar de qualquer forma? Não Mostrar Detalhes... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> + <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> QMultiInputContext - + Select IM Seleccione Método de Entrada @@ -3092,7 +3100,7 @@ Deseja apagar de qualquer forma? QMultiInputContextPlugin - + Multiple input method switcher Seleccionador de método de entrada @@ -3105,7 +3113,7 @@ Deseja apagar de qualquer forma? QNativeSocketEngine - + The remote host closed the connection A máquina remota fechou a ligação @@ -3238,7 +3246,7 @@ Deseja apagar de qualquer forma? QNetworkAccessCacheBackend - + Error opening %1 @@ -3246,7 +3254,7 @@ Deseja apagar de qualquer forma? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3274,7 +3282,7 @@ Deseja apagar de qualquer forma? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3284,7 +3292,7 @@ Deseja apagar de qualquer forma? - + Logging in to %1 failed: authentication required @@ -3302,7 +3310,7 @@ Deseja apagar de qualquer forma? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3315,7 +3323,7 @@ Deseja apagar de qualquer forma? - + Protocol "%1" is unknown @@ -3323,7 +3331,7 @@ Deseja apagar de qualquer forma? QNetworkReplyImpl - + Operation canceled @@ -3332,7 +3340,7 @@ Deseja apagar de qualquer forma? QOCIDriver - + Unable to logon Não foi possível autenticar @@ -3361,7 +3369,7 @@ Deseja apagar de qualquer forma? QOCIResult - + Unable to bind column for batch execute @@ -3388,18 +3396,16 @@ Deseja apagar de qualquer forma? Não foi possível preparar a expressão - - + Unable to bind value Não foi possível fazer o ligamento do valor - Unable to execute select statement - Não foi possível executar a expressão select + Não foi possível executar a expressão select - + Unable to execute statement Não foi possível executar a expressão @@ -3407,7 +3413,7 @@ Deseja apagar de qualquer forma? QODBCDriver - + Unable to connect Não foi possível ligar @@ -3417,7 +3423,7 @@ Deseja apagar de qualquer forma? Não foi possível ligar - O 'driver' não suporta todas as funcionalidades necessárias - + Unable to disable autocommit Não foi possível desactivar finalização automática @@ -3440,19 +3446,19 @@ Deseja apagar de qualquer forma? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Não foi possível definir 'SQL_CURSOR_STATIC' como atributo da expressão. Por favor verifique a configuração do seu 'driver' ODBC - + Unable to execute statement Não foi possível executar a expressão - + Unable to fetch next Não foi possível obter o seguinte @@ -3462,19 +3468,19 @@ Deseja apagar de qualquer forma? Não foi possível preparar a expressão - + Unable to bind variable Não foi possível fazer o ligamento da variável - - + + Unable to fetch last - + Unable to fetch @@ -3492,12 +3498,12 @@ Deseja apagar de qualquer forma? QObject - + Home Início - + Operation not supported on %1 @@ -3507,7 +3513,7 @@ Deseja apagar de qualquer forma? - + Write error writing to %1: %2 @@ -3532,7 +3538,7 @@ Deseja apagar de qualquer forma? - + No host name given @@ -3541,7 +3547,7 @@ Deseja apagar de qualquer forma? QPPDOptionsModel - + Name Nome @@ -3554,7 +3560,7 @@ Deseja apagar de qualquer forma? QPSQLDriver - + Unable to connect Não foi possível ligar @@ -3574,7 +3580,7 @@ Deseja apagar de qualquer forma? Não foi possível anular a transacção - + Unable to subscribe @@ -3587,12 +3593,12 @@ Deseja apagar de qualquer forma? QPSQLResult - + Unable to create query Não foi possível criar a 'query' - + Unable to prepare statement @@ -3600,7 +3606,7 @@ Deseja apagar de qualquer forma? QPageSetupWidget - + Centimeters (cm) @@ -3716,7 +3722,7 @@ Deseja apagar de qualquer forma? QPrintDialog - + locally connected ligado localmente @@ -3741,7 +3747,7 @@ Deseja apagar de qualquer forma? Paisagem - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3891,7 +3897,7 @@ Deseja apagar de qualquer forma? Envelope #10 Comum EUA (105 x 241 mm) - + OK OK @@ -3912,7 +3918,7 @@ Deseja apagar de qualquer forma? Fonte papel: - + Print @@ -4244,13 +4250,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4532,8 +4538,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4562,7 +4568,7 @@ Please choose a different file name. - + @@ -4582,6 +4588,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4590,7 +4601,7 @@ Please choose a different file name. QProgressDialog - + Cancel Cancelar @@ -4614,7 +4625,7 @@ Please choose a different file name. QRegExp - + no error occurred sem erros @@ -4662,7 +4673,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Erro ao abrir base de dados @@ -4685,12 +4696,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Não foi possível obter os resultados - + Unable to execute statement Não foi possível executar a expressão @@ -4698,7 +4709,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Erro ao abrir a base de dados @@ -4765,12 +4776,12 @@ Please choose a different file name. QScrollBar - + Scroll here Deslizar aqui - + Left edge Borda esquerda @@ -4780,7 +4791,7 @@ Please choose a different file name. Topo - + Right edge Borda direita @@ -4790,7 +4801,7 @@ Please choose a different file name. Fundo - + Page left Página para esquerda @@ -4801,7 +4812,7 @@ Please choose a different file name. Página para cima - + Page right Página para direita @@ -4812,7 +4823,7 @@ Please choose a different file name. Página para baixo - + Scroll left Deslizar para esquerda @@ -4822,7 +4833,7 @@ Please choose a different file name. Deslizar para cima - + Scroll right Deslizar para a direita @@ -4850,7 +4861,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4861,7 +4872,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4871,8 +4882,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4950,7 +4961,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5535,7 +5546,7 @@ Please choose a different file name. QSql - + Delete Apagar @@ -5592,7 +5603,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5651,7 +5662,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5681,7 +5692,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Não foi possível estabelecer a ligação @@ -5711,7 +5722,7 @@ Please choose a different file name. Operação de 'socket' não suportada - + Operation on socket is not supported @@ -5719,7 +5730,7 @@ Please choose a different file name. QTextControl - + &Undo &Desfazer @@ -5777,7 +5788,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Esta plataforma não suporta IPv6 @@ -5785,7 +5796,7 @@ Please choose a different file name. QUndoGroup - + Undo Desfazer @@ -5798,7 +5809,7 @@ Please choose a different file name. QUndoModel - + <empty> <vazio> @@ -5806,7 +5817,7 @@ Please choose a different file name. QUndoStack - + Undo Desfazer @@ -5877,7 +5888,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6288,7 +6299,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6364,6 +6375,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6432,11 +6448,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? O Que é Isto? @@ -6444,7 +6470,7 @@ Please choose a different file name. QWidget - + * * @@ -6452,7 +6478,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6514,7 +6540,7 @@ Please choose a different file name. QWorkspace - + &Restore &Restaurar @@ -6584,7 +6610,7 @@ Please choose a different file name. QXml - + no error occurred não ocorreu nenhum erro @@ -6702,8 +6728,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6887,7 +6913,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6897,12 +6923,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6912,7 +6938,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6952,7 +6978,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6963,7 +6989,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6978,17 +7004,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7019,17 +7045,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7039,7 +7065,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7049,7 +7075,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7059,7 +7085,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7069,7 +7095,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7079,7 +7105,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7104,7 +7130,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7114,7 +7140,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7124,12 +7150,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7139,7 +7165,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7149,7 +7175,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7159,33 +7185,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7201,7 +7227,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7216,27 +7242,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7251,7 +7277,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7286,17 +7312,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7306,12 +7332,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7321,17 +7347,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7352,7 +7378,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7634,7 +7660,7 @@ Please choose a different file name. - + empty @@ -7659,7 +7685,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7674,7 +7700,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7684,12 +7710,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7704,13 +7730,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7729,12 +7755,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7744,12 +7770,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7804,7 +7830,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7879,7 +7905,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 3d05b71..1db3e46 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -85,7 +85,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -98,24 +98,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -149,7 +149,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -162,7 +162,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True True @@ -190,7 +190,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Копировать или перемеÑтить файл @@ -215,7 +215,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Ð’Ñе файлы (*) @@ -355,7 +355,7 @@ have libgstreamer-plugins-base installed. - + Open Открыть @@ -523,7 +523,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +573,7 @@ to Q3MainWindow - + Line up ВыровнÑÑ‚ÑŒ @@ -586,7 +586,7 @@ to Q3NetworkProtocol - + Operation stopped by the user ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð° пользователем @@ -594,7 +594,7 @@ to Q3ProgressDialog - + Cancel Отмена @@ -603,7 +603,7 @@ to Q3TabDialog - + OK OK @@ -632,7 +632,7 @@ to Q3TextEdit - + &Undo &Отменить @@ -671,7 +671,7 @@ to Q3TitleBar - + System @@ -739,7 +739,7 @@ to Q3ToolBar - + More... Больше... @@ -747,7 +747,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +799,7 @@ to Q3Wizard - + &Cancel &Отмена @@ -827,9 +827,9 @@ to QAbstractSocket - - - + + + Host not found @@ -872,7 +872,7 @@ to QAbstractSpinBox - + &Step up @@ -890,13 +890,13 @@ to QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Программный модуль '%1' требует Qt %2, найдена верÑÐ¸Ñ %3. @@ -906,7 +906,7 @@ to Ошибка ÑовмеÑтимоÑти библиотеки Qt - + Activate @@ -942,7 +942,7 @@ to QCheckBox - + Uncheck @@ -960,7 +960,7 @@ to QColorDialog - + Hu&e: &Тон: @@ -1034,13 +1034,13 @@ to QComboBox - + Open Открыть - + False False @@ -1058,7 +1058,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1079,12 +1079,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1102,8 +1102,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1118,7 +1118,7 @@ to - + Unable to fetch record %1 @@ -1136,7 +1136,7 @@ to QDateTimeEdit - + AM @@ -1159,7 +1159,7 @@ to QDial - + QDial @@ -1177,7 +1177,7 @@ to QDialog - + What's This? Что Ñто? @@ -1190,9 +1190,9 @@ to QDialogButtonBox - + - + OK OK @@ -1315,7 +1315,7 @@ to QDirModel - + Name Ð˜Ð¼Ñ @@ -1345,7 +1345,7 @@ to QDockWidget - + Close Закрыть @@ -1376,7 +1376,7 @@ to QErrorMessage - + &Show this message again &Показывать Ñто Ñообщение в дальнейшем @@ -1404,13 +1404,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1433,8 +1438,8 @@ to QFileDialog - - + + All Files (*) Ð’Ñе файлы (*) @@ -1457,13 +1462,13 @@ to Детальный вид - + File Файл - + Open Открыть @@ -1473,26 +1478,26 @@ to Сохранить как - + - + &Open &Открыть - + &Save &Сохранить - + Recent Places - + &Rename &Переименовать @@ -1507,33 +1512,33 @@ to Показать &Ñкрытые файлы - + New Folder Ðовый каталог - + Find Directory Ðайти каталог - + Directories Каталоги - + All Files (*.*) Ð’Ñе файлы (*.*) - - + + Directory: Каталог: - + %1 already exists. Do you want to replace it? @@ -1564,14 +1569,14 @@ Please verify the correct file name was given. - + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1597,7 +1602,7 @@ Do you want to delete it anyway? - + Show @@ -1613,19 +1618,19 @@ Do you want to delete it anyway? - + &Choose - + Remove - - + + File &name: &Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°: @@ -1645,7 +1650,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB @@ -1707,7 +1712,7 @@ Do you want to delete it anyway? - + My Computer @@ -1720,7 +1725,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1937,7 +1942,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &Шрифт @@ -1986,7 +1991,7 @@ Do you want to delete it anyway? QFtp - + Host %1 found Обнаружен узел %1 @@ -1996,7 +2001,7 @@ Do you want to delete it anyway? Узел обнаружен - + Connected to host %1 @@ -2132,7 +2137,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° @@ -2140,11 +2145,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2170,13 +2175,13 @@ Do you want to delete it anyway? QHttp - - + + Connection refused Отказано в Ñоединении - + Host %1 not found @@ -2189,12 +2194,12 @@ Do you want to delete it anyway? ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° данных - + HTTPS connection requested but SSL support not compiled in - + @@ -2233,21 +2238,21 @@ Do you want to delete it anyway? Соединение разорвано - - + + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° - + Request aborted Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½ - + No server set to connect to Ðе выбран Ñервер Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ @@ -2265,7 +2270,12 @@ Do you want to delete it anyway? Получен некорректный HTTP-заголовок - + + Unknown authentication method + + + + @@ -2288,7 +2298,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2369,7 +2379,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2392,7 +2402,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2412,7 +2422,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2482,7 +2492,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2502,7 +2512,7 @@ Do you want to delete it anyway? - + Unknown error ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° @@ -2510,7 +2520,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2533,7 +2543,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2541,7 +2551,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2572,7 +2582,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2587,8 +2597,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2608,7 +2618,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &Отменить @@ -2646,8 +2656,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2663,7 +2673,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2671,8 +2681,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2685,7 +2695,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2742,7 +2752,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2752,7 +2762,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2770,7 +2780,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2785,7 +2795,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2830,7 +2840,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2838,7 +2848,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2931,7 +2941,7 @@ Do you want to delete it anyway? QMenu - + Close Закрыть @@ -2988,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2996,22 +3006,22 @@ Do you want to delete it anyway? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt - + Help Справка - - <p>This program uses Qt version %1.</p> - - - - + Show Details... @@ -3020,21 +3030,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -3042,7 +3042,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3224,7 +3224,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3252,7 +3252,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3265,7 +3265,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3273,7 +3273,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3282,7 +3282,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3311,7 +3311,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3338,18 +3338,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3357,7 +3351,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3367,7 +3361,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3390,19 +3384,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3412,19 +3406,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3442,12 +3436,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3457,7 +3451,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3482,7 +3476,7 @@ Do you want to delete it anyway? - + No host name given @@ -3491,7 +3485,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name Ð˜Ð¼Ñ @@ -3504,7 +3498,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3524,7 +3518,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3537,12 +3531,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3550,7 +3544,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3666,7 +3660,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected локальный @@ -3683,7 +3677,7 @@ Do you want to delete it anyway? неизвеÑтно - + OK OK @@ -3700,7 +3694,7 @@ Do you want to delete it anyway? Принтер - + Print all Печатать вÑе @@ -3880,7 +3874,7 @@ Do you want to delete it anyway? - + Print @@ -4128,13 +4122,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4412,8 +4406,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4442,7 +4436,7 @@ Please choose a different file name. - + @@ -4462,6 +4456,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4470,7 +4469,7 @@ Please choose a different file name. QProgressDialog - + Cancel Отмена @@ -4494,7 +4493,7 @@ Please choose a different file name. QRegExp - + no error occurred ошибки отÑутÑтвуют @@ -4542,7 +4541,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4565,12 +4564,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4578,7 +4577,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4641,12 +4640,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4656,7 +4655,7 @@ Please choose a different file name. - + Right edge @@ -4666,7 +4665,7 @@ Please choose a different file name. - + Page left @@ -4677,7 +4676,7 @@ Please choose a different file name. - + Page right @@ -4688,7 +4687,7 @@ Please choose a different file name. - + Scroll left @@ -4698,7 +4697,7 @@ Please choose a different file name. - + Scroll right @@ -4726,7 +4725,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4737,7 +4736,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4747,8 +4746,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4826,7 +4825,7 @@ Please choose a different file name. QShortcut - + Space Space @@ -5407,7 +5406,7 @@ Please choose a different file name. QSql - + Delete Удалить @@ -5464,7 +5463,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5523,7 +5522,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5553,7 +5552,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5579,7 +5578,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5587,7 +5586,7 @@ Please choose a different file name. QTextControl - + &Undo &Отменить @@ -5645,7 +5644,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5653,7 +5652,7 @@ Please choose a different file name. QUndoGroup - + Undo Отменить @@ -5666,7 +5665,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5674,7 +5673,7 @@ Please choose a different file name. QUndoStack - + Undo Отменить @@ -5745,7 +5744,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6155,7 +6154,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6231,6 +6230,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6299,11 +6303,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Что Ñто? @@ -6311,7 +6325,7 @@ Please choose a different file name. QWidget - + * @@ -6319,7 +6333,7 @@ Please choose a different file name. QWizard - + < &Back < &Ðазад @@ -6381,7 +6395,7 @@ Please choose a different file name. QWorkspace - + &Restore &ВоÑÑтановить @@ -6451,7 +6465,7 @@ Please choose a different file name. QXml - + no error occurred ошибки отÑутÑтвуют @@ -6569,8 +6583,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6754,7 +6768,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6764,12 +6778,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6779,7 +6793,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6819,7 +6833,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6830,7 +6844,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6845,17 +6859,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6886,17 +6900,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6906,7 +6920,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6916,7 +6930,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6926,7 +6940,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6936,7 +6950,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6946,7 +6960,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6971,7 +6985,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6981,7 +6995,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6991,12 +7005,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7006,7 +7020,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7016,7 +7030,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7026,33 +7040,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7066,7 +7080,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7081,27 +7095,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7116,7 +7130,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7151,17 +7165,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7171,12 +7185,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7186,17 +7200,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7217,7 +7231,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7499,7 +7513,7 @@ Please choose a different file name. - + empty @@ -7524,7 +7538,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7539,7 +7553,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7549,12 +7563,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7569,13 +7583,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7594,12 +7608,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7609,12 +7623,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7669,7 +7683,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7744,7 +7758,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts index f681d1b..5045022 100644 --- a/translations/qt_sk.ts +++ b/translations/qt_sk.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 nie je definované @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Pravda @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File KopírovaÅ¥ alebo presunúť súbor @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) VÅ¡etky súbory (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open OtvoriÅ¥ @@ -527,7 +527,7 @@ Overte cestu a meno súboru. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ na Q3MainWindow - + Line up VyrovnaÅ¥ @@ -590,7 +590,7 @@ na Q3NetworkProtocol - + Operation stopped by the user Operácia zastavená užívateľom @@ -598,7 +598,7 @@ na Q3ProgressDialog - + Cancel Storno @@ -607,7 +607,7 @@ na Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ na Q3TextEdit - + &Undo V&rátiÅ¥ späť @@ -675,7 +675,7 @@ na Q3TitleBar - + System Systém @@ -743,7 +743,7 @@ na Q3ToolBar - + More... Viac... @@ -751,7 +751,7 @@ na Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ na Q3Wizard - + &Cancel S&torno @@ -831,9 +831,9 @@ na QAbstractSocket - - - + + + Host not found PoÄítaÄ nenájdený @@ -876,7 +876,7 @@ na QAbstractSpinBox - + &Step up Krok na&hor @@ -894,13 +894,13 @@ na QApplication - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Executable '%1' requires Qt %2, found Qt %3. Program '%1' vyžaduje Qt %2, nájdené Qt %3. @@ -910,7 +910,7 @@ na Chyba kompatibility knižnice Qt - + Activate AktivovaÅ¥ @@ -946,7 +946,7 @@ na QCheckBox - + Uncheck OdÅ¡krtnúť @@ -964,7 +964,7 @@ na QColorDialog - + Hu&e: Od&tieň: @@ -1038,13 +1038,13 @@ na QComboBox - + Open OtvoriÅ¥ - + False Nepravda @@ -1062,7 +1062,7 @@ na QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ na QDB2Driver - + Unable to connect Nedá sa pripojiÅ¥ - + Unable to commit transaction Transakcia sa nedá potvrdiÅ¥ @@ -1106,8 +1106,8 @@ na QDB2Result - - + + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -1122,7 +1122,7 @@ na Premenná sa nedá naviazaÅ¥ - + Unable to fetch record %1 Záznam %1 sa nedá získaÅ¥ @@ -1140,7 +1140,7 @@ na QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ na QDial - + QDial QDial @@ -1181,7 +1181,7 @@ na QDialog - + What's This? ÄŒo je to? @@ -1194,9 +1194,9 @@ na QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ na QDirModel - + Name Meno @@ -1349,7 +1349,7 @@ na QDockWidget - + Close ZavrieÅ¥ @@ -1380,7 +1380,7 @@ na QErrorMessage - + &Show this message again &ZobraziÅ¥ túto správu aj nabudúce @@ -1408,13 +1408,18 @@ na QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,8 +1442,8 @@ na QFileDialog - - + + All Files (*) VÅ¡etky súbory (*) @@ -1467,26 +1472,26 @@ na Detaily - + Open OtvoriÅ¥ - + - + &Open &OtvoriÅ¥ - + &Save &UložiÅ¥ - + &Rename P&remenovaÅ¥ @@ -1501,12 +1506,12 @@ na ZobraziÅ¥ &skryté súbory - + Directories PrieÄinky - + %1 already exists. Do you want to replace it? %1 už existuje. @@ -1522,7 +1527,7 @@ Súbor nenájdený. Prosím overte správnosÅ¥ zadaného mena súboru. - + Recent Places @@ -1550,8 +1555,8 @@ Prosím overte správnosÅ¥ zadaného mena súboru. Súbory typu: - - + + Directory: PrieÄinok: @@ -1564,8 +1569,8 @@ Súbor nenájdený. Prosím overte správnosÅ¥ zadaného mena súboru - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1574,7 +1579,7 @@ PrieÄinok nenájdený. Prosím overte správnosÅ¥ zadaného mena prieÄinku. - + '%1' is write protected. Do you want to delete it anyway? '%1' je chránený proti zápisu. @@ -1591,17 +1596,17 @@ Chcete ho aj tak zmazaÅ¥? PrieÄinok sa nedá zmazaÅ¥. - + All Files (*.*) VÅ¡etky súbory (*.*) - + Save As UložiÅ¥ ako - + Drive Oddiel @@ -1632,19 +1637,19 @@ Chcete ho aj tak zmazaÅ¥? &Nový prieÄinok - + &Choose &ZvoliÅ¥ - - + + File &name: Me&no súboru: - + New Folder Nový prieÄinok @@ -1655,7 +1660,7 @@ Chcete ho aj tak zmazaÅ¥? Dopredu - + Remove OdstrániÅ¥ @@ -1663,7 +1668,7 @@ Chcete ho aj tak zmazaÅ¥? QFileSystemModel - + %1 TB %1 TB @@ -1725,7 +1730,7 @@ Chcete ho aj tak zmazaÅ¥? Dátum zmeny - + My Computer Môj poÄítaÄ @@ -1738,7 +1743,7 @@ Chcete ho aj tak zmazaÅ¥? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Chcete ho aj tak zmazaÅ¥? QFontDialog - + &Font &Písmo @@ -2004,7 +2009,7 @@ Chcete ho aj tak zmazaÅ¥? QFtp - + Host %1 found PoÄítaÄ %1 nenájdený @@ -2014,7 +2019,7 @@ Chcete ho aj tak zmazaÅ¥? PoÄítaÄ nájdený - + Connected to host %1 @@ -2150,7 +2155,7 @@ Chcete ho aj tak zmazaÅ¥? QHostInfo - + Unknown error Neznáma chyba @@ -2158,11 +2163,11 @@ Chcete ho aj tak zmazaÅ¥? QHostInfoAgent - + - + @@ -2188,13 +2193,13 @@ Chcete ho aj tak zmazaÅ¥? QHttp - - + + Connection refused Spojenie odmietnuté - + Host %1 not found @@ -2207,12 +2212,12 @@ Chcete ho aj tak zmazaÅ¥? Neplatná dĺžka obsahu - + HTTPS connection requested but SSL support not compiled in - + @@ -2246,21 +2251,21 @@ Chcete ho aj tak zmazaÅ¥? Spojenie uzavreté - - + + Unknown error Neznáma chyba - + Request aborted Požiadavka preruÅ¡ená - + No server set to connect to Nenastavený server na pripojenie @@ -2278,7 +2283,12 @@ Chcete ho aj tak zmazaÅ¥? Neplatná hlaviÄka odpovede HTTP - + + Unknown authentication method + + + + @@ -2306,7 +2316,7 @@ Chcete ho aj tak zmazaÅ¥? Vyžaduje sa overenie - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Chcete ho aj tak zmazaÅ¥? QIBaseDriver - + Error opening database Chyba pri otváraní databázy @@ -2410,7 +2420,7 @@ Chcete ho aj tak zmazaÅ¥? QIBaseResult - + Unable to create BLOB BLOB sa nedá vytvoriÅ¥ @@ -2430,7 +2440,7 @@ Chcete ho aj tak zmazaÅ¥? BLOB sa nedá ÄítaÅ¥ - + Could not find array Pole sa nedá nájsÅ¥ @@ -2500,7 +2510,7 @@ Chcete ho aj tak zmazaÅ¥? QIODevice - + Permission denied Prístup zamietnutý @@ -2520,7 +2530,7 @@ Chcete ho aj tak zmazaÅ¥? Na zariadení nie je voľné miesto - + Unknown error Neznáma chyba @@ -2528,7 +2538,7 @@ Chcete ho aj tak zmazaÅ¥? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Chcete ho aj tak zmazaÅ¥? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Chcete ho aj tak zmazaÅ¥? QLibrary::resolve_sys: Symbol "%1" nie je definovaný v %2 (%3) - + Could not mmap '%1': %2 Nedá sa mmap '%1': %2 @@ -2602,7 +2612,7 @@ Chcete ho aj tak zmazaÅ¥? - + The shared library was not found. Zdieľaná knižnica nebola nájdená. @@ -2617,8 +2627,8 @@ Chcete ho aj tak zmazaÅ¥? Modul '%1' používa nekompatibilnú Qt knižnicu. (Nedajú sa mieÅ¡aÅ¥ debug a release knižnice.) - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Chcete ho aj tak zmazaÅ¥? QLineEdit - + &Undo V&rátiÅ¥ späť @@ -2676,8 +2686,8 @@ Chcete ho aj tak zmazaÅ¥? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Chcete ho aj tak zmazaÅ¥? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Chcete ho aj tak zmazaÅ¥? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Chcete ho aj tak zmazaÅ¥? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Chcete ho aj tak zmazaÅ¥? QMYSQLDriver - + Unable to open database ' Databáza sa nedá otvoriÅ¥ ' @@ -2782,7 +2792,7 @@ Chcete ho aj tak zmazaÅ¥? Nedá sa pripojiÅ¥ - + Unable to begin transaction Transakcia sa nedá spustiÅ¥ @@ -2800,7 +2810,7 @@ Chcete ho aj tak zmazaÅ¥? QMYSQLResult - + Unable to fetch data Dáta sa nedajú získaÅ¥ @@ -2815,7 +2825,7 @@ Chcete ho aj tak zmazaÅ¥? Výsledok sa nedá uložiÅ¥ - + Unable to prepare statement Príkaz sa nedá pripraviÅ¥ @@ -2860,7 +2870,7 @@ Chcete ho aj tak zmazaÅ¥? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Chcete ho aj tak zmazaÅ¥? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Chcete ho aj tak zmazaÅ¥? QMenu - + Close ZavrieÅ¥ @@ -3034,7 +3044,7 @@ Chcete ho aj tak zmazaÅ¥? QMessageBox - + @@ -3042,26 +3052,30 @@ Chcete ho aj tak zmazaÅ¥? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Informácie o Qt - + Help Pomocník - <p>This program uses Qt version %1.</p> - <p>Tento program používa Qt verziu %1.</p> + <p>Tento program používa Qt verziu %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Informácie o Qt<h3>%1<p>Qt je C++ nástroj pre vývoj viac-platformových aplikácií.</p><p>Qt poskytuje jedno zdrojový prenos medzi MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux a vÅ¡etkými významnými komerÄnými variantmi Unix. Qt je tiež dostupná pre vložené zariadenia ako Qtopia Core.</p><p>Qt je produkt spoloÄnosti Trolltech. Pozrite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pre viac informácií.</p> - + Show Details... ZobraziÅ¥ detaily... @@ -3071,20 +3085,14 @@ Chcete ho aj tak zmazaÅ¥? SkryÅ¥ detaily... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> + <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> QMultiInputContext - + Select IM VybraÅ¥ IM @@ -3092,7 +3100,7 @@ Chcete ho aj tak zmazaÅ¥? QMultiInputContextPlugin - + Multiple input method switcher PrepínaÄ metódy viacnásobného vstupu @@ -3105,7 +3113,7 @@ Chcete ho aj tak zmazaÅ¥? QNativeSocketEngine - + The remote host closed the connection Vzdialený poÄítaÄ uzavrel spojenie @@ -3238,7 +3246,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessCacheBackend - + Error opening %1 @@ -3246,7 +3254,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3274,7 +3282,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3284,7 +3292,7 @@ Chcete ho aj tak zmazaÅ¥? - + Logging in to %1 failed: authentication required @@ -3302,7 +3310,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3315,7 +3323,7 @@ Chcete ho aj tak zmazaÅ¥? - + Protocol "%1" is unknown @@ -3323,7 +3331,7 @@ Chcete ho aj tak zmazaÅ¥? QNetworkReplyImpl - + Operation canceled @@ -3332,7 +3340,7 @@ Chcete ho aj tak zmazaÅ¥? QOCIDriver - + Unable to logon Nedá sa prihlásiÅ¥ @@ -3361,7 +3369,7 @@ Chcete ho aj tak zmazaÅ¥? QOCIResult - + Unable to bind column for batch execute @@ -3388,18 +3396,16 @@ Chcete ho aj tak zmazaÅ¥? Príkaz sa nedá pripraviÅ¥ - - + Unable to bind value Hodnota sa nedá previazaÅ¥ - Unable to execute select statement - Príkaz select sa nedá vykonaÅ¥ + Príkaz select sa nedá vykonaÅ¥ - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -3407,7 +3413,7 @@ Chcete ho aj tak zmazaÅ¥? QODBCDriver - + Unable to connect Nedá sa pripojiÅ¥ @@ -3417,7 +3423,7 @@ Chcete ho aj tak zmazaÅ¥? Nedá sa pripojiÅ¥ - ovládaÄ neposkytuje vÅ¡etku požadovanú funkcionalitu - + Unable to disable autocommit Nedá sa zakázaÅ¥ automatické potvrdzovanie @@ -3440,19 +3446,19 @@ Chcete ho aj tak zmazaÅ¥? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Pre príkaz sa nedá nastaviÅ¥ atribút 'SQL_CURSOR_STATIC'. Prosím skontrolujte konfiguráciu ovládaÄa ODBC - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ - + Unable to fetch next Nedá sa získaÅ¥ Äaľší záznam @@ -3462,19 +3468,19 @@ Chcete ho aj tak zmazaÅ¥? Príkaz sa nedá pripraviÅ¥ - + Unable to bind variable Premenná sa nedá previazaÅ¥ - - + + Unable to fetch last - + Unable to fetch @@ -3492,12 +3498,12 @@ Chcete ho aj tak zmazaÅ¥? QObject - + Home Domov - + Operation not supported on %1 @@ -3507,7 +3513,7 @@ Chcete ho aj tak zmazaÅ¥? - + Write error writing to %1: %2 @@ -3532,7 +3538,7 @@ Chcete ho aj tak zmazaÅ¥? - + No host name given @@ -3541,7 +3547,7 @@ Chcete ho aj tak zmazaÅ¥? QPPDOptionsModel - + Name Meno @@ -3554,7 +3560,7 @@ Chcete ho aj tak zmazaÅ¥? QPSQLDriver - + Unable to connect Nedá sa pripojiÅ¥ @@ -3574,7 +3580,7 @@ Chcete ho aj tak zmazaÅ¥? Transakcia sa nedá vrátiÅ¥ späť - + Unable to subscribe @@ -3587,12 +3593,12 @@ Chcete ho aj tak zmazaÅ¥? QPSQLResult - + Unable to create query Nedá sa vytvoriÅ¥ hľadanie - + Unable to prepare statement @@ -3600,7 +3606,7 @@ Chcete ho aj tak zmazaÅ¥? QPageSetupWidget - + Centimeters (cm) @@ -3716,7 +3722,7 @@ Chcete ho aj tak zmazaÅ¥? QPrintDialog - + locally connected lokálne pripojená @@ -3733,7 +3739,7 @@ Chcete ho aj tak zmazaÅ¥? neznáme - + OK OK @@ -3746,7 +3752,7 @@ Chcete ho aj tak zmazaÅ¥? TlaÄiÅ¥ farebne ak je to dostupné - + Print all TlaÄiÅ¥ vÅ¡etko @@ -3943,7 +3949,7 @@ Chcete ho aj tak zmazaÅ¥? Zdroj papiera: - + Print @@ -4245,13 +4251,13 @@ Prosím zvoľte iné meno súboru. QPrintPreviewDialog - + Page Setup - + %1% @@ -4533,8 +4539,8 @@ Prosím zvoľte iné meno súboru. QProcess - - + + Could not open input redirection for reading @@ -4563,7 +4569,7 @@ Prosím zvoľte iné meno súboru. - + @@ -4583,6 +4589,11 @@ Prosím zvoľte iné meno súboru. + + No program defined + + + Process failed to start @@ -4591,7 +4602,7 @@ Prosím zvoľte iné meno súboru. QProgressDialog - + Cancel Storno @@ -4615,7 +4626,7 @@ Prosím zvoľte iné meno súboru. QRegExp - + no error occurred nevyskytli sa žiadne chyby @@ -4663,7 +4674,7 @@ Prosím zvoľte iné meno súboru. QSQLite2Driver - + Error to open database Chyba pri otváraní databázy @@ -4686,12 +4697,12 @@ Prosím zvoľte iné meno súboru. QSQLite2Result - + Unable to fetch results Výsledky sa nedajú získaÅ¥ - + Unable to execute statement Príkaz sa nedá vykonaÅ¥ @@ -4699,7 +4710,7 @@ Prosím zvoľte iné meno súboru. QSQLiteDriver - + Error opening database Chyba pri otváraní databázy @@ -4766,12 +4777,12 @@ Prosím zvoľte iné meno súboru. QScrollBar - + Scroll here Posunúť sem - + Left edge Ľavá hrana @@ -4781,7 +4792,7 @@ Prosím zvoľte iné meno súboru. Vrch - + Right edge Pravá hrana @@ -4791,7 +4802,7 @@ Prosím zvoľte iné meno súboru. Spodok - + Page left Strana naľavo @@ -4802,7 +4813,7 @@ Prosím zvoľte iné meno súboru. Strana nahor - + Page right Strana napravo @@ -4813,7 +4824,7 @@ Prosím zvoľte iné meno súboru. Strana nadol - + Scroll left Posunúť naľavo @@ -4823,7 +4834,7 @@ Prosím zvoľte iné meno súboru. Posunúť nahor - + Scroll right Posunúť napravo @@ -4851,7 +4862,7 @@ Prosím zvoľte iné meno súboru. QSharedMemory - + %1: unable to set key on lock @@ -4862,7 +4873,7 @@ Prosím zvoľte iné meno súboru. - + %1: unable to lock @@ -4872,8 +4883,8 @@ Prosím zvoľte iné meno súboru. - - + + %1: permission denied @@ -4951,7 +4962,7 @@ Prosím zvoľte iné meno súboru. QShortcut - + Space Medzera @@ -5536,7 +5547,7 @@ Prosím zvoľte iné meno súboru. QSql - + Delete OdstrániÅ¥ @@ -5593,7 +5604,7 @@ Prosím zvoľte iné meno súboru. QSslSocket - + Error creating SSL context (%1) Chyba pri vytváraní SSL kontextu (%1) @@ -5656,7 +5667,7 @@ Prosím zvoľte iné meno súboru. QSystemSemaphore - + %1: out of resources @@ -5686,7 +5697,7 @@ Prosím zvoľte iné meno súboru. QTDSDriver - + Unable to open connection Nedá sa otvoriÅ¥ spojenie @@ -5716,7 +5727,7 @@ Prosím zvoľte iné meno súboru. Nepodporovaná operácia so soketom - + Operation on socket is not supported @@ -5724,7 +5735,7 @@ Prosím zvoľte iné meno súboru. QTextControl - + &Undo V&rátiÅ¥ späť @@ -5782,7 +5793,7 @@ Prosím zvoľte iné meno súboru. QUdpSocket - + This platform does not support IPv6 Táto platforma nepodporuje IPv6 @@ -5790,7 +5801,7 @@ Prosím zvoľte iné meno súboru. QUndoGroup - + Undo VrátiÅ¥ späť @@ -5803,7 +5814,7 @@ Prosím zvoľte iné meno súboru. QUndoModel - + <empty> <prázdne> @@ -5811,7 +5822,7 @@ Prosím zvoľte iné meno súboru. QUndoStack - + Undo VrátiÅ¥ späť @@ -5882,7 +5893,7 @@ Prosím zvoľte iné meno súboru. QWebFrame - + Request cancelled @@ -6292,7 +6303,7 @@ Prosím zvoľte iné meno súboru. - + JavaScript Alert - %1 @@ -6368,6 +6379,11 @@ Prosím zvoľte iné meno súboru. + Select all + + + + Select to the next character @@ -6436,11 +6452,21 @@ Prosím zvoľte iné meno súboru. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? ÄŒo je to? @@ -6448,7 +6474,7 @@ Prosím zvoľte iné meno súboru. QWidget - + * * @@ -6456,7 +6482,7 @@ Prosím zvoľte iné meno súboru. QWizard - + Go Back VrátiÅ¥ sa späť @@ -6518,7 +6544,7 @@ Prosím zvoľte iné meno súboru. QWorkspace - + &Restore &ObnoviÅ¥ @@ -6588,7 +6614,7 @@ Prosím zvoľte iné meno súboru. QXml - + no error occurred nevyskytla sa žiadna chyba @@ -6706,8 +6732,8 @@ Prosím zvoľte iné meno súboru. QXmlStream - - + + Extra content at end of document. Obsah naviac na konci dokumentu. @@ -6895,7 +6921,7 @@ Prosím zvoľte iné meno súboru. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6905,12 +6931,12 @@ Prosím zvoľte iné meno súboru. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6920,7 +6946,7 @@ Prosím zvoľte iné meno súboru. - + Year %1 is invalid because it begins with %2. @@ -6960,7 +6986,7 @@ Prosím zvoľte iné meno súboru. - + At least one component must be present. @@ -6971,7 +6997,7 @@ Prosím zvoľte iné meno súboru. - + No operand in an integer division, %1, can be %2. @@ -6986,17 +7012,17 @@ Prosím zvoľte iné meno súboru. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7027,17 +7053,17 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7047,7 +7073,7 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7057,7 +7083,7 @@ Prosím zvoľte iné meno súboru. - + Operator %1 cannot be used on type %2. @@ -7067,7 +7093,7 @@ Prosím zvoľte iné meno súboru. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7077,7 +7103,7 @@ Prosím zvoľte iné meno súboru. - + Type error in cast, expected %1, received %2. @@ -7087,7 +7113,7 @@ Prosím zvoľte iné meno súboru. - + No casting is possible with %1 as the target type. @@ -7112,7 +7138,7 @@ Prosím zvoľte iné meno súboru. - + A comment cannot contain %1 @@ -7122,7 +7148,7 @@ Prosím zvoľte iné meno súboru. - + No comparisons can be done involving the type %1. @@ -7132,12 +7158,12 @@ Prosím zvoľte iné meno súboru. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7147,7 +7173,7 @@ Prosím zvoľte iné meno súboru. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7157,7 +7183,7 @@ Prosím zvoľte iné meno súboru. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7167,33 +7193,33 @@ Prosím zvoľte iné meno súboru. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7207,7 +7233,7 @@ Prosím zvoľte iné meno súboru. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7222,27 +7248,27 @@ Prosím zvoľte iné meno súboru. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7257,7 +7283,7 @@ Prosím zvoľte iné meno súboru. - + %1 matches newline characters @@ -7292,17 +7318,17 @@ Prosím zvoľte iné meno súboru. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7312,12 +7338,12 @@ Prosím zvoľte iné meno súboru. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7327,17 +7353,17 @@ Prosím zvoľte iné meno súboru. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7358,7 +7384,7 @@ Prosím zvoľte iné meno súboru. - + The variable %1 is unused @@ -7640,7 +7666,7 @@ Prosím zvoľte iné meno súboru. - + empty @@ -7665,7 +7691,7 @@ Prosím zvoľte iné meno súboru. - + Required type is %1, but %2 was found. @@ -7680,7 +7706,7 @@ Prosím zvoľte iné meno súboru. - + It's not possible to add attributes after any other kind of node. @@ -7690,12 +7716,12 @@ Prosím zvoľte iné meno súboru. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7710,13 +7736,13 @@ Prosím zvoľte iné meno súboru. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7735,12 +7761,12 @@ Prosím zvoľte iné meno súboru. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7750,12 +7776,12 @@ Prosím zvoľte iné meno súboru. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7810,7 +7836,7 @@ Prosím zvoľte iné meno súboru. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7885,7 +7911,7 @@ Prosím zvoľte iné meno súboru. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts index f27480d..1b75722 100644 --- a/translations/qt_sv.ts +++ b/translations/qt_sv.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -89,7 +89,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -102,24 +102,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -153,7 +153,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 är inte definierad @@ -166,7 +166,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Sant @@ -194,7 +194,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Kopiera eller ta bort en fil @@ -219,7 +219,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Alla filer (*) @@ -359,7 +359,7 @@ have libgstreamer-plugins-base installed. - + Open Öppna @@ -527,7 +527,7 @@ Kontrollera sökväg och filnamn. Q3LocalFs - + Could not read directory %1 @@ -577,7 +577,7 @@ till Q3MainWindow - + Line up Rada upp @@ -590,7 +590,7 @@ till Q3NetworkProtocol - + Operation stopped by the user Ã…tgärden stoppades av användaren @@ -598,7 +598,7 @@ till Q3ProgressDialog - + Cancel Avbryt @@ -607,7 +607,7 @@ till Q3TabDialog - + OK OK @@ -636,7 +636,7 @@ till Q3TextEdit - + &Undo &Ã…ngra @@ -675,7 +675,7 @@ till Q3TitleBar - + System System @@ -743,7 +743,7 @@ till Q3ToolBar - + More... Mer... @@ -751,7 +751,7 @@ till Q3UrlOperator - + The protocol `%1' is not supported @@ -803,7 +803,7 @@ till Q3Wizard - + &Cancel &Avbryt @@ -831,9 +831,9 @@ till QAbstractSocket - - - + + + Host not found Värden hittades inte @@ -876,7 +876,7 @@ till QAbstractSpinBox - + &Step up &Stega uppÃ¥t @@ -894,12 +894,12 @@ till QApplication - + Activate Aktivera - + Executable '%1' requires Qt %2, found Qt %3. Binären \"%1\" kräver Qt %2, hittade Qt %3. @@ -909,7 +909,7 @@ till Inkompatibelt Qt-biblioteksfel - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -946,7 +946,7 @@ till QCheckBox - + Uncheck Avkryssa @@ -964,7 +964,7 @@ till QColorDialog - + Hu&e: Nya&ns: @@ -1038,13 +1038,13 @@ till QComboBox - + Open Öppna - + False Falskt @@ -1062,7 +1062,7 @@ till QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1083,12 +1083,12 @@ till QDB2Driver - + Unable to connect Kunde inte ansluta - + Unable to commit transaction Kunde inte verkställa transaktion @@ -1106,8 +1106,8 @@ till QDB2Result - - + + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -1122,7 +1122,7 @@ till Kunde inte binda variabel - + Unable to fetch record %1 Kunde inte hämta posten %1 @@ -1140,7 +1140,7 @@ till QDateTimeEdit - + AM AM @@ -1163,7 +1163,7 @@ till QDial - + QDial @@ -1181,7 +1181,7 @@ till QDialog - + What's This? Vad är det här? @@ -1194,9 +1194,9 @@ till QDialogButtonBox - + - + OK OK @@ -1319,7 +1319,7 @@ till QDirModel - + Name Namn @@ -1349,7 +1349,7 @@ till QDockWidget - + Close Stäng @@ -1380,7 +1380,7 @@ till QErrorMessage - + Debug Message: Felsökningsmeddelande: @@ -1408,13 +1408,18 @@ till QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1437,37 +1442,37 @@ till QFileDialog - - + + All Files (*) Alla filer (*) - + Directories Kataloger - + &Open &Öppna - + &Save &Spara - + Open Öppna - + %1 already exists. Do you want to replace it? %1 finns redan. @@ -1488,7 +1493,7 @@ Kontrollera att det korrekta filnamnet angavs. Min dator - + &Rename &Byt namn @@ -1534,7 +1539,7 @@ Kontrollera att det korrekta filnamnet angavs. - + Directory: Katalog: @@ -1547,8 +1552,8 @@ Filen hittades inte. Kontrollera att det korrekta filnamnet angavs - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1557,7 +1562,7 @@ Katalogen hittades inte. Kontrollera att det korrekta katalognamnet angavs. - + '%1' is write protected. Do you want to delete it anyway? \"%1\" är skrivskyddad. @@ -1574,22 +1579,22 @@ Vill du ta bort den ändÃ¥? Kunde inte ta bort katalogen. - + Recent Places - + All Files (*.*) Alla filer (*.*) - + Save As Spara som - + Drive Enhet @@ -1621,29 +1626,29 @@ Vill du ta bort den ändÃ¥? FramÃ¥t - + New Folder Ny mapp - + &New Folder - + &Choose - + Remove - - + + File &name: Fil&namn: @@ -1663,7 +1668,7 @@ Vill du ta bort den ändÃ¥? QFileSystemModel - + %1 TB @@ -1725,7 +1730,7 @@ Vill du ta bort den ändÃ¥? Ändringsdatum - + My Computer Min dator @@ -1738,7 +1743,7 @@ Vill du ta bort den ändÃ¥? QFontDatabase - + Normal @@ -1955,7 +1960,7 @@ Vill du ta bort den ändÃ¥? QFontDialog - + &Font &Typsnitt @@ -2004,8 +2009,8 @@ Vill du ta bort den ändÃ¥? QFtp - - + + Not connected Inte ansluten @@ -2150,7 +2155,7 @@ Vill du ta bort den ändÃ¥? QHostInfo - + Unknown error Okänt fel @@ -2158,11 +2163,11 @@ Vill du ta bort den ändÃ¥? QHostInfoAgent - + - + @@ -2188,26 +2193,26 @@ Vill du ta bort den ändÃ¥? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Okänt fel - + Request aborted Begäran avbröts - + No server set to connect to Ingen server inställd att ansluta till @@ -2225,18 +2230,23 @@ Vill du ta bort den ändÃ¥? Servern stängde oväntat anslutningen - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Anslutningen nekades - + Host %1 not found @@ -2257,7 +2267,7 @@ Vill du ta bort den ändÃ¥? Ogiltig HTTP-svarshuvud - + @@ -2306,7 +2316,7 @@ Vill du ta bort den ändÃ¥? - + Connection refused (or timed out) @@ -2387,7 +2397,7 @@ Vill du ta bort den ändÃ¥? QIBaseDriver - + Error opening database Fel vid öppning av databas @@ -2410,7 +2420,7 @@ Vill du ta bort den ändÃ¥? QIBaseResult - + Unable to create BLOB Kunde inte skapa BLOB @@ -2430,7 +2440,7 @@ Vill du ta bort den ändÃ¥? Kunde inte läsa BLOB - + Could not find array Kunde inte hitta kedja @@ -2500,7 +2510,7 @@ Vill du ta bort den ändÃ¥? QIODevice - + Permission denied Ã…tkomst nekad @@ -2520,7 +2530,7 @@ Vill du ta bort den ändÃ¥? Inget ledigt utrymme pÃ¥ enheten - + Unknown error Okänt fel @@ -2528,7 +2538,7 @@ Vill du ta bort den ändÃ¥? QInputContext - + XIM XIM @@ -2551,7 +2561,7 @@ Vill du ta bort den ändÃ¥? QInputDialog - + Enter a value: @@ -2571,7 +2581,7 @@ Vill du ta bort den ändÃ¥? QLibrary::resolve_sys: Symbolen "%1" är inte definierad i %2 (%3) - + Could not mmap '%1': %2 @@ -2587,7 +2597,7 @@ Vill du ta bort den ändÃ¥? - + The shared library was not found. @@ -2617,8 +2627,8 @@ Vill du ta bort den ändÃ¥? Okänt fel - - + + Cannot load library %1: %2 @@ -2638,7 +2648,7 @@ Vill du ta bort den ändÃ¥? QLineEdit - + &Undo &Ã…ngra @@ -2676,8 +2686,8 @@ Vill du ta bort den ändÃ¥? QLocalServer - - + + %1: Name error @@ -2693,7 +2703,7 @@ Vill du ta bort den ändÃ¥? - + %1: Unknown error %2 @@ -2701,8 +2711,8 @@ Vill du ta bort den ändÃ¥? QLocalSocket - - + + %1: Connection refused @@ -2715,7 +2725,7 @@ Vill du ta bort den ändÃ¥? - + %1: Invalid name @@ -2772,7 +2782,7 @@ Vill du ta bort den ändÃ¥? QMYSQLDriver - + Unable to open database ' Kunde inte öppna databasen \" @@ -2782,7 +2792,7 @@ Vill du ta bort den ändÃ¥? Kunde inte ansluta - + Unable to begin transaction Kunde inte pÃ¥börja transaktion @@ -2800,7 +2810,7 @@ Vill du ta bort den ändÃ¥? QMYSQLResult - + Unable to fetch data Kunde inte hämta data @@ -2815,7 +2825,7 @@ Vill du ta bort den ändÃ¥? Kunde inte lagra resultat - + Unable to prepare statement Kunde inte förbereda frÃ¥gesats @@ -2860,7 +2870,7 @@ Vill du ta bort den ändÃ¥? QMdiArea - + (Untitled) @@ -2868,7 +2878,7 @@ Vill du ta bort den ändÃ¥? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2961,7 +2971,7 @@ Vill du ta bort den ändÃ¥? QMenu - + Close Stäng @@ -2990,7 +3000,7 @@ Vill du ta bort den ändÃ¥? QMessageBox - + Help Hjälp @@ -3003,21 +3013,25 @@ Vill du ta bort den ändÃ¥? OK - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Om Qt - <p>This program uses Qt version %1.</p> - <p>Detta program använder Qt version %1.</p> + <p>Detta program använder Qt version %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Om Qt</h3>%1<p>Qt är ett C++-verktygssamling för utveckling av krossplattformsprogram.</p><p>Qt tillhandahÃ¥ller portabilitet för samma källkod mellan MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, och alla andra stora kommersiella Unix-varianter. Qt finns ocksÃ¥ tillgängligt för inbäddade enheter som Qtopia Core.</p><p>Qt är en produkt frÃ¥n Trolltech. Se <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> för mer information.</p> - + Show Details... Visa detaljer... @@ -3026,21 +3040,11 @@ Vill du ta bort den ändÃ¥? Hide Details... Dölj detaljer,,, - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM Välj inmatningsmetod @@ -3048,7 +3052,7 @@ Vill du ta bort den ändÃ¥? QMultiInputContextPlugin - + Multiple input method switcher Växlare för flera inmatningsmetoder @@ -3061,7 +3065,7 @@ Vill du ta bort den ändÃ¥? QNativeSocketEngine - + The remote host closed the connection Fjärrvärden stängde anslutningen @@ -3194,7 +3198,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessCacheBackend - + Error opening %1 @@ -3202,7 +3206,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3230,7 +3234,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3240,7 +3244,7 @@ Vill du ta bort den ändÃ¥? - + Logging in to %1 failed: authentication required @@ -3258,7 +3262,7 @@ Vill du ta bort den ändÃ¥? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3271,7 +3275,7 @@ Vill du ta bort den ändÃ¥? - + Protocol "%1" is unknown @@ -3279,7 +3283,7 @@ Vill du ta bort den ändÃ¥? QNetworkReplyImpl - + Operation canceled @@ -3288,7 +3292,7 @@ Vill du ta bort den ändÃ¥? QOCIDriver - + Unable to logon Kunde inte logga in @@ -3317,7 +3321,7 @@ Vill du ta bort den ändÃ¥? QOCIResult - + Unable to bind column for batch execute @@ -3344,18 +3348,16 @@ Vill du ta bort den ändÃ¥? Kunde inte förbereda frÃ¥gesats - - + Unable to bind value Kunde inte binda värde - Unable to execute select statement - Kunde inte köra \"select\"-frÃ¥gesats + Kunde inte köra \"select\"-frÃ¥gesats - + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -3363,7 +3365,7 @@ Vill du ta bort den ändÃ¥? QODBCDriver - + Unable to connect Kunde inte ansluta @@ -3373,7 +3375,7 @@ Vill du ta bort den ändÃ¥? Kunde inte ansluta - Drivrutinen har inte stöd för all nödvändig funktionalitet - + Unable to disable autocommit Kunde inte inaktivera automatisk verkställning @@ -3396,19 +3398,19 @@ Vill du ta bort den ändÃ¥? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Kunde inte ställa in \"SQL_CURSOR_STATIC\" som frÃ¥gesatsattribut. Kontrollera konfigurationen för din ODBC-drivrutin - + Unable to execute statement Kunde inte köra frÃ¥gesats - + Unable to fetch next Kunde inte hämta nästa @@ -3418,19 +3420,19 @@ Vill du ta bort den ändÃ¥? Kunde inte förbereda frÃ¥gesats - + Unable to bind variable Kunde inte binda variabel - - + + Unable to fetch last - + Unable to fetch @@ -3448,12 +3450,12 @@ Vill du ta bort den ändÃ¥? QObject - + Home Home - + Operation not supported on %1 @@ -3463,7 +3465,7 @@ Vill du ta bort den ändÃ¥? - + Write error writing to %1: %2 @@ -3488,7 +3490,7 @@ Vill du ta bort den ändÃ¥? - + No host name given @@ -3497,7 +3499,7 @@ Vill du ta bort den ändÃ¥? QPPDOptionsModel - + Name Namn @@ -3510,7 +3512,7 @@ Vill du ta bort den ändÃ¥? QPSQLDriver - + Unable to connect Kunde inte ansluta @@ -3530,7 +3532,7 @@ Vill du ta bort den ändÃ¥? Kunde inte rulla tillbaka transaktion - + Unable to subscribe @@ -3543,12 +3545,12 @@ Vill du ta bort den ändÃ¥? QPSQLResult - + Unable to create query Kunde inte skapa frÃ¥ga - + Unable to prepare statement Kunde inte förbereda frÃ¥gesats @@ -3556,7 +3558,7 @@ Vill du ta bort den ändÃ¥? QPageSetupWidget - + Centimeters (cm) @@ -3672,7 +3674,7 @@ Vill du ta bort den ändÃ¥? QPrintDialog - + locally connected lokalt ansluten @@ -3697,7 +3699,7 @@ Vill du ta bort den ändÃ¥? Liggande - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) @@ -3847,7 +3849,7 @@ Vill du ta bort den ändÃ¥? US Common #10 Envelope (105 x 241 mm) - + OK OK @@ -3868,7 +3870,7 @@ Vill du ta bort den ändÃ¥? Papperskälla: - + Print @@ -4200,13 +4202,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4488,8 +4490,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4518,7 +4520,7 @@ Please choose a different file name. - + @@ -4538,6 +4540,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4546,7 +4553,7 @@ Please choose a different file name. QProgressDialog - + Cancel Avbryt @@ -4570,7 +4577,7 @@ Please choose a different file name. QRegExp - + no error occurred inga fel inträffade @@ -4618,7 +4625,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Fel vid öppning av databas @@ -4641,12 +4648,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Kunde inte hämta resultat - + Unable to execute statement Kunde inte köra frÃ¥gesats @@ -4654,7 +4661,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Fel vid öppning av databas @@ -4721,12 +4728,12 @@ Please choose a different file name. QScrollBar - + Scroll here Rulla här - + Left edge Vänsterkant @@ -4736,7 +4743,7 @@ Please choose a different file name. Överkant - + Right edge Högerkant @@ -4746,7 +4753,7 @@ Please choose a different file name. Nederkant - + Page left Sida vänster @@ -4757,7 +4764,7 @@ Please choose a different file name. Sida uppÃ¥t - + Page right Sida höger @@ -4768,7 +4775,7 @@ Please choose a different file name. Sida nedÃ¥t - + Scroll left Rulla vänster @@ -4778,7 +4785,7 @@ Please choose a different file name. Rulla uppÃ¥t - + Scroll right Rulla höger @@ -4806,7 +4813,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4817,7 +4824,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4827,8 +4834,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4906,7 +4913,7 @@ Please choose a different file name. QShortcut - + Space Mellanslag @@ -5491,7 +5498,7 @@ Please choose a different file name. QSql - + Delete Ta bort @@ -5548,7 +5555,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5607,7 +5614,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5637,7 +5644,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Kunde inte öppna anslutning @@ -5667,7 +5674,7 @@ Please choose a different file name. UttagsÃ¥tgärd stöds inte - + Operation on socket is not supported @@ -5675,7 +5682,7 @@ Please choose a different file name. QTextControl - + &Undo &Ã…ngra @@ -5733,7 +5740,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Denna plattform saknar stöd för IPv6 @@ -5741,7 +5748,7 @@ Please choose a different file name. QUndoGroup - + Undo Ã…ngra @@ -5754,7 +5761,7 @@ Please choose a different file name. QUndoModel - + <empty> <tom> @@ -5762,7 +5769,7 @@ Please choose a different file name. QUndoStack - + Undo Ã…ngra @@ -5833,7 +5840,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6243,7 +6250,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6319,6 +6326,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6387,11 +6399,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Vad är det här? @@ -6399,7 +6421,7 @@ Please choose a different file name. QWidget - + * * @@ -6407,7 +6429,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6465,7 +6487,7 @@ Please choose a different file name. QWorkspace - + &Restore Ã…te&rställ @@ -6535,7 +6557,7 @@ Please choose a different file name. QXml - + no error occurred inga fel inträffade @@ -6653,8 +6675,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6838,7 +6860,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6848,12 +6870,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6863,7 +6885,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6903,7 +6925,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6914,7 +6936,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6929,17 +6951,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6970,17 +6992,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6990,7 +7012,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7000,7 +7022,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7010,7 +7032,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7020,7 +7042,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7030,7 +7052,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7055,7 +7077,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7065,7 +7087,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7075,12 +7097,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7090,7 +7112,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7100,7 +7122,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7110,33 +7132,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7150,7 +7172,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7165,27 +7187,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7200,7 +7222,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7235,17 +7257,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7255,12 +7277,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7270,17 +7292,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7301,7 +7323,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7583,7 +7605,7 @@ Please choose a different file name. - + empty @@ -7608,7 +7630,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7623,7 +7645,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7633,12 +7655,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7653,13 +7675,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7678,12 +7700,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7693,12 +7715,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7753,7 +7775,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7828,7 +7850,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index c16a645..d6a7d80 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -96,7 +96,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -109,24 +109,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -160,7 +160,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1, %2 не визначено @@ -173,7 +173,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True Так @@ -201,7 +201,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File Копіювати або переÑунути файл @@ -226,7 +226,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) Ð’ÑÑ– файли (*) @@ -366,7 +366,7 @@ have libgstreamer-plugins-base installed. - + Open Відкрити @@ -534,7 +534,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -583,7 +583,7 @@ to Q3MainWindow - + Line up ВирівнÑти @@ -596,7 +596,7 @@ to Q3NetworkProtocol - + Operation stopped by the user Дію зупинено кориÑтувачем @@ -604,7 +604,7 @@ to Q3ProgressDialog - + Cancel СкаÑувати @@ -613,7 +613,7 @@ to Q3TabDialog - + OK Гаразд @@ -642,7 +642,7 @@ to Q3TextEdit - + &Undo &Повернути @@ -681,7 +681,7 @@ to Q3TitleBar - + System СиÑтема @@ -749,7 +749,7 @@ to Q3ToolBar - + More... Додатково... @@ -757,7 +757,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -809,7 +809,7 @@ to Q3Wizard - + &Cancel &СкаÑувати @@ -837,9 +837,9 @@ to QAbstractSocket - - - + + + Host not found Вузол не знайдено @@ -882,7 +882,7 @@ to QAbstractSpinBox - + &Step up &Крок вгору @@ -900,12 +900,12 @@ to QApplication - + Activate Ðктивувати - + Executable '%1' requires Qt %2, found Qt %3. Програма "%1" потребує Qt %2, але знайдено Qt %3. @@ -915,7 +915,7 @@ to Помилка неÑуміÑноÑÑ‚Ñ– бібліотеки Qt - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -952,7 +952,7 @@ to QCheckBox - + Uncheck ЗнÑти позначку @@ -970,7 +970,7 @@ to QColorDialog - + Hu&e: Від&тінок: @@ -1044,13 +1044,13 @@ to QComboBox - + Open Відкрити - + False ÐÑ– @@ -1068,7 +1068,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1089,12 +1089,12 @@ to QDB2Driver - + Unable to connect Ðеможливо з'єднатиÑÑ - + Unable to commit transaction Ðеможливо завершити транзакцію @@ -1112,8 +1112,8 @@ to QDB2Result - - + + Unable to execute statement Ðеможливо виконати оператор @@ -1128,7 +1128,7 @@ to Ðеможливо прив'Ñзати змінну - + Unable to fetch record %1 Ðеможливо вибрати Ð·Ð°Ð¿Ð¸Ñ %1 @@ -1146,7 +1146,7 @@ to QDateTimeEdit - + AM AM @@ -1169,7 +1169,7 @@ to QDial - + QDial QDial @@ -1187,7 +1187,7 @@ to QDialog - + What's This? Що це? @@ -1200,9 +1200,9 @@ to QDialogButtonBox - + - + OK Гаразд @@ -1325,7 +1325,7 @@ to QDirModel - + Name Ім'Ñ @@ -1355,7 +1355,7 @@ to QDockWidget - + Close Закрити @@ -1386,7 +1386,7 @@ to QErrorMessage - + Debug Message: ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ: @@ -1414,13 +1414,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1443,37 +1448,37 @@ to QFileDialog - - + + All Files (*) Ð’ÑÑ– файли (*) - + Directories Каталоги - + &Open &Відкрити - + &Save &Зберегти - + Open Відкрити - + %1 already exists. Do you want to replace it? %1 вже Ñ–Ñнує. @@ -1494,7 +1499,7 @@ Please verify the correct file name was given. Мій комп'ютер - + &Rename &Перейменувати @@ -1540,7 +1545,7 @@ Please verify the correct file name was given. - + Directory: Каталог: @@ -1553,8 +1558,8 @@ Please verify the correct file name was given ПереконайтеÑÑ, що введено правильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1563,7 +1568,7 @@ Please verify the correct directory name was given. ПереконайтеÑÑ, що введено правильне ім'Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ. - + '%1' is write protected. Do you want to delete it anyway? "%1" захищено від запиÑу. @@ -1580,22 +1585,22 @@ Do you want to delete it anyway? Ðеможливо вилучити каталог. - + Recent Places - + All Files (*.*) Ð’ÑÑ– файли (*.*) - + Save As Зберегти, Ñк - + Drive ДиÑк @@ -1631,17 +1636,17 @@ Do you want to delete it anyway? Вперед - + New Folder Ðова тека - + &New Folder &Ðова тека - + &Choose &Вибрати @@ -1651,13 +1656,13 @@ Do you want to delete it anyway? Зберегти, &Ñк: - + Remove Вилучити - - + + File &name: &Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ: @@ -1677,7 +1682,7 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename Ðеправильне ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ @@ -1714,7 +1719,7 @@ Do you want to delete it anyway? Дата зміни - + My Computer Мій комп'ютер @@ -1752,7 +1757,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1969,7 +1974,7 @@ Do you want to delete it anyway? QFontDialog - + &Font &Шрифт @@ -2018,8 +2023,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected Ðе з'єднано @@ -2161,7 +2166,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error Ðевідома помилка @@ -2169,11 +2174,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2199,26 +2204,26 @@ Do you want to delete it anyway? QHttp - + HTTPS connection requested but SSL support not compiled in - - + + Unknown error Ðевідома помилка - + Request aborted Запит перервано - + No server set to connect to Ðе вказано Ñервер Ð´Ð»Ñ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -2236,18 +2241,23 @@ Do you want to delete it anyway? Сервер неÑподівано закрив з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ - + + Unknown authentication method + + + + Error writing response to device - + Connection refused Відмовлено у зв'Ñзку - + Host %1 not found @@ -2268,7 +2278,7 @@ Do you want to delete it anyway? Ðеправильний заголовок відповіді HTTP - + @@ -2317,7 +2327,7 @@ Do you want to delete it anyway? ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова - + Connection refused (or timed out) @@ -2398,7 +2408,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database Ðеможливо відкрити базу даних @@ -2421,7 +2431,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB Ðеможливо Ñтворити BLOB @@ -2441,7 +2451,7 @@ Do you want to delete it anyway? Ðеможливо прочитати BLOB - + Could not find array Ðеможливо знайти маÑив @@ -2511,7 +2521,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied Відмовлено у доÑтупі @@ -2531,7 +2541,7 @@ Do you want to delete it anyway? Ðа приÑтрої не лишилоÑÑŒ міÑÑ†Ñ - + Unknown error Ðевідома помилка @@ -2539,7 +2549,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2562,7 +2572,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2582,7 +2592,7 @@ Do you want to delete it anyway? QLibrary::resolve_sys: Ñимвол "%1" не Ñ” визначеним в %2 (%3) - + Could not mmap '%1': %2 Помилка Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ mmap "%1": %2 @@ -2613,7 +2623,7 @@ Do you want to delete it anyway? - + The shared library was not found. Спільну бібліотеку не знайдено. @@ -2628,8 +2638,8 @@ Do you want to delete it anyway? Додаток "%1" викориÑтовує неÑуміÑну бібліотеку Qt. (Ðе дозволÑєтьÑÑ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ñ‚Ð¸ верÑÑ–ÑŽ бібліотеки Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ Ñ– верÑÑ–ÑŽ випуÑку.) - - + + Cannot load library %1: %2 @@ -2649,7 +2659,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo &Повернути @@ -2687,8 +2697,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2704,7 +2714,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2712,8 +2722,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2726,7 +2736,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2783,7 +2793,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' Ðеможливо відкрити базу даних @@ -2793,7 +2803,7 @@ Do you want to delete it anyway? Ðеможливо з'єднатиÑÑ - + Unable to begin transaction Ðеможливо почати транзакцію @@ -2811,7 +2821,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data Ðеможливо вибрати дані @@ -2826,7 +2836,7 @@ Do you want to delete it anyway? Ðеможливо запиÑати результат - + Unable to prepare statement Ðеможливо підготувати оператор @@ -2871,7 +2881,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2879,7 +2889,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2972,7 +2982,7 @@ Do you want to delete it anyway? QMenu - + Close Закрити @@ -3045,7 +3055,7 @@ Do you want to delete it anyway? QMessageBox - + Help Довідка @@ -3058,21 +3068,25 @@ Do you want to delete it anyway? Гаразд - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt Про Qt - <p>This program uses Qt version %1.</p> - <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt верÑÑ–Ñ— %1.</p> + <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt верÑÑ–Ñ— %1.</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>Про Qt</h3>%1<p>Qt - це інÑтрументарій C++ Ð´Ð»Ñ Ð¼Ñ–Ð¶Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¾Ð²Ð¾Ñ— розробки.</p><p>Qt забезпечує мобільніÑÑ‚ÑŒ єдиних джерельних текÑтів між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та вÑіма оÑновними комерційними верÑÑ–Ñми Unix. Qt Ñ–Ñнує також Ð´Ð»Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ… приÑтроїв, таких, Ñк Qtopia Core.</p><p>Qt - це продукт компанії Trolltech. Більше інформації можна знайти на <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + Show Details... Показати подробиці... @@ -3082,20 +3096,14 @@ Do you want to delete it anyway? Сховати подробиці... - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> + <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> QMultiInputContext - + Select IM Вибрати метод вводу @@ -3103,7 +3111,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher Перемикач методів вводу @@ -3116,7 +3124,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection Віддалений вузол закрив з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -3249,7 +3257,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3257,7 +3265,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3285,7 +3293,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3295,7 +3303,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3313,7 +3321,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3326,7 +3334,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3334,7 +3342,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3343,7 +3351,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon Ðеможливо зайти @@ -3372,7 +3380,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3399,18 +3407,16 @@ Do you want to delete it anyway? Ðеможливо підготувати оператор - - + Unable to bind value Ðеможливо прив'Ñзати Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ - Unable to execute select statement - Ðеможливо виконати оператор Ð²Ð¸Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ + Ðеможливо виконати оператор Ð²Ð¸Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ - + Unable to execute statement Ðеможливо виконати оператор @@ -3418,7 +3424,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect Ðеможливо з'єднатиÑÑ @@ -3428,7 +3434,7 @@ Do you want to delete it anyway? Ðеможливо з'єднатиÑÑ - драйвер не підтримує вÑÑ–Ñ… потрібних функцій - + Unable to disable autocommit Ðеможливо вимкнути Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ–Ð¹ @@ -3451,19 +3457,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: неможливо вÑтановити 'SQL_CURSOR_STATIC', Ñк атрибут оператора. Будь лаÑка, перевірте Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð° ODBC - + Unable to execute statement Ðеможливо виконати оператор - + Unable to fetch next Ðеможливо вибрати наÑтупний @@ -3473,19 +3479,19 @@ Do you want to delete it anyway? Ðеможливо підготувати оператор - + Unable to bind variable Ðеможливо прив'Ñзати змінну - - + + Unable to fetch last - + Unable to fetch @@ -3503,12 +3509,12 @@ Do you want to delete it anyway? QObject - + Home Home - + Operation not supported on %1 @@ -3518,7 +3524,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3543,7 +3549,7 @@ Do you want to delete it anyway? - + No host name given @@ -3552,7 +3558,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name Ім'Ñ @@ -3565,7 +3571,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect Ðеможливо з'єднатиÑÑ @@ -3585,7 +3591,7 @@ Do you want to delete it anyway? Ðеможливо відкотити транзакцію - + Unable to subscribe @@ -3598,12 +3604,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query Ðеможливо Ñтворити запит - + Unable to prepare statement Ðеможливо підготувати оператор @@ -3611,7 +3617,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3727,7 +3733,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected локальне з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -3752,7 +3758,7 @@ Do you want to delete it anyway? Ðльбомне - + A0 (841 x 1189 mm) A0 (841 x 1189 мм) @@ -3902,7 +3908,7 @@ Do you want to delete it anyway? US Common #10 Envelope (105 x 241 мм) - + OK Гаразд @@ -3923,7 +3929,7 @@ Do you want to delete it anyway? Джерело паперу: - + Print @@ -4255,13 +4261,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4543,8 +4549,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4573,7 +4579,7 @@ Please choose a different file name. - + @@ -4593,6 +4599,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4601,7 +4612,7 @@ Please choose a different file name. QProgressDialog - + Cancel СкаÑувати @@ -4625,7 +4636,7 @@ Please choose a different file name. QRegExp - + no error occurred без помилок @@ -4673,7 +4684,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database Помилка Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даних @@ -4696,12 +4707,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results Ðеможливо витÑгнути результат - + Unable to execute statement Ðеможливо виконати оператор @@ -4709,7 +4720,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database Ðеможливо відкрити базу даних @@ -4776,12 +4787,12 @@ Please choose a different file name. QScrollBar - + Scroll here Прокрутити Ñюди - + Left edge Лівий край @@ -4791,7 +4802,7 @@ Please choose a different file name. Верх - + Right edge Правий край @@ -4801,7 +4812,7 @@ Please choose a different file name. Ðиз - + Page left Сторінка ліворуч @@ -4812,7 +4823,7 @@ Please choose a different file name. Сторінка вгору - + Page right Сторінка праворуч @@ -4823,7 +4834,7 @@ Please choose a different file name. Сторінка додолу - + Scroll left Прокрутити ліворуч @@ -4833,7 +4844,7 @@ Please choose a different file name. Прокрутити вгору - + Scroll right Прокрутити праворуч @@ -4861,7 +4872,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4872,7 +4883,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4882,8 +4893,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4961,7 +4972,7 @@ Please choose a different file name. QShortcut - + Space Прогалина @@ -5546,7 +5557,7 @@ Please choose a different file name. QSql - + Delete Вилучити @@ -5603,7 +5614,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 Ðеможливо запиÑати дані: %1 @@ -5666,7 +5677,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5696,7 +5707,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection Ðеможливо відкрити з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ @@ -5726,7 +5737,7 @@ Please choose a different file name. Дії з Ñокетами не підтримуютьÑÑ - + Operation on socket is not supported @@ -5734,7 +5745,7 @@ Please choose a different file name. QTextControl - + &Undo &Повернути @@ -5792,7 +5803,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 Ð¦Ñ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð° не підтримує IPv6 @@ -5800,7 +5811,7 @@ Please choose a different file name. QUndoGroup - + Undo Повернути @@ -5813,7 +5824,7 @@ Please choose a different file name. QUndoModel - + <empty> <порожньо> @@ -5821,7 +5832,7 @@ Please choose a different file name. QUndoStack - + Undo Повернути @@ -5892,7 +5903,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6304,7 +6315,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6380,6 +6391,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6448,11 +6464,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? Що це? @@ -6460,7 +6486,7 @@ Please choose a different file name. QWidget - + * * @@ -6468,7 +6494,7 @@ Please choose a different file name. QWizard - + Go Back Піти назад @@ -6530,7 +6556,7 @@ Please choose a different file name. QWorkspace - + &Restore &Відновити @@ -6600,7 +6626,7 @@ Please choose a different file name. QXml - + no error occurred без помилок @@ -6718,8 +6744,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. Ðадлишковий вміÑÑ‚ в кінці документу. @@ -6911,7 +6937,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6921,12 +6947,12 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. @@ -6936,7 +6962,7 @@ Please choose a different file name. - + Year %1 is invalid because it begins with %2. @@ -6976,7 +7002,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6987,7 +7013,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -7002,17 +7028,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -7043,17 +7069,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -7063,7 +7089,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -7073,7 +7099,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -7083,7 +7109,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -7093,7 +7119,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -7103,7 +7129,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -7128,7 +7154,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -7138,7 +7164,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -7148,12 +7174,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -7163,7 +7189,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -7173,7 +7199,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -7183,33 +7209,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -7227,7 +7253,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -7242,27 +7268,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -7277,7 +7303,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7312,17 +7338,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7332,12 +7358,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7347,17 +7373,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7378,7 +7404,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7660,7 +7686,7 @@ Please choose a different file name. - + empty @@ -7685,7 +7711,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7700,7 +7726,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7710,12 +7736,12 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - + %1 is an unsupported encoding. @@ -7730,13 +7756,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7755,12 +7781,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7770,12 +7796,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7830,7 +7856,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7905,7 +7931,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_untranslated.ts b/translations/qt_untranslated.ts index cbedeba..083a56f 100644 --- a/translations/qt_untranslated.ts +++ b/translations/qt_untranslated.ts @@ -4,7 +4,7 @@ AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> @@ -22,7 +22,7 @@ CloseButton - + Close Tab @@ -78,7 +78,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -91,24 +91,24 @@ have libgstreamer-plugins-base installed. - - + + - - - - + + + + Could not open media source. - + Invalid source type. - + Could not locate media source. @@ -142,7 +142,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined @@ -155,7 +155,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True @@ -183,7 +183,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File @@ -208,7 +208,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) @@ -348,7 +348,7 @@ have libgstreamer-plugins-base installed. - + Open @@ -514,7 +514,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -556,7 +556,7 @@ to Q3MainWindow - + Line up @@ -569,7 +569,7 @@ to Q3NetworkProtocol - + Operation stopped by the user @@ -577,7 +577,7 @@ to Q3ProgressDialog - + Cancel @@ -586,7 +586,7 @@ to Q3TabDialog - + OK @@ -615,7 +615,7 @@ to Q3TextEdit - + &Undo @@ -654,7 +654,7 @@ to Q3TitleBar - + System @@ -722,7 +722,7 @@ to Q3ToolBar - + More... @@ -730,7 +730,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -782,7 +782,7 @@ to Q3Wizard - + &Cancel @@ -810,9 +810,9 @@ to QAbstractSocket - - - + + + Host not found @@ -855,7 +855,7 @@ to QAbstractSpinBox - + &Step up @@ -873,12 +873,12 @@ to QApplication - + Activate - + Executable '%1' requires Qt %2, found Qt %3. @@ -888,7 +888,7 @@ to - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. @@ -925,7 +925,7 @@ to QCheckBox - + Uncheck @@ -943,7 +943,7 @@ to QColorDialog - + Hu&e: @@ -1001,13 +1001,13 @@ to QComboBox - + Open - + False @@ -1025,7 +1025,7 @@ to QCoreApplication - + %1: key is empty QSystemSemaphore @@ -1046,12 +1046,12 @@ to QDB2Driver - + Unable to connect - + Unable to commit transaction @@ -1069,8 +1069,8 @@ to QDB2Result - - + + Unable to execute statement @@ -1085,7 +1085,7 @@ to - + Unable to fetch record %1 @@ -1103,7 +1103,7 @@ to QDateTimeEdit - + AM @@ -1126,7 +1126,7 @@ to QDial - + QDial @@ -1144,7 +1144,7 @@ to QDialog - + What's This? @@ -1157,9 +1157,9 @@ to QDialogButtonBox - + - + OK @@ -1282,7 +1282,7 @@ to QDirModel - + Name @@ -1312,7 +1312,7 @@ to QDockWidget - + Close @@ -1343,7 +1343,7 @@ to QErrorMessage - + Debug Message: @@ -1371,13 +1371,18 @@ to QFile - - + + Destination file exists - + + Cannot remove source file + + + + Cannot open %1 for input @@ -1400,37 +1405,37 @@ to QFileDialog - - + + All Files (*) - + Directories - + &Open - + &Save - + Open - + %1 already exists. Do you want to replace it? @@ -1448,7 +1453,7 @@ Please verify the correct file name was given. - + &Rename @@ -1494,20 +1499,20 @@ Please verify the correct file name was given. - + Directory: - - + + %1 Directory not found. Please verify the correct directory name was given. - + '%1' is write protected. Do you want to delete it anyway? @@ -1523,22 +1528,22 @@ Do you want to delete it anyway? - + Recent Places - + All Files (*.*) - + Save As - + Drive @@ -1570,29 +1575,29 @@ Do you want to delete it anyway? - + New Folder - + &New Folder - + &Choose - + Remove - - + + File &name: @@ -1612,7 +1617,7 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename @@ -1649,7 +1654,7 @@ Do you want to delete it anyway? - + My Computer @@ -1687,7 +1692,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal @@ -1904,7 +1909,7 @@ Do you want to delete it anyway? QFontDialog - + &Font @@ -1953,8 +1958,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected @@ -2090,7 +2095,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error @@ -2098,11 +2103,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2128,21 +2133,21 @@ Do you want to delete it anyway? QHttp - - - + + + Unknown error - + Request aborted - + No server set to connect to @@ -2160,18 +2165,23 @@ Do you want to delete it anyway? - + + Unknown authentication method + + + + Error writing response to device - + Connection refused - + Host %1 not found @@ -2192,7 +2202,7 @@ Do you want to delete it anyway? - + @@ -2241,7 +2251,7 @@ Do you want to delete it anyway? - + Connection refused (or timed out) @@ -2271,7 +2281,7 @@ Do you want to delete it anyway? - + HTTPS connection requested but SSL support not compiled in @@ -2327,7 +2337,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database @@ -2350,7 +2360,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB @@ -2370,7 +2380,7 @@ Do you want to delete it anyway? - + Could not find array @@ -2440,7 +2450,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied @@ -2460,7 +2470,7 @@ Do you want to delete it anyway? - + Unknown error @@ -2468,7 +2478,7 @@ Do you want to delete it anyway? QInputContext - + XIM @@ -2491,7 +2501,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: @@ -2499,7 +2509,7 @@ Do you want to delete it anyway? QLibrary - + Could not mmap '%1': %2 @@ -2530,7 +2540,7 @@ Do you want to delete it anyway? - + The shared library was not found. @@ -2545,8 +2555,8 @@ Do you want to delete it anyway? - - + + Cannot load library %1: %2 @@ -2566,7 +2576,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo @@ -2604,8 +2614,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error @@ -2621,7 +2631,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 @@ -2629,8 +2639,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused @@ -2643,7 +2653,7 @@ Do you want to delete it anyway? - + %1: Invalid name @@ -2700,7 +2710,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' @@ -2710,7 +2720,7 @@ Do you want to delete it anyway? - + Unable to begin transaction @@ -2728,7 +2738,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data @@ -2743,7 +2753,7 @@ Do you want to delete it anyway? - + Unable to prepare statement @@ -2788,7 +2798,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) @@ -2796,7 +2806,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] @@ -2889,7 +2899,7 @@ Do you want to delete it anyway? QMenu - + Close @@ -2911,7 +2921,7 @@ Do you want to delete it anyway? QMessageBox - + Help @@ -2924,17 +2934,17 @@ Do you want to delete it anyway? - - About Qt + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - <p>This program uses Qt version %1.</p> + + About Qt - + Show Details... @@ -2943,21 +2953,11 @@ Do you want to delete it anyway? Hide Details... - - - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - - - - - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - - QMultiInputContext - + Select IM @@ -2965,7 +2965,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher @@ -2978,7 +2978,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection @@ -3111,7 +3111,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 @@ -3119,7 +3119,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 @@ -3147,7 +3147,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found @@ -3157,7 +3157,7 @@ Do you want to delete it anyway? - + Logging in to %1 failed: authentication required @@ -3175,7 +3175,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found @@ -3188,7 +3188,7 @@ Do you want to delete it anyway? - + Protocol "%1" is unknown @@ -3196,7 +3196,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled @@ -3205,7 +3205,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon @@ -3234,7 +3234,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3261,18 +3261,12 @@ Do you want to delete it anyway? - - + Unable to bind value - - Unable to execute select statement - - - - + Unable to execute statement @@ -3280,7 +3274,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect @@ -3290,7 +3284,7 @@ Do you want to delete it anyway? - + Unable to disable autocommit @@ -3313,19 +3307,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration - + Unable to execute statement - + Unable to fetch next @@ -3335,19 +3329,19 @@ Do you want to delete it anyway? - + Unable to bind variable - - + + Unable to fetch last - + Unable to fetch @@ -3365,12 +3359,12 @@ Do you want to delete it anyway? QObject - + Home - + Operation not supported on %1 @@ -3380,7 +3374,7 @@ Do you want to delete it anyway? - + Write error writing to %1: %2 @@ -3405,7 +3399,7 @@ Do you want to delete it anyway? - + No host name given @@ -3414,7 +3408,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name @@ -3427,7 +3421,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect @@ -3447,7 +3441,7 @@ Do you want to delete it anyway? - + Unable to subscribe @@ -3460,12 +3454,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query - + Unable to prepare statement @@ -3473,7 +3467,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) @@ -3589,7 +3583,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected @@ -3606,7 +3600,7 @@ Do you want to delete it anyway? - + A0 (841 x 1189 mm) @@ -3756,12 +3750,12 @@ Do you want to delete it anyway? - + OK - + Print @@ -4015,13 +4009,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup - + %1% @@ -4288,8 +4282,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading @@ -4318,7 +4312,7 @@ Please choose a different file name. - + @@ -4338,6 +4332,11 @@ Please choose a different file name. + + No program defined + + + Process failed to start @@ -4346,7 +4345,7 @@ Please choose a different file name. QProgressDialog - + Cancel @@ -4370,7 +4369,7 @@ Please choose a different file name. QRegExp - + no error occurred @@ -4418,7 +4417,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database @@ -4441,12 +4440,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results - + Unable to execute statement @@ -4454,7 +4453,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database @@ -4517,12 +4516,12 @@ Please choose a different file name. QScrollBar - + Scroll here - + Left edge @@ -4532,7 +4531,7 @@ Please choose a different file name. - + Right edge @@ -4542,7 +4541,7 @@ Please choose a different file name. - + Page left @@ -4553,7 +4552,7 @@ Please choose a different file name. - + Page right @@ -4564,7 +4563,7 @@ Please choose a different file name. - + Scroll left @@ -4574,7 +4573,7 @@ Please choose a different file name. - + Scroll right @@ -4602,7 +4601,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock @@ -4613,7 +4612,7 @@ Please choose a different file name. - + %1: unable to lock @@ -4623,8 +4622,8 @@ Please choose a different file name. - - + + %1: permission denied @@ -4702,7 +4701,7 @@ Please choose a different file name. QShortcut - + Space @@ -5283,7 +5282,7 @@ Please choose a different file name. QSql - + Delete @@ -5340,7 +5339,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 @@ -5399,7 +5398,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources @@ -5429,7 +5428,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection @@ -5455,7 +5454,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported @@ -5463,7 +5462,7 @@ Please choose a different file name. QTextControl - + &Undo @@ -5521,7 +5520,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 @@ -5529,7 +5528,7 @@ Please choose a different file name. QUndoGroup - + Undo @@ -5542,7 +5541,7 @@ Please choose a different file name. QUndoModel - + <empty> @@ -5550,7 +5549,7 @@ Please choose a different file name. QUndoStack - + Undo @@ -5621,7 +5620,7 @@ Please choose a different file name. QWebFrame - + Request cancelled @@ -6031,7 +6030,7 @@ Please choose a different file name. - + JavaScript Alert - %1 @@ -6107,6 +6106,11 @@ Please choose a different file name. + Select all + + + + Select to the next character @@ -6175,11 +6179,21 @@ Please choose a different file name. Delete to the end of the word + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? @@ -6187,7 +6201,7 @@ Please choose a different file name. QWidget - + * @@ -6195,7 +6209,7 @@ Please choose a different file name. QWizard - + Go Back @@ -6253,7 +6267,7 @@ Please choose a different file name. QWorkspace - + &Restore @@ -6323,7 +6337,7 @@ Please choose a different file name. QXml - + no error occurred @@ -6441,8 +6455,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. @@ -6626,7 +6640,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. @@ -6636,17 +6650,17 @@ Please choose a different file name. - + Network timeout. - + Element %1 can't be serialized because it appears outside the document element. - + Year %1 is invalid because it begins with %2. @@ -6686,7 +6700,7 @@ Please choose a different file name. - + At least one component must be present. @@ -6697,7 +6711,7 @@ Please choose a different file name. - + No operand in an integer division, %1, can be %2. @@ -6712,17 +6726,17 @@ Please choose a different file name. - + %1 is not a valid value of type %2. - + When casting to %1 from %2, the source value cannot be %3. - + Integer division (%1) by zero (%2) is undefined. @@ -6753,17 +6767,17 @@ Please choose a different file name. - + A value of type %1 cannot have an Effective Boolean Value. - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. - + Value %1 of type %2 exceeds maximum (%3). @@ -6773,7 +6787,7 @@ Please choose a different file name. - + A value of type %1 must contain an even number of digits. The value %2 does not. @@ -6783,7 +6797,7 @@ Please choose a different file name. - + Operator %1 cannot be used on type %2. @@ -6793,7 +6807,7 @@ Please choose a different file name. - + The namespace URI in the name for a computed attribute cannot be %1. @@ -6803,7 +6817,7 @@ Please choose a different file name. - + Type error in cast, expected %1, received %2. @@ -6813,7 +6827,7 @@ Please choose a different file name. - + No casting is possible with %1 as the target type. @@ -6838,7 +6852,7 @@ Please choose a different file name. - + A comment cannot contain %1 @@ -6848,7 +6862,7 @@ Please choose a different file name. - + No comparisons can be done involving the type %1. @@ -6858,12 +6872,12 @@ Please choose a different file name. - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - + A library module cannot be evaluated directly. It must be imported from a main module. @@ -6873,7 +6887,7 @@ Please choose a different file name. - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. @@ -6883,7 +6897,7 @@ Please choose a different file name. - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. @@ -6893,33 +6907,33 @@ Please choose a different file name. - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - + The data of a processing instruction cannot contain the string %1 - + No namespace binding exists for the prefix %1 - + No namespace binding exists for the prefix %1 in %2 - + %1 is an invalid %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. @@ -6933,7 +6947,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. @@ -6948,27 +6962,27 @@ Please choose a different file name. - + %1 is not a valid XML 1.0 character. - + The first argument to %1 cannot be of type %2. - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - + %1 was called. - + %1 must be followed by %2 or %3, not at the end of the replacement string. @@ -6983,7 +6997,7 @@ Please choose a different file name. - + %1 matches newline characters @@ -7018,17 +7032,17 @@ Please choose a different file name. - + It will not be possible to retrieve %1. - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. - + The default collection is undefined @@ -7038,12 +7052,12 @@ Please choose a different file name. - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. @@ -7053,17 +7067,17 @@ Please choose a different file name. - + Required cardinality is %1; got cardinality %2. - + The item %1 did not match the required type %2. - + %1 is an unknown schema type. @@ -7084,7 +7098,7 @@ Please choose a different file name. - + The variable %1 is unused @@ -7366,7 +7380,7 @@ Please choose a different file name. - + empty @@ -7391,7 +7405,7 @@ Please choose a different file name. - + Required type is %1, but %2 was found. @@ -7406,7 +7420,7 @@ Please choose a different file name. - + It's not possible to add attributes after any other kind of node. @@ -7416,7 +7430,7 @@ Please choose a different file name. - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. @@ -7426,7 +7440,7 @@ Please choose a different file name. - + %1 is an unsupported encoding. @@ -7441,13 +7455,13 @@ Please choose a different file name. - + Ambiguous rule match. - - In a namespace constructor, the value for a namespace value cannot be an empty string. + + In a namespace constructor, the value for a namespace cannot be an empty string. @@ -7466,12 +7480,12 @@ Please choose a different file name. - + Circularity detected - + The parameter %1 is required, but no corresponding %2 is supplied. @@ -7481,12 +7495,12 @@ Please choose a different file name. - + The URI cannot have a fragment - + Element %1 is not allowed at this location. @@ -7541,7 +7555,7 @@ Please choose a different file name. - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. @@ -7616,7 +7630,7 @@ Please choose a different file name. - + Element %1 cannot have a sequence constructor. diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index 14ec1cd..061919d 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -1,11 +1,10 @@ - AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>音频回放设备 <b>%1</b> 没有工作。<br/>回滚到 <b>%2</b>。</html> @@ -23,7 +22,7 @@ CloseButton - + Close Tab 关闭标签页 @@ -81,7 +80,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -97,24 +96,24 @@ have libgstreamer-plugins-base installed. 缺少一个需è¦çš„解ç å™¨ã€‚您需è¦å®‰è£…如下解ç å™¨æ¥æ’­æ”¾è¿™ä¸ªå†…容:%0 - - + + - - - - + + + + Could not open media source. ä¸èƒ½æ‰“开媒体æºã€‚ - + Invalid source type. 无效的æºç±»åž‹ã€‚ - + Could not locate media source. ä¸èƒ½å®šä½åª’体æºã€‚ @@ -148,7 +147,7 @@ have libgstreamer-plugins-base installed. Q3Accel - + %1, %2 not defined %1,%2未定义 @@ -161,7 +160,7 @@ have libgstreamer-plugins-base installed. Q3DataTable - + True 真 @@ -189,7 +188,7 @@ have libgstreamer-plugins-base installed. Q3FileDialog - + Copy or Move a File å¤åˆ¶æˆ–者移动一个文件 @@ -214,7 +213,7 @@ have libgstreamer-plugins-base installed. - + All Files (*) 所有文件 (*) @@ -354,7 +353,7 @@ have libgstreamer-plugins-base installed. - + Open 打开 @@ -523,7 +522,7 @@ Check path and filename. Q3LocalFs - + Could not read directory %1 @@ -573,7 +572,7 @@ to Q3MainWindow - + Line up 排列 @@ -586,7 +585,7 @@ to Q3NetworkProtocol - + Operation stopped by the user æ“作被用户åœæ­¢ @@ -594,7 +593,7 @@ to Q3ProgressDialog - + Cancel å–消 @@ -603,7 +602,7 @@ to Q3TabDialog - + OK 确认 @@ -632,7 +631,7 @@ to Q3TextEdit - + &Undo 撤消(&U) @@ -671,7 +670,7 @@ to Q3TitleBar - + System 系统 @@ -739,7 +738,7 @@ to Q3ToolBar - + More... 更多... @@ -747,7 +746,7 @@ to Q3UrlOperator - + The protocol `%1' is not supported @@ -799,7 +798,7 @@ to Q3Wizard - + &Cancel å–消(&C) @@ -827,9 +826,9 @@ to QAbstractSocket - - - + + + Host not found 主机未找到 @@ -872,7 +871,7 @@ to QAbstractSpinBox - + &Step up 增加(&S) @@ -890,12 +889,12 @@ to QApplication - + Activate 激活 - + Executable '%1' requires Qt %2, found Qt %3. 执行“%1â€éœ€è¦Qt %2,åªæ‰¾åˆ°äº†Qt %3。 @@ -905,7 +904,7 @@ to ä¸å…¼å®¹çš„Qt错误 - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -942,7 +941,7 @@ to QCheckBox - + Uncheck å–消选中 @@ -960,7 +959,7 @@ to QColorDialog - + Hu&e: 色调(&E): @@ -1022,13 +1021,13 @@ to QComboBox - + Open 打开 - + False å‡ @@ -1071,7 +1070,7 @@ to %1:未知错误 %2 - + %1: key is empty QSystemSemaphore %1:键是空的 @@ -1092,12 +1091,12 @@ to QDB2Driver - + Unable to connect ä¸èƒ½è¿žæŽ¥ - + Unable to commit transaction ä¸èƒ½æ交事务 @@ -1115,8 +1114,8 @@ to QDB2Result - - + + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -1131,7 +1130,7 @@ to ä¸èƒ½å¸®å®šå˜é‡ - + Unable to fetch record %1 ä¸èƒ½èŽ·å–记录%1 @@ -1149,7 +1148,7 @@ to QDateTimeEdit - + AM AM @@ -1172,7 +1171,7 @@ to QDial - + QDial QDial @@ -1190,7 +1189,7 @@ to QDialog - + What's This? 这是什么? @@ -1203,9 +1202,9 @@ to QDialogButtonBox - + - + OK 确定 @@ -1328,7 +1327,7 @@ to QDirModel - + Name å称 @@ -1358,7 +1357,7 @@ to QDockWidget - + Close 关闭 @@ -1389,7 +1388,7 @@ to QErrorMessage - + Debug Message: 调试消æ¯ï¼š @@ -1417,13 +1416,18 @@ to QFile - - + + Destination file exists 目标文件已存在 - + + Cannot remove source file + + + + Cannot open %1 for input 无法输入 %1 @@ -1446,37 +1450,37 @@ to QFileDialog - - + + All Files (*) 所有文件 (*) - + Directories 目录 - + &Open 打开(&O) - + &Save ä¿å­˜(&S) - + Open 打开 - + %1 already exists. Do you want to replace it? %1å·²ç»å­˜åœ¨ã€‚ @@ -1497,7 +1501,7 @@ Please verify the correct file name was given. 我的计算机 - + &Rename é‡å‘½å(&R) @@ -1543,13 +1547,13 @@ Please verify the correct file name was given. - + Directory: 目录: - - + + %1 Directory not found. Please verify the correct directory name was given. @@ -1558,7 +1562,7 @@ Please verify the correct directory name was given. 请核实已给定正确目录å。 - + '%1' is write protected. Do you want to delete it anyway? “%1“是写ä¿æŠ¤çš„。 @@ -1575,17 +1579,17 @@ Do you want to delete it anyway? ä¸èƒ½åˆ é™¤ç›®å½•ã€‚ - + Recent Places 最近的地方 - + Save As å¦å­˜ä¸º - + Drive 驱动器 @@ -1617,29 +1621,29 @@ Do you want to delete it anyway? å‰è¿› - + New Folder 新建文件夹 - + &New Folder 新建文件夹(&N) - + &Choose 选择(&C) - + Remove 移除 - - + + File &name: 文件å称(&N): @@ -1656,7 +1660,7 @@ Do you want to delete it anyway? 创建新文件夹 - + All Files (*.*) 所有文件 (*.*) @@ -1664,7 +1668,7 @@ Do you want to delete it anyway? QFileSystemModel - + %1 TB %1 TB @@ -1726,7 +1730,7 @@ Do you want to delete it anyway? 日期被修改 - + My Computer 我的计算机 @@ -1739,7 +1743,7 @@ Do you want to delete it anyway? QFontDatabase - + Normal 普通 @@ -1956,7 +1960,7 @@ Do you want to delete it anyway? QFontDialog - + &Font 字体(&F) @@ -2005,8 +2009,8 @@ Do you want to delete it anyway? QFtp - - + + Not connected 没有连接 @@ -2151,7 +2155,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error 未知的错误 @@ -2159,11 +2163,11 @@ Do you want to delete it anyway? QHostInfoAgent - + - + @@ -2189,21 +2193,21 @@ Do you want to delete it anyway? QHttp - - - + + + Unknown error 未知的错误 - + Request aborted 请求被放弃了 - + No server set to connect to 没有设置è¦è¿žæŽ¥çš„æœåŠ¡å™¨ @@ -2221,18 +2225,23 @@ Do you want to delete it anyway? æœåŠ¡å™¨å¼‚常地关闭了连接 - + + Unknown authentication method + + + + Error writing response to device å‘设备中进行写回å¤æ—¶å‘生错误 - + Connection refused è¿žæŽ¥è¢«æ‹’ç» - + Host %1 not found @@ -2253,7 +2262,7 @@ Do you want to delete it anyway? 无效的HTTPå“应头 - + @@ -2302,7 +2311,7 @@ Do you want to delete it anyway? 需è¦è®¤è¯ - + Connection refused (or timed out) 连接被拒ç»(或者超时) @@ -2332,7 +2341,7 @@ Do you want to delete it anyway? SSL æ¡æ‰‹å¤±è´¥ - + HTTPS connection requested but SSL support not compiled in HTTPS è¿žæŽ¥éœ€è¦ SSLï¼Œä½†å®ƒæ²¡æœ‰è¢«ç¼–è¯‘è¿›æ¥ @@ -2388,7 +2397,7 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database 打开数æ®åº“错误 @@ -2411,7 +2420,7 @@ Do you want to delete it anyway? QIBaseResult - + Unable to create BLOB ä¸èƒ½åˆ›å»ºBLOB @@ -2431,7 +2440,7 @@ Do you want to delete it anyway? ä¸èƒ½è¯»å–BLOB - + Could not find array ä¸èƒ½æ‰¾åˆ°æ•°ç»„ @@ -2501,7 +2510,7 @@ Do you want to delete it anyway? QIODevice - + Permission denied æƒé™è¢«æ‹’ç» @@ -2521,7 +2530,7 @@ Do you want to delete it anyway? 设备上没有空间了 - + Unknown error 未知的错误 @@ -2529,7 +2538,7 @@ Do you want to delete it anyway? QInputContext - + XIM XIM @@ -2552,7 +2561,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: 输入一个值: @@ -2572,7 +2581,7 @@ Do you want to delete it anyway? QLibrary::resolve_sys: 符å·â€œ%1â€åœ¨%2(%3)没有被定义 - + Could not mmap '%1': %2 ä¸èƒ½æ˜ å°„â€%1“:%2 @@ -2603,7 +2612,7 @@ Do you want to delete it anyway? - + The shared library was not found. 共享库没有被找到。 @@ -2618,8 +2627,8 @@ Do you want to delete it anyway? æ’件“%1“使用了ä¸å…¼å®¹çš„Qt库。(ä¸èƒ½æ··åˆä½¿ç”¨åº“的调试版本和å‘布版本。) - - + + Cannot load library %1: %2 无法加载库%1:%2 @@ -2639,7 +2648,7 @@ Do you want to delete it anyway? QLineEdit - + &Undo 撤消(&U) @@ -2677,8 +2686,8 @@ Do you want to delete it anyway? QLocalServer - - + + %1: Name error %1: å称错误 @@ -2694,7 +2703,7 @@ Do you want to delete it anyway? - + %1: Unknown error %2 %1:未知错误 %2 @@ -2702,8 +2711,8 @@ Do you want to delete it anyway? QLocalSocket - - + + %1: Connection refused %1ï¼šè¿žæŽ¥è¢«æ‹’ç» @@ -2716,7 +2725,7 @@ Do you want to delete it anyway? - + %1: Invalid name %1:无效å称 @@ -2773,7 +2782,7 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' ä¸èƒ½æ‰“开数æ®åº“ @@ -2783,7 +2792,7 @@ Do you want to delete it anyway? ä¸èƒ½è¿žæŽ¥ - + Unable to begin transaction ä¸èƒ½å¼€å§‹äº‹åŠ¡ @@ -2801,7 +2810,7 @@ Do you want to delete it anyway? QMYSQLResult - + Unable to fetch data ä¸èƒ½èŽ·å–æ•°æ® @@ -2816,7 +2825,7 @@ Do you want to delete it anyway? ä¸èƒ½å­˜å‚¨ç»“æžœ - + Unable to prepare statement ä¸èƒ½å‡†å¤‡è¯­å¥ @@ -2861,7 +2870,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) (未命åçš„) @@ -2869,7 +2878,7 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] @@ -2962,7 +2971,7 @@ Do you want to delete it anyway? QMenu - + Close 关闭 @@ -3035,7 +3044,7 @@ Do you want to delete it anyway? QMessageBox - + Help 帮助 @@ -3048,17 +3057,21 @@ Do you want to delete it anyway? 确定 - + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt 关于Qt - <p>This program uses Qt version %1.</p> - <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> + <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> - + Show Details... 显示细节…… @@ -3068,14 +3081,12 @@ Do you want to delete it anyway? éšè—细节…… - <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> - <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>这个程åºä½¿ç”¨äº†Qt %1å¼€æºç‰ˆæœ¬ã€‚</p><p>Qtå¼€æºç‰ˆæœ¬åªç”¨äºŽå¼€æºåº”用程åºçš„å¼€å‘。如果è¦å¼€å‘ç§æœ‰ï¼ˆé—­æºï¼‰è½¯ä»¶ï¼Œä½ éœ€è¦ä¸€ä¸ªå•†ä¸šçš„Qtå议。</p><p>有关Qtå议的概览,请å‚考<a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> + <p>这个程åºä½¿ç”¨äº†Qt %1å¼€æºç‰ˆæœ¬ã€‚</p><p>Qtå¼€æºç‰ˆæœ¬åªç”¨äºŽå¼€æºåº”用程åºçš„å¼€å‘。如果è¦å¼€å‘ç§æœ‰ï¼ˆé—­æºï¼‰è½¯ä»¶ï¼Œä½ éœ€è¦ä¸€ä¸ªå•†ä¸šçš„Qtå议。</p><p>有关Qtå议的概览,请å‚考<a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -3085,7 +3096,7 @@ Do you want to delete it anyway? QMultiInputContext - + Select IM 选择输入法 @@ -3093,7 +3104,7 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 多输入法切æ¢å™¨ @@ -3106,7 +3117,7 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection 远端主机关闭了这个连接 @@ -3239,7 +3250,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 打开%1å‘生错误 @@ -3247,7 +3258,7 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 正在打开éžæœ¬åœ°æ–‡ä»¶ %1 的请求 @@ -3275,7 +3286,7 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found 未找到åˆé€‚çš„ä»£ç† @@ -3285,7 +3296,7 @@ Do you want to delete it anyway? æ— æ³•è¯»å– %1:是一个目录 - + Logging in to %1 failed: authentication required 登入 %1 失败:需è¦éªŒè¯ @@ -3303,7 +3314,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found 未找到åˆé€‚çš„ä»£ç† @@ -3316,7 +3327,7 @@ Do you want to delete it anyway? 下载 %1 错误 - æœåŠ¡å™¨å›žå¤ï¼š%2 - + Protocol "%1" is unknown å议“%1â€æ˜¯æœªçŸ¥çš„ @@ -3324,7 +3335,7 @@ Do you want to delete it anyway? QNetworkReplyImpl - + Operation canceled æ“作被å–消 @@ -3333,7 +3344,7 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon ä¸èƒ½ç™»å½• @@ -3362,7 +3373,7 @@ Do you want to delete it anyway? QOCIResult - + Unable to bind column for batch execute @@ -3389,18 +3400,16 @@ Do you want to delete it anyway? ä¸èƒ½å‡†å¤‡è¯­å¥ - - + Unable to bind value ä¸èƒ½ç»‘定值 - Unable to execute select statement - ä¸èƒ½æ‰§è¡Œé€‰æ‹©è¯­å¥ + ä¸èƒ½æ‰§è¡Œé€‰æ‹©è¯­å¥ - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -3408,7 +3417,7 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect ä¸èƒ½è¿žæŽ¥ @@ -3418,7 +3427,7 @@ Do you want to delete it anyway? ä¸èƒ½è¿žæŽ¥â€”驱动程åºä¸æ”¯æŒæ‰€æœ‰åŠŸèƒ½ - + Unable to disable autocommit ä¸èƒ½ç¦æ­¢è‡ªåŠ¨æ交 @@ -3441,19 +3450,19 @@ Do you want to delete it anyway? QODBCResult - + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ä¸èƒ½æŠŠâ€œSQL_CURSOR_STATICâ€è®¾ç½®ä¸ºè¯­å¥å±žæ€§ã€‚请检查你的ODBC驱动程åºè®¾ç½®ã€‚ - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ - + Unable to fetch next ä¸èƒ½èŽ·å–下一个 @@ -3463,19 +3472,19 @@ Do you want to delete it anyway? ä¸èƒ½å‡†å¤‡è¯­å¥ - + Unable to bind variable ä¸èƒ½å¸®å®šå˜é‡ - - + + Unable to fetch last ä¸èƒ½èŽ·å–最åŽä¸€ä¸ª - + Unable to fetch ä¸èƒ½èŽ·å– @@ -3493,12 +3502,12 @@ Do you want to delete it anyway? QObject - + Home 家 - + Operation not supported on %1 在 %1 上ä¸è¢«æ”¯æŒçš„æ“作 @@ -3508,7 +3517,7 @@ Do you want to delete it anyway? 无效的 URI:%1 - + Write error writing to %1: %2 写入 %1 错误:%2 @@ -3533,7 +3542,7 @@ Do you want to delete it anyway? å议错误:收到了大å°ä¸º 0 的包 - + No host name given 未指定主机å @@ -3542,7 +3551,7 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name å称 @@ -3555,7 +3564,7 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect ä¸èƒ½è¿žæŽ¥ @@ -3575,7 +3584,7 @@ Do you want to delete it anyway? ä¸èƒ½å›žæ»šäº‹åŠ¡ - + Unable to subscribe ä¸èƒ½è®¢é˜… @@ -3588,12 +3597,12 @@ Do you want to delete it anyway? QPSQLResult - + Unable to create query ä¸èƒ½åˆ›å»ºæŸ¥è¯¢ - + Unable to prepare statement ä¸èƒ½å‡†å¤‡è¯­å¥ @@ -3601,7 +3610,7 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) 厘米 (cm) @@ -3717,7 +3726,7 @@ Do you want to delete it anyway? QPrintDialog - + locally connected 本地已ç»è¿žæŽ¥çš„ @@ -3734,7 +3743,7 @@ Do you want to delete it anyway? 未知的 - + Print all 打å°å…¨éƒ¨ @@ -3899,12 +3908,12 @@ Do you want to delete it anyway? 美国普通10å·ä¿¡å° (105 x 241 毫米) - + OK 确定 - + Print @@ -4146,13 +4155,13 @@ Please choose a different file name. QPrintPreviewDialog - + Page Setup 页é¢è®¾ç½® - + %1% %1% @@ -4419,8 +4428,8 @@ Please choose a different file name. QProcess - - + + Could not open input redirection for reading 无法打开用于读å–的输入é‡å®šå‘ @@ -4449,7 +4458,7 @@ Please choose a different file name. 进程处ç†è¶…æ—¶ - + @@ -4469,6 +4478,11 @@ Please choose a different file name. 进程已崩溃 + + No program defined + + + Process failed to start å¯åŠ¨è¿›ç¨‹å¤±è´¥ @@ -4477,7 +4491,7 @@ Please choose a different file name. QProgressDialog - + Cancel 撤消 @@ -4501,7 +4515,7 @@ Please choose a different file name. QRegExp - + no error occurred 没有错误å‘生 @@ -4549,7 +4563,7 @@ Please choose a different file name. QSQLite2Driver - + Error to open database 打开数æ®åº“错误 @@ -4572,12 +4586,12 @@ Please choose a different file name. QSQLite2Result - + Unable to fetch results ä¸èƒ½èŽ·å–结果 - + Unable to execute statement ä¸èƒ½æ‰§è¡Œè¯­å¥ @@ -4585,7 +4599,7 @@ Please choose a different file name. QSQLiteDriver - + Error opening database 打开数æ®åº“错误 @@ -4648,12 +4662,12 @@ Please choose a different file name. QScrollBar - + Scroll here 滚动到这里 - + Left edge 左边缘 @@ -4663,7 +4677,7 @@ Please choose a different file name. 顶部 - + Right edge å³è¾¹ç¼˜ @@ -4673,7 +4687,7 @@ Please choose a different file name. 底部 - + Page left 左一页 @@ -4684,7 +4698,7 @@ Please choose a different file name. 上一页 - + Page right å³ä¸€é¡µ @@ -4695,7 +4709,7 @@ Please choose a different file name. 下一页 - + Scroll left å‘左滚动 @@ -4705,7 +4719,7 @@ Please choose a different file name. å‘上滚动 - + Scroll right å‘å³æ»šåŠ¨ @@ -4733,7 +4747,7 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock %1:无法设置é”定的键 @@ -4744,7 +4758,7 @@ Please choose a different file name. - + %1: unable to lock %1:无法é”定 @@ -4754,8 +4768,8 @@ Please choose a different file name. %1:无法å–消é”定 - - + + %1: permission denied %1:æƒé™è¢«æ‹’ç» @@ -4833,7 +4847,7 @@ Please choose a different file name. QShortcut - + Space 空格 @@ -5418,7 +5432,7 @@ Please choose a different file name. QSql - + Delete 删除 @@ -5475,7 +5489,7 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 ä¸èƒ½å†™å…¥æ•°æ®ï¼š%1 @@ -5534,7 +5548,7 @@ Please choose a different file name. QSystemSemaphore - + %1: out of resources %1:资æºè€—尽了 @@ -5564,7 +5578,7 @@ Please choose a different file name. QTDSDriver - + Unable to open connection ä¸èƒ½æ‰“开连接 @@ -5590,7 +5604,7 @@ Please choose a different file name. QTcpServer - + Operation on socket is not supported socketæ“作ä¸è¢«æ”¯æŒ @@ -5598,7 +5612,7 @@ Please choose a different file name. QTextControl - + &Undo 撤消(&U) @@ -5656,7 +5670,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 这个平å°ä¸æ”¯æŒIPv6 @@ -5664,7 +5678,7 @@ Please choose a different file name. QUndoGroup - + Undo 撤销 @@ -5677,7 +5691,7 @@ Please choose a different file name. QUndoModel - + <empty> <空白> @@ -5685,7 +5699,7 @@ Please choose a different file name. QUndoStack - + Undo 撤销 @@ -5756,7 +5770,7 @@ Please choose a different file name. QWebFrame - + Request cancelled 请求被å–消了 @@ -6166,7 +6180,7 @@ Please choose a different file name. - + JavaScript Alert - %1 JavaScript警告 - %1 @@ -6242,6 +6256,11 @@ Please choose a different file name. + Select all + + + + Select to the next character 选中到下一个字符 @@ -6310,11 +6329,21 @@ Please choose a different file name. Delete to the end of the word 删除到å•è¯å°¾ + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? 这是什么? @@ -6322,7 +6351,7 @@ Please choose a different file name. QWidget - + * * @@ -6330,7 +6359,7 @@ Please choose a different file name. QWizard - + Go Back 返回 @@ -6392,7 +6421,7 @@ Please choose a different file name. QWorkspace - + &Restore æ¢å¤(&R) @@ -6462,7 +6491,7 @@ Please choose a different file name. QXml - + no error occurred 没有错误å‘生 @@ -6580,8 +6609,8 @@ Please choose a different file name. QXmlStream - - + + Extra content at end of document. 文档末尾有é¢å¤–内容。 @@ -6765,7 +6794,7 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. 带有值 %2 çš„ %1 属性已ç»å£°æ˜Žè¿‡äº†ã€‚ @@ -6775,12 +6804,12 @@ Please choose a different file name. 一个 %1 属性必须带有一个有效的 %2 作为值,但 %3 å´ä¸æ˜¯ã€‚ - + Network timeout. 网络超时。 - + Element %1 can't be serialized because it appears outside the document element. 元素 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在文档元素之外。 @@ -6789,7 +6818,7 @@ Please choose a different file name. 属性元素 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在最顶层。 - + Year %1 is invalid because it begins with %2. %1 年是无效的,因为应该从 %2 开始。 @@ -6829,7 +6858,7 @@ Please choose a different file name. 溢出:数æ®æ— æ³•è¢«å‘ˆçŽ°ã€‚ - + At least one component must be present. 至少有一个组件被呈现。 @@ -6840,7 +6869,7 @@ Please choose a different file name. 至少一个时间组件必须出现在这个 %1 ç•Œé™ä¹‹åŽã€‚ - + No operand in an integer division, %1, can be %2. 在整数除法中没有æ“作数,%1,å¯ä»¥æ˜¯ %2。 @@ -6855,17 +6884,17 @@ Please choose a different file name. 除法中的第二个æ“作数,%1,ä¸èƒ½æ˜¯é›¶(%2)。 - + %1 is not a valid value of type %2. %1 ä¸æ˜¯ç±»åž‹ä¸º %2 的有效值。 - + When casting to %1 from %2, the source value cannot be %3. 当从 %2 抛出到 %1 时,æºå€¼ä¸èƒ½æ˜¯ %3。 - + Integer division (%1) by zero (%2) is undefined. 整数除法(%1)除零(%2)是未定义的。 @@ -6896,17 +6925,17 @@ Please choose a different file name. 一个类型为 %1 的值乘以 %2 或者 %3(正负无穷)是ä¸å…许的。 - + A value of type %1 cannot have an Effective Boolean Value. 一个类型为 %1 的值ä¸èƒ½æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„布尔值(Effective Boolean Value)。 - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. 有效的布尔值(Effective Boolean Value)ä¸èƒ½è¢«ç”¨äºŽè®¡ç®—一个包å«ä¸¤ä¸ªæˆ–者更多原å­å€¼çš„åºåˆ—。 - + Value %1 of type %2 exceeds maximum (%3). 类型为 %2 的值 %1 超过了最大值(%3)。 @@ -6916,7 +6945,7 @@ Please choose a different file name. 类型为 %2 的值 %1 超过了最å°å€¼(%3)。 - + A value of type %1 must contain an even number of digits. The value %2 does not. 类型为 %1 的值必须包å«å¶æ•°ä¸ªæ•°å­—。值 %2 ä¸æ˜¯è¿™æ ·çš„。 @@ -6926,7 +6955,7 @@ Please choose a different file name. %1 ä¸æ˜¯ç±»åž‹ä¸º %2 的有效值。 - + Operator %1 cannot be used on type %2. æ“作符 %1 ä¸èƒ½è¢«ç”¨äºŽç±»åž‹ %2。 @@ -6936,7 +6965,7 @@ Please choose a different file name. æ“作符 %1 ä¸èƒ½è¢«ç”¨äºŽç±»åž‹ä¸º %2 å’Œ %3 的原å­å€¼ã€‚ - + The namespace URI in the name for a computed attribute cannot be %1. 一个被计算的属性的å称中的命å空间 URI ä¸èƒ½æ˜¯ %1。 @@ -6946,7 +6975,7 @@ Please choose a different file name. 一个被计算的属性的å称ä¸èƒ½ä½¿ç”¨å¸¦æœ‰æœ¬åœ°å称 %2 的命å空间 URI %1。 - + Type error in cast, expected %1, received %2. 抛出类型错误,期望的是 %1,收到的是 %2。 @@ -6956,7 +6985,7 @@ Please choose a different file name. 当抛出到 %1 或者它的派生类时,æºç±»åž‹å¿…须是åŒä¸€ç±»åž‹ï¼Œæˆ–者它必须是一个字符串类型。类型 %2 是ä¸è¢«å…许的。 - + No casting is possible with %1 as the target type. 无法以 %1 为目标类型进行抛出。 @@ -6981,7 +7010,7 @@ Please choose a different file name. 从 %2 抛出到 %1 失败:%3 - + A comment cannot contain %1 注释ä¸èƒ½åŒ…å« %1 @@ -6991,7 +7020,7 @@ Please choose a different file name. 注释ä¸èƒ½ä»¥ %1 结尾。 - + No comparisons can be done involving the type %1. 对于类型 %1 ä¸èƒ½è¿›è¡Œæ¯”较。 @@ -7001,12 +7030,12 @@ Please choose a different file name. 在类型 %2 å’Œ %3 的原å­å€¼ä¹‹é—´ï¼Œæ“作符 %1 是ä¸å¯ç”¨çš„。 - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. 一个属性节点ä¸èƒ½æ˜¯ä¸€ä¸ªæ–‡æ¡£èŠ‚点的å­èŠ‚点。因此,这个属性 %1 所在ä½ç½®æ˜¯ä¸åˆé€‚的。 - + A library module cannot be evaluated directly. It must be imported from a main module. 一个库模å—ä¸èƒ½è¢«ç›´æŽ¥è¯„估。它必须从一个主模å—中导入。 @@ -7016,7 +7045,7 @@ Please choose a different file name. 没有å为 %1 的模æ¿å­˜åœ¨ã€‚ - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. 类型为 %1 的值ä¸èƒ½è¢«åˆ¤æ–­ã€‚一个判断必须是数值类型或者一个有效的布尔值(Effective Boolean Value)类型。 @@ -7026,7 +7055,7 @@ Please choose a different file name. 一个定ä½åˆ¤æ–­å¿…须评估一个å•ä¸€æ•°å€¼ã€‚ - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. 一个处ç†æŒ‡ä»¤ä¸­çš„目标å称ä¸èƒ½æ˜¯ä»»ä½•å¤§å°å†™æ··åˆçš„ %1。因此,%2 是无效的。 @@ -7036,33 +7065,33 @@ Please choose a different file name. %1 ä¸æ˜¯å¤„ç†æŒ‡ä»¤çš„有效目标å称。它必须是值 %2,例如 %3。 - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. 一个路径中的最åŽä¸€æ­¥å¿…须包å«èŠ‚点或者原å­å€¼ã€‚它ä¸èƒ½æ˜¯ä¸¤è€…的一个组åˆã€‚ - + The data of a processing instruction cannot contain the string %1 处ç†æŒ‡ä»¤çš„æ•°æ®ä¸èƒ½åŒ…å«å­—符串 %1 - + No namespace binding exists for the prefix %1 对于å‰ç¼€ %1,没有存在绑定的命å空间。 - + No namespace binding exists for the prefix %1 in %2 对于 %2 中的å‰ç¼€ %1,没有存在绑定的命å空间。 - + %1 is an invalid %2 %1 是一个无效的 %2。 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 最多å¯ä»¥æœ‰ %n 个å‚数。因此 %2 是无效的。 @@ -7076,7 +7105,7 @@ Please choose a different file name. - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. %1 的第一个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。它必须是数字类型的,xs:yearMonthDuration 或者 xs:dayTimeDuration。 @@ -7091,27 +7120,27 @@ Please choose a different file name. %1 的第二个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。它必须是类型 %3ã€%4 或者 %5 的。 - + %1 is not a valid XML 1.0 character. %1 ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ XML 1.0 字符。 - + The first argument to %1 cannot be of type %2. %1 的第一个å‚æ•°ä¸èƒ½æ˜¯ç±»åž‹ %2 的。 - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. 如果两个值都有区å移(zone offset),它们必须拥有相åŒçš„区å移。%1 å’Œ %2 的区å移是ä¸åŒçš„。 - + %1 was called. %1 被调用了。 - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 必须被 %2 或者 %3 è·Ÿéšï¼Œä¸èƒ½åœ¨æ›¿æ¢å­—符串的末尾。 @@ -7126,7 +7155,7 @@ Please choose a different file name. 在这个替æ¢å­—符串中,%1 åªèƒ½è¢«ç”¨äºŽè½¬ä¹‰å®ƒæœ¬èº«æˆ–者 %2,而ä¸æ˜¯ %3 - + %1 matches newline characters %1 匹é…了æ¢è¡Œç¬¦ @@ -7161,17 +7190,17 @@ Please choose a different file name. 如果第一个å‚数是空åºåˆ—或者零长度字符串(无命å空间),那么就ä¸èƒ½æŒ‡å®šå‰ç¼€ã€‚å‰ç¼€ %1 被指定了。 - + It will not be possible to retrieve %1. å°†ä¸èƒ½èŽ·å– %1。 - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. 函数 %1 的第二个å‚数的根节点必须是一个文档节点。%2 ä¸æ˜¯ä¸€ä¸ªæ–‡æ¡£èŠ‚点。 - + The default collection is undefined 默认收集(collection)是未定义的 @@ -7181,12 +7210,12 @@ Please choose a different file name. æ— æ³•èŽ·å– %1 - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). ä¸æ”¯æŒæ­£è§„化(normalization)è¡¨å• %1。被支æŒçš„表å•æ˜¯ %2ã€%3ã€%4 å’Œ %5,以åŠæ— ï¼Œä¾‹å¦‚空字符串(无正规化)。 - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. 区å移(zone offset)必须在 %1...%2 范围之内。%3 是在范围之外的。 @@ -7196,17 +7225,17 @@ Please choose a different file name. %1 ä¸æ˜¯åˆ†é’Ÿçš„整数。 - + Required cardinality is %1; got cardinality %2. 所需è¦çš„表间关系是 %1;得到的表间关系å´æ˜¯ %2。 - + The item %1 did not match the required type %2. 项 %1 和所需的类型 %2 ä¸åŒ¹é…。 - + %1 is an unknown schema type. %1 是一个未知的方案类型。 @@ -7227,7 +7256,7 @@ Please choose a different file name. 没有å称为 %1 çš„å˜é‡å­˜åœ¨ã€‚ - + The variable %1 is unused å˜é‡ %1 没有被使用 @@ -7525,7 +7554,7 @@ Please choose a different file name. 一个扩展表达å¼çš„å称必须在一个命å空间中。 - + empty 空白 @@ -7550,7 +7579,7 @@ Please choose a different file name. 零或者更多 - + Required type is %1, but %2 was found. 需è¦çš„类型是 %1,但是找到的是 %2。 @@ -7565,7 +7594,7 @@ Please choose a different file name. 焦点未定义。 - + It's not possible to add attributes after any other kind of node. ä¸èƒ½åœ¨ä»»ä½•å…¶å®ƒç±»åž‹èŠ‚点åŽæ·»åŠ å±žæ€§ã€‚ @@ -7575,7 +7604,7 @@ Please choose a different file name. 一个å称为 %1 的属性已ç»è¢«åˆ›å»ºã€‚ - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. åªæ”¯æŒ Unicode 代ç ç‚¹æ ¡éªŒ(Unicode Codepoint Collation)(%1)。%2 是ä¸è¢«æ”¯æŒçš„。 @@ -7585,7 +7614,7 @@ Please choose a different file name. 属性 %1 ä¸èƒ½è¢«ä¸²è¡ŒåŒ–,因为它出现在最顶层。 - + %1 is an unsupported encoding. %1 是ä¸è¢«æ”¯æŒçš„ç¼–ç ã€‚ @@ -7600,14 +7629,18 @@ Please choose a different file name. 在使用编ç %3çš„%2中出现的代ç ç‚¹%1ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„XML字符。 - + Ambiguous rule match. å«ç³Šè§„则匹é…。 - In a namespace constructor, the value for a namespace value cannot be an empty string. - 在一个命å空间构造中,命å空间的值ä¸èƒ½ä¸ºç©ºå­—符串。 + 在一个命å空间构造中,命å空间的值ä¸èƒ½ä¸ºç©ºå­—符串。 + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + @@ -7625,12 +7658,12 @@ Please choose a different file name. åªæœ‰å‰ç¼€%1å¯ä»¥ç»‘定到%2,å之也一样 - + Circularity detected 检测到环 - + The parameter %1 is required, but no corresponding %2 is supplied. 需è¦å‚æ•°%1,但是没有æ供对应的%2。 @@ -7640,12 +7673,12 @@ Please choose a different file name. å‚æ•°%1已传递,但没有相应的%2存在。 - + The URI cannot have a fragment URIä¸èƒ½æœ‰ç‰‡æ®µ - + Element %1 is not allowed at this location. 元素%1ä¸èƒ½åœ¨è¿™ä¸ªä½ç½®ã€‚ @@ -7700,7 +7733,7 @@ Please choose a different file name. 在元素%2çš„%1属性中至少è¦æŒ‡å®šä¸€ä¸ªæ¨¡å¼ã€‚ - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. 属性%1ä¸èƒ½å‡ºçŽ°åœ¨å…ƒç´ %2上。åªæœ‰æ ‡å‡†å±žæ€§å¯ä»¥å‡ºçŽ°ã€‚ @@ -7775,7 +7808,7 @@ Please choose a different file name. 元素%1ä¸èƒ½æœ‰å­å…ƒç´ ã€‚ - + Element %1 cannot have a sequence constructor. 元素%1ä¸èƒ½æœ‰é¡ºåºæž„造。 diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts index 5fccebf..9fb871b 100644 --- a/translations/qt_zh_TW.ts +++ b/translations/qt_zh_TW.ts @@ -1,18 +1,20 @@ - - + + AudioOutput - + <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>音效播放è£ç½® <b>%1</b> 未能é‹ä½œã€‚<br/>改用é è¨­è£ç½® <b>%2</b>。</html> + <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>音效播放è£ç½® <b>%1</b> å·²å¯ä½¿ç”¨ï¼Œå› ç‚ºæœ‰è¼ƒé«˜å„ªå…ˆæ¬Šï¼Œå› æ­¤å°‡åˆ‡æ›åˆ°è©²è£ç½®ã€‚</html> + Revert back to device '%1' 回復到è£ç½® %1 @@ -20,7 +22,7 @@ CloseButton - + Close Tab é—œé–‰åˆ†é  @@ -39,27 +41,32 @@ Phonon:: - + Notifications 通知 + Music 音樂 + Video å½±åƒ + Communication 通訊 + Games éŠæˆ² + Accessibility 輔助è£ç½® @@ -67,13 +74,14 @@ Phonon::Gstreamer::Backend - + Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. 警告:您å¯èƒ½æ²’æœ‰å®‰è£ gstreamer0.10-plugins-good。 有些影åƒçš„功能將被關閉。 + Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled 警告:您å¯èƒ½æ²’æœ‰å®‰è£ GStreamer 外掛程å¼ã€‚ 所有音效與影åƒæ”¯æ´å°‡è¢«é—œé–‰ã€‚ @@ -82,7 +90,7 @@ Phonon::Gstreamer::MediaObject - + Cannot start playback. Check your Gstreamer installation and make sure you @@ -93,26 +101,39 @@ have libgstreamer-plugins-base installed. libgstreamer-plugins-base 套件。 + A required codec is missing. You need to install the following codec(s) to play this content: %0 找ä¸åˆ°éœ€è¦çš„編解碼器。您需è¦å®‰è£ä»¥ä¸‹çš„套件來播放此內容:%0 + + + + + + + + Could not open media source. 無法開啟媒體來æºã€‚ + Invalid source type. ä¸åˆæ³•çš„來æºåž‹æ…‹ã€‚ + Could not locate media source. 無法定ä½åª’體來æºã€‚ + Could not open audio device. The device is already in use. 無法開啟音效è£ç½®ã€‚è£ç½®å·²åœ¨ä½¿ç”¨ä¸­ã€‚ + Could not decode media source. 無法解碼媒體來æºã€‚ @@ -120,10 +141,15 @@ libgstreamer-plugins-base 套件。 Phonon::VolumeSlider + + Volume: %1% 音é‡ï¼š%1% + + + Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% 使用此滑動器來調整音é‡ã€‚最左邊的ä½ç½®ç‚º 0%,最å³é‚Šçš„為 %1%。 @@ -131,11 +157,12 @@ libgstreamer-plugins-base 套件。 Q3Accel - + %1, %2 not defined %1,%2 未定義 + Ambiguous %1 not handled ä¸æ˜Žç¢ºçš„ %1 å°šæœªè™•ç† @@ -143,23 +170,27 @@ libgstreamer-plugins-base 套件。 Q3DataTable - + True 真 + False å‡ + Insert æ’å…¥ + Update æ›´æ–° + Delete 刪除 @@ -167,242 +198,313 @@ libgstreamer-plugins-base 套件。 Q3FileDialog - + Copy or Move a File 複製或移動檔案 + Read: %1 讀å–:%1 + + Write: %1 寫入:%1 + + Cancel å–消 - + + + + All Files (*) 所有檔案 (*) + Name å稱 + Size å¤§å° + Type åž‹æ…‹ + Date 日期 + Attributes 屬性 + + &OK 確定(&O) + Look &in: 尋找於(&I): + + + File &name: 檔å(&N): + File &type: 檔案型態(&T): + Back 返回 + One directory up 往上一層目錄 + Create New Folder 建立新資料夾 + List View 列表檢視 + Detail View 詳細檢視 + Preview File Info é è¦½æª”案資訊 + Preview File Contents é è¦½æª”案內容 + Read-write å¯è®€å¯« + Read-only 唯讀 + Write-only 唯寫 + Inaccessible ç„¡æ³•å­˜å– + Symlink to File åˆ°æª”æ¡ˆçš„ç¬¦è™Ÿé€£çµ + Symlink to Directory åˆ°ç›®éŒ„çš„ç¬¦è™Ÿé€£çµ + Symlink to Special åˆ°ç‰¹æ®Šç¯€é»žçš„ç¬¦è™Ÿé€£çµ + File 檔案 + Dir 目錄 + Special 特殊節點 - + + + Open é–‹å•Ÿ - + + Save As å¦å­˜æ–°æª” + + + &Open é–‹å•Ÿ(&O) + + &Save 儲存(&S) + &Rename é‡æ–°å‘½å(&R) + &Delete 刪除(&D) + R&eload é‡æ–°è¼‰å…¥(&E) + Sort by &Name ä¾å稱排åº(&N) + Sort by &Size ä¾å¤§å°æŽ’åº(&S) + Sort by &Date ä¾æ—¥æœŸæŽ’åº(&D) + &Unsorted 未排åº(&U) + Sort æŽ’åº + Show &hidden files 顯示隱è—檔(&H) + the file 此檔案 + the directory 此目錄 + the symlink æ­¤ç¬¦è™Ÿé€£çµ + Delete %1 刪除 %1 + <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>您確定è¦åˆªé™¤ %1 "%2" 嗎?</qt> + &Yes 是(&Y) + &No å¦(&N) + New Folder 1 新資料夾 1 + New Folder 新資料夾 + New Folder %1 新資料夾 %1 + Find Directory 尋找目錄 + + Directories 目錄 + Directory: 目錄: + + Error 錯誤 + %1 File not found. Check path and filename. @@ -411,14 +513,17 @@ Check path and filename. 請檢查路徑與檔å。 + All Files (*.*) 所有檔案 (*.*) + Open é–‹å•Ÿ + Select a Directory è«‹é¸æ“‡ä¸€å€‹ç›®éŒ„ @@ -426,24 +531,29 @@ Check path and filename. Q3LocalFs + + Could not read directory %1 無法讀å–目錄 %1 + Could not create directory %1 無法建立目錄 %1 + Could not remove file or directory %1 無法移除目錄 %1 + Could not rename %1 to @@ -454,12 +564,14 @@ to %2 + Could not open %1 無法開啟 %1 + Could not write %1 無法寫入 @@ -469,11 +581,12 @@ to Q3MainWindow - + Line up 排列 + Customize... 自訂... @@ -481,7 +594,7 @@ to Q3NetworkProtocol - + Operation stopped by the user 使用者已中止æ“作 @@ -489,6 +602,8 @@ to Q3ProgressDialog + + Cancel å–消 @@ -496,22 +611,28 @@ to Q3TabDialog + + OK 確定 + Apply 套用 + Help 說明 + Defaults é è¨­ + Cancel å–消 @@ -519,31 +640,38 @@ to Q3TextEdit - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + &Paste 貼上(&P) + Clear 清除 + + Select All 全部é¸æ“‡ @@ -551,55 +679,67 @@ to Q3TitleBar - + System 系統 + Restore up å‘上æ¢å¾© + Minimize 最å°åŒ– + Restore down å‘下æ¢å¾© + Maximize 最大化 + Close 關閉 + Contains commands to manipulate the window 包å«è¦æ“作此視窗的指令 + Puts a minimized back to normal 將最å°åŒ–è¦–çª—æ”¾å›žåŽŸå¤§å° + Moves the window out of the way 把視窗移開 + Puts a maximized window back to normal å°‡æœ€å¤§åŒ–è¦–çª—æ”¾å›žåŽŸå¤§å° + Makes the window full screen å°‡è¦–çª—æ”¾å¤§åˆ°å…¨ç•«é¢ + Closes the window 關閉視窗 + Displays the name of the window and contains controls to manipulate it 顯示視窗å稱,並包å«æ“作它的控制元件 @@ -607,7 +747,7 @@ to Q3ToolBar - + More... 更多... @@ -615,38 +755,51 @@ to Q3UrlOperator + + + The protocol `%1' is not supported å”定 %1 æœªæ”¯æ´ + The protocol `%1' does not support listing directories å”定 %1 未支æ´åˆ—出目錄 + The protocol `%1' does not support creating new directories å”定 %1 未支æ´å»ºç«‹æ–°ç›®éŒ„ + The protocol `%1' does not support removing files or directories å”定 %1 未支æ´ç§»é™¤æª”案或目錄 + The protocol `%1' does not support renaming files or directories å”定 %1 未支æ´é‡æ–°å‘½å檔案或目錄 + The protocol `%1' does not support getting files å”定 %1 未支æ´å–得檔案 + The protocol `%1' does not support putting files å”定 %1 未支æ´å¯«å…¥æª”案 + + The protocol `%1' does not support copying or moving files or directories å”定 %1 未支æ´è¤‡è£½æˆ–移動檔案或目錄 + + (unknown) (未知) @@ -654,23 +807,27 @@ to Q3Wizard - + &Cancel å–消(&C) + < &Back <返回(&B) + &Next > 下一個(&N)> + &Finish 完æˆ(&F) + &Help 說明(&H) @@ -678,31 +835,44 @@ to QAbstractSocket + + + + Host not found 找ä¸åˆ°ä¸»æ©Ÿ - + + + Connection refused 連線被拒 + Connection timed out 連線逾時 + + + Operation on socket is not supported Socket çš„æ“ä½œæœªè¢«æ”¯æ´ + Socket operation timed out Socket æ“作逾時 + Socket is not connected Socket 未連線 + Network unreachable 無法使用網路 @@ -710,15 +880,17 @@ to QAbstractSpinBox - + &Step up 單步å‘上(&S) + Step &down 單步å‘下(&D) + &Select All 全部é¸æ“‡(&S) @@ -726,27 +898,28 @@ to QApplication - + Activate å•Ÿå‹• - + Executable '%1' requires Qt %2, found Qt %3. 執行檔 %1 éœ€è¦ Qt %2,但åªæ‰¾åˆ° Qt %3。 + Incompatible Qt Library Error Qt 函å¼åº«ä¸ç›¸å®¹çš„錯誤 - + QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - + Activates the program's main window 啟動程å¼çš„主視窗 @@ -754,18 +927,22 @@ to QAxSelect + Select ActiveX Control é¸æ“‡ ActiveX 控制 + OK 確定 + &Cancel å–消(&C) + COM &Object: COM 物件(&O) @@ -773,15 +950,17 @@ to QCheckBox - + Uncheck å–æ¶ˆå‹¾é¸ + Check å‹¾é¸ + Toggle åˆ‡æ› @@ -789,43 +968,52 @@ to QColorDialog - + Hu&e: 色調(&E): + &Sat: 飽和度(&S): + &Val: 亮度(&V): + &Red: ç´…(&R): + &Green: 綠(&G): + Bl&ue: è—(&U): + A&lpha channel: Alpha 色頻(&L): + Select Color é¸æ“‡é¡è‰² + &Basic colors 基本é¡è‰²(&B) + &Custom colors 自訂é¡è‰²(&C) @@ -842,6 +1030,7 @@ to å–消 + &Add to Custom Colors 新增到自訂é¡è‰²(&A) @@ -853,20 +1042,23 @@ to QComboBox + + Open é–‹å•Ÿ - + False å‡ + True 真 - + Close 關閉 @@ -899,17 +1091,19 @@ to %1:未知的錯誤 %2 - + %1: key is empty QSystemSemaphore %1:éµå€¼æ˜¯ç©ºçš„ + %1: unable to make key QSystemSemaphore %1:無法產生éµå€¼ + %1: ftok failed QSystemSemaphore %1:ftok 失敗 @@ -918,19 +1112,22 @@ to QDB2Driver - + Unable to connect 無法連接 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 + Unable to set autocommit 無法設定自動æ交 @@ -938,26 +1135,33 @@ to QDB2Result + + Unable to execute statement 無法執行敘述 + Unable to prepare statement 無法準備敘述 + Unable to bind variable 無法çµåˆè®Šæ•¸ + Unable to fetch record %1 無法抓å–紀錄 %1 + Unable to fetch next 無法抓å–下一筆 + Unable to fetch first 無法抓å–第一筆 @@ -965,19 +1169,22 @@ to QDateTimeEdit - + AM AM + am am + PM PM + pm pm @@ -985,15 +1192,17 @@ to QDial - + QDial QDial + SpeedoMeter SpeedoMeter + SliderHandle SliderHandle @@ -1001,11 +1210,12 @@ to QDialog - + What's This? 這是什麼? + Done å®Œæˆ @@ -1013,100 +1223,124 @@ to QDialogButtonBox - + + + OK 確定 - + Save 儲存 + &Save 儲存(&S) + Open é–‹å•Ÿ + Cancel å–消 + &Cancel å–消(&C) + Close 關閉 + &Close 關閉(&C) + Apply 套用 + Reset é‡ç½® + Help 說明 + Don't Save ä¸è¦å„²å­˜ + Discard 丟棄 + &Yes 是(&Y) + Yes to &All 全部回答是(&A) + &No å¦(&N) + N&o to All 全部回答å¦(&O) + Save All 全部儲存 + Abort 中止 + Retry é‡è©¦ + Ignore 忽略 + Restore Defaults 回復é è¨­å€¼ + Close without Saving 關閉而ä¸å„²å­˜ + &OK 確定(&O) @@ -1114,25 +1348,29 @@ to QDirModel - + Name å稱 + Size å¤§å° + Kind Match OS X Finder 種類 + Type All other platforms åž‹æ…‹ + Date Modified 變更日期 @@ -1140,15 +1378,17 @@ to QDockWidget - + Close 關閉 + Dock 嵌入 + Float 飄浮 @@ -1156,10 +1396,12 @@ to QDoubleSpinBox + More 更多 + Less 較少 @@ -1167,23 +1409,27 @@ to QErrorMessage - + Debug Message: 除錯訊æ¯ï¼š + Warning: 警告: + Fatal Error: åš´é‡éŒ¯èª¤ï¼š + &Show this message again å†åº¦é¡¯ç¤ºæ­¤è¨Šæ¯(&S) + &OK 確定(&O) @@ -1191,22 +1437,33 @@ to QFile + + Destination file exists 目標檔已存在 + + Cannot remove source file + + + + Cannot open %1 for input 無法開啟 %1 以輸入 + Cannot open for output 無法開啟 %1 以輸出 + Failure to write block 寫入å€å¡Šæ™‚失敗 + Cannot create %1 for output 無法建立 %1 以輸出 @@ -1214,32 +1471,44 @@ to QFileDialog + + All Files (*) 所有檔案 (*) + Directories 目錄 + + + + &Open é–‹å•Ÿ(&O) + + &Save 儲存(&S) + Open é–‹å•Ÿ + %1 already exists. Do you want to replace it? %1 已存在 您è¦å–代它嗎? + %1 File not found. Please verify the correct file name was given. @@ -1248,43 +1517,58 @@ Please verify the correct file name was given. 請檢查檔å是å¦æ­£ç¢ºã€‚ - + My Computer 我的電腦 + &Rename é‡æ–°å‘½å(&R) + &Delete 刪除(&D) + Show &hidden files 顯示隱è—檔(&H) + + Back 返回 + + Parent Directory 父目錄 + + List View 列表檢視 + + Detail View 詳細檢視 + + Files of type: 檔案型態: + + Directory: 目錄: @@ -1297,6 +1581,8 @@ Please verify the correct file name was given 請檢查檔å是å¦æ­£ç¢ºã€‚ + + %1 Directory not found. Please verify the correct directory name was given. @@ -1305,84 +1591,105 @@ Please verify the correct directory name was given. 請檢查目錄å稱是å¦æ­£ç¢ºã€‚ + '%1' is write protected. Do you want to delete it anyway? %1 有寫入ä¿è­·ã€‚ 您確定è¦åˆªé™¤å®ƒå—Žï¼Ÿ + Are sure you want to delete '%1'? 您確定è¦åˆªé™¤ %1 嗎? + Could not delete directory. 無法刪除目錄。 + Recent Places 最近的地方 - + All Files (*.*) 所有檔案 (*.*) + Save As å¦å­˜æ–°æª” - + Drive ç£ç¢Ÿ + + File 檔案 + Unknown 未知 + Find Directory 尋找目錄 + Show 顯示 + + Forward å¾€å‰ - + New Folder 新資料夾 + &New Folder 新增資料夾(&N) + + &Choose é¸æ“‡(&C) - + Remove 移除 + + File &name: 檔å(&N): + + Look in: 尋找於: + + Create New Folder 建立新資料夾 @@ -1390,62 +1697,74 @@ Do you want to delete it anyway? QFileSystemModel - + Invalid filename ä¸åˆæ³•çš„檔å + <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>無法使用å稱 "%1"。</b><p>請使用其它å稱,字元數少一點,或是ä¸è¦æœ‰æ¨™é»žç¬¦è™Ÿã€‚ + Name å稱 + Size å¤§å° + Kind Match OS X Finder 種類 + Type All other platforms åž‹æ…‹ + Date Modified 變更日期 - + My Computer 我的電腦 + Computer 電腦 + %1 TB %1 TB + %1 GB %1 GB + %1 MB %1 MB + %1 KB %1 KB + %1 bytes %1 ä½å…ƒçµ„ @@ -1453,166 +1772,216 @@ Do you want to delete it anyway? QFontDatabase + + Normal 正常 + + + Bold ç²—é«” + + Demi Bold åŠç²—é«” + + + Black 黑體 + Demi åŠé«” + + Light 輕體 + + Italic 斜體 + + Oblique 傾斜體 + Any 任何 + Latin æ‹‰ä¸ + Greek 希臘 + Cyrillic 斯拉夫 + Armenian 亞美尼亞 + Hebrew 希伯來 + Arabic 阿拉伯 + Syriac 敘利亞 + Thaana Thaana + Devanagari Devanagari + Bengali 孟加拉 + Gurmukhi Gurmukhi + Gujarati Gujarati + Oriya Oriya + Tamil å¦ç±³çˆ¾ + Telugu Telugu + Kannada åŽé”é‚£ + Malayalam 馬來語 + Sinhala 錫蘭 + Thai 泰語 + Lao 寮國 + Tibetan è¥¿è— + Myanmar 緬甸 + Georgian 喬治亞 + Khmer 高棉 + Simplified Chinese 簡體中文 + Traditional Chinese ç¹é«”中文 + Japanese 日語 + Korean 韓語 + Vietnamese è¶Šå— + Symbol 符號 + Ogham æ­ç”˜ + Runic ç›§æ© @@ -1620,39 +1989,48 @@ Do you want to delete it anyway? QFontDialog - + &Font å­—åž‹(&F) + Font st&yle 字型樣å¼(&Y) + &Size 大å°(&S) + Effects 效果 + Stri&keout 刪除線(&K) + &Underline 底線(&U) + Sample 範例 + Wr&iting System 寫入系統(&I) + + Select Font é¸æ“‡å­—åž‹ @@ -1660,116 +2038,145 @@ Do you want to delete it anyway? QFtp - + + Not connected 未連線 - + + Host %1 not found 找ä¸åˆ°ä¸»æ©Ÿ %1 - + + Connection refused to host %1 連線到主機 %1 被拒 + Connection timed out to host %1 連線到主機 %1 逾時 + + + Connected to host %1 已連接到主機 %1 + + Connection refused for data connection 資料連線被拒 + + + + Unknown error 未知的錯誤 - + + Connecting to host failed: %1 連線到主機失敗: %1 - + + Login failed: %1 登入失敗: %1 - + + Listing directory failed: %1 列出目錄時失敗: %1 - + + Changing directory failed: %1 變更目錄時失敗: %1 - + + Downloading file failed: %1 下載檔案時失敗: %1 - + + Uploading file failed: %1 上傳檔案時失敗: %1 - + + Removing file failed: %1 移除檔案時失敗: %1 - + + Creating directory failed: %1 建立目錄時失敗: %1 - + + Removing directory failed: %1 移除目錄時失敗: %1 + + + Connection closed 連線已關閉 + Host %1 found 找到主機 %1 + Connection to %1 closed 到 %1 的連線已關閉 + Host found 找到主機 + Connected to host 已連線到主機 @@ -1777,7 +2184,7 @@ Do you want to delete it anyway? QHostInfo - + Unknown error 未知的錯誤 @@ -1785,14 +2192,29 @@ Do you want to delete it anyway? QHostInfoAgent + + + + + + + + Host not found 找ä¸åˆ°ä¸»æ©Ÿ + + + + Unknown address type 未知的ä½å€åž‹æ…‹ + + + Unknown error 未知的錯誤 @@ -1800,116 +2222,155 @@ Do you want to delete it anyway? QHttp + + + + Unknown error 未知的錯誤 + + Request aborted è¦æ±‚中止 - + + No server set to connect to 沒有設定è¦é€£ç·šåˆ°å“ªå€‹ä¼ºæœå™¨ - + + Wrong content length 錯誤的內容長度 - + + Server closed connection unexpectedly 伺æœå™¨ç„¡é è­¦é—œé–‰é€£ç·š + + Unknown authentication method + + + + Error writing response to device 寫入回應到è£ç½®æ™‚發生錯誤 - + + Connection refused 連線被拒 - + + + Host %1 not found 找ä¸åˆ°ä¸»æ©Ÿ %1 - + + + + HTTP request failed HTTP è¦æ±‚失敗 - + + Invalid HTTP response header ä¸åˆæ³•çš„ HTTP 回覆標頭 + + + + Invalid HTTP chunked body ä¸åˆæ³•çš„ HTTP å€å¡Šä¸»é«” - + Host %1 found 找到主機 %1 + Connected to host %1 已連接到主機 %1 + Connection to %1 closed 到 %1 的連線已關閉 + Host found 找到主機 + Connected to host 已連線到主機 - + + Connection closed 連線已關閉 + Proxy authentication required 代ç†ä¼ºæœå™¨éœ€è¦èªè­‰ + Authentication required 需è¦èªè­‰ + Connection refused (or timed out) 連線被拒(或連線逾時) - + Proxy requires authentication 代ç†ä¼ºæœå™¨éœ€è¦èªè­‰ + Host requires authentication 主機需è¦èªè­‰ + Data corrupted 資料已æ毀 + Unknown protocol specified 指定了未知的å”定 + SSL handshake failed SSL æºé€šå¤±æ•— + HTTPS connection requested but SSL support not compiled in HTTPS 連線需è¦çš„ SSL 支æ´ä¸¦æœªç·¨è­¯é€²ä¾† @@ -1917,38 +2378,47 @@ Do you want to delete it anyway? QHttpSocketEngine + Did not receive HTTP response from proxy 未從代ç†ä¼ºæœå™¨æŽ¥æ”¶åˆ° HTTP 回應 + Error parsing authentication request from proxy 剖æžå¾žä»£ç†ä¼ºæœå™¨å‚³ä¾†çš„èªè­‰è¦æ±‚時發生錯誤 + Authentication required 需è¦èªè­‰ + Proxy denied connection 代ç†ä¼ºæœå™¨æ‹’絕連線 + Error communicating with HTTP proxy 與 HTTP 代ç†ä¼ºæœå™¨è¯ç¹«æ™‚發生錯誤 + Proxy server not found 找ä¸åˆ°ä»£ç†ä¼ºæœå™¨ + Proxy connection refused 代ç†ä¼ºæœå™¨é€£ç·šè¢«æ‹’ + Proxy server connection timed out 代ç†ä¼ºæœå™¨é€£ç·šé€¾æ™‚ + Proxy connection closed prematurely 代ç†ä¼ºæœå™¨é€£ç·šå·²ä¸æ­£å¸¸é—œé–‰ @@ -1956,19 +2426,22 @@ Do you want to delete it anyway? QIBaseDriver - + Error opening database 開啟資料庫發生錯誤 + Could not start transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -1976,70 +2449,89 @@ Do you want to delete it anyway? QIBaseResult + Unable to create BLOB 無法建立 BLOB + Unable to write BLOB 無法寫入 BLOB + Unable to open BLOB 無法開啟 BLOB + Unable to read BLOB ç„¡æ³•è®€å– BLOB + + Could not find array 找ä¸åˆ°é™£åˆ— + Could not get array data 無法å–得陣列資料 + Could not get query info 無法å–得查詢資訊 + Could not start transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Could not allocate statement 無法é…置敘述 + Could not prepare statement 無法準備敘述 + + Could not describe input statement 無法æ述輸入敘述 + Could not describe statement 無法æ述敘述 + Unable to close statement 無法關閉敘述 + Unable to execute query 無法執行查詢 + Could not fetch next item 無法抓å–下一個項目 + Could not get statement info 無法å–得敘述資訊 @@ -2047,24 +2539,27 @@ Do you want to delete it anyway? QIODevice - + Permission denied 權é™ä¸è¶³ + Too many open files é–‹å•ŸéŽå¤šæª”案 + No such file or directory 找ä¸åˆ°è©²æª”案或目錄 + No space left on device è£ç½®ä¸Šå·²ç„¡ç©ºé–“ - + Unknown error 未知的錯誤 @@ -2072,19 +2567,22 @@ Do you want to delete it anyway? QInputContext - + XIM XIM + XIM input method XIM 輸入法 + Windows input method Windows 輸入法 + Mac OS X input method Mac OS X 輸入法 @@ -2092,7 +2590,7 @@ Do you want to delete it anyway? QInputDialog - + Enter a value: 請輸入值: @@ -2112,55 +2610,66 @@ Do you want to delete it anyway? QLibrary::resolve_sys: 符號 "%1" 未定義於 %2 (%3) - + Could not mmap '%1': %2 無法 mmap '%1':%2 + Plugin verification data mismatch in '%1' 在 %1 中的外掛程å¼ç¢ºèªè³‡æ–™ä¸ç¬¦åˆ + Could not unmap '%1': %2 無法 unmap '%1':%2 + The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ï¼ˆ%2.%3.%4)ã€%5】 + The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ã€‚é æœŸå»ºæ§‹é‘° %2,å»å¾—到 %3 + Unknown error 未知的錯誤 - + + The shared library was not found. 找ä¸åˆ°åˆ†äº«å‡½å¼åº« + The file '%1' is not a valid Qt plugin. 檔案 %1 ä¸æ˜¯åˆæ³•çš„ Qt 外掛程å¼ã€‚ + The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) å¤–æŽ›ç¨‹å¼ %1 使用ä¸ç›¸å®¹çš„ Qt 函å¼åº«ã€‚(ä¸èƒ½å°‡é™¤éŒ¯èˆ‡é‡‹å‡ºç‰ˆçš„函å¼åº«æ··åœ¨ä¸€èµ·ã€‚) - + + Cannot load library %1: %2 無法載入函å¼åº« %1:%2 - + + Cannot unload library %1: %2 無法å¸è¼‰å‡½å¼åº« %1:%2 - + + Cannot resolve symbol "%1" in %2: %3 無法å解 %2 內的符號 %1:%3 @@ -2168,31 +2677,37 @@ Do you want to delete it anyway? QLineEdit - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + &Paste 貼上(&P) + Delete 刪除 + Select All 全部é¸æ“‡ @@ -2200,20 +2715,24 @@ Do you want to delete it anyway? QLocalServer - + + %1: Name error %1:å稱錯誤 + %1: Permission denied %1:存å–被拒 + %1: Address in use %1:ä½å€ä½¿ç”¨ä¸­ - + + %1: Unknown error %2 %1:未知的錯誤 %2 @@ -2221,54 +2740,70 @@ Do you want to delete it anyway? QLocalSocket - + + %1: Connection refused %1:連線被拒 - + + %1: Remote closed %1:é ç«¯å·²é—œé–‰ + + + + %1: Invalid name %1:ä¸åˆæ³•çš„å稱 - + + %1: Socket access error %1:Socket ä½å€éŒ¯èª¤ - + + %1: Socket resource error %1:Socket 資æºéŒ¯èª¤ - + + %1: Socket operation timed out %1:Socket æ“作逾時 - + + %1: Datagram too large %1:資料包éŽå¤§ + + + %1: Connection error %1:連線錯誤 - + + %1: The socket operation is not supported %1:socket æ“ä½œæœªæ”¯æ´ + %1: Unknown error %1:未知的錯誤 - + + %1: Unknown error %2 %1:未知的錯誤 %2 @@ -2276,23 +2811,27 @@ Do you want to delete it anyway? QMYSQLDriver - + Unable to open database ' 無法開啟資料庫 + Unable to connect 無法連線 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -2300,46 +2839,59 @@ Do you want to delete it anyway? QMYSQLResult + Unable to fetch data 無法抓å–資料 + Unable to execute query 無法執行查詢 + Unable to store result 無法儲存çµæžœ + + Unable to prepare statement 無法準備敘述 + Unable to reset statement 無法é‡ç½®æ•˜è¿° + Unable to bind value 無法çµåˆæ•¸å€¼ + Unable to execute statement 無法執行敘述 + + Unable to bind outvalues 無法çµåˆè¼¸å‡ºå€¼ + Unable to store statement results 無法儲存敘述çµæžœ + Unable to execute next query 無法執行下一個查詢 + Unable to store next result 無法儲存下一個çµæžœ @@ -2347,7 +2899,7 @@ Do you want to delete it anyway? QMdiArea - + (Untitled) (未命å) @@ -2355,75 +2907,92 @@ Do you want to delete it anyway? QMdiSubWindow - + %1 - [%2] %1 - [%2] + Close 關閉 + Minimize 最å°åŒ– + Restore Down å‘下æ¢å¾© + &Restore 回復(&R) + &Move 移動(&M) + &Size 大å°(&S) + Mi&nimize 最å°åŒ–(&N) + Ma&ximize 最大化(&X) + Stay on &Top 留在頂端(&T) + &Close 關閉(&C) + - [%1] - [%1] + Maximize 最大化 + Unshade å–消é®è”½ + Shade é®è”½ + Restore 回復 + Help 說明 + Menu é¸å–® @@ -2431,14 +3000,21 @@ Do you want to delete it anyway? QMenu + + Close 關閉 + + Open é–‹å•Ÿ + + + Execute 執行 @@ -2497,40 +3073,53 @@ Do you want to delete it anyway? QMessageBox + Help 說明 + + + + OK 確定 + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + + About Qt 關於 Qt <p>This program uses Qt version %1.</p> - <p> 這個程å¼ä½¿ç”¨ Qt 版本 %1</p> + <p> 這個程å¼ä½¿ç”¨ Qt 版本 %1</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qtopia Core.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt 也å¯ä»¥ç”¨ Qtopia Core 用於嵌入å¼ç³»çµ±ã€‚</p><p>Qt 為 Trolltech 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + Show Details... 顯示詳情... + Hide Details... éš±è—詳情... <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> - <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> + <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> - <p>這個程å¼ä½¿ç”¨äº† Qt 開放æºç¢¼ç‰ˆæœ¬ %1。</p><p>Qt 開放æºç¢¼ç‰ˆæœ¬æ˜¯å°ˆé–€ç‚ºäº†é–‹ç™¼é–‹æ”¾æºç¢¼æ‡‰ç”¨ç¨‹å¼ä½¿ç”¨çš„版本。若是您è¦é–‹ç™¼å°ˆåˆ©ç§æœ‰ï¼ˆå°é–‰ï¼‰è»Ÿé«”ï¼Œæ‚¨éœ€è¦ Qt 的商業授權。</p><p>Qt 的授權概è¦è«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> + <p>這個程å¼ä½¿ç”¨äº† Qt 開放æºç¢¼ç‰ˆæœ¬ %1。</p><p>Qt 開放æºç¢¼ç‰ˆæœ¬æ˜¯å°ˆé–€ç‚ºäº†é–‹ç™¼é–‹æ”¾æºç¢¼æ‡‰ç”¨ç¨‹å¼ä½¿ç”¨çš„版本。若是您è¦é–‹ç™¼å°ˆåˆ©ç§æœ‰ï¼ˆå°é–‰ï¼‰è»Ÿé«”ï¼Œæ‚¨éœ€è¦ Qt 的商業授權。</p><p>Qt 的授權概è¦è«‹åƒè€ƒ <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>。</p> <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt Embedded.</p><p>Qt is a Trolltech product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> @@ -2540,7 +3129,7 @@ Do you want to delete it anyway? QMultiInputContext - + Select IM é¸æ“‡è¼¸å…¥æ³• @@ -2548,11 +3137,12 @@ Do you want to delete it anyway? QMultiInputContextPlugin - + Multiple input method switcher 多é‡è¼¸å…¥æ³•åˆ‡æ›å™¨ + Multiple input method switcher that uses the context menu of the text widgets 使用文字元件中的內文é¸å–®çš„多é‡è¼¸å…¥æ³•åˆ‡æ›å™¨ @@ -2560,107 +3150,132 @@ Do you want to delete it anyway? QNativeSocketEngine - + The remote host closed the connection é ç«¯ä¸»æ©Ÿé—œé–‰äº†é€£ç·š + Network operation timed out 網路æ“作逾時 + Out of resources 資æºä¸è¶³ + Unsupported socket operation 未支æ´çš„ socket æ“作 + Protocol type not supported å”å®šåž‹æ…‹æœªæ”¯æ´ + Invalid socket descriptor ä¸åˆæ³•çš„ socket æè¿°å­ + Network unreachable 無法使用網路 + Permission denied 權é™ä¸è¶³ + Connection timed out 連線逾時 + Connection refused 連線被拒 + The bound address is already in use çµåˆçš„ä½å€å·²ç¶“在使用中 + The address is not available 無法å–å¾—ä½å€ + The address is protected æ­¤ä½å€å·²è¢«ä¿è­· + Unable to send a message 無法é€å‡ºè¨Šæ¯ + Unable to receive a message ç„¡æ³•æŽ¥æ”¶è¨Šæ¯ + Unable to write 無法寫入 + Network error 網路錯誤 + Another socket is already listening on the same port å¦ä¸€å€‹ socket 已經在監è½åŒä¸€å€‹é€£æŽ¥åŸ  + Unable to initialize non-blocking socket 無法åˆå§‹åŒ–éžé˜»æ“‹æ€§ socket + Unable to initialize broadcast socket 無法åˆå§‹åŒ–廣播 socket + Attempt to use IPv6 socket on a platform with no IPv6 support 試圖在沒有 IPv6 支æ´çš„å¹³å°ä¸Šä½¿ç”¨ IPv6 socket + Host unreachable 無法連線到主機 + Datagram was too large to send 資料éŽå¤§ç„¡æ³•é€å‡º + Operation on non-socket å°éž socket æ“作 + Unknown error 未知的錯誤 + The proxy type is invalid for this operation 代ç†ä¼ºæœå™¨åž‹æ…‹ç„¡æ³•æ”¯æ´æ­¤æ“作 @@ -2668,7 +3283,7 @@ Do you want to delete it anyway? QNetworkAccessCacheBackend - + Error opening %1 é–‹å•Ÿ %1 發生錯誤 @@ -2676,23 +3291,27 @@ Do you want to delete it anyway? QNetworkAccessFileBackend - + Request for opening non-local file %1 è¦æ±‚é–‹å•Ÿéžæœ¬åœ°ç«¯æª”案 %1 + Error opening %1: %2 é–‹å•Ÿ %1 發生錯誤:%2 + Write error writing to %1: %2 寫入 %1 時發生錯誤:%2 + Cannot open %1: Path is a directory 無法開啟 %1:此路徑是一個目錄 + Read error reading from %1: %2 從 %1 讀å–錯誤:%2 @@ -2700,23 +3319,27 @@ Do you want to delete it anyway? QNetworkAccessFtpBackend - + No suitable proxy found 找ä¸åˆ°åˆé©çš„代ç†ä¼ºæœå™¨ + Cannot open %1: is a directory 無法開啟 %1:是一個目錄 + Logging in to %1 failed: authentication required 登入 %1 失敗:需è¦èªè­‰ + Error while downloading %1: %2 下載 %1 時發生錯誤:%2 + Error while uploading %1: %2 上傳 %1 時發生錯誤:%2 @@ -2724,7 +3347,7 @@ Do you want to delete it anyway? QNetworkAccessHttpBackend - + No suitable proxy found 找ä¸åˆ°åˆé©çš„代ç†ä¼ºæœå™¨ @@ -2732,11 +3355,12 @@ Do you want to delete it anyway? QNetworkReply + Error downloading %1 - server replied: %2 下載 %1 時發生錯誤─伺æœå™¨å›žæ‡‰ï¼š%2 - + Protocol "%1" is unknown 未知的å”定 %1 @@ -2744,6 +3368,8 @@ Do you want to delete it anyway? QNetworkReplyImpl + + Operation canceled å–消æ“作 @@ -2751,24 +3377,28 @@ Do you want to delete it anyway? QOCIDriver - + Unable to logon 無法登入 + Unable to initialize QOCIDriver 無法åˆå§‹åŒ– + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 @@ -2776,34 +3406,43 @@ Do you want to delete it anyway? QOCIResult + + + Unable to bind column for batch execute 無法çµåˆæ¬„ä½ä»¥åšæ‰¹æ¬¡åŸ·è¡Œ + Unable to execute batch statement 無法執行批次敘述 + Unable to goto next 無法跳到下一個 + Unable to alloc statement 無法é…置敘述 + Unable to prepare statement 無法準備敘述 + Unable to bind value 無法çµåˆæ•¸å€¼ Unable to execute select statement - 無法執行é¸å–的敘述 + 無法執行é¸å–的敘述 + Unable to execute statement 無法執行敘述 @@ -2811,27 +3450,32 @@ Do you want to delete it anyway? QODBCDriver - + Unable to connect 無法連接 + Unable to connect - Driver doesn't support all needed functionality 無法連接─驅動程å¼ç„¡æ³•æ”¯æ´æ‰€æœ‰éœ€è¦çš„功能 + Unable to disable autocommit 無法關閉自動æ交功能 + Unable to commit transaction 無法æ交事務 + Unable to rollback transaction 無法å轉事務 + Unable to enable autocommit 無法開啟自動æ交功能 @@ -2839,38 +3483,51 @@ Do you want to delete it anyway? QODBCResult + + QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 無法設定 SQL_CURSOR_STATIC åšç‚ºæ•˜è¿°å±¬æ€§ã€‚請檢查您的 ODBC 驅動程å¼çš„設定 + + Unable to execute statement 無法執行敘述 + Unable to fetch next 無法抓å–下一筆 + Unable to prepare statement 無法準備敘述 + Unable to bind variable 無法çµåˆè®Šæ•¸ + + + Unable to fetch last 無法抓å–最後一筆 + Unable to fetch ç„¡æ³•æŠ“å– + Unable to fetch first 無法抓å–第一筆 + Unable to fetch previous 無法抓å–å‰ä¸€ç­† @@ -2878,41 +3535,48 @@ Do you want to delete it anyway? QObject - + Home é¦–é  - + Operation not supported on %1 在 %1 上ä¸æ”¯æ´æ­¤æ“作 + Invalid URI: %1 ä¸åˆæ³•çš„網å€ï¼š%1 - + Write error writing to %1: %2 寫入 %1 時發生錯誤:%2 + Read error reading from %1: %2 從 %1 讀å–錯誤:%2 + Socket error on %1: %2 %1 上發生 socket 錯誤:%2 + Remote host closed the connection prematurely on %1 æ–¼ %1 上é ç«¯ä¸»æ©Ÿé—œé–‰äº†ä¸æ­£å¸¸çš„連線 + Protocol error: packet of size 0 received å”定錯誤:接收到大å°ç‚º 0 çš„å°åŒ… + + No host name given 未指定主機 @@ -2920,11 +3584,12 @@ Do you want to delete it anyway? QPPDOptionsModel - + Name å稱 + Value 值 @@ -2932,27 +3597,32 @@ Do you want to delete it anyway? QPSQLDriver - + Unable to connect 無法連線 + Could not begin transaction 無法開始事務 + Could not commit transaction 無法æ交事務 + Could not rollback transaction 無法å轉事務 + Unable to subscribe 無法訂閱 + Unable to unsubscribe 無法å–消訂閱 @@ -2960,10 +3630,12 @@ Do you want to delete it anyway? QPSQLResult + Unable to create query 無法建立查詢 + Unable to prepare statement 無法準備敘述 @@ -2971,83 +3643,102 @@ Do you want to delete it anyway? QPageSetupWidget - + Centimeters (cm) 公分 + Millimeters (mm) 公厘 + Inches (in) è‹±å‹ + Points (pt) 點 + Form 表單 + Paper 紙張 + Page size: 紙張大å°ï¼š + Width: 寬度: + Height: 高度: + Paper source: 紙張來æºï¼š + Orientation æ–¹å‘ + Portrait ç¸±å‘ + Landscape æ©«å‘ + Reverse landscape ååºæ©«å‘ + Reverse portrait ååºç¸±å‘ + Margins é‚Šç·£ + top margin 上緣 + left margin 左緣 + right margin å³ç·£ + bottom margin 下緣 @@ -3055,11 +3746,12 @@ Do you want to delete it anyway? QPluginLoader - + Unknown error 未知的錯誤 + The plugin was not loaded. 外掛程å¼æœªè¼‰å…¥ã€‚ @@ -3067,15 +3759,19 @@ Do you want to delete it anyway? QPrintDialog - + locally connected 本地連接 + + Aliases: %1 別å:%1 + + unknown 未知 @@ -3088,128 +3784,157 @@ Do you want to delete it anyway? æ©«å‘ - + A0 (841 x 1189 mm) A0 (841 x 1189 mm) + A1 (594 x 841 mm) A1 (594 x 841 mm) + A2 (420 x 594 mm) A2 (420 x 594 mm) + A3 (297 x 420 mm) A3 (297 x 420 mm) + A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm, 8.26 x 11.7 英å‹) + A5 (148 x 210 mm) A5 (148 x 210 mm) + A6 (105 x 148 mm) A6 (105 x 148 mm) + A7 (74 x 105 mm) A7 (74 x 105 mm) + A8 (52 x 74 mm) A8 (52 x 74 mm) + A9 (37 x 52 mm) A9 (37 x 52 mm) + B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) + B1 (707 x 1000 mm) B1 (707 x 1000 mm) + B2 (500 x 707 mm) B2 (500 x 707 mm) + B3 (353 x 500 mm) B3 (353 x 500 mm) + B4 (250 x 353 mm) B4 (250 x 353 mm) + B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm, 6.93 x 9.84 英å‹) + B6 (125 x 176 mm) B6 (125 x 176 mm) + B7 (88 x 125 mm) B7 (88 x 125 mm) + B8 (62 x 88 mm) B8 (62 x 88 mm) + B9 (44 x 62 mm) B9 (44 x 62 mm) + B10 (31 x 44 mm) B10 (31 x 44 mm) + C5E (163 x 229 mm) C5E (163 x 229 mm) + DLE (110 x 220 mm) DLE (110 x 220 mm) + Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7.5 x 10 英å‹, 191 x 254 mm) + Folio (210 x 330 mm) å°é–‹ (210 x 330 mm) + Ledger (432 x 279 mm) Ledger (432 x 279 mm) + Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8.5 x 14 英å‹, 216 x 356 mm) + Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8.5 x 11 英å‹, 216 x 279 mm) + Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) + US Common #10 Envelope (105 x 241 mm) US 常用 10 è™Ÿä¿¡å° (105x241 mm) - + OK 確定 @@ -3230,6 +3955,9 @@ Do you want to delete it anyway? 紙張來æºï¼š + + + Print åˆ—å° @@ -3242,6 +3970,7 @@ Do you want to delete it anyway? å°è¡¨æ©Ÿ + Print To File ... 列å°åˆ°æª”案... @@ -3274,11 +4003,12 @@ Do you want to delete it anyway? 列å°åˆ°æª”案 - + Print range 列å°ç¯„åœ + Print all å…¨éƒ¨åˆ—å° @@ -3323,190 +4053,234 @@ Do you want to delete it anyway? é›™é¢åˆ—å° - + File %1 is not writable. Please choose a different file name. 檔案 %1 無法寫入。 è«‹é¸æ“‡å…¶å®ƒæª”å。 + %1 already exists. Do you want to overwrite it? %1 已存在。 您è¦è¦†å¯«å®ƒå—Žï¼Ÿ + File exists 檔案已存在 + <qt>Do you want to overwrite it?</qt> <qt>您è¦è¦†å¯«å®ƒå—Žï¼Ÿ</qt> + Print selection 列å°é¸æ“‡å€ + %1 is a directory. Please choose a different file name. %1 是一個目錄。 è«‹é¸æ“‡å…¶ä»–檔å。 + A0 A0 + A1 A1 + A2 A2 + A3 A3 + A4 A4 + A5 A5 + A6 A6 + A7 A7 + A8 A8 + A9 A9 + B0 B0 + B1 B1 + B2 B2 + B3 B3 + B4 B4 + B5 B5 + B6 B6 + B7 B7 + B8 B8 + B9 B9 + B10 B10 + C5E C5E + DLE DLE + Executive Executive + Folio Folio + Ledger Ledger + Legal Legal + Letter Letter + Tabloid Tabloid + US Common #10 Envelope US Common #10 Envelope + Custom 自訂 + + &Options >> æ“作 (&O) >> + &Print 列å°(&P) + &Options << æ“作 (&O) << + Print to File (PDF) 列å°åˆ°æª”案(PDF) + Print to File (Postscript) 列å°åˆ°æª”案(Postscript) + Local file 本地端檔案 + Write %1 file 寫入 %1 檔案 - + The 'From' value cannot be greater than the 'To' value. 起始數值ä¸èƒ½å¤§æ–¼çµæŸæ•¸å€¼ @@ -3514,87 +4288,108 @@ Please choose a different file name. QPrintPreviewDialog + + Page Setup é é¢è¨­å®š - + %1% %1% + Print Preview 列å°é è¦½ + Next page ä¸‹ä¸€é  + Previous page å‰ä¸€é  + First page ç¬¬ä¸€é  + Last page æœ€å¾Œä¸€é  + Fit width 符åˆå¯¬åº¦ + Fit page 符åˆé é¢ + Zoom in 放大 + Zoom out ç¸®å° + Portrait ç¸±å‘ + Landscape æ©«å‘ + Show single page 顯示單一é é¢ + Show facing pages 顯示å°é¢ + Show overview of all pages 顯示所有é é¢é è¦½ + Print åˆ—å° + Page setup 列å°è¨­å®š + Close 關閉 + Export to PDF 匯出到 PDF 檔 + Export to PostScript 匯出到 PostScript 檔 @@ -3617,14 +4412,17 @@ Please choose a different file name. QPrintPropertiesWidget + Form 表單 + Page é é¢ + Advanced 進階 @@ -3632,78 +4430,97 @@ Please choose a different file name. QPrintSettingsOutput + Form 表單 + Copies 份數 + Print range 列å°ç¯„åœ + Print all å…¨éƒ¨åˆ—å° + Pages from 指定é é¢ï¼šå¾ž + to 到 + Selection é¸æ“‡å€ + Output Settings 輸出設定 + Copies: 份數: + Collate æ ¡å° + Reverse åå‘ + Options é¸é … + Color Mode é¡è‰²æ¨¡å¼ + Color é¡è‰² + Grayscale ç°éšŽ + Duplex Printing é›™å·¥åˆ—å° + None ç„¡ + Long side é•·é‚Š + Short side 短邊 @@ -3711,38 +4528,47 @@ Please choose a different file name. QPrintWidget + Form 表單 + Printer å°è¡¨æ©Ÿ + &Name: å稱(&N): + P&roperties 屬性(&R) + Location: ä½ç½®ï¼š + Preview é è¦½ + Type: 型態: + Output &file: 輸出檔案(&F): + ... ... @@ -3750,37 +4576,62 @@ Please choose a different file name. QProcess - + + Could not open input redirection for reading 無法開啟輸入導å‘ä»¥è®€å– - + + Could not open output redirection for writing 無法開啟輸出導å‘以寫入 + Resource error (fork failure): %1 資æºéŒ¯èª¤ï¼ˆfork 失敗):%1 + + + + + + + + + Process operation timed out 行程æ“作逾時 + + + + Error reading from process 從行程讀å–時發生錯誤 - + + + Error writing to process 寫入行程時發生錯誤 + Process crashed 行程已崩潰 + + No program defined + + + + Process failed to start 啟動行程失敗 @@ -3788,7 +4639,7 @@ Please choose a different file name. QProgressDialog - + Cancel å–消 @@ -3796,6 +4647,7 @@ Please choose a different file name. QPushButton + Open é–‹å•Ÿ @@ -3803,6 +4655,7 @@ Please choose a different file name. QRadioButton + Check å‹¾é¸ @@ -3810,39 +4663,47 @@ Please choose a different file name. QRegExp - + no error occurred 沒有發生錯誤 + disabled feature used 使用已關閉的功能 + bad char class syntax 錯誤的字元類別語法 + bad lookahead syntax 錯誤的 lookahead 語法 + bad repetition syntax 錯誤的é‡è¦†èªžæ³• + invalid octal value ä¸åˆæ³•çš„八進ä½å€¼ + missing left delim 少了左方的å€éš”符 + unexpected end 未é æœŸé‡åˆ°çµå°¾ + met internal limit é‡åˆ°å…§éƒ¨é™åˆ¶ @@ -3850,19 +4711,22 @@ Please choose a different file name. QSQLite2Driver - + Error to open database 開啟資料庫時發生錯誤 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 + Unable to rollback Transaction 無法å轉事務 @@ -3870,10 +4734,12 @@ Please choose a different file name. QSQLite2Result + Unable to fetch results 無法抓å–çµæžœ + Unable to execute statement 無法執行敘述 @@ -3881,19 +4747,22 @@ Please choose a different file name. QSQLiteDriver - + Error opening database 開啟資料庫發生錯誤 + Error closing database 關閉資料庫發生錯誤 + Unable to begin transaction 無法開始事務 + Unable to commit transaction 無法æ交事務 @@ -3902,6 +4771,7 @@ Please choose a different file name. 無法å轉事務 + Unable to rollback transaction 無法å轉事務 @@ -3909,26 +4779,34 @@ Please choose a different file name. QSQLiteResult + + + Unable to fetch row 無法抓å–列 + Unable to execute statement 無法執行敘述 + Unable to reset statement 無法é‡ç½®æ•˜è¿° + Unable to bind parameters 無法çµåˆåƒæ•¸ + Parameter count mismatch åƒæ•¸æ•¸é‡ä¸ç¬¦åˆ + No query 沒有查詢 @@ -3936,69 +4814,84 @@ Please choose a different file name. QScrollBar - + Scroll here 在此æ²è»¸ + Left edge 左邊緣 + Top 頂端 + Right edge å³é‚Šç·£ + Bottom 底端 + Page left é é¢å·¦æ–¹ - + + Page up é é¢ä¸Šæ–¹ + Page right é é¢å³æ–¹ - + + Page down é é¢ä¸‹æ–¹ + Scroll left 往左æ²è»¸ + Scroll up 往上æ²è»¸ + Scroll right å¾€å³æ²è»¸ + Scroll down 往下æ²è»¸ + Line up å°ä¸ŠæŽ’列 + Position ä½ç½® + Line down å°ä¸‹æŽ’列 @@ -4006,81 +4899,99 @@ Please choose a different file name. QSharedMemory - + %1: unable to set key on lock %1:無法設定éµå€¼ + %1: create size is less then 0 %1:建立大å°å°æ–¼ 0 - + + %1: unable to lock %1:無法鎖定 + %1: unable to unlock %1:無法解除鎖定 - + + %1: permission denied %1:存å–被拒 + + %1: already exists %1:已存在 - + + %1: doesn't exists %1:ä¸å­˜åœ¨ - + + %1: out of resources %1:資æºä¸è¶³ - + + %1: unknown error %2 %1:未知的錯誤 %2 + %1: key is empty %1:éµå€¼æ˜¯ç©ºçš„ + %1: unix key file doesn't exists %1:unix éµå€¼æª”ä¸å­˜åœ¨ + %1: ftok failed %1:ftok 失敗 - + + %1: unable to make key %1:無法產生éµå€¼ + %1: system-imposed size restrictions %1:系統大å°é™åˆ¶ + %1: not attached %1:未附加 + %1: invalid size %1:ä¸åˆæ³•çš„å¤§å° + %1: key error %1:éµå€¼éŒ¯èª¤ + %1: size query failed %1:大å°æŸ¥è©¢å¤±æ•— @@ -4088,371 +4999,466 @@ Please choose a different file name. QShortcut - + Space ç©ºç™½éµ + Esc Esc + Tab Tab + Backtab Backtab + Backspace Backspace + Return Return + Enter Enter + Ins Ins + Del Del + Pause Pause + Print Print + SysReq SysReq + Home Home + End End + Left å·¦éµ + Up ä¸Šéµ + Right å³éµ + Down ä¸‹éµ + PgUp PgUp + PgDown PgDown + CapsLock 大寫鎖定 + NumLock 數字鎖定 + ScrollLock æ²è»¸éŽ–定 + Menu é¸å–® + Help 說明 + Back 返回 + Forward å¾€å‰ + Stop åœæ­¢ + Refresh 刷新 + Volume Down 音é‡é™ä½Ž + Volume Mute éœéŸ³ + Volume Up 音é‡æ高 + Bass Boost é‡ä½ŽéŸ³ + Bass Up Bass Up + Bass Down Bass Down + Treble Up Treble Up + Treble Down Treble Down + Media Play 媒體播放 + Media Stop 媒體åœæ­¢ + Media Previous 媒體å‰ä¸€é¦– + Media Next 媒體下一首 + Media Record 媒體錄音 + Favorites 我的最愛 + Search æœå°‹ + Standby 待命 + Open URL é–‹å•Ÿç¶²å€ + Launch Mail å•Ÿå‹•éƒµä»¶ç¨‹å¼ + Launch Media å•Ÿå‹•åª’é«”ç¨‹å¼ + Launch (0) 啟動(0) + Launch (1) 啟動(1) + Launch (2) 啟動(2) + Launch (3) 啟動(3) + Launch (4) 啟動(4) + Launch (5) 啟動(5) + Launch (6) 啟動(6) + Launch (7) 啟動(7) + Launch (8) 啟動(8) + Launch (9) 啟動(9) + Launch (A) 啟動(A) + Launch (B) 啟動(B) + Launch (C) 啟動(C) + Launch (D) 啟動(D) + Launch (E) 啟動(E) + Launch (F) 啟動(F) + Print Screen 列å°èž¢å¹• + Page Up å¾€ä¸Šä¸€é  + Page Down å¾€ä¸‹ä¸€é  + Caps Lock 大寫鎖定 + Num Lock 數字鎖定 + Number Lock 數字鎖定 + Scroll Lock æ²è»¸éŽ–定 + Insert æ’å…¥ + Delete 刪除 + Escape Escape + System Request 系統è¦æ±‚ SysRq + Select é¸æ“‡ + Yes 是 + No å¦ + Context1 內文1 + Context2 內文2 + Context3 內文3 + Context4 內文4 + Call å‘¼å« + Hangup 掛斷 + Flip å轉 + + Ctrl Ctrl + + Shift Shift + + Alt Alt + + Meta Meta + + + + F%1 F%1 + Home Page é¦–é  @@ -4460,23 +5466,27 @@ Please choose a different file name. QSlider - + Page left é é¢å·¦æ–¹ + Page up é é¢ä¸Šæ–¹ + Position ä½ç½® + Page right é é¢å³æ–¹ + Page down é é¢ä¸‹æ–¹ @@ -4484,54 +5494,67 @@ Please choose a different file name. QSocks5SocketEngine + Connection to proxy refused 代ç†ä¼ºæœå™¨é€£ç·šè¢«æ‹’ + Connection to proxy closed prematurely 代ç†ä¼ºæœå™¨é€£ç·šå·²ä¸æ­£å¸¸é—œé–‰ + Proxy host not found 找ä¸åˆ°ä»£ç†ä¼ºæœå™¨ + Connection to proxy timed out 代ç†ä¼ºæœå™¨é€£ç·šé€¾æ™‚ + Proxy authentication failed 代ç†ä¼ºæœå™¨èªè­‰å¤±æ•— + Proxy authentication failed: %1 代ç†ä¼ºæœå™¨èªè­‰å¤±æ•—:%1 + SOCKS version 5 protocol error SOCKS 5 çš„å”定錯誤 + General SOCKSv5 server failure 一般的 SOCKSv5 伺æœå™¨éŒ¯èª¤ + Connection not allowed by SOCKSv5 server 連線未被 SOCKSv5 伺æœå™¨å…許 + TTL expired TTL 逾時 + SOCKSv5 command not supported SOCKSv5 æŒ‡ä»¤æœªè¢«æ”¯æ´ + Address type not supported ä½å€åž‹æ…‹æœªè¢«æ”¯æ´ + Unknown SOCKSv5 proxy error code 0x%1 未知的 SOCKSv5 代ç†ä¼ºæœå™¨éŒ¯èª¤ä»£ç¢¼ 0x%1 @@ -4540,6 +5563,7 @@ Please choose a different file name. 連接到 socks 伺æœå™¨æ™‚發生 socks5 逾時錯誤 + Network operation timed out 網路æ“作逾時 @@ -4547,10 +5571,12 @@ Please choose a different file name. QSpinBox + More 更多 + Less 較少 @@ -4558,43 +5584,56 @@ Please choose a different file name. QSql - + Delete 刪除 + Delete this record? è¦åˆªé™¤é€™ç­†ç´€éŒ„嗎? + + + Yes 是 + + + No å¦ + Insert æ’å…¥ + Update æ›´æ–° + Save edits? è¦å„²å­˜ç·¨è¼¯éŽçš„內容嗎? + Cancel å–消 + Confirm ç¢ºèª + Cancel your edits? è¦å–消編輯嗎? @@ -4602,43 +5641,52 @@ Please choose a different file name. QSslSocket - + Unable to write data: %1 無法寫入資料:%1 + Error while reading: %1 讀å–時發生錯誤:%1 + Error during SSL handshake: %1 SSL åŒæ­¥æ™‚發生錯誤:%1 + Error creating SSL context (%1) 建立 SSL 內文時發生錯誤(%1) + Invalid or empty cipher list (%1) ä¸åˆæ³•æˆ–空白的加密清單(%1) + Error creating SSL session, %1 建立 SSL 工作階段時發生錯誤:%1 + Error creating SSL session: %1 建立 SSL 工作階段時發生錯誤:%1 + Cannot provide a certificate with no key, %1 沒有金鑰無法æ供憑證:%1 + Error loading local certificate, %1 載入本地憑證時發生錯誤:%1 + Error loading private key, %1 載入ç§é‘°æ™‚發生錯誤:%1 @@ -4647,6 +5695,7 @@ Please choose a different file name. ç§é‘°èˆ‡å…¬é‘°ä¸ç¬¦ï¼š%1 + Private key does not certificate public key, %1 ç§å¯†é‡‘鑰無法èªè­‰å…¬é–‹é‡‘鑰,%1 @@ -4654,25 +5703,30 @@ Please choose a different file name. QSystemSemaphore - + + %1: out of resources %1:資æºä¸è¶³ - + + %1: permission denied %1:存å–被拒 + %1: already exists %1:已存在 + %1: does not exist %1:ä¸å­˜åœ¨ - + + %1: unknown error %2 %1:未知的錯誤 %2 @@ -4680,11 +5734,12 @@ Please choose a different file name. QTDSDriver - + Unable to open connection 無法開啟連線 + Unable to use database 無法使用資料庫 @@ -4692,10 +5747,12 @@ Please choose a different file name. QTabBar + Scroll Left 往左æ²è»¸ + Scroll Right å¾€å³æ²è»¸ @@ -4707,7 +5764,7 @@ Please choose a different file name. 未支æ´çš„ socket æ“作 - + Operation on socket is not supported Socket çš„æ“ä½œæœªè¢«æ”¯æ´ @@ -4715,35 +5772,42 @@ Please choose a different file name. QTextControl - + &Undo 復原(&U) + &Redo é‡åš(&R) + Cu&t 剪下(&T) + &Copy 複製(&C) + Copy &Link Location 複製連çµä½å€(&L) + &Paste 貼上(&P) + Delete 刪除 + Select All 全部é¸æ“‡ @@ -4751,10 +5815,14 @@ Please choose a different file name. QToolButton + + Press 按下 + + Open é–‹å•Ÿ @@ -4762,7 +5830,7 @@ Please choose a different file name. QUdpSocket - + This platform does not support IPv6 此平å°ä¸æ”¯æ´ IPv6 @@ -4770,11 +5838,12 @@ Please choose a different file name. QUndoGroup - + Undo 復原 + Redo é‡åš @@ -4782,7 +5851,7 @@ Please choose a different file name. QUndoModel - + <empty> <空白> @@ -4790,11 +5859,12 @@ Please choose a different file name. QUndoStack - + Undo 復原 + Redo é‡åš @@ -4802,47 +5872,57 @@ Please choose a different file name. QUnicodeControlCharacterMenu - + LRM Left-to-right mark LRM 左到å³æ¨™è¨˜ + RLM Right-to-left mark RLM å³åˆ°å·¦æ¨™è¨˜ + ZWJ Zero width joiner ZWJ 零寬度連接器 + ZWNJ Zero width non-joiner ZWNJ 零寬度éžé€£æŽ¥å™¨ + ZWSP Zero width space ZWSP 零寬度空白 + LRE Start of left-to-right embedding LRE 左到å³åµŒå…¥èµ·é»ž + RLE Start of right-to-left embedding RLE å³åˆ°å·¦åµŒå…¥èµ·é»ž + LRO Start of left-to-right override LRO 左到å³è¦†å¯«èµ·é»ž + RLO Start of right-to-left override RLO å³åˆ°å·¦è¦†å¯«èµ·é»ž + PDF Pop directional formatting PDF 彈出方å‘æ ¼å¼ + Insert Unicode control character æ’å…¥è¬åœ‹ç¢¼æŽ§åˆ¶å­—å…ƒ @@ -4850,27 +5930,32 @@ Please choose a different file name. QWebFrame - + Request cancelled 請求已å–消 + Request blocked 請求已被阻擋 + Cannot show URL ç„¡æ³•é¡¯ç¤ºç¶²å€ + Frame load interruped by policy change å½±åƒè¼‰å…¥å› æ”¿ç­–變更而中斷 + Cannot show mimetype 無法顯示 MIME åž‹æ…‹ + File does not exist 檔案ä¸å­˜åœ¨ @@ -4878,316 +5963,376 @@ Please choose a different file name. QWebPage - + Bad HTTP request ä¸è‰¯çš„ HTTP 請求 - + Submit default label for Submit buttons in forms on web pages æ交 + Submit Submit (input element) alt text for <input> elements with no alt, title, or value æ交 + Reset default label for Reset buttons in forms on web pages é‡ç½® + This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' 這是å¯æœå°‹çš„索引。請輸入關éµå­—:  + Choose File title for file button used in HTML forms é¸æ“‡æª”案 + No file selected text to display in file button used in HTML forms when no file is selected 未é¸å–任何檔案 + Open in New Window Open in New Window context menu item 在新視窗開啟 + Save Link... Download Linked File context menu item 儲存連çµ... + Copy Link Copy Link context menu item è¤‡è£½é€£çµ + Open Image Open Image in New Window context menu item é–‹å•Ÿå½±åƒ + Save Image Download Image context menu item å„²å­˜å½±åƒ + Copy Image Copy Link context menu item è¤‡è£½å½±åƒ + Open Frame Open Frame in New Window context menu item 開啟框架 + Copy Copy context menu item 複製 + Go Back Back context menu item 往回 + Go Forward Forward context menu item å¾€å‰ + Stop Stop context menu item åœæ­¢ + Reload Reload context menu item é‡æ–°è¼‰å…¥ + Cut Cut context menu item 剪下 + Paste Paste context menu item 貼上 + No Guesses Found No Guesses Found context menu item 找ä¸åˆ°å¯èƒ½çš„內容 + Ignore Ignore Spelling context menu item 忽略 + Add To Dictionary Learn Spelling context menu item 新增到字典 + Search The Web Search The Web context menu item æœå°‹ç«™å° + Look Up In Dictionary Look Up in Dictionary context menu item 在字典裡æœå°‹ + Open Link Open Link context menu item é–‹å•Ÿé€£çµ + Ignore Ignore Grammar context menu item 忽略 + Spelling Spelling and Grammar context sub-menu item 拼字 + Show Spelling and Grammar menu item title 顯示拼字與文法 + Hide Spelling and Grammar menu item title éš±è—拼字與文法 + Check Spelling Check spelling context menu item 檢查拼字 + Check Spelling While Typing Check spelling while typing context menu item 打字時立å³æª¢æŸ¥æ‹¼å­— + Check Grammar With Spelling Check grammar with spelling context menu item 檢查拼字與文法 + Fonts Font context sub-menu item å­—åž‹ + Bold Bold context menu item ç²—é«” + Italic Italic context menu item 斜體 + Underline Underline context menu item 底線 + Outline Outline context menu item 外框線 + Direction Writing direction context sub-menu item æ–¹å‘ + Text Direction Text direction context sub-menu item æ–‡å­—æ–¹å‘ + Default Default writing direction context menu item é è¨­ + LTR Left to Right context menu item å·¦åˆ°å³ + RTL Right to Left context menu item å³åˆ°å·¦ + Inspect Inspect Element context menu item 查驗 + No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed 沒有最近的æœå°‹ + Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title 最近的æœå°‹ + Clear recent searches menu item in Recent Searches menu that empties menu's contents 清除最近的æœå°‹ + Unknown Unknown filesize FTP directory listing item 未知 + %1 (%2x%3 pixels) Title string for images %1(%2x%3 åƒç´ ï¼‰ - + Web Inspector - %2 網站查驗器─%2 - + Scroll here 在此æ²è»¸ + Left edge 左邊緣 + Top 頂端 + Right edge å³é‚Šç·£ + Bottom 底端 + Page left é é¢å·¦æ–¹ + Page up é é¢ä¸Šæ–¹ + Page right é é¢å³æ–¹ + Page down é é¢ä¸‹æ–¹ + Scroll left 往左æ²è»¸ + Scroll up 往上æ²è»¸ + Scroll right å¾€å³æ²è»¸ + Scroll down 往下æ²è»¸ - + %n file(s) number of chosen file @@ -5195,127 +6340,170 @@ Please choose a different file name. - + JavaScript Alert - %1 JavaScript 警告 ─ %1 + JavaScript Confirm - %1 JavaScript ç¢ºèª â”€ %1 + JavaScript Prompt - %1 JavaScript æ示 ─ %1 + Move the cursor to the next character 移動游標到下一個字元 + Move the cursor to the previous character 移動游標到å‰ä¸€å€‹å­—å…ƒ + Move the cursor to the next word 移動游標到下一個單字 + Move the cursor to the previous word 移動游標到å‰ä¸€å€‹å–®å­— + Move the cursor to the next line 移動游標到下一行 + Move the cursor to the previous line 移動游標到å‰ä¸€è¡Œ + Move the cursor to the start of the line 移動游標到這一行的起頭 + Move the cursor to the end of the line 移動游標到這一行的çµå°¾ + Move the cursor to the start of the block 移動游標到這一個å€å¡Šçš„èµ·é ­ + Move the cursor to the end of the block 移動游標到這一個å€å¡Šçš„çµå°¾ + Move the cursor to the start of the document 移動游標到這一個文件的起頭 + Move the cursor to the end of the document 移動游標到這一個文件的çµå°¾ + + Select all + + + + Select to the next character é¸æ“‡åˆ°ä¸‹ä¸€å€‹å­—å…ƒ + Select to the previous character é¸æ“‡åˆ°å‰ä¸€å€‹å­—å…ƒ + Select to the next word é¸æ“‡åˆ°ä¸‹ä¸€å€‹å–®å­— + Select to the previous word é¸æ“‡åˆ°å‰ä¸€å€‹å–®å­— + Select to the next line é¸æ“‡åˆ°ä¸‹ä¸€è¡Œ + Select to the previous line é¸æ“‡åˆ°å‰ä¸€è¡Œ + Select to the start of the line é¸æ“‡åˆ°é€™ä¸€è¡Œçš„èµ·é ­ + Select to the end of the line é¸æ“‡åˆ°é€™ä¸€è¡Œçš„çµå°¾ + Select to the start of the block é¸æ“‡åˆ°é€™ä¸€å€‹å€å¡Šçš„èµ·é ­ + Select to the end of the block é¸æ“‡åˆ°é€™ä¸€å€‹å€å¡Šçš„çµå°¾ + Select to the start of the document é¸æ“‡åˆ°é€™ä¸€å€‹æ–‡ä»¶çš„èµ·é ­ + Select to the end of the document é¸æ“‡åˆ°é€™ä¸€å€‹æ–‡ä»¶çš„çµå°¾ + Delete to the start of the word 刪除到此單字的起頭 + Delete to the end of the word 刪除到此單字的çµå°¾ + + + Insert a new paragraph + + + + + Insert a new line + + QWhatsThisAction - + What's This? 這是什麼? @@ -5323,7 +6511,7 @@ Please choose a different file name. QWidget - + * + @@ -5331,19 +6519,22 @@ Please choose a different file name. QWizard - + Go Back 往回 + Continue 繼續 + Commit æ交 + Done å®Œæˆ @@ -5352,30 +6543,37 @@ Please choose a different file name. 離開 + Help 說明 + < &Back <返回(&B) + &Finish 完æˆ(&F) + Cancel å–消 + &Help 說明(&H) + &Next 下一個(&N) + &Next > 下一個(&N)> @@ -5383,55 +6581,69 @@ Please choose a different file name. QWorkspace - + &Restore 回復(&R) + &Move 移動(&M) + &Size 大å°(&S) + Mi&nimize 最å°åŒ–(&N) + Ma&ximize 最大化(&X) + &Close 關閉(&C) + Stay on &Top 留在頂端(&T) + + Sh&ade é®è”½(&A) + + %1 - [%2] %1 - [%2] + Minimize 最å°åŒ– + Restore Down å‘下æ¢å¾© + Close 關閉 + &Unshade å–消é®è”½(&U) @@ -5439,95 +6651,117 @@ Please choose a different file name. QXml - + no error occurred 沒有發生錯誤 + error triggered by consumer 用戶觸發的錯誤 + unexpected end of file 未é æœŸé‡åˆ°æª”案çµå°¾ + more than one document type definition 定義了一個以上的文件型態 + error occurred while parsing element 剖æžå…ƒç´ æ™‚發生錯誤 + tag mismatch 標籤ä¸å°ç¨± + error occurred while parsing content 剖æžå…§å®¹æ™‚發生錯誤 + unexpected character éžé æœŸçš„å­—å…ƒ + invalid name for processing instruction 處ç†æŒ‡ä»¤æ™‚çš„ä¸åˆæ³•å稱 + version expected while reading the XML declaration è®€å– XML 宣告時應有版本號 + wrong value for standalone declaration ç¨ç«‹å®£å‘Šæ™‚的值錯誤 + encoding declaration or standalone declaration expected while reading the XML declaration è®€å– XML 宣告時應有編碼宣告或ç¨ç«‹å®£å‘Š + standalone declaration expected while reading the XML declaration è®€å– XML 宣告時應有讀立宣告 + error occurred while parsing document type definition 剖æžæ–‡ä»¶åž‹æ…‹å®šç¾©æ™‚發生錯誤 + letter is expected é æœŸæ‡‰ç‚ºå­—æ¯ + error occurred while parsing comment 剖æžè¨»è§£æ™‚發生錯誤 + error occurred while parsing reference 剖æžåƒè€ƒæ™‚發生錯誤 + internal general entity reference not allowed in DTD 在 DTD 中ä¸å…許內部產生的實體åƒè€ƒ + external parsed general entity reference not allowed in attribute value 在屬性值中ä¸å…許使用外部剖æžçš„實體åƒè€ƒ + external parsed general entity reference not allowed in DTD 在 DTD 中ä¸å…許使用外部剖æžçš„實體åƒè€ƒ + unparsed entity reference in wrong context 在錯誤的內文中有未剖æžçš„實體åƒè€ƒ + recursive entities éžè¿´çš„實體 + error in the text declaration of an external entity 在外部實體中的文字宣告有錯誤 @@ -5535,47 +6769,58 @@ Please choose a different file name. QXmlStream - + + Extra content at end of document. 文件尾端有多餘的內容。 + Invalid entity value. ä¸åˆæ³•çš„實體值 + Invalid XML character. ä¸åˆæ³•çš„ XML 字元。 + Sequence ']]>' not allowed in content. 在內文中ä¸å…許有åºåˆ— "]]>"。 + Namespace prefix '%1' not declared 命å空間的å‰ç½®å­—串 %1 未宣告 + Attribute redefined. 屬性é‡å®šç¾©ã€‚ + Unexpected character '%1' in public id literal. 在公開代碼字元中é‡åˆ°éžé æœŸçš„å­—å…ƒ %1。 + Invalid XML version string. ä¸åˆæ³•çš„ XML 版本字串。 + Unsupported XML version. 未支æ´çš„ XML 版本。 + %1 is an invalid encoding name. %1 為ä¸åˆæ³•çš„編碼å稱。 + Encoding %1 is unsupported 編碼 %1 ä¸æ”¯æ´ã€‚ @@ -5584,100 +6829,128 @@ Please choose a different file name. ä¸åˆæ³•çš„ XML 編碼å稱。 + Standalone accepts only yes or no. ç¨ç«‹å¯¦é«”åªæŽ¥å— yes 或 no。 + Invalid attribute in XML declaration. XML 宣告中有ä¸åˆæ³•çš„屬性。 + Premature end of document. 文件çµå°¾ä¸æ­£ç¢ºã€‚ + Invalid document. ä¸åˆæ³•çš„文件。 + Expected é æœŸæ‡‰ç‚º + , but got ' ,但是看到的是 + Unexpected ' éžé æœŸ + Expected character data. é æœŸçš„字元資料。 + Recursive entity detected. åµæ¸¬åˆ°éžè¿´å¯¦é«”。 + Start tag expected. é æœŸæ‡‰æœ‰é–‹å§‹æ¨™ç±¤ã€‚ + XML declaration not at start of document. XML 宣告沒有在文件開始處。 + NDATA in parameter entity declaration. 在åƒæ•¸å¯¦é«”宣告有 NDATA。 + %1 is an invalid processing instruction name. %1 是ä¸åˆæ³•çš„處ç†æŒ‡ä»¤å稱。 + Invalid processing instruction name. ä¸åˆæ³•çš„處ç†æŒ‡ä»¤å稱。 + + + + Illegal namespace declaration. ä¸åˆæ³•çš„命å空間宣告。 - + Invalid XML name. ä¸åˆæ³•çš„ XML å稱。 + Opening and ending tag mismatch. 開啟與çµæŸçš„標籤ä¸å°ç¨±ã€‚ + Reference to unparsed entity '%1'. åƒè€ƒåˆ°æœªå‰–æžçš„實體 %1。 + + + Entity '%1' not declared. 實體 %1 未宣告。 + Reference to external entity '%1' in attribute value. 在屬性值中åƒè€ƒåˆ°å¤–部實體 %1。 + Invalid character reference. ä¸åˆæ³•çš„å­—å…ƒåƒè€ƒã€‚ + + Encountered incorrectly encoded content. é‡åˆ°ä¸æ­£ç¢ºçš„編碼內容。 + The standalone pseudo attribute must appear after the encoding. ç¨ç«‹çš„虛擬屬性必須在編碼之後出ç¾ã€‚ - + %1 is an invalid PUBLIC identifier. %1 為ä¸åˆæ³•çš„ PUBLIC 識別å­ã€‚ @@ -5685,21 +6958,22 @@ Please choose a different file name. QtXmlPatterns - + An %1-attribute with value %2 has already been declared. 已宣告屬性 %1 的值為 %2。 + An %1-attribute must have a valid %2 as value, which %3 isn't. 屬性 %1 必須以åˆæ³•çš„ %2 為值,而 %3 是ä¸åˆæ³•çš„。 - + Network timeout. 網路逾時。 - + Element %1 can't be serialized because it appears outside the document element. 元素 %1 無法åºåˆ—化,因為似乎是在文件元素之外。 @@ -5708,425 +6982,482 @@ Please choose a different file name. 屬性元素 %1 無法åºåˆ—化,因為似乎是在頂層。 - + Year %1 is invalid because it begins with %2. 年份 %1 ä¸åˆæ³•ï¼Œå› ç‚ºæ˜¯å¾ž %2 開始的。 + Day %1 is outside the range %2..%3. 日期 %1 已超出 %2 到 %3 的範åœã€‚ + Month %1 is outside the range %2..%3. 月份 %1 已超出 %2 到 %3 的範åœã€‚ + Overflow: Can't represent date %1. 溢ä½ï¼šç„¡æ³•è¡¨ç¤ºæ—¥æœŸ %1。 + Day %1 is invalid for month %2. 月份 %2 中沒有日期 %1。 + Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; 時間 24:%1:%2.%3 ä¸åˆæ³•ã€‚å°æ™‚為 24 則分ã€ç§’與毫秒都必須是 0。 + Time %1:%2:%3.%4 is invalid. 時間 %1:%2:%3.%4 ä¸åˆæ³•ã€‚ + Overflow: Date can't be represented. 溢ä½ï¼šç„¡æ³•è¡¨ç¤ºæ—¥æœŸã€‚ + + At least one component must be present. 必須表é”至少一個組件。 + At least one time component must appear after the %1-delimiter. 在分隔符 %1 後必須至少有一個時間組件。 - + No operand in an integer division, %1, can be %2. 整數除法沒有é‹ä½œå°è±¡ï¼Œ%1,å¯ä»¥æ˜¯ %2 + The first operand in an integer division, %1, cannot be infinity (%2). 整數除法的第一個é‹ç®—å°è±¡ %1 ä¸èƒ½æ˜¯ç„¡é™å¤§ï¼ˆ%2)。 + The second operand in a division, %1, cannot be zero (%2). 整數除法的第二個é‹ç®—å°è±¡ %1 ä¸èƒ½æ˜¯é›¶ï¼ˆ%2)。 - + %1 is not a valid value of type %2. %1 ä¸æ˜¯åˆæ³•çš„ %2 型態的值。 - + When casting to %1 from %2, the source value cannot be %3. 從 %2 轉æ›åž‹æ…‹ç‚º %1 的時候,來æºæ•¸å€¼ä¸èƒ½æ˜¯ %3。 - + Integer division (%1) by zero (%2) is undefined. 整數除法 %1 除以零(%2)的行為未定義。 + Division (%1) by zero (%2) is undefined. 除法 %1 除以零(%2)的行為未定義。 + Modulus division (%1) by zero (%2) is undefined. 餘數除法 %1 除以零(%2)的行為未定義。 + + Dividing a value of type %1 by %2 (not-a-number) is not allowed. 將型態 %1 除以 %2(éžæ•¸å€¼ï¼‰æ˜¯ä¸å…許的。 + Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. 將型態 %1 除以 %2 或 %3(正或負零)是ä¸å…許的。 + Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. 將型態 %1 乘以 %2 或 %3(正或負無é™å¤§ï¼‰æ˜¯ä¸å…許的。 - + A value of type %1 cannot have an Effective Boolean Value. åž‹æ…‹ %1 ä¸èƒ½æœ‰å¯¦éš›å¸ƒæž—值。 - + Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. 實際布林值(Effective Boolean)無法用在兩個或兩個以上的原數值(atomic value)的計算。 - + Value %1 of type %2 exceeds maximum (%3). åž‹æ…‹ %2 的數值 %1 已超éŽæœ€å¤§å€¼ï¼ˆ%3)。 + Value %1 of type %2 is below minimum (%3). åž‹æ…‹ %2 的數值 %1 已低éŽæœ€å°å€¼ï¼ˆ%3)。 - + A value of type %1 must contain an even number of digits. The value %2 does not. åž‹æ…‹ %1 的值必須包å«å¶æ•¸å€‹æ•¸å­—。數值 %2 未符åˆæ­¤æ¢ä»¶ã€‚ + %1 is not valid as a value of type %2. %1 ä¸æ˜¯åˆæ³•çš„ %2 型態的值。 - + Operator %1 cannot be used on type %2. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2。 + Operator %1 cannot be used on atomic values of type %2 and %3. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2 與 %3 的原數值。 - + The namespace URI in the name for a computed attribute cannot be %1. 在已計算屬性的å稱的命å空間網å€ä¸èƒ½æ˜¯ %1。 + The name for a computed attribute cannot have the namespace URI %1 with the local name %2. 在已計算屬性的å稱ä¸èƒ½åŒæ™‚有命åç©ºé–“ç¶²å€ %1 與本地端å稱 %2。 - + Type error in cast, expected %1, received %2. 轉æ›åž‹æ…‹éŒ¯èª¤ï¼Œæ‡‰ç‚º %1 但接收到 %2。 + When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. 轉æ›ç‚ºåž‹æ…‹ %1 或其è¡ç”Ÿåž‹æ…‹æ™‚,來æºæ•¸å€¼å¿…須是相åŒåž‹æ…‹ï¼Œæˆ–者是字串。型態 %2 是ä¸è¢«å…許的。 - + No casting is possible with %1 as the target type. ä¸èƒ½è½‰æ›åˆ° %1 型態。 + It is not possible to cast from %1 to %2. ä¸èƒ½å¾ž %1 轉æ›åˆ° %2。 + Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated. 無法轉æ›åˆ° %1 因為它是一個抽象型態,ä¸èƒ½è¢«å¯¦é«”化。 + It's not possible to cast the value %1 of type %2 to %3 無法轉æ›åž‹æ…‹ %2 的數值 %1 到 %3 + Failure when casting from %1 to %2: %3 從 %1 轉æ›åˆ° %2 時失敗:%3 - + A comment cannot contain %1 註解ä¸èƒ½åŒ…å« %1 + A comment cannot end with a %1. 註解ä¸èƒ½ä»¥ %1 åšçµå°¾ - + No comparisons can be done involving the type %1. 包å«åž‹æ…‹ %1 時ä¸èƒ½åšæ¯”較。 + Operator %1 is not available between atomic values of type %2 and %3. æ“作元 %1 ä¸èƒ½ç”¨æ–¼åž‹æ…‹ %2 與 %3 的原數值。 - + An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. 屬性點ä¸èƒ½åšç‚ºæ–‡ä»¶é»žçš„å­ç¯€é»žã€‚因此,屬性 %1 çš„ä½ç½®ä¸åˆé©ã€‚ - + A library module cannot be evaluated directly. It must be imported from a main module. ä¸èƒ½ç›´æŽ¥è¨ˆç®—函å¼æ¨¡çµ„。必須è¦å¾žä¸»æ¨¡çµ„匯入。 + No template by name %1 exists. 沒有å為 %1 的樣本存在。 - + A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. åž‹æ…‹ %1 的值ä¸èƒ½æ˜¯è¬‚詞(predicate)。謂詞必須是數值型態,或是實際布林值。 + A positional predicate must evaluate to a single numeric value. ä½ç½®è¬‚詞必須能計算出單一的數值。 - + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. 處ç†æŒ‡ä»¤çš„目標å稱ä¸èƒ½æ˜¯ä»»ä½•å¤§å°å¯«çµ„åˆçš„ %1。因此,%2 是ä¸åˆæ³•çš„值。 + %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„處ç†æŒ‡ä»¤çš„目標å稱。必須是 %2 的值,例如 %3。 - + The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. 路徑的最後一步必須是節點或原值,而ä¸èƒ½åœ¨å…©è€…之間。 - + The data of a processing instruction cannot contain the string %1 處ç†æŒ‡ä»¤çš„資料ä¸èƒ½åŒ…å«å­—串 %1 - + No namespace binding exists for the prefix %1 å‰ç½®å­—串 %1 沒有çµåˆå‘½å空間 - + No namespace binding exists for the prefix %1 in %2 在 %2 çš„å‰ç½®å­—串 %1 沒有çµåˆå‘½å空間 - + + %1 is an invalid %2 %1 是ä¸åˆæ³•çš„ %2 - + %1 takes at most %n argument(s). %2 is therefore invalid. %1 最多åªèƒ½æœ‰ %n 個åƒæ•¸ï¼Œå› æ­¤ %2 是ä¸åˆæ³•çš„。 + %1 requires at least %n argument(s). %2 is therefore invalid. %1 è‡³å°‘éœ€è¦ %n 個åƒæ•¸ï¼Œå› æ­¤ %2 是ä¸åˆæ³•çš„。 - + The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是數值型態,xs.yearMonthDuration 或 xs.dayTimeDuration。 + The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是 %3ã€%4 或 %5 型態。 + The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. å‘¼å« %1 的第二個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。必須是 %3ã€%4 或 %5 型態。 - + %1 is not a valid XML 1.0 character. %1 ä¸æ˜¯åˆæ³•çš„ XML 1.0 字元。 - + The first argument to %1 cannot be of type %2. å‘¼å« %1 的第一個åƒæ•¸ä¸èƒ½æ˜¯ %2 型態。 - + If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. 如果兩個值都有å€åŸŸä½ç§»ï¼Œå‰‡å¿…須是相åŒçš„å€åŸŸä½ç§»ã€‚%1 與 %2 並ä¸ç›¸åŒã€‚ - + %1 was called. %1 已被呼å«ã€‚ - + %1 must be followed by %2 or %3, not at the end of the replacement string. %1 後é¢å¿…須跟著 %2 或 %3,而éžå–代字串的çµå°¾ã€‚ + In the replacement string, %1 must be followed by at least one digit when not escaped. 在å–代字串中,在未脫逸的情形下 %1 必須至少跟著一ä½æ•¸å­—。 + In the replacement string, %1 can only be used to escape itself or %2, not %3 在å–代字串中,%1 åªèƒ½ç”¨æ–¼è‡ªèº«æˆ– %2 çš„è„«é€¸ï¼Œè€Œéž %3。 - + %1 matches newline characters %1 符åˆäº†æ›è¡Œå­—å…ƒ + %1 and %2 match the start and end of a line. %1 與 %2 符åˆäº†ä¸€è¡Œçš„開始與çµå°¾ã€‚ + Matches are case insensitive 比å°ç‚ºå€åˆ†å¤§å°å¯« + Whitespace characters are removed, except when they appear in character classes 空白字元已移除,除éžå®ƒå€‘出ç¾åœ¨å­—元類別 + %1 is an invalid regular expression pattern: %2 %1 是ä¸åˆæ³•çš„æ­£è¦è¡¨ç¤ºå¼æ¨£å¼ï¼š%2 + %1 is an invalid flag for regular expressions. Valid flags are: %1 是正è¦è¡¨ç¤ºå¼ä¸­ä¸åˆæ³•çš„旗標。åˆæ³•çš„旗標有: - + If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. 如果第一個åƒæ•¸æ˜¯ç©ºåºåˆ—,或是長度為 0 的字串(沒有命å空間),則無法指定å‰ç½®å­—串。但是您指定了 %1。 - + It will not be possible to retrieve %1. 無法å–å¾— %1。 - + The root node of the second argument to function %1 must be a document node. %2 is not a document node. å‡½å¼ %1 的第二個åƒæ•¸çš„根節點必須是文件節點。%2 ä¸æ˜¯æ–‡ä»¶ç¯€é»žã€‚ - + The default collection is undefined é è¨­çš„收è—未定義 + %1 cannot be retrieved %1 無法å–å¾— - + The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). 未支æ´å¸¸æ…‹åŒ–表單 %1。支æ´çš„表單有 %2ã€%3ã€%4ã€%5,以åŠç„¡ï¼ˆä¹Ÿå°±æ˜¯ç©ºå­—串,未常態化)。 - + A zone offset must be in the range %1..%2 inclusive. %3 is out of range. å€åŸŸä½ç§»å¿…須是在 %1 到 %2 範åœä¹‹å…§ã€‚%3 已超出範åœã€‚ + %1 is not a whole number of minutes. %1 ä¸æ˜¯åˆ†é˜çš„數值。 - + Required cardinality is %1; got cardinality %2. 需è¦çš„基數為 %1;得到的是 %2。 - + The item %1 did not match the required type %2. é …ç›® %1 未符åˆéœ€è¦çš„åž‹æ…‹ %2。 + + %1 is an unknown schema type. %1 是未知的機制型態。 + Only one %1 declaration can occur in the query prolog. åªæœ‰ä¸€å€‹ %1 宣告å¯ä»¥åœ¨æŸ¥è©¢ä¸­ã€‚ + The initialization of variable %1 depends on itself 變數 %1 çš„åˆå§‹åŒ–與自身相ä¾ã€‚ + No variable by name %1 exists 沒有å為 %1 的變數存在 - + The variable %1 is unused 變數 %1 未使用 - + Version %1 is not supported. The supported XQuery version is 1.0. 版本 %1 未支æ´ã€‚支æ´çš„ XQuery 版本為 1.0。 + The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. 編碼 %1 ä¸åˆæ³•ã€‚å¿…é ˆåªèƒ½åŒ…å«æ‹‰ä¸å­—元,ä¸å«ç©ºç™½ï¼Œä¸¦ä¸”è¦ç¬¦åˆæ­£è¦è¡¨ç¤ºå¼ %2。 + No function with signature %1 is available 沒有簽章為 %1 的函å¼å¯ä½¿ç”¨ + + A default namespace declaration must occur before function, variable, and option declarations. é è¨­çš„命å空間宣告必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + Namespace declarations must occur before function, variable, and option declarations. 命å空間宣告必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + Module imports must occur before function, variable, and option declarations. 模組匯入必須在函å¼ã€è®Šæ•¸èˆ‡é¸é …宣告之å‰ã€‚ + It is not possible to redeclare prefix %1. 無法é‡å®£å‘Šå‰ç½®å­—串 %1。 @@ -6135,22 +7466,27 @@ Please choose a different file name. åªæœ‰å‰ç½®å­—串 %1 å¯ä»¥è¢«å®£å‘Šèˆ‡å‘½å空間 %2 çµåˆã€‚它é è¨­å·²ç¶“與å‰ç½®å­—串 %1 çµåˆã€‚ + Prefix %1 is already declared in the prolog. å‰ç½®å­—串 %1 已在 prolog 中宣告。 + The name of an option must have a prefix. There is no default namespace for options. é¸é …å稱必須有å‰ç½®å­—串。沒有é¸é …çš„é è¨­å‘½å空間。 + The Schema Import feature is not supported, and therefore %1 declarations cannot occur. 機制匯入功能未支æ´ï¼Œå› æ­¤æœ‰ %1 個宣告無法é”æˆã€‚ + The target namespace of a %1 cannot be empty. %1 的目標命å空間ä¸èƒ½æ˜¯ç©ºçš„。 + The module import feature is not supported 模組匯入功能未支æ´ã€‚ @@ -6159,6 +7495,7 @@ Please choose a different file name. å稱為 %1 的變數已經在 prolog 中宣告。 + No value is available for the external variable by name %1. å為 %1 的外部變數沒有å¯ç”¨çš„值。 @@ -6167,162 +7504,202 @@ Please choose a different file name. 使用者定義的函å¼çš„命å空間ä¸èƒ½æ˜¯ç©ºçš„(請試試使用é å®šç¾©å‰ç½®å­—串 %1) + A construct was encountered which only is allowed in XQuery. é‡åˆ°äº†å»ºæ§‹ï¼Œå¯¦éš›ä¸Šåªèƒ½å…許在 XQuery 內。 + A template by name %1 has already been declared. å為 %1 的屬性已被宣告。 + The keyword %1 cannot occur with any other mode name. é—œéµå­— %1 ä¸èƒ½èˆ‡ä»»ä½•å…¶å®ƒæ¨¡å¼å稱一起存在。 + The value of attribute %1 must of type %2, which %3 isn't. 屬性 %1 的值必須為型態 %2,但 %3 ä¸æ˜¯ã€‚ + The prefix %1 can not be bound. By default, it is already bound to the namespace %2. å‰ç½®å­—串 %1 ä¸èƒ½è¢«çµåˆã€‚é è¨­å®ƒå·²èˆ‡å‘½å空間 %2 çµåˆã€‚ + A variable by name %1 has already been declared. å為 %1 的變數已被宣告。 + A stylesheet function must have a prefixed name. 樣å¼è¡¨å‡½å¼å¿…須有å‰ç½®å稱。 + The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) 使用者定義函å¼çš„命å空間ä¸èƒ½ç‚ºç©ºç™½ï¼ˆè«‹è©¦è‘—用é å…ˆå®šç¾©çš„å‰ç½®å­—串 %1) + The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. 命å空間 %1 已被ä¿ç•™ï¼Œå› æ­¤ä½¿ç”¨è€…定義函å¼ä¸èƒ½ä½¿ç”¨å®ƒã€‚請試試é å®šç¾©å‰ç½®å­—串 %2。 + The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 在函å¼æ¨¡çµ„中的使用者定義函å¼çš„命å空間必須與模組的命å空間相åŒã€‚也就是,應該為 %1 而ä¸æ˜¯ %2。 + A function already exists with the signature %1. 已經有簽章為 %1 的函å¼å­˜åœ¨ã€‚ + No external functions are supported. All supported functions can be used directly, without first declaring them as external 未支æ´å¤–部函å¼ã€‚所有支æ´çš„å«å¼å¯ä»¥ç›´æŽ¥ä½¿ç”¨è€Œä¸éœ€è¦å…ˆå®£å‘Šç‚ºå¤–部函å¼ã€‚ + An argument by name %1 has already been declared. Every argument name must be unique. å稱為 %1 çš„åƒæ•¸å·²è¢«å®£å‘Šã€‚æ¯å€‹åƒæ•¸å稱必須唯一。 + When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. ç•¶å‡½å¼ %1 用於樣å¼æ¯”å°æ™‚,åƒæ•¸å¿…須是變數åƒè€ƒæˆ–字串。 + In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 的第一個åƒæ•¸å¿…須是字串,以便用於比å°ã€‚ + In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 的第一個åƒæ•¸å¿…須是文字或變數åƒè€ƒï¼Œä»¥ä¾¿ç”¨æ–¼æ¯”å°ã€‚ + In an XSL-T pattern, function %1 cannot have a third argument. 在 XSL-T 樣å¼å…§ï¼Œå‡½å¼ %1 çš„ä¸èƒ½æœ‰ç¬¬ä¸‰å€‹åƒæ•¸ã€‚ + In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. 在 XSL-T 樣å¼å…§ï¼Œåªæœ‰å‡½å¼ %1,%2 å¯ä»¥ç”¨æ–¼æ¯”å°ã€‚%3 ä¸è¡Œã€‚ + In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. 在 XSL-T 樣å¼å…§ï¼Œä¸èƒ½ç”¨ %1 軸,åªèƒ½ç”¨ %2 或 %3。 + %1 is an invalid template mode name. %1 ä¸æ˜¯åˆæ³•çš„樣本模å¼å稱。 + The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. 與 for 敘述çµåˆçš„變數å稱必須與ä½ç½®è®Šæ•¸ä¸åŒã€‚因此,有兩個å為 %1 的變數è¡çªäº†ã€‚ + The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. 未支æ´æ©Ÿåˆ¶ç¢ºèªåŠŸèƒ½ã€‚%1 敘述無法使用。 + None of the pragma expressions are supported. Therefore, a fallback expression must be present æœªæ”¯æ´ pragma 敘述。因次,必須有é è¨­çš„敘述。 + Each name of a template parameter must be unique; %1 is duplicated. æ¯å€‹æ¨£æœ¬åƒæ•¸çš„å稱必須唯一;%1 已經被使用。 + The %1-axis is unsupported in XQuery XQuery ä¸­æœªæ”¯æ´ %1 軸 + %1 is not a valid name for a processing-instruction. %1 ä¸æ˜¯è™•ç†æŒ‡ä»¤çš„åˆæ³•å稱。 + %1 is not a valid numeric literal. %1 ä¸æ˜¯åˆæ³•çš„數值。 + No function by name %1 is available. 沒有å為 %1 的函å¼ã€‚ + The namespace URI cannot be the empty string when binding to a prefix, %1. è¦èˆ‡å‰ç½®å­—串 %1 çµåˆçš„命å空間網å€ä¸èƒ½æ˜¯ç©ºå­—串。 + %1 is an invalid namespace URI. %1 是ä¸åˆæ³•çš„命å空間網å€ã€‚ + It is not possible to bind to the prefix %1 無法與å‰ç½®å­—串 %1 çµåˆã€‚ + Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). 命å空間 %1 åªèƒ½èˆ‡ %2 çµåˆï¼ˆä¹Ÿå°±æ˜¯èªªï¼Œè¦é å…ˆå®šç¾©ï¼‰ã€‚ + Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). å‰ç½®å­—串 %1 åªèƒ½èˆ‡ %2 çµåˆï¼ˆä¹Ÿå°±æ˜¯èªªï¼Œè¦é å…ˆå®šç¾©ï¼‰ã€‚ + Two namespace declaration attributes have the same name: %1. 有兩個命å空間宣告的屬性有相åŒçš„å稱:%1 + The namespace URI must be a constant and cannot use enclosed expressions. 命å空間網å€å¿…須是常數,並且ä¸èƒ½ä½¿ç”¨å°é–‰æ•˜è¿°ã€‚ + An attribute by name %1 has already appeared on this element. å為 %1 的屬性已出ç¾åœ¨æ­¤å…ƒç´ ã€‚ + A direct element constructor is not well-formed. %1 is ended with %2. 直接元素建構器沒有完整產生。%1 以 %2 çµæŸã€‚ + The name %1 does not refer to any schema type. å稱 %1 未指å‘任何機制型態。 + %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 是複數型態,無法轉æ›æˆè¤‡æ•¸åž‹æ…‹ã€‚然而,轉æ›ç‚ºåŽŸåž‹æ…‹ï¼Œå¦‚ %2 是å¯è¡Œçš„。 + %1 is not an atomic type. Casting is only possible to atomic types. %1 ä¸æ˜¯ä¸€å€‹åŽŸåž‹æ…‹ã€‚åªèƒ½è½‰æ›ç‚ºåŽŸåž‹æ…‹ã€‚ @@ -6331,260 +7708,313 @@ Please choose a different file name. %1 ä¸æ˜¯ä¸€å€‹åˆæ³•çš„處ç†æŒ‡ä»¤çš„å稱。因此å稱測試永é ä¸æœƒæˆåŠŸã€‚ + + %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 ä¸æ˜¯ç¯„åœå…§å±¬æ€§å®£å‘Šã€‚注æ„機制匯入功能未支æ´ã€‚ + The name of an extension expression must be in a namespace. 延伸敘述的å稱必須在命å空間內。 - + empty 空白 + zero or one 0 或 1 個 + exactly one 剛好一個 + one or more 一個以上 + zero or more 0 個以上 - + Required type is %1, but %2 was found. 需è¦çš„型態為 %1,但找到 %2。 + Promoting %1 to %2 may cause loss of precision. å°‡ %1 抬å‡ç‚º %2 å¯èƒ½æœƒå¤±åŽ»ç²¾ç¢ºåº¦ã€‚ + The focus is undefined. 焦點未定義。 - + It's not possible to add attributes after any other kind of node. ä¸èƒ½åœ¨ä»»ä½•å…¶å®ƒç¨®é¡žçš„節點後é¢åŠ å…¥å±¬æ€§ã€‚ + An attribute by name %1 has already been created. å為 %1 的屬性已被建立。 - + Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. åªæ”¯æ´ Unicode Codepoint Collation(%1)。%2 未支æ´ã€‚; - + Attribute %1 can't be serialized because it appears at the top level. 屬性元素 %1 無法åºåˆ—化,因為似乎是在頂層。 - + %1 is an unsupported encoding. %1 是個未被支æ´çš„編碼。 + %1 contains octets which are disallowed in the requested encoding %2. %1 包å«äº†åœ¨è¦æ±‚的編碼 %2 å…§ä¸å…許的八進ä½å€¼ã€‚ + The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. 在 %2 內的代碼點 %1(編碼 %3)是一個ä¸åˆæ³•çš„ XML 字元。 - + Ambiguous rule match. ä¸æ˜Žç¢ºçš„è¦å‰‡ç¬¦åˆã€‚ - In a namespace constructor, the value for a namespace value cannot be an empty string. - 在命å空間建構å­ä¸­ï¼Œå‘½å空間的值ä¸èƒ½æ˜¯ç©ºå­—串。 + 在命å空間建構å­ä¸­ï¼Œå‘½å空間的值ä¸èƒ½æ˜¯ç©ºå­—串。 + + + + In a namespace constructor, the value for a namespace cannot be an empty string. + + The prefix must be a valid %1, which %2 is not. å‰ç½®å­—串必須是åˆæ³•çš„ %1,但 %2 ä¸æ˜¯ã€‚ + The prefix %1 cannot be bound. å‰ç½®å­—串 %1 ä¸èƒ½è¢«çµåˆã€‚ + Only the prefix %1 can be bound to %2 and vice versa. åªæœ‰å‰ç½®å­—串 %1 能與 %2 çµåˆã€‚å之亦然。 - + Circularity detected åµæ¸¬åˆ°ç’°ç‹€ - + The parameter %1 is required, but no corresponding %2 is supplied. 需è¦åƒæ•¸ %1,但是沒有æ供相關的 %2。 + The parameter %1 is passed, but no corresponding %2 exists. åƒæ•¸ %1 已傳é€ï¼Œä½†æ‰¾ä¸åˆ°ç›¸é—œçš„ %2。 - + The URI cannot have a fragment URI ä¸èƒ½æœ‰ç‰‡æ®µã€‚ - + Element %1 is not allowed at this location. 元素 %1 ä¸èƒ½åœ¨æ­¤ä½ç½®ã€‚ + Text nodes are not allowed at this location. 文字節點ä¸èƒ½åœ¨æ­¤ä½ç½®ã€‚ + Parse error: %1 剖æžéŒ¯èª¤ï¼š%1 + The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. XLS-T 版本屬性的值必須是型態 %1 的值,而 %2 ä¸æ˜¯ã€‚ + Running an XSL-T 1.0 stylesheet with a 2.0 processor. 使用 2.0 處ç†å™¨åŸ·è¡Œ XSL-T 1.0 樣å¼è¡¨ä¸­ã€‚ + Unknown XSL-T attribute %1. 未知的 XSL-T 屬性 %1。 + Attribute %1 and %2 are mutually exclusive. 屬性 %1 與 %2 彼此互斥。 + In a simplified stylesheet module, attribute %1 must be present. 在簡化的樣å¼è¡¨æ¨¡çµ„中,屬性 %1 必須存在。 + If element %1 has no attribute %2, it cannot have attribute %3 or %4. 若元素 %1 沒有屬性 %2,則也ä¸èƒ½æœ‰å±¬æ€§ %3 或 %4。 + Element %1 must have at least one of the attributes %2 or %3. 元素 %1 必須至少有屬性 %2 或 %3 其中一個。 + At least one mode must be specified in the %1-attribute on element %2. 在元素 %2 çš„ %1 屬性中至少è¦æŒ‡å®šä¸€å€‹æ¨¡å¼ã€‚ - + Attribute %1 cannot appear on the element %2. Only the standard attributes can appear. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰æ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3 以åŠæ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3,%4 以åŠæ¨™æº–屬性。 + Attribute %1 cannot appear on the element %2. Allowed is %3, and the standard attributes. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨å…ƒç´  %2。åªèƒ½æœ‰ %3 以åŠæ¨™æº–屬性。 + XSL-T attributes on XSL-T elements must be in the null namespace, not in the XSL-T namespace which %1 is. XSL-T 元素內的 XSL-T 屬性必須放在空(null)的命å空間,而ä¸æ˜¯åƒ %1 在 XSL-T 命å空間。 + The attribute %1 must appear on element %2. 屬性 %1 必須在元素 %2 內出ç¾ã€‚ + The element with local name %1 does not exist in XSL-T. 有本地å稱 %1 的元素在 XSL-T å…§ä¸å­˜åœ¨ã€‚ - + Element %1 must come last. 元素 %1 必須最後出ç¾ã€‚ + At least one %1-element must occur before %2. 至少一個元素 %1 è¦å‡ºç¾åœ¨ %2 之å‰ã€‚ + Only one %1-element can appear. åªèƒ½å‡ºç¾ä¸€å€‹å…ƒç´  %1。 + At least one %1-element must occur inside %2. 至少一個元素 %1 è¦å‡ºç¾åœ¨ %2 之內。 + When attribute %1 is present on %2, a sequence constructor cannot be used. 當屬性 %1 出ç¾åœ¨ %2 內時,ä¸èƒ½ä½¿ç”¨åºåˆ—建構å­ã€‚ + Element %1 must have either a %2-attribute or a sequence constructor. 元素 %1 必須至少有一個屬性 %2 或一個åºåˆ—建構å­ã€‚ + When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. 當需è¦åƒæ•¸æ™‚,ä¸èƒ½é€éŽå±¬æ€§ %1 或åºåˆ—建構å­æä¾›é è¨­å€¼ã€‚ + Element %1 cannot have children. 元素 %1 ä¸èƒ½æœ‰å­å…ƒç´ ã€‚ + Element %1 cannot have a sequence constructor. 元素 %1ä¸èƒ½æœ‰åºåˆ—建構å­ã€‚ + + The attribute %1 cannot appear on %2, when it is a child of %3. 屬性 %1 ä¸èƒ½å‡ºç¾åœ¨ %2,因為它是 %3 çš„å­å…ƒç´ ã€‚ + A parameter in a function cannot be declared to be a tunnel. 函å¼å…§çš„åƒæ•¸ä¸èƒ½è¢«å®£å‘Šç‚ºé€šé“(tunnel)。 + This processor is not Schema-aware and therefore %1 cannot be used. 此處ç†å™¨ä¸æ˜¯ Schema-aware,因此ä¸èƒ½ä½¿ç”¨ %1。 + Top level stylesheet elements must be in a non-null namespace, which %1 isn't. 頂層樣å¼è¡¨å…ƒç´ å¿…須是éžç©ºç™½çš„命å空間,而 %1 ä¸æ˜¯ã€‚ + The value for attribute %1 on element %2 must either be %3 or %4, not %5. 元素 %2 內屬性 %1 的值必須是 %3 或 %4,而ä¸æ˜¯ %5。 + Attribute %1 cannot have the value %2. 屬性 %1 的值ä¸èƒ½ç‚º %2。 + The attribute %1 can only appear on the first %2 element. 屬性 %1 åªèƒ½å‡ºç¾åœ¨å‰ %2 個元素內。 + At least one %1 element must appear as child of %2. %2 必須至少有一個å­å…ƒç´  %1。 @@ -6592,11 +8022,13 @@ Please choose a different file name. VolumeSlider - + Muted éœéŸ³ + + Volume: %1% 音é‡ï¼š%1% diff --git a/translations/qtconfig_pl.ts b/translations/qtconfig_pl.ts index cff5eb1..cafc022 100644 --- a/translations/qtconfig_pl.ts +++ b/translations/qtconfig_pl.ts @@ -1,10 +1,10 @@ - - + + MainWindow - + On The Spot W oknie dokumentu (On-The-Spot) @@ -76,7 +76,7 @@ Użyj prostego oprogramowania renderujÄ…cego - + Over The Spot Nad oknem dokumentu (Over-The-Spot) @@ -91,17 +91,21 @@ W dodatkowym oknie (Root) - + Select a Directory Wybierz katalog + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>Wersja %2 + <h3>%1</h3><br/>Wersja %2 - + Qt Configuration @@ -133,12 +137,22 @@ &Anuluj - + No changes to be saved. Brak zmian do zapisania. - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Saving changes... Zapisywanie zmian... @@ -809,6 +823,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_untranslated.ts b/translations/qtconfig_untranslated.ts index 09f8985..e0f85c3 100644 --- a/translations/qtconfig_untranslated.ts +++ b/translations/qtconfig_untranslated.ts @@ -1,9 +1,20 @@ - + + MainWindow - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + On The Spot @@ -75,7 +86,7 @@ - + No changes to be saved. @@ -85,7 +96,7 @@ - + Over The Spot @@ -100,17 +111,17 @@ - + Select a Directory - <h3>%1</h3><br/>Version %2 + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - + Qt Configuration @@ -796,6 +807,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_zh_CN.ts b/translations/qtconfig_zh_CN.ts index 90d3e6b..63e198c 100644 --- a/translations/qtconfig_zh_CN.ts +++ b/translations/qtconfig_zh_CN.ts @@ -1,16 +1,15 @@ - MainWindow - + On The Spot 客户端程åºé¢„编辑模å¼(On The Spot) - + Over The Spot 光标跟éšé£Žæ ¼(Over The Spot) @@ -25,17 +24,16 @@ 输入æœåŠ¡å™¨é¢„编辑模å¼(Root) - + Select a Directory 选择一个目录 - <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>版本 %2 + <h3>%1</h3><br/>版本 %2 - + Qt Configuration @@ -67,7 +65,7 @@ å–消(&C) - + No changes to be saved. 没有å˜åŒ–被ä¿å­˜ã€‚ @@ -77,7 +75,7 @@ 正在ä¿å­˜å˜åŒ–... - + @@ -85,7 +83,17 @@ 自动(默认) - + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Choose audio output automatically. 自动选择音频输出。 @@ -133,7 +141,12 @@ 使用简å•çš„软件渲染。 - + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + aRts aRts @@ -810,6 +823,14 @@ p, li { white-space: pre-wrap; } + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase diff --git a/translations/qtconfig_zh_TW.ts b/translations/qtconfig_zh_TW.ts index 88f9bb0..d55614d 100644 --- a/translations/qtconfig_zh_TW.ts +++ b/translations/qtconfig_zh_TW.ts @@ -1,110 +1,158 @@ - - + + MainWindow - + On The Spot On The Spot(在輸入處輸入) + No changes to be saved. 沒有è¦å„²å­˜çš„變更。 + Saving changes... 儲存變更... + Over The Spot Over The Spot(在輸入處æ供編輯視窗) + Off The Spot Off The Spot(在輸入處下方æ供編輯視窗) + Root Root(使用根視窗) + Select a Directory é¸æ“‡ä¸€å€‹ç›®éŒ„ <h3>%1</h3><br/>Version %2 - <h3>%1</h3><br/>版本 %2 + <h3>%1</h3><br/>版本 %2 + + + Qt Configuration Qt 設定 + Save Changes 儲存變更 + Save changes to settings? è¦å„²å­˜è¨­å®šçš„變更嗎? + &Yes 是(&Y) + &No å¦(&N) + &Cancel å–消(&C) + + + + Auto (default) 自動(é è¨­ï¼‰ + + Desktop Settings (Default) + + + + + Choose style and palette based on your desktop settings. + + + + Choose audio output automatically. 自動é¸æ“‡éŸ³æ•ˆè¼¸å‡ºã€‚ + Phonon GStreamer backend not available. 沒有 Phonon GStreamer 後端介é¢ã€‚ + Choose render method automatically 自動é¸æ“‡æˆåƒæ–¹æ³• + + X11 X11 + Use X11 Overlays 使用 X11 æˆåƒ + + OpenGL OpenGL + Use OpenGL if avaiable å¯ä»¥çš„話使用 OpenGL + + Software 軟體 + Use simple software rendering 使用簡單的軟體æˆåƒ + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> + + + + + aRts aRts + Experimental aRts support for GStreamer. GStreamer 中實驗性的 aRts 支æ´ã€‚ @@ -112,318 +160,397 @@ MainWindowBase + Qt Configuration Qt 設定 + Appearance 外觀 + GUI Style 使用者介é¢é¢¨æ ¼ + Select GUI &Style: é¸æ“‡ä½¿ç”¨è€…介é¢é¢¨æ ¼(&S): + Build Palette 建構調色盤 + &3-D Effects: 立體效果(&3): + Window Back&ground: 視窗背景(&G): + &Tune Palette... 調整調色盤(&T)... + Preview é è¦½ + Select &Palette: é¸æ“‡èª¿è‰²ç›¤(&P): + Active Palette 啟動調色盤 + Inactive Palette åœç”¨èª¿è‰²ç›¤ + Disabled Palette 關閉調色盤 + Fonts å­—åž‹ + Default Font é è¨­å­—åž‹ + &Style: 風格(&S) + &Point Size: 點大å°(&P): + F&amily: 家æ—(&A): + Sample Text 範例文字 + Font Substitution å­—åž‹æ›¿æ› + S&elect or Enter a Family: é¸æ“‡æˆ–輸入一個字型家æ—(&E): + Current Substitutions: ç›®å‰çš„替代: + Up 上 + Down 下 + Remove 移除 + Select s&ubstitute Family: é¸æ“‡æ›¿ä»£å®¶æ—(&U): + Add 新增 + Interface ä»‹é¢ + Feel Settings 感覺設定 + ms 毫秒 + &Double Click Interval: 雙擊間隔(&D): + No blinking ä¸é–ƒçˆ + &Cursor Flash Time: 游標閃çˆæ™‚é–“(&C): + lines è¡Œ + Wheel &Scroll Lines: 滾輪æ²è»¸è¡Œæ•¸(&S): + Resolve symlinks in URLs 解譯網å€ä¸­çš„ç¬¦è™Ÿé€£çµ + GUI Effects 使用者介é¢æ•ˆæžœ + &Enable é–‹å•Ÿ(&E) + Alt+E Alt+E + &Menu Effect: é¸å–®æ•ˆæžœ(&M) + C&omboBox Effect: 下拉å¼é¸å–®æ•ˆæžœ(&O): + &ToolTip Effect: 工具æ示效果(&T): + Tool&Box Effect: 工具盒效果(&B): + Disable 關閉 + Animate å‹•ç•« + Fade 淡出 + Global Strut 全域支柱(Strut) + Minimum &Width: 最å°å¯¬åº¦(&W): + Minimum Hei&ght: 最å°é«˜åº¦(&G): + pixels åƒç´  + Enhanced support for languages written right-to-left å°ç”±å³åˆ°å·¦å¯«çš„èªžè¨€åŠ å¼·æ”¯æ´ + XIM Input Style: XIM 輸入風格: + On The Spot On The Spot(在輸入處輸入) + Over The Spot Over The Spot(在輸入處æ供編輯視窗) + Off The Spot Off The Spot(在輸入處下方æ供編輯視窗) + Root Root(使用根視窗) + Default Input Method: é è¨­è¼¸å…¥æ³•ï¼š + Printer å°è¡¨æ©Ÿ + Enable Font embedding 開啟字型嵌入 + Font Paths 字型路徑 + Browse... ç€è¦½... + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. 按下「ç€è¦½ã€éµæˆ–輸入一個目錄並按 Enter éµä¾†åŠ å…¥åˆ—表中。 + &File 檔案(&F) + &Help 說明(&H) + &Save 儲存(&S) + Save 儲存 + Ctrl+S Ctrl+S + E&xit 離開(&X) + Exit 離開 + &About 關於(&A) + About 關於 + About &Qt 關於Qt (&Q) + About Qt 關於Qt + Phonon Phonon + About Phonon 關於 Phonon + Current Version: ç›®å‰ç‰ˆæœ¬ï¼š + Not available 無法使用 + Website: 網站: + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -436,10 +563,12 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + About GStreamer 關於 GStreamer + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -452,18 +581,22 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + GStreamer backend settings GStreamer 後端介é¢è¨­å®š + Preferred audio sink: é è¨­ä½¿ç”¨çš„音效槽 + Preferred render method: é è¨­ä½¿ç”¨çš„æˆåƒæ–¹æ³•: + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -476,6 +609,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">注æ„:變更這些設定å¯èƒ½æœƒç„¡æ³•è®“應用程å¼æ­£ç¢ºå•Ÿå‹•ã€‚</span></p></body></html> + Please use the KDE Control Center to set the palette. 請使用 KDE 控制中心來設定調色盤。 @@ -483,217 +617,278 @@ p, li { white-space: pre-wrap; } PaletteEditorAdvancedBase + Tune Palette 調整調色盤 + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> <b>編輯調色盤</b><p>變更目å‰å…ƒä»¶æˆ–表單的調色盤。</p><p>使用產生的調色盤,或é¸æ“‡æ¯å€‹é¡è‰²ç¾¤çµ„或é¡è‰²è§’色的é¡è‰²ã€‚</p><p>調色盤å¯ä»¥åœ¨é è¦½å€ä¸­ç”¨ä¸åŒçš„元件佈局來測試。</p> + Select &Palette: é¸æ“‡èª¿è‰²ç›¤(&P): + Active Palette 啟動調色盤 + Inactive Palette åœç”¨èª¿è‰²ç›¤ + Disabled Palette 關閉調色盤 + Auto 自動 + Build inactive palette from active 從啟用的調色盤建立新的éžå•Ÿç”¨çš„調色盤 + Build disabled palette from active 從啟用的調色盤建立新的關閉的調色盤 + Central color &roles å°‡é¡è‰²è§’色置中(&R) + Choose central color role é¸æ“‡ä¸­å¤®é¡è‰²è§’色 + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> <b>é¸æ“‡é¡è‰²è§’色</b><p>å¯ç”¨çš„中央角色包括:<ul><li>視窗─一般背景é¡è‰²ã€‚</li><li>視窗文字─一般å‰æ™¯æ–‡å­—</li><li>基底─用於如文字輸入元件的背景,通常是白色或其它較淡的é¡è‰²ã€‚</li><li>文字─與基底一起使用的å‰æ™¯é¡è‰²ã€‚通常是與視窗文字一樣,這樣å¯ä»¥è®“視窗與基底都有好的å°æ¯”效果。</li><li>按éµâ”€ä¸€èˆ¬æŒ‰éµçš„背景é¡è‰²ï¼Œè¦èˆ‡è¦–窗的背景é¡è‰²ä¸åŒï¼Œå°±åƒéº¥é‡‘å¡”å¼çš„風格。</li><li>按éµæ–‡å­—─用於按éµçš„å‰æ™¯é¡è‰²ã€‚</li><li>çªé¡¯â”€ç”¨æ–¼é¸æ“‡å€æˆ–çªé¡¯é …目的é¡è‰²ã€‚</li><li>çªé¡¯æ–‡å­—─çªé¡¯æ–‡å­—用的é¡è‰²ã€‚</li><li>明亮文字─與視窗文字éžå¸¸ä¸åŒçš„文字é¡è‰²ã€‚</li></ul></p> + Window 視窗 + WindowText 視窗文字 + Button æŒ‰éµ + Base 基底 + Text 文字 + BrightText 明亮文字 + ButtonText 按éµæ–‡å­— + Highlight çªé¡¯ + HighlightedText çªé¡¯æ–‡å­— + &Select Color: é¸æ“‡é¡è‰²(&S): + Choose a color é¸æ“‡ä¸€å€‹é¡è‰² + Choose a color for the selected central color role. é¸æ“‡ç”¨æ–¼é¸å–的中央é¡è‰²è§’色的é¡è‰²ã€‚ + 3-D shadow &effects 立體陰影效果(&E) + Build &from button color 從按éµé¡è‰²å»ºç«‹(&F) + Generate shadings 產生é®è”½ + Check to let 3D-effect colors be calculated from button-color. 勾é¸ä»¥è®“立體效果å¯ä»¥å¾žæŒ‰éµé¡è‰²ä¸­è¨ˆç®—é¡è‰²ã€‚ + Choose 3D-effect color role é¸æ“‡ç«‹é«”效果é¡è‰²è§’色 + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> <b>é¸æ“‡é¡è‰²è§’色:</b><p>å¯ç”¨çš„角色包括:<ul><li>淡─比按éµé¡è‰²æ·¡ã€‚<li><li>中淡─在按éµé¡è‰²èˆ‡æ·¡è‰²ä¹‹é–“。</li><li>中等─在按éµé¡è‰²èˆ‡æš—色之間。</li><li>暗色─比按éµé¡è‰²æš—。</li><li>陰影:éžå¸¸æš—çš„é¡è‰²ã€‚</li></ul> + Light æ·¡ + Midlight 中淡 + Mid 中等 + Dark æš— + Shadow é™°å½± + Select Co&lor: é¸æ“‡é¡è‰²(&O): + Choose a color for the selected effect color role. é¸æ“‡ç”¨æ–¼é¸å–的效果é¡è‰²è§’色的é¡è‰²ã€‚ + OK 確定 + Close dialog and apply all changes. 關閉å°è©±æ¡†ï¼Œå¥—用所有的變更。 + Cancel å–消 + Close dialog and discard all changes. 關閉å°è©±æ¡†ï¼Œä¸¦ä¸Ÿæ£„所有的變更。 + PreviewFrame + + + Desktop settings will only take effect after an application restart. + + + + PreviewWidgetBase + Preview Window é è¦½è¦–窗 + ButtonGroup 按éµç¾¤çµ„ + RadioButton1 圓鈕1 + RadioButton2 圓鈕2 + RadioButton3 圓鈕3 + ButtonGroup2 按éµç¾¤çµ„2 + CheckBox1 勾é¸ç›’1 + CheckBox2 勾é¸ç›’2 + LineEdit è¡Œç·¨è¼¯å€ + ComboBox 下拉å¼é¸å–® + PushButton æŒ‰éµ + <p> <a href="http://qtsoftware.com">http://qtsoftware.com</a> </p> diff --git a/translations/qvfb_pl.ts b/translations/qvfb_pl.ts index ac42503..a5baaed 100644 --- a/translations/qvfb_pl.ts +++ b/translations/qvfb_pl.ts @@ -1,10 +1,10 @@ - - + + AnimationSaveWidget - + Record Nagraj @@ -249,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. Nie można zaÅ‚adować pliku z obrazkiem '%1'. diff --git a/translations/qvfb_untranslated.ts b/translations/qvfb_untranslated.ts index 0f75227..cc18132 100644 --- a/translations/qvfb_untranslated.ts +++ b/translations/qvfb_untranslated.ts @@ -1,9 +1,10 @@ - + + AnimationSaveWidget - + Record @@ -248,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. diff --git a/translations/qvfb_zh_CN.ts b/translations/qvfb_zh_CN.ts index cbccfe3..d9c816d 100644 --- a/translations/qvfb_zh_CN.ts +++ b/translations/qvfb_zh_CN.ts @@ -4,7 +4,7 @@ AnimationSaveWidget - + Record å½•åƒ @@ -249,7 +249,7 @@ DeviceSkin - + The image file '%1' could not be loaded. 图åƒæ–‡ä»¶â€œ%1â€ä¸èƒ½è¢«åŠ è½½ã€‚ diff --git a/translations/qvfb_zh_TW.ts b/translations/qvfb_zh_TW.ts index a48aae4..b789479 100644 --- a/translations/qvfb_zh_TW.ts +++ b/translations/qvfb_zh_TW.ts @@ -1,57 +1,74 @@ - - + + AnimationSaveWidget + + Record 錄影 + Reset é‡ç½® + Save 儲存 + Save in MPEG format (requires netpbm package installed) 以 MPEG æ ¼å¼å„²å­˜ (需è¦å®‰è£ netpbm 套件) + + Click record to begin recording. 按下「錄影ã€é–‹å§‹éŒ„影。 + + Finished saving. 完æˆå„²å­˜ã€‚ + Paused. Click record to resume, or save if done. 已暫åœã€‚按下「錄影ã€å¯ä»¥ç¹¼çºŒï¼ŒæŒ‰ã€Œå„²å­˜ã€è¡¨ç¤ºå·²å®Œæˆã€‚ + Pause æš«åœ + Recording... 錄影中... + Saving... 儲存中... + + Save animation... 儲存動畫... + Save canceled. 儲存已å–消。 + Save failed! 儲存失敗! @@ -59,138 +76,172 @@ Config + Configure 設定 + Size å¤§å° + 176x220 "SmartPhone" 176x220 「智慧型手機〠+ 240x320 "PDA" 240x320 「PDA〠+ 320x240 "TV" / "QVGA" 320x240 「TVã€/「QVGA〠+ 640x480 "VGA" 640x480「VGA〠+ 800x600 800x600 + 1024x768 1024x768 + Custom 自訂 + Depth 深度 + 1 bit monochrome 1 ä½å…ƒå–®è‰² + 4 bit grayscale 4 ä½å…ƒç°éšŽ + 8 bit 8 ä½å…ƒ + 12 (16) bit 12 (16) ä½å…ƒ + 16 bit 16 ä½å…ƒ + 18 bit 18 ä½å…ƒ + 24 bit 24 ä½å…ƒ + 32 bit 32 ä½å…ƒ + Skin 外觀 + None ç„¡ + Emulate touch screen (no mouse move) 模擬觸控å¼èž¢å¹•ï¼ˆæ²’有滑鼠移動) + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) 模擬液晶螢幕(åªå›ºå®šç¸®æ”¾ 3 å€ï¼‰ + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. <p>注æ„,任何使用此虛擬 framebuffer 的應用程å¼åœ¨æ‚¨è®Šæ›´å¤§å°æˆ–深度後都會被終止。ä¸éŽè®Šæ›´åº•ä¸‹çš„ Gamma 值則ä¸æœƒã€‚ + Gamma Gamma + Blue è— + 1.0 1.0 + Green 綠 + All 全部 + Red ç´… + Set all to 1.0 把所有的值都設為 1.0 + &OK 確定(&O) + &Cancel å–消(&C) + 15 bit 15 ä½å…ƒ + 32 bit ARGB 32 ä½å…ƒ ARGB @@ -198,47 +249,57 @@ DeviceSkin - + The image file '%1' could not be loaded. 無法載入影åƒæª” '%1'。 + The skin directory '%1' does not contain a configuration file. 外觀目錄 %1 內並沒有設定檔。 + The skin configuration file '%1' could not be opened. 無法開啟外觀設定檔 %1。 + The skin configuration file '%1' could not be read: %2 無法讀å–外觀設定檔 %1。 + Syntax error: %1 語法錯誤:%1 + The skin "up" image file '%1' does not exist. 「上ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "down" image file '%1' does not exist. 「下ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin "closed" image file '%1' does not exist. 「關閉ã€çš„外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + The skin cursor image file '%1' does not exist. 游標的外觀影åƒæª” %1 ä¸å­˜åœ¨ã€‚ + Syntax error in area definition: %1 å€åŸŸå®šç¾©ä¸­æœ‰èªžæ³•éŒ¯èª¤ï¼š%1 + Mismatch in number of areas, expected %1, got %2. å€åŸŸæ•¸é‡ä¸ç¬¦ï¼Œæ‡‰ç‚º %1,但實際上是 %2。 @@ -246,14 +307,17 @@ QVFb + Browse... ç€è¦½... + Load Custom Skin... 載入自訂的外觀... + All QVFB Skins (*.skin) 所有 QVFB 外觀檔 (*.skin) -- cgit v0.12 From 18911afe29858e2b89107024d4dc27f115210822 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 16 Apr 2009 13:29:25 +0200 Subject: Run syncqt when available and necessary The nightly public snapshots contain bin/syncqt but do not contain the include/ directory. Hence configure needs to detect this case and run syncqt to create the include tree so that configure actually passes Signed-off-by: Thiago Macieira --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 9f2b28d..b582d85 100755 --- a/configure +++ b/configure @@ -3973,7 +3973,7 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes" if [ "$OPT_SHADOW" = "yes" ]; then "$outpath/bin/syncqt" $SYNCQT_OPTS - elif [ "$CFG_DEV" = "yes" ]; then + elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS fi fi -- cgit v0.12 From 7e2041554870ad21699eef8d39ddf35f408be0e6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 18 Apr 2009 16:54:44 +0200 Subject: sanitize whitespace & parentheses --- src/corelib/io/qtemporaryfile.cpp | 255 +++++++++++++++++++------------------- 1 file changed, 127 insertions(+), 128 deletions(-) diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 6a7b067..ad2b116 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -105,100 +105,100 @@ QT_BEGIN_NAMESPACE */ static int _gettemp(char *path, int *doopen, int domkdir, int slen) { - char *start, *trv, *suffp; - QT_STATBUF sbuf; - int rval; + char *start, *trv, *suffp; + QT_STATBUF sbuf; + int rval; #if defined(Q_OS_WIN) int pid; #else - pid_t pid; + pid_t pid; #endif - if (doopen && domkdir) { - errno = EINVAL; - return(0); - } - - for (trv = path; *trv; ++trv) - ; - trv -= slen; - suffp = trv; - --trv; - if (trv < path) { - errno = EINVAL; - return (0); - } + if (doopen && domkdir) { + errno = EINVAL; + return 0; + } + + for (trv = path; *trv; ++trv) + ; + trv -= slen; + suffp = trv; + --trv; + if (trv < path) { + errno = EINVAL; + return 0; + } #if defined(Q_OS_WIN) && defined(_MSC_VER) && _MSC_VER >= 1400 - pid = _getpid(); + pid = _getpid(); #else - pid = getpid(); + pid = getpid(); #endif - while (trv >= path && *trv == 'X' && pid != 0) { - *trv-- = (pid % 10) + '0'; - pid /= 10; - } + while (trv >= path && *trv == 'X' && pid != 0) { + *trv-- = (pid % 10) + '0'; + pid /= 10; + } #ifndef S_ISDIR -#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif - while (trv >= path && *trv == 'X') { - char c; - - // CHANGE arc4random() -> random() - pid = (qrand() & 0xffff) % (26+26); - if (pid < 26) - c = pid + 'A'; - else - c = (pid - 26) + 'a'; - *trv-- = c; - } - start = trv + 1; - - /* - * check the target directory; if you have six X's and it - * doesn't exist this runs for a *very* long time. - */ - if (doopen || domkdir) { - for (;; --trv) { - if (trv <= path) - break; - if (*trv == '/') { - *trv = '\0'; + while (trv >= path && *trv == 'X') { + char c; + + // CHANGE arc4random() -> random() + pid = (qrand() & 0xffff) % (26+26); + if (pid < 26) + c = pid + 'A'; + else + c = (pid - 26) + 'a'; + *trv-- = c; + } + start = trv + 1; + + /* + * check the target directory; if you have six X's and it + * doesn't exist this runs for a *very* long time. + */ + if (doopen || domkdir) { + for (;; --trv) { + if (trv <= path) + break; + if (*trv == '/') { + *trv = '\0'; #if defined (Q_OS_WIN) && !defined(Q_OS_WINCE) - if (trv - path == 2 && path[1] == ':') { - // Special case for Windows drives - // (e.g., "C:" => "C:\"). - // ### Better to use a Windows - // call for this. - char drive[] = "c:\\"; - drive[0] = path[0]; - rval = QT_STAT(drive, &sbuf); - } else + if (trv - path == 2 && path[1] == ':') { + // Special case for Windows drives + // (e.g., "C:" => "C:\"). + // ### Better to use a Windows + // call for this. + char drive[] = "c:\\"; + drive[0] = path[0]; + rval = QT_STAT(drive, &sbuf); + } else #endif - rval = QT_STAT(path, &sbuf); - *trv = '/'; - if (rval != 0) - return(0); - if (!S_ISDIR(sbuf.st_mode)) { - errno = ENOTDIR; - return(0); - } - break; - } - } - } - - for (;;) { - if (doopen) { + rval = QT_STAT(path, &sbuf); + *trv = '/'; + if (rval != 0) + return 0; + if (!S_ISDIR(sbuf.st_mode)) { + errno = ENOTDIR; + return 0; + } + break; + } + } + } + + for (;;) { + if (doopen) { #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400 - if (_sopen_s(doopen, path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR|QT_OPEN_BINARY -#ifdef QT_LARGEFILE_SUPPORT - |QT_OPEN_LARGEFILE -#endif - , _SH_DENYNO, _S_IREAD | _S_IWRITE)== 0) -#else -#if defined(Q_OS_WINCE) + if (_sopen_s(doopen, path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR|QT_OPEN_BINARY +# ifdef QT_LARGEFILE_SUPPORT + |QT_OPEN_LARGEFILE +# endif + , _SH_DENYNO, _S_IREAD | _S_IWRITE)== 0) +#else // WIN && !CE +# if defined(Q_OS_WINCE) QString targetPath; if (QDir::isAbsolutePath(QString::fromLatin1(path))) targetPath = QLatin1String(path); @@ -207,72 +207,71 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen) if ((*doopen = QT_OPEN(targetPath.toLocal8Bit(), O_CREAT|O_EXCL|O_RDWR -#else - if ((*doopen = - open(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR -#endif -#ifdef QT_LARGEFILE_SUPPORT - |QT_OPEN_LARGEFILE -#endif +# else // CE + if ((*doopen = + open(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR +# endif +# ifdef QT_LARGEFILE_SUPPORT + |QT_OPEN_LARGEFILE +# endif # if defined(Q_OS_WINCE) - |_O_BINARY + |_O_BINARY # elif defined(Q_OS_WIN) - |O_BINARY + |O_BINARY # endif - , 0600)) >= 0) -#endif - - return(1); - if (errno != EEXIST) - return(0); - } else if (domkdir) { + , 0600)) >= 0) +#endif // WIN && !CE + return 1; + if (errno != EEXIST) + return 0; + } else if (domkdir) { #ifdef Q_OS_WIN - if (QT_MKDIR(path) == 0) + if (QT_MKDIR(path) == 0) #else - if (mkdir(path, 0700) == 0) + if (mkdir(path, 0700) == 0) #endif - return(1); - if (errno != EEXIST) - return(0); - } + return 1; + if (errno != EEXIST) + return 0; + } #ifndef Q_OS_WIN - else if (QT_LSTAT(path, &sbuf)) - return(errno == ENOENT ? 1 : 0); + else if (QT_LSTAT(path, &sbuf)) + return (errno == ENOENT) ? 1 : 0; #else - if (!QFileInfo(QLatin1String(path)).exists()) - return 1; + if (!QFileInfo(QLatin1String(path)).exists()) + return 1; #endif - /* tricky little algorwwithm for backward compatibility */ - for (trv = start;;) { - if (!*trv) - return (0); - if (*trv == 'Z') { - if (trv == suffp) - return (0); - *trv++ = 'a'; - } else { - if (isdigit(*trv)) - *trv = 'a'; - else if (*trv == 'z') /* inc from z to A */ - *trv = 'A'; - else { - if (trv == suffp) - return (0); - ++*trv; - } - break; - } + /* tricky little algorwwithm for backward compatibility */ + for (trv = start;;) { + if (!*trv) + return 0; + if (*trv == 'Z') { + if (trv == suffp) + return 0; + *trv++ = 'a'; + } else { + if (isdigit(*trv)) + *trv = 'a'; + else if (*trv == 'z') /* inc from z to A */ + *trv = 'A'; + else { + if (trv == suffp) + return 0; + ++*trv; } + break; + } } - /*NOTREACHED*/ + } + /*NOTREACHED*/ } #ifndef Q_WS_WIN static int qt_mkstemps(char *path, int slen) { - int fd = 0; - return (_gettemp(path, &fd, 0, slen) ? fd : -1); + int fd = 0; + return (_gettemp(path, &fd, 0, slen) ? fd : -1); } #endif -- cgit v0.12 From bd2086f3b71ae83f458fc24c710b4ad9d1312183 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 18 Apr 2009 17:23:44 +0200 Subject: Make temporary files close-on-exec Reviewed-By: thiago --- src/corelib/io/qtemporaryfile.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index ad2b116..4856353 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -219,9 +219,20 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen) # elif defined(Q_OS_WIN) |O_BINARY # endif +# ifdef O_CLOEXEC + // supported on Linux >= 2.6.23; avoids one extra system call + // and avoids a race condition: if another thread forks, we could + // end up leaking a file descriptor... + |O_CLOEXEC +# endif , 0600)) >= 0) #endif // WIN && !CE + { +#if defined(Q_OS_UNIX) && !defined(O_CLOEXEC) + fcntl(*doopen, F_SETFD, FD_CLOEXEC); +#endif return 1; + } if (errno != EEXIST) return 0; } else if (domkdir) { -- cgit v0.12 From 2cdbf9a9e53d67d4c2dd845c65aee17464f3dca1 Mon Sep 17 00:00:00 2001 From: Bill King Date: Fri, 17 Apr 2009 13:27:53 +1000 Subject: Miscellaneous cleanups for Sql tests. --- tests/auto/qsqldatabase/tst_databases.h | 43 ++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h index 611077f..ef51285 100644 --- a/tests/auto/qsqldatabase/tst_databases.h +++ b/tests/auto/qsqldatabase/tst_databases.h @@ -217,7 +217,7 @@ public: // addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3309, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 5.0.18 Linux // addDb( "QMYSQL3", "testdb", "troll", "trond", "iceblink.nokia.troll.no" ); // MySQL 5.0.13 Windows // addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql4-nokia.trolltech.com.au" ); // MySQL 4.1.22-2.el4 linux -// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux +// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux // addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no" ); // V7.2 NOT SUPPORTED! // addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5434 ); // V7.2 NOT SUPPORTED! Multi-byte @@ -238,14 +238,15 @@ public: // addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "firebird2-nokia.trolltech.com.au" ); // Firebird 2.1.1 // use in-memory database to prevent local files - addDb("QSQLITE", ":memory:"); -// addDb( "QSQLITE", QDir::toNativeSeparators(QDir::tempPath()+"/foo.db") ); +// addDb("QSQLITE", ":memory:"); + addDb( "QSQLITE", QDir::toNativeSeparators(QDir::tempPath()+"/foo.db") ); // addDb( "QSQLITE2", QDir::toNativeSeparators(QDir::tempPath()+"/foo2.db") ); // addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=iceblink.nokia.troll.no\\ICEBLINK", "troll", "trond", "" ); // addDb( "QODBC3", "DRIVER={SQL Native Client};SERVER=silence.nokia.troll.no\\SQLEXPRESS", "troll", "trond", "" ); -// addDb( "QODBC", "DRIVER={MySQL ODBC 3.51 Driver};SERVER=mysql5-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" ); -// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=horsehead.nokia.troll.no;DATABASE=testdb;PORT=4101;UID=troll;PWD=trondk", "troll", "trondk", "" ); +// addDb( "QODBC", "DRIVER={MySQL ODBC 3.51 Driver};SERVER=mysql5-nokia.trolltech.com.au;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" ); +// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=horsehead.nokia.troll.no;DATABASE=testdb;PORT=4101;UID=troll;PWD=trondk", "troll", "trondk", "" ); +// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=silence.nokia.troll.no;DATABASE=testdb;PORT=2392;UID=troll;PWD=trond", "troll", "trond", "" ); } @@ -312,17 +313,21 @@ public: QSqlQuery q( db ); QStringList dbtables=db.tables(); - foreach(QString tableName, tableNames) + foreach(const QString &tableName, tableNames) { wasDropped = true; QString table=tableName; if ( db.driver()->isIdentifierEscaped(table, QSqlDriver::TableName)) table = db.driver()->stripDelimiters(table, QSqlDriver::TableName); - if ( dbtables.contains( table, Qt::CaseSensitive ) ) - wasDropped = q.exec( "drop table " + tableName); - else if ( dbtables.contains( table, Qt::CaseInsensitive ) ) - wasDropped = q.exec( "drop table " + tableName); + foreach(const QString dbtablesName, dbtables) { + if(dbtablesName.toUpper() == table.toUpper()) { + dbtables.removeAll(dbtablesName); + wasDropped = q.exec("drop table " + db.driver()->escapeIdentifier( dbtablesName, QSqlDriver::TableName )); + if(!wasDropped) + wasDropped = q.exec("drop table " + dbtablesName); + } + } if ( !wasDropped ) qWarning() << dbToString(db) << "unable to drop table" << tableName << ':' << q.lastError().text() << "tables:" << dbtables; @@ -396,12 +401,26 @@ public: static QByteArray printError( const QSqlError& err ) { - return QString( "'" + err.driverText() + "' || '" + err.databaseText() + "'" ).toLocal8Bit(); + QString result; + if(err.number() > 0) + result += '(' + QString::number(err.number()) + ") "; + result += '\''; + if(!err.driverText().isEmpty()) + result += err.driverText() + "' || '"; + result += err.databaseText() + "'"; + return result.toLocal8Bit(); } static QByteArray printError( const QSqlError& err, const QSqlDatabase& db ) { - return QString( dbToString(db) + ": '" + err.driverText() + "' || '" + err.databaseText() + "'" ).toLocal8Bit(); + QString result(dbToString(db) + ": "); + if(err.number() > 0) + result += '(' + QString::number(err.number()) + ") "; + result += '\''; + if(!err.driverText().isEmpty()) + result += err.driverText() + "' || '"; + result += err.databaseText() + "'"; + return result.toLocal8Bit(); } static bool isSqlServer( QSqlDatabase db ) -- cgit v0.12 From bf0033ba01fec73c06d533b57b3920b216223c2d Mon Sep 17 00:00:00 2001 From: Bill King Date: Mon, 20 Apr 2009 09:47:10 +1000 Subject: Fixes over-verboseness in OCI tables function. Differring case of username shouldn't mean adding the username on front. Also fixes autotest failures. --- src/sql/drivers/oci/qsql_oci.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index fa9b5f0..d63c482 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -2208,7 +2208,7 @@ QStringList QOCIDriver::tables(QSql::TableType type) const user = user.toUpper(); while (t.next()) { - if (t.value(0).toString() != user) + if (t.value(0).toString().toUpper() != user.toUpper()) tl.append(t.value(0).toString() + QLatin1String(".") + t.value(1).toString()); else tl.append(t.value(1).toString()); @@ -2224,7 +2224,7 @@ QStringList QOCIDriver::tables(QSql::TableType type) const "and owner != 'CTXSYS'" "and owner != 'WMSYS'")); while (t.next()) { - if (t.value(0).toString() != d->user) + if (t.value(0).toString().toUpper() != d->user.toUpper()) tl.append(t.value(0).toString() + QLatin1String(".") + t.value(1).toString()); else tl.append(t.value(1).toString()); -- cgit v0.12 From 10194aafd10824fe1919aa44083224e8bea442ca Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 17 Apr 2009 15:41:09 +0200 Subject: fix compilation of QtWebKit with Visual Studio Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and 014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual Studio / IncrediBuild. The problem is as follows: QtWebKit has too many entries in INCLUDE_PATHS. In moc.prf is a rule that builds a mocinclude.tmp that contains command line options for moc. moc gets then called with @mocinclude.tmp. Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp, which is necessary for parallel MinGW builds. Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET. See task 189914. Once this task is solved, this commit must be reverted. Reviewed-by: joao --- mkspecs/features/moc.prf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 7c4ff28..60508c8 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -47,7 +47,12 @@ win32:count($$list($$INCPATH), 40, >) { defineReplace(mocCmd) { !isEmpty(WIN_INCLUDETEMP) { - return($$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) + RET = + if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { + RET += $$mocinclude.commands + } + RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2 + return($$RET) } return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) } -- cgit v0.12 From 9d9889682c79bacb803ef5613502e7307c1d16bd Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 20 Apr 2009 09:49:55 +0200 Subject: BT: Fix a crash when using Q(File)Dialog::open() in QCocoa. If we don't have a sheet, we need to recreate it in Cocoa. Unfortunately, we neglected to reassign the NSWindow pointer in that case, so the program would crash. Reviewed-by: Richard Moe Gustavsen --- src/gui/kernel/qwidget_mac.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 2c3f7f1..37dc79c 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4627,8 +4627,11 @@ void QWidgetPrivate::setModal_sys() if (windowParent && q->windowModality() == Qt::WindowModal){ // Window should be window-modal, which implies a sheet. - if (!alreadySheet) + if (!alreadySheet) { + // NB: the following call will call setModal_sys recursivly: recreateMacWindow(); + windowRef = qt_mac_window_for(q); + } if ([windowRef isKindOfClass:[NSPanel class]]){ // If the primary window of the sheet parent is a child of a modal dialog, // the sheet parent should not be modally shaddowed. -- cgit v0.12 From fee1423eba48746d46e13c02374249d1760219d7 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 15 Apr 2009 08:32:42 +0200 Subject: Some ifdefs for debugging clipping performance --- src/gui/painting/qpaintengine_raster.cpp | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index addd63d..e981f8d 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1140,6 +1140,33 @@ void QRasterPaintEnginePrivate::updateMatrixData(QSpanData *spanData, const QBru } } +// #define QT_CLIPPING_RATIOS + +#ifdef QT_CLIPPING_RATIOS +int rectClips; +int regionClips; +int totalClips; + +static void checkClipRatios(QRasterPaintEnginePrivate *d) +{ + if (d->clip()->hasRectClip) + rectClips++; + if (d->clip()->hasRegionClip) + regionClips++; + totalClips++; + + if ((totalClips % 5000) == 0) { + printf("Clipping ratio: rectangular=%f%%, region=%f%%, complex=%f%%\n", + rectClips * 100.0 / (qreal) totalClips, + regionClips * 100.0 / (qreal) totalClips, + (totalClips - rectClips - regionClips) * 100.0 / (qreal) totalClips); + totalClips = 0; + rectClips = 0; + regionClips = 0; + } + +} +#endif /*! \internal @@ -1241,6 +1268,10 @@ void QRasterPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op) d->solid_color_filler.clip = d->clip(); d->solid_color_filler.adjustSpanMethods(); + +#ifdef QT_CLIPPING_RATIOS + checkClipRatios(d); +#endif } @@ -1315,6 +1346,11 @@ void QRasterPaintEngine::clip(const QRect &rect, Qt::ClipOperation op) d->solid_color_filler.clip = d->clip(); d->solid_color_filler.adjustSpanMethods(); + + +#ifdef QT_CLIPPING_RATIOS + checkClipRatios(d); +#endif } /*! -- cgit v0.12 From 92d4fc8401a1ef31122804e219a57513e6f37e0a Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 16 Apr 2009 13:42:33 +0200 Subject: Fix docs for QPixmapCache::setCacheLimit()/cacheLimit() --- src/gui/image/qpixmapcache.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 4253f8d..eedb6a3 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -275,7 +275,8 @@ bool QPixmapCache::insert(const QString &key, const QPixmap &pm) /*! Returns the cache limit (in kilobytes). - The default cache limit is 2048 KB for Embedded, 10240 KB for Desktops. + The default cache limit is 2048 KB for Embedded, 10240 KB for + Desktops. \sa setCacheLimit() */ @@ -288,7 +289,8 @@ int QPixmapCache::cacheLimit() /*! Sets the cache limit to \a n kilobytes. - The default setting is 1024 kilobytes. + The default setting is 2048 KB for Embedded, 10240 KB for + Desktops. \sa cacheLimit() */ -- cgit v0.12 From f619d17ff3fbc8f8ff60a1175bc83435f977550c Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 17 Apr 2009 13:00:31 +0200 Subject: Fix ARGB8565 onto RGB16 image blending on windows The rounding was just wrong... Task-number: 246009 Reviewed-by: Trond --- src/gui/painting/qblendfunctions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 6589439..84a1e4a 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -363,9 +363,9 @@ template void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, quint32 siag = dg * sia; quint32 siab = db * sia; - quint32 rr = ((siar + (siar>>8) + (0x80 << 11)) >> 8) & 0xf800; - quint32 rg = ((siag + (siag>>8) + (0x80 << 5)) >> 8) & 0x07e0; - quint32 rb = ((siab + (siab>>8) + (0x80 >> 3)) >> 8); + quint32 rr = ((siar + (siar>>8) + (0x80 << 8)) >> 8) & 0xf800; + quint32 rg = ((siag + (siag>>8) + (0x80 << 3)) >> 8) & 0x07e0; + quint32 rb = ((siab + (siab>>8) + (0x80 >> 3)) >> 8) & 0x001f; *dst = alphaFunc.bytemul(spix) + rr + rg + rb; #endif -- cgit v0.12 From 2e5080b136dabf70d0ea3bcb39aff0b5f858056d Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 17 Apr 2009 14:07:04 +0200 Subject: Fix ARGB24PM->RGB16 for i386 GCC There was special code for gcc to run super-fast, but it was buggy and didn't blend properly. Kill this code for the benefit of the normal blend function. The performance on an Intel Quad Core 2 was not too different from the bytemul approach. Task-number: 246009 Reviewed-by: Trond --- src/gui/painting/qblendfunctions.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 84a1e4a..70cea4d 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -44,19 +44,6 @@ QT_BEGIN_NAMESPACE - -// This ifdef is made with the best of intention. GCC fails to -// optimzie the code properly so the bytemul approach is the fastest -// it gets. Both on ARM and on MSVC the code is optimized to be better -// than the bytemul approach... On the other hand... This code is -// almost never run on i386 so it may be downright silly to have this -// piece of code here... -#if defined (Q_CC_GNU) && (defined (QT_ARCH_I386) || defined (QT_ARCH_X86_64)) -# define QT_BLEND_USE_BYTEMUL -#endif - -// #define QT_DEBUG_DRAW - static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; struct SourceOnlyAlpha @@ -286,7 +273,7 @@ static void qt_blend_rgb16_on_rgb16(uchar *dst, int dbpl, int const_alpha) { #ifdef QT_DEBUG_DRAW - printf("qt_blend_argb16_on_rgb16: dst=(%p, %d), src=(%p, %d), dim=(%d, %d) alpha=%d\n", + printf("qt_blend_rgb16_on_rgb16: dst=(%p, %d), src=(%p, %d), dim=(%d, %d) alpha=%d\n", dst, dbpl, src, sbpl, w, h, const_alpha); #endif @@ -347,11 +334,6 @@ template void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, if (alpha == 255) { *dst = spix; } else if (alpha != 0) { -#ifdef QT_BLEND_USE_BYTEMUL - // truncate green channel to avoid overflow - *dst = (alphaFunc.bytemul(spix) & 0xffdf) - + (quint16) qrgb565(*dst).byte_mul(qrgb565::ialpha(alpha)); -#else quint16 dpix = *dst; quint32 sia = 255 - alpha; @@ -368,7 +350,6 @@ template void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, quint32 rb = ((siab + (siab>>8) + (0x80 >> 3)) >> 8) & 0x001f; *dst = alphaFunc.bytemul(spix) + rr + rg + rb; -#endif } ++dst; -- cgit v0.12 From 2c5ec5867c0d40f17906aa7b23380218d392970a Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 20 Apr 2009 07:29:44 +0200 Subject: Fix drawhelper pixel-writeback when dest has alpha. The blending always happens in 32-bit premultiplied so the conversion back to dest-format needs to base itself on premlutiplied too. Task-number: 182246 Reviewed-by: Samuel --- src/gui/painting/qdrawhelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index efdc778..e7bb1e1 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -370,7 +370,7 @@ Q_STATIC_TEMPLATE_FUNCTION void QT_FASTCALL destStore(QRasterBuffer *rasterBuffe Q_TEMPLATE_FIX(DST)) { DST *dest = reinterpret_cast(rasterBuffer->scanLine(y)) + x; - const quint32 *src = reinterpret_cast(buffer); + const quint32p *src = reinterpret_cast(buffer); while (length--) *dest++ = DST(*src++); } -- cgit v0.12 From 8047e8b5ac359e7470211a37e266d429c3641839 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 20 Apr 2009 07:49:14 +0200 Subject: Make the 32-bit ARGBPM on 16-bit RGB blend function faster The "optimized" version of this function was actually slower by quite a bit, so revert it to the old "trivial" code. Reviewed-by: Samuel --- src/gui/painting/qblendfunctions.cpp | 134 +++++++++-------------------------- 1 file changed, 33 insertions(+), 101 deletions(-) diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 70cea4d..dd7b016 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -416,113 +416,45 @@ static void qt_blend_argb32_on_rgb16(uchar *destPixels, int dbpl, } quint16 *dst = (quint16 *) destPixels; - int dstExtraStride = dbpl / 2 - w; - - const quint32 *src = (const quint32 *) srcPixels; - int srcExtraStride = sbpl / 4 - w; + quint32 *src = (quint32 *) srcPixels; for (int y=0; y> 1; - const int srcAlign = ((quintptr)src) & 0x3; - if (length32) { - if (srcAlign) { - for (int i = 0; i < length32; ++i) { - quint32 *dest32 = reinterpret_cast(dst); - const quint8 a1 = qAlpha(src[0]); - const quint8 a2 = qAlpha(src[1]); - quint32 s; - - if (!a1 && !a2) { - src += 2; - dst +=2; - continue; - } - - s = convert_argb32_to_rgb16(src[0]) - | (convert_argb32_to_rgb16(src[1]) << 16); - - if (a1 == a2) { - if (a1 < 255) { - const quint8 sa = ((255 - a1)+1) >> 3; - s += BYTE_MUL_RGB16_32(*dest32, sa); - } - } else { - if (a1 < 255) - s += BYTE_MUL_RGB16(dst[0], 255 - a1); - if (a2 < 255) - s += BYTE_MUL_RGB16(dst[1], 255 - a2) << 16; - } - - *dest32 = s; - src += 2; - dst += 2; - } - } else { - for (int i = 0; i < length32; ++i) { - quint32 *dest32 = reinterpret_cast(dst); - const quint8 a1 = qAlpha(src[0]); - const quint8 a2 = qAlpha(src[1]); - quint32 s; - - if (!a1 && !a2) { - src += 2; - dst +=2; - continue; - } - - const quint64 *src64 = - reinterpret_cast(src); - s = qConvertRgb32To16x2(*src64); - - if (a1 == a2) { - if (a1 < 255) { - const quint8 sa = ((255 - a1)+1) >> 3; - s += BYTE_MUL_RGB16_32(*dest32, sa); - } - } else { - if (a1 < 255) - s += BYTE_MUL_RGB16(dst[0], 255 - a1); - if (a2 < 255) - s += BYTE_MUL_RGB16(dst[1], 255 - a2) << 16; - } - - *dest32 = s; - src += 2; - dst += 2; - } - } - } - const int tail = length & 0x1; - if (tail) { - const quint8 alpha = qAlpha(*src); - if (alpha) { - quint16 s = convert_argb32_to_rgb16(*src); - if (alpha < 255) - s += BYTE_MUL_RGB16(*dst, 255 - alpha); - *dst = s; + quint32 spix = src[x]; + quint32 alpha = spix >> 24; + + if (alpha == 255) { + dst[x] = convert_argb32_to_rgb16(spix); + } else if (alpha != 0) { + quint32 dpix = dst[x]; + + quint32 sia = 255 - alpha; + + quint32 sr = (spix >> 8) & 0xf800; + quint32 sg = (spix >> 5) & 0x07e0; + quint32 sb = (spix >> 3) & 0x001f; + + quint32 dr = (dpix & 0x0000f800); + quint32 dg = (dpix & 0x000007e0); + quint32 db = (dpix & 0x0000001f); + + quint32 siar = dr * sia; + quint32 siag = dg * sia; + quint32 siab = db * sia; + + quint32 rr = sr + ((siar + (siar>>8) + (0x80 << 8)) >> 8); + quint32 rg = sg + ((siag + (siag>>8) + (0x80 << 3)) >> 8); + quint32 rb = sb + ((siab + (siab>>8) + (0x80 >> 3)) >> 8); + + dst[x] = (rr & 0xf800) + | (rg & 0x07e0) + | (rb); } - ++dst; - ++src; } - dst += dstExtraStride; - src += srcExtraStride; + dst = (quint16 *) (((uchar *) dst) + dbpl); + src = (quint32 *) (((uchar *) src) + sbpl); } - } -- cgit v0.12 From c3937c516b98edffa4792bccde3aa18926082e44 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 20 Apr 2009 07:38:33 +0200 Subject: Ifdef out the QWS blend functions for less common bitdephts by default ARGB32_PM, RGB32, ARGB8565_PM and RGB16 are optimizied elsewhere and they are the most important formats. The implemenentation of several of these depths are also buggy, so one can question their relevance. Reviewed-by: Samuel --- src/gui/painting/qdrawhelper.cpp | 90 ++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index e7bb1e1..c11837a 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -4763,7 +4763,7 @@ void QT_FASTCALL blendUntransformed(int count, const QSpan *spans, void *userDat static void blend_untransformed_rgb888(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_24) +#if defined(QT_QWS_DEPTH_24) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB888) @@ -4777,7 +4777,7 @@ static void blend_untransformed_rgb888(int count, const QSpan *spans, static void blend_untransformed_argb6666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -4793,7 +4793,7 @@ static void blend_untransformed_argb6666(int count, const QSpan *spans, static void blend_untransformed_rgb666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -4809,7 +4809,7 @@ static void blend_untransformed_rgb666(int count, const QSpan *spans, static void blend_untransformed_argb8565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -4825,7 +4825,7 @@ static void blend_untransformed_argb8565(int count, const QSpan *spans, static void blend_untransformed_rgb565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -4841,7 +4841,7 @@ static void blend_untransformed_rgb565(int count, const QSpan *spans, static void blend_untransformed_argb8555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -4857,7 +4857,7 @@ static void blend_untransformed_argb8555(int count, const QSpan *spans, static void blend_untransformed_rgb555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -4873,7 +4873,7 @@ static void blend_untransformed_rgb555(int count, const QSpan *spans, static void blend_untransformed_argb4444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -4889,7 +4889,7 @@ static void blend_untransformed_argb4444(int count, const QSpan *spans, static void blend_untransformed_rgb444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -5084,7 +5084,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTiled(int count, const QSpan *spans, void * static void blend_tiled_rgb888(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_24) +#if defined(QT_QWS_DEPTH_24) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB888) @@ -5097,7 +5097,7 @@ static void blend_tiled_rgb888(int count, const QSpan *spans, void *userData) static void blend_tiled_argb6666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -5112,7 +5112,7 @@ static void blend_tiled_argb6666(int count, const QSpan *spans, void *userData) static void blend_tiled_rgb666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -5127,7 +5127,7 @@ static void blend_tiled_rgb666(int count, const QSpan *spans, void *userData) static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -5142,7 +5142,7 @@ static void blend_tiled_argb8565(int count, const QSpan *spans, void *userData) static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -5157,7 +5157,7 @@ static void blend_tiled_rgb565(int count, const QSpan *spans, void *userData) static void blend_tiled_argb8555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -5172,7 +5172,7 @@ static void blend_tiled_argb8555(int count, const QSpan *spans, void *userData) static void blend_tiled_rgb555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -5187,7 +5187,7 @@ static void blend_tiled_rgb555(int count, const QSpan *spans, void *userData) static void blend_tiled_argb4444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -5202,7 +5202,7 @@ static void blend_tiled_argb4444(int count, const QSpan *spans, void *userData) static void blend_tiled_rgb444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -5599,7 +5599,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedBilinear(int count, const QSpan static void blend_transformed_bilinear_rgb888(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_24) +#if defined(QT_QWS_DEPTH_24) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB888) @@ -5612,7 +5612,7 @@ static void blend_transformed_bilinear_rgb888(int count, const QSpan *spans, voi static void blend_transformed_bilinear_argb6666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -5627,7 +5627,7 @@ static void blend_transformed_bilinear_argb6666(int count, const QSpan *spans, v static void blend_transformed_bilinear_rgb666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -5642,7 +5642,7 @@ static void blend_transformed_bilinear_rgb666(int count, const QSpan *spans, voi static void blend_transformed_bilinear_argb8565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -5658,7 +5658,7 @@ static void blend_transformed_bilinear_argb8565(int count, const QSpan *spans, v static void blend_transformed_bilinear_rgb565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB16) @@ -5673,7 +5673,7 @@ static void blend_transformed_bilinear_rgb565(int count, const QSpan *spans, static void blend_transformed_bilinear_argb8555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -5688,7 +5688,7 @@ static void blend_transformed_bilinear_argb8555(int count, const QSpan *spans, v static void blend_transformed_bilinear_rgb555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -5703,7 +5703,7 @@ static void blend_transformed_bilinear_rgb555(int count, const QSpan *spans, voi static void blend_transformed_bilinear_argb4444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -5718,7 +5718,7 @@ static void blend_transformed_bilinear_argb4444(int count, const QSpan *spans, v static void blend_transformed_bilinear_rgb444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -6195,7 +6195,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformed(int count, const QSpan *spans, static void blend_transformed_rgb888(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_24) +#if defined(QT_QWS_DEPTH_24) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB888) @@ -6209,7 +6209,7 @@ static void blend_transformed_rgb888(int count, const QSpan *spans, static void blend_transformed_argb6666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -6225,7 +6225,7 @@ static void blend_transformed_argb6666(int count, const QSpan *spans, static void blend_transformed_rgb666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -6241,7 +6241,7 @@ static void blend_transformed_rgb666(int count, const QSpan *spans, static void blend_transformed_argb8565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -6257,7 +6257,7 @@ static void blend_transformed_argb8565(int count, const QSpan *spans, static void blend_transformed_rgb565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -6273,7 +6273,7 @@ static void blend_transformed_rgb565(int count, const QSpan *spans, static void blend_transformed_argb8555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -6289,7 +6289,7 @@ static void blend_transformed_argb8555(int count, const QSpan *spans, static void blend_transformed_rgb555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -6305,7 +6305,7 @@ static void blend_transformed_rgb555(int count, const QSpan *spans, static void blend_transformed_argb4444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -6321,7 +6321,7 @@ static void blend_transformed_argb4444(int count, const QSpan *spans, static void blend_transformed_rgb444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -6619,7 +6619,7 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedTiled(int count, const QSpan *sp static void blend_transformed_tiled_rgb888(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_24) +#if defined(QT_QWS_DEPTH_24) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_RGB888) @@ -6633,7 +6633,7 @@ static void blend_transformed_tiled_rgb888(int count, const QSpan *spans, static void blend_transformed_tiled_argb6666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -6649,7 +6649,7 @@ static void blend_transformed_tiled_argb6666(int count, const QSpan *spans, static void blend_transformed_tiled_rgb666(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_18) +#if defined(QT_QWS_DEPTH_18) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB6666_Premultiplied) @@ -6665,7 +6665,7 @@ static void blend_transformed_tiled_rgb666(int count, const QSpan *spans, static void blend_transformed_tiled_argb8565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -6681,7 +6681,7 @@ static void blend_transformed_tiled_argb8565(int count, const QSpan *spans, static void blend_transformed_tiled_rgb565(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_16) +#if defined(QT_QWS_DEPTH_16) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8565_Premultiplied) @@ -6697,7 +6697,7 @@ static void blend_transformed_tiled_rgb565(int count, const QSpan *spans, static void blend_transformed_tiled_argb8555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -6713,7 +6713,7 @@ static void blend_transformed_tiled_argb8555(int count, const QSpan *spans, static void blend_transformed_tiled_rgb555(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_15) +#if defined(QT_QWS_DEPTH_15) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB8555_Premultiplied) @@ -6729,7 +6729,7 @@ static void blend_transformed_tiled_rgb555(int count, const QSpan *spans, static void blend_transformed_tiled_argb4444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) @@ -6745,7 +6745,7 @@ static void blend_transformed_tiled_argb4444(int count, const QSpan *spans, static void blend_transformed_tiled_rgb444(int count, const QSpan *spans, void *userData) { -#if !defined(Q_WS_QWS) || defined(QT_QWS_DEPTH_12) +#if defined(QT_QWS_DEPTH_12) QSpanData *data = reinterpret_cast(userData); if (data->texture.format == QImage::Format_ARGB4444_Premultiplied) -- cgit v0.12 From 3bcbfcfa466890469f3053a3c5987bc2cf85317b Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 20 Apr 2009 18:24:26 +1000 Subject: BT: Update text of About Qt dialog Add Copyright message as requested by Legal, and update .ts files again. Reviewed-by: Trust Me --- src/gui/dialogs/qmessagebox.cpp | 1 + translations/qt_ar.ts | 18 +++++++++--------- translations/qt_de.ts | 18 +++++++++--------- translations/qt_es.ts | 18 +++++++++--------- translations/qt_fr.ts | 18 +++++++++--------- translations/qt_iw.ts | 18 +++++++++--------- translations/qt_ja_JP.ts | 10 +++++----- translations/qt_pl.ts | 6 +++--- translations/qt_pt.ts | 18 +++++++++--------- translations/qt_ru.ts | 18 +++++++++--------- translations/qt_sk.ts | 18 +++++++++--------- translations/qt_sv.ts | 18 +++++++++--------- translations/qt_uk.ts | 18 +++++++++--------- translations/qt_untranslated.ts | 18 +++++++++--------- translations/qt_zh_CN.ts | 18 +++++++++--------- translations/qt_zh_TW.ts | 18 +++++++++--------- 16 files changed, 126 insertions(+), 125 deletions(-) diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 1ddb8f4..456b480 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1717,6 +1717,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "to comply with the terms of the GNU GPL version 3.0.

" "

Please see www.qtsoftware.com/products/licensing " "for an overview of Qt licensing.

" + "

Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).

" "

Qt is a Nokia product. See www.qtsoftware.com/qt " "for more information.

" ).arg(QLatin1String(QT_VERSION_STR)); diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts index b9c1adc..b5a60e2 100644 --- a/translations/qt_ar.ts +++ b/translations/qt_ar.ts @@ -1190,7 +1190,7 @@ to QDialogButtonBox - + OK @@ -2998,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -3006,17 +3006,12 @@ Do you want to delete it anyway? مواÙقة - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help مساعدة @@ -3030,6 +3025,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 4806231..70cf6f3 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -1170,7 +1170,7 @@ nach QDialogButtonBox - + OK @@ -2949,7 +2949,7 @@ Möchten sie die Datei trotzdem löschen? QMessageBox - + @@ -2957,17 +2957,12 @@ Möchten sie die Datei trotzdem löschen? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Ãœber Qt - + Help Hilfe @@ -2985,6 +2980,11 @@ Möchten sie die Datei trotzdem löschen? Hide Details... Details ausblenden... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_es.ts b/translations/qt_es.ts index f9299cb..ee1e88c 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -1194,7 +1194,7 @@ a QDialogButtonBox - + OK @@ -3056,7 +3056,7 @@ All other platforms QMessageBox - + Help Ayuda @@ -3069,12 +3069,7 @@ All other platforms Aceptar - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Acerca de Qt @@ -3087,7 +3082,7 @@ All other platforms <h3>Acerca de Qt</h3>%1<p>Qt es un toolkit en C++ para desarrollo de aplicaciones multiplataforma.</p><p>Qt proporciona portabilidad del código entre MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux y todas las variantes comerciales de Unix importantes. Qt también está disponible para sistemas empotrados bajo el nombre Qtopia Core.</p><p>Qt es un producto de Trolltech. Visite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para obtener más información.</p> - + Show Details... Mostrar los detalles... @@ -3097,6 +3092,11 @@ All other platforms Ocultar los detalles... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index a035963..37b334b 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1350,7 +1350,7 @@ en QDialogButtonBox - + OK @@ -3199,7 +3199,7 @@ Voulez-vous quand même le supprimer? QMessageBox - + @@ -3207,17 +3207,12 @@ Voulez-vous quand même le supprimer? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt À propos de Qt - + Help Aide @@ -3240,6 +3235,11 @@ Voulez-vous quand même le supprimer? Cacher les détails... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> diff --git a/translations/qt_iw.ts b/translations/qt_iw.ts index 52ecc9a..3b4897d 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_iw.ts @@ -1187,7 +1187,7 @@ to QDialogButtonBox - + OK @@ -2958,7 +2958,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2966,17 +2966,12 @@ Do you want to delete it anyway? ×ישור - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help עזרה @@ -2990,6 +2985,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts index f3e7584..7c8b874 100644 --- a/translations/qt_ja_JP.ts +++ b/translations/qt_ja_JP.ts @@ -1194,7 +1194,7 @@ to QDialogButtonBox - + OK @@ -3036,7 +3036,7 @@ Do you want to delete it anyway? QMessageBox - + Help ヘルプ @@ -3065,12 +3065,12 @@ Do you want to delete it anyway? <p>Qt オープンソース版ã¯ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºç”¨ã§ã™ã€‚ソースコードを公開ã—ãªã„商用アプリケーションを開発ã™ã‚‹ã«ã¯å•†ç”¨ç‰ˆã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚</p><p>Qtã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«ã¤ã„ã¦ã¯<tt>http://qtsoftware.com/company/model.html</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - + About Qt Qt ã«ã¤ã„㦠- + Show Details... 詳細を表示... @@ -3081,7 +3081,7 @@ Do you want to delete it anyway? - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts index efc8401..7f9ec8d 100644 --- a/translations/qt_pl.ts +++ b/translations/qt_pl.ts @@ -1267,7 +1267,7 @@ na Ni&e dla wszystkich - + OK @@ -2995,7 +2995,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Informacje o Qt - + Help Pomoc @@ -3014,7 +3014,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts index 5a93718..b00aaa0 100644 --- a/translations/qt_pt.ts +++ b/translations/qt_pt.ts @@ -1194,7 +1194,7 @@ para QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Deseja apagar de qualquer forma? QMessageBox - + Help Ajuda @@ -3057,12 +3057,7 @@ Deseja apagar de qualquer forma? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Acerca do Qt @@ -3075,7 +3070,7 @@ Deseja apagar de qualquer forma? <h3>Acerca do Qt</h3>%1<p>Qt é um conjunto de ferramentas para desenvolvimento de aplicações multiplataforma.</p>O Qt oferece portabilidade de código fonte único em MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux e todas as principais variantes comerciais de Unix. O Qt está igualmente disponível para dispositivos embebidos como Qtopia Core.</p><p>O Qt é um produto Trolltech. Veja <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para mais informação.</p> - + Show Details... Mostrar Detalhes... @@ -3085,6 +3080,11 @@ Deseja apagar de qualquer forma? Não Mostrar Detalhes... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 1db3e46..28e786b 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -1190,7 +1190,7 @@ to QDialogButtonBox - + OK @@ -2998,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -3006,17 +3006,12 @@ Do you want to delete it anyway? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help Справка @@ -3030,6 +3025,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts index 5045022..1bf53e7 100644 --- a/translations/qt_sk.ts +++ b/translations/qt_sk.ts @@ -1194,7 +1194,7 @@ na QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Chcete ho aj tak zmazaÅ¥? QMessageBox - + @@ -3052,17 +3052,12 @@ Chcete ho aj tak zmazaÅ¥? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Informácie o Qt - + Help Pomocník @@ -3085,6 +3080,11 @@ Chcete ho aj tak zmazaÅ¥? SkryÅ¥ detaily... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts index 1b75722..d6affce 100644 --- a/translations/qt_sv.ts +++ b/translations/qt_sv.ts @@ -1194,7 +1194,7 @@ till QDialogButtonBox - + OK @@ -3000,7 +3000,7 @@ Vill du ta bort den ändÃ¥? QMessageBox - + Help Hjälp @@ -3013,12 +3013,7 @@ Vill du ta bort den ändÃ¥? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Om Qt @@ -3031,7 +3026,7 @@ Vill du ta bort den ändÃ¥? <h3>Om Qt</h3>%1<p>Qt är ett C++-verktygssamling för utveckling av krossplattformsprogram.</p><p>Qt tillhandahÃ¥ller portabilitet för samma källkod mellan MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, och alla andra stora kommersiella Unix-varianter. Qt finns ocksÃ¥ tillgängligt för inbäddade enheter som Qtopia Core.</p><p>Qt är en produkt frÃ¥n Trolltech. Se <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> för mer information.</p> - + Show Details... Visa detaljer... @@ -3040,6 +3035,11 @@ Vill du ta bort den ändÃ¥? Hide Details... Dölj detaljer,,, + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index d6a7d80..9c1b1f4 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -1200,7 +1200,7 @@ to QDialogButtonBox - + OK @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QMessageBox - + Help Довідка @@ -3068,12 +3068,7 @@ Do you want to delete it anyway? Гаразд - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Про Qt @@ -3086,7 +3081,7 @@ Do you want to delete it anyway? <h3>Про Qt</h3>%1<p>Qt - це інÑтрументарій C++ Ð´Ð»Ñ Ð¼Ñ–Ð¶Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¾Ð²Ð¾Ñ— розробки.</p><p>Qt забезпечує мобільніÑÑ‚ÑŒ єдиних джерельних текÑтів між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та вÑіма оÑновними комерційними верÑÑ–Ñми Unix. Qt Ñ–Ñнує також Ð´Ð»Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ… приÑтроїв, таких, Ñк Qtopia Core.</p><p>Qt - це продукт компанії Trolltech. Більше інформації можна знайти на <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + Show Details... Показати подробиці... @@ -3096,6 +3091,11 @@ Do you want to delete it anyway? Сховати подробиці... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> diff --git a/translations/qt_untranslated.ts b/translations/qt_untranslated.ts index 083a56f..35a2802 100644 --- a/translations/qt_untranslated.ts +++ b/translations/qt_untranslated.ts @@ -1157,7 +1157,7 @@ to QDialogButtonBox - + OK @@ -2921,7 +2921,7 @@ Do you want to delete it anyway? QMessageBox - + Help @@ -2934,17 +2934,12 @@ Do you want to delete it anyway? - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Show Details... @@ -2953,6 +2948,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index 061919d..b0a7947 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -1202,7 +1202,7 @@ to QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Do you want to delete it anyway? QMessageBox - + Help 帮助 @@ -3057,12 +3057,7 @@ Do you want to delete it anyway? 确定 - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt 关于Qt @@ -3071,7 +3066,7 @@ Do you want to delete it anyway? <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> - + Show Details... 显示细节…… @@ -3081,6 +3076,11 @@ Do you want to delete it anyway? éšè—细节…… + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts index 9fb871b..bcb6f8d 100644 --- a/translations/qt_zh_TW.ts +++ b/translations/qt_zh_TW.ts @@ -1223,7 +1223,7 @@ to QDialogButtonBox - + OK @@ -3073,7 +3073,7 @@ Do you want to delete it anyway? QMessageBox - + Help 說明 @@ -3086,12 +3086,7 @@ Do you want to delete it anyway? 確定 - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt 關於 Qt @@ -3104,7 +3099,7 @@ Do you want to delete it anyway? <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt 也å¯ä»¥ç”¨ Qtopia Core 用於嵌入å¼ç³»çµ±ã€‚</p><p>Qt 為 Trolltech 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> - + Show Details... 顯示詳情... @@ -3114,6 +3109,11 @@ Do you want to delete it anyway? éš±è—詳情... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> -- cgit v0.12 From 8179c72a4ae999bd9a2aaf59fdf568acc9662c2d Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 20 Apr 2009 09:49:55 +0200 Subject: BT: Fix a crash when using Q(File)Dialog::open() in QCocoa. If we don't have a sheet, we need to recreate it in Cocoa. Unfortunately, we neglected to reassign the NSWindow pointer in that case, so the program would crash. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 9d9889682c79bacb803ef5613502e7307c1d16bd) --- src/gui/kernel/qwidget_mac.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 43f6725..e416b43 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4610,8 +4610,11 @@ void QWidgetPrivate::setModal_sys() if (windowParent && q->windowModality() == Qt::WindowModal){ // Window should be window-modal, which implies a sheet. - if (!alreadySheet) + if (!alreadySheet) { + // NB: the following call will call setModal_sys recursivly: recreateMacWindow(); + windowRef = qt_mac_window_for(q); + } if ([windowRef isKindOfClass:[NSPanel class]]){ // If the primary window of the sheet parent is a child of a modal dialog, // the sheet parent should not be modally shaddowed. -- cgit v0.12 From 5c88d69263bba567ce2144f6ff0d3069ef79b5aa Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 20 Apr 2009 18:24:26 +1000 Subject: BT: Update text of About Qt dialog Add Copyright message as requested by Legal, and update .ts files again. Reviewed-by: Trust Me (cherry picked from commit 3bcbfcfa466890469f3053a3c5987bc2cf85317b) --- src/gui/dialogs/qmessagebox.cpp | 1 + translations/qt_ar.ts | 18 +++++++++--------- translations/qt_de.ts | 18 +++++++++--------- translations/qt_es.ts | 18 +++++++++--------- translations/qt_fr.ts | 18 +++++++++--------- translations/qt_iw.ts | 18 +++++++++--------- translations/qt_ja_JP.ts | 10 +++++----- translations/qt_pl.ts | 6 +++--- translations/qt_pt.ts | 18 +++++++++--------- translations/qt_ru.ts | 18 +++++++++--------- translations/qt_sk.ts | 18 +++++++++--------- translations/qt_sv.ts | 18 +++++++++--------- translations/qt_uk.ts | 18 +++++++++--------- translations/qt_untranslated.ts | 18 +++++++++--------- translations/qt_zh_CN.ts | 18 +++++++++--------- translations/qt_zh_TW.ts | 18 +++++++++--------- 16 files changed, 126 insertions(+), 125 deletions(-) diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index c0744d7..6da4832 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1717,6 +1717,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "to comply with the terms of the GNU GPL version 3.0.

" "

Please see www.qtsoftware.com/products/licensing " "for an overview of Qt licensing.

" + "

Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).

" "

Qt is a Nokia product. See www.qtsoftware.com/qt " "for more information.

" ).arg(QLatin1String(QT_VERSION_STR)); diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts index b9c1adc..b5a60e2 100644 --- a/translations/qt_ar.ts +++ b/translations/qt_ar.ts @@ -1190,7 +1190,7 @@ to QDialogButtonBox - + OK @@ -2998,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -3006,17 +3006,12 @@ Do you want to delete it anyway? مواÙقة - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help مساعدة @@ -3030,6 +3025,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 4806231..70cf6f3 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -1170,7 +1170,7 @@ nach QDialogButtonBox - + OK @@ -2949,7 +2949,7 @@ Möchten sie die Datei trotzdem löschen? QMessageBox - + @@ -2957,17 +2957,12 @@ Möchten sie die Datei trotzdem löschen? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Ãœber Qt - + Help Hilfe @@ -2985,6 +2980,11 @@ Möchten sie die Datei trotzdem löschen? Hide Details... Details ausblenden... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_es.ts b/translations/qt_es.ts index f9299cb..ee1e88c 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -1194,7 +1194,7 @@ a QDialogButtonBox - + OK @@ -3056,7 +3056,7 @@ All other platforms QMessageBox - + Help Ayuda @@ -3069,12 +3069,7 @@ All other platforms Aceptar - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Acerca de Qt @@ -3087,7 +3082,7 @@ All other platforms <h3>Acerca de Qt</h3>%1<p>Qt es un toolkit en C++ para desarrollo de aplicaciones multiplataforma.</p><p>Qt proporciona portabilidad del código entre MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux y todas las variantes comerciales de Unix importantes. Qt también está disponible para sistemas empotrados bajo el nombre Qtopia Core.</p><p>Qt es un producto de Trolltech. Visite <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para obtener más información.</p> - + Show Details... Mostrar los detalles... @@ -3097,6 +3092,11 @@ All other platforms Ocultar los detalles... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Este programa utiliza Qt Open Source Edition versión %1.</p><p>Qt Open Source Edition está dirigida al desarrollo de aplicaciones libres. Para desarrollar aplicaciones privativas (de código cerrado) necesita una licencia comercial de Qt.</p><p>Visite <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> para obtener una visión global de las licencias de Qt.</p> diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index a035963..37b334b 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1350,7 +1350,7 @@ en QDialogButtonBox - + OK @@ -3199,7 +3199,7 @@ Voulez-vous quand même le supprimer? QMessageBox - + @@ -3207,17 +3207,12 @@ Voulez-vous quand même le supprimer? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt À propos de Qt - + Help Aide @@ -3240,6 +3235,11 @@ Voulez-vous quand même le supprimer? Cacher les détails... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>A propos de Qt</h3>%1<p>Qt est un framework de développement d'applications multi-plateforme.</p><p>Qt fournit la portabilité du code source surMS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, et toutes les variantes majeures d'Unix. Qt est aussi disponible pour l'embarqué avec Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt est un produit de Nokia. Allez à <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> pour plus d'informations.</p> diff --git a/translations/qt_iw.ts b/translations/qt_iw.ts index 52ecc9a..3b4897d 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_iw.ts @@ -1187,7 +1187,7 @@ to QDialogButtonBox - + OK @@ -2958,7 +2958,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -2966,17 +2966,12 @@ Do you want to delete it anyway? ×ישור - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help עזרה @@ -2990,6 +2985,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts index f3e7584..7c8b874 100644 --- a/translations/qt_ja_JP.ts +++ b/translations/qt_ja_JP.ts @@ -1194,7 +1194,7 @@ to QDialogButtonBox - + OK @@ -3036,7 +3036,7 @@ Do you want to delete it anyway? QMessageBox - + Help ヘルプ @@ -3065,12 +3065,12 @@ Do you want to delete it anyway? <p>Qt オープンソース版ã¯ã‚ªãƒ¼ãƒ—ンソースã®ã‚¢ãƒ—リケーションã®é–‹ç™ºç”¨ã§ã™ã€‚ソースコードを公開ã—ãªã„商用アプリケーションを開発ã™ã‚‹ã«ã¯å•†ç”¨ç‰ˆã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒå¿…è¦ã§ã™ã€‚</p><p>Qtã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«ã¤ã„ã¦ã¯<tt>http://qtsoftware.com/company/model.html</tt>ã‚’å‚ç…§ã—ã¦ãã ã•ã„。</p> - + About Qt Qt ã«ã¤ã„㦠- + Show Details... 詳細を表示... @@ -3081,7 +3081,7 @@ Do you want to delete it anyway? - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts index efc8401..7f9ec8d 100644 --- a/translations/qt_pl.ts +++ b/translations/qt_pl.ts @@ -1267,7 +1267,7 @@ na Ni&e dla wszystkich - + OK @@ -2995,7 +2995,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. Informacje o Qt - + Help Pomoc @@ -3014,7 +3014,7 @@ ProszÄ™ o sprawdzenie podanej nazwy pliku. - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts index 5a93718..b00aaa0 100644 --- a/translations/qt_pt.ts +++ b/translations/qt_pt.ts @@ -1194,7 +1194,7 @@ para QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Deseja apagar de qualquer forma? QMessageBox - + Help Ajuda @@ -3057,12 +3057,7 @@ Deseja apagar de qualquer forma? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Acerca do Qt @@ -3075,7 +3070,7 @@ Deseja apagar de qualquer forma? <h3>Acerca do Qt</h3>%1<p>Qt é um conjunto de ferramentas para desenvolvimento de aplicações multiplataforma.</p>O Qt oferece portabilidade de código fonte único em MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux e todas as principais variantes comerciais de Unix. O Qt está igualmente disponível para dispositivos embebidos como Qtopia Core.</p><p>O Qt é um produto Trolltech. Veja <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> para mais informação.</p> - + Show Details... Mostrar Detalhes... @@ -3085,6 +3080,11 @@ Deseja apagar de qualquer forma? Não Mostrar Detalhes... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Este programa usa Qt Open Source Edition versão %1.</p><p>Qt Open Source Edition é indicado para o desenvolvimento de aplicações/programas open source. Se pretender desenvolver aplicações sem disponibilizar o codigo fonte, então precisará de obter uma licença comercial.</p><p>Por favor consulte <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a>para obter mais informação acerca de licenças Qt.</p> diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index 1db3e46..28e786b 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -1190,7 +1190,7 @@ to QDialogButtonBox - + OK @@ -2998,7 +2998,7 @@ Do you want to delete it anyway? QMessageBox - + @@ -3006,17 +3006,12 @@ Do you want to delete it anyway? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Help Справка @@ -3030,6 +3025,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts index 5045022..1bf53e7 100644 --- a/translations/qt_sk.ts +++ b/translations/qt_sk.ts @@ -1194,7 +1194,7 @@ na QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Chcete ho aj tak zmazaÅ¥? QMessageBox - + @@ -3052,17 +3052,12 @@ Chcete ho aj tak zmazaÅ¥? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Informácie o Qt - + Help Pomocník @@ -3085,6 +3080,11 @@ Chcete ho aj tak zmazaÅ¥? SkryÅ¥ detaily... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Tento program používa Qt Open Source Edition verziu %1.</p><p>Qt Open Source Edition je urÄená pre vývoj Open Source aplikácií. Pre vývoj vlastnených (closed source) aplikácií potrebujete komerÄnú Qt licenciu.</p><p>Prosím pozrite <a href="http://qtsoftware.com/company/model.html">qtsoftware.com/company/model.html</a> pre prehľad Qt licencovania.</p> diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts index 1b75722..d6affce 100644 --- a/translations/qt_sv.ts +++ b/translations/qt_sv.ts @@ -1194,7 +1194,7 @@ till QDialogButtonBox - + OK @@ -3000,7 +3000,7 @@ Vill du ta bort den ändÃ¥? QMessageBox - + Help Hjälp @@ -3013,12 +3013,7 @@ Vill du ta bort den ändÃ¥? OK - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Om Qt @@ -3031,7 +3026,7 @@ Vill du ta bort den ändÃ¥? <h3>Om Qt</h3>%1<p>Qt är ett C++-verktygssamling för utveckling av krossplattformsprogram.</p><p>Qt tillhandahÃ¥ller portabilitet för samma källkod mellan MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, och alla andra stora kommersiella Unix-varianter. Qt finns ocksÃ¥ tillgängligt för inbäddade enheter som Qtopia Core.</p><p>Qt är en produkt frÃ¥n Trolltech. Se <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> för mer information.</p> - + Show Details... Visa detaljer... @@ -3040,6 +3035,11 @@ Vill du ta bort den ändÃ¥? Hide Details... Dölj detaljer,,, + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_uk.ts b/translations/qt_uk.ts index d6a7d80..9c1b1f4 100644 --- a/translations/qt_uk.ts +++ b/translations/qt_uk.ts @@ -1200,7 +1200,7 @@ to QDialogButtonBox - + OK @@ -3055,7 +3055,7 @@ Do you want to delete it anyway? QMessageBox - + Help Довідка @@ -3068,12 +3068,7 @@ Do you want to delete it anyway? Гаразд - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt Про Qt @@ -3086,7 +3081,7 @@ Do you want to delete it anyway? <h3>Про Qt</h3>%1<p>Qt - це інÑтрументарій C++ Ð´Ð»Ñ Ð¼Ñ–Ð¶Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¾Ð²Ð¾Ñ— розробки.</p><p>Qt забезпечує мобільніÑÑ‚ÑŒ єдиних джерельних текÑтів між MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux та вÑіма оÑновними комерційними верÑÑ–Ñми Unix. Qt Ñ–Ñнує також Ð´Ð»Ñ Ð²Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ… приÑтроїв, таких, Ñк Qtopia Core.</p><p>Qt - це продукт компанії Trolltech. Більше інформації можна знайти на <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>.</p> - + Show Details... Показати подробиці... @@ -3096,6 +3091,11 @@ Do you want to delete it anyway? Сховати подробиці... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> for an overview of Qt licensing.</p> <p>Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° викориÑтовує Qt Open Source Edition верÑÑ–Ñ— %1.</p><p>Qt Open Source Edition призначено Ð´Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ відкритих програмних заÑобів. Ð”Ð»Ñ Ñ€Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ¸ влаÑницьких (закритих) програм вам потрібна комерційна Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð»Ñ Qt.</p><p>ПереглÑньте <a href="http://qtsoftware.com/company/model/">qtsoftware.com/company/model/</a> щодо оглÑду ліцензій Qt.</p> diff --git a/translations/qt_untranslated.ts b/translations/qt_untranslated.ts index 083a56f..35a2802 100644 --- a/translations/qt_untranslated.ts +++ b/translations/qt_untranslated.ts @@ -1157,7 +1157,7 @@ to QDialogButtonBox - + OK @@ -2921,7 +2921,7 @@ Do you want to delete it anyway? QMessageBox - + Help @@ -2934,17 +2934,12 @@ Do you want to delete it anyway? - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt - + Show Details... @@ -2953,6 +2948,11 @@ Do you want to delete it anyway? Hide Details... + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + QMultiInputContext diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index 061919d..b0a7947 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -1202,7 +1202,7 @@ to QDialogButtonBox - + OK @@ -3044,7 +3044,7 @@ Do you want to delete it anyway? QMessageBox - + Help 帮助 @@ -3057,12 +3057,7 @@ Do you want to delete it anyway? 确定 - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt 关于Qt @@ -3071,7 +3066,7 @@ Do you want to delete it anyway? <p>这个程åºä½¿ç”¨çš„是Qt %1版。</p> - + Show Details... 显示细节…… @@ -3081,6 +3076,11 @@ Do you want to delete it anyway? éšè—细节…… + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>关于Qt</h3>%1<p>Qt是一个用于跨平å°åº”用程åºå¼€å‘çš„C++工具包。</p><p>对于MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux和所有主æµå•†ä¸šUnix,Qtæ供了å•ä¸€æºç¨‹åºçš„å¯ç§»æ¤æ€§ã€‚Qt也有用于嵌入å¼Linuxå’ŒWindows CE的版本。</p><p>Qt是Nokia的产å“。有关更多信æ¯ï¼Œè¯·å‚考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts index 9fb871b..bcb6f8d 100644 --- a/translations/qt_zh_TW.ts +++ b/translations/qt_zh_TW.ts @@ -1223,7 +1223,7 @@ to QDialogButtonBox - + OK @@ -3073,7 +3073,7 @@ Do you want to delete it anyway? QMessageBox - + Help 說明 @@ -3086,12 +3086,7 @@ Do you want to delete it anyway? 確定 - - <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> - - - - + About Qt 關於 Qt @@ -3104,7 +3099,7 @@ Do you want to delete it anyway? <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt 也å¯ä»¥ç”¨ Qtopia Core 用於嵌入å¼ç³»çµ±ã€‚</p><p>Qt 為 Trolltech 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> - + Show Details... 顯示詳情... @@ -3114,6 +3109,11 @@ Do you want to delete it anyway? éš±è—詳情... + + <h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p> + + + <h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p> <h3>關於 Qt</h3>%1<p>Qt 為一個跨平å°çš„ C++ 開發工具。</p><p>Qt æä¾›å„å¹³å°ç›¸å®¹æ©Ÿåˆ¶ï¼Œåªè¦å¯«ä¸€ä»½ç¨‹å¼ç¢¼ï¼Œå°±å¯ä»¥åœ¨ MS&nbsp;Windowsã€Mac&nbsp;OS&nbsp;Xã€Linux 與å„主è¦çš„商業 Unix å¹³å°ä¸Šç·¨è­¯ã€‚Qt ä¹Ÿæœ‰ç”¨æ–¼åµŒå…¥å¼ Linux 與 Windows CE 的版本。</p><p>Qt 為 Nokia 的產å“。詳情請åƒè€ƒ <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p> -- cgit v0.12 From 9f668a352df15404234ea30bc9bb0c1ef774c1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Mon, 20 Apr 2009 11:03:57 +0200 Subject: Clean up white space. --- src/plugins/imageformats/ico/qicohandler.cpp | 325 +++++++++++++-------------- 1 file changed, 160 insertions(+), 165 deletions(-) diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 299190b..aa53370 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -57,38 +57,38 @@ // in an ICO file. typedef struct { - quint8 bWidth; // Width of the image - quint8 bHeight; // Height of the image (times 2) - quint8 bColorCount; // Number of colors in image (0 if >=8bpp) [ not ture ] - quint8 bReserved; // Reserved - quint16 wPlanes; // Color Planes - quint16 wBitCount; // Bits per pixel - quint32 dwBytesInRes; // how many bytes in this resource? - quint32 dwImageOffset; // where in the file is this image + quint8 bWidth; // Width of the image + quint8 bHeight; // Height of the image (times 2) + quint8 bColorCount; // Number of colors in image (0 if >=8bpp) [ not ture ] + quint8 bReserved; // Reserved + quint16 wPlanes; // Color Planes + quint16 wBitCount; // Bits per pixel + quint32 dwBytesInRes; // how many bytes in this resource? + quint32 dwImageOffset; // where in the file is this image } ICONDIRENTRY, *LPICONDIRENTRY; #define ICONDIRENTRY_SIZE 16 typedef struct { - quint16 idReserved; // Reserved - quint16 idType; // resource type (1 for icons) - quint16 idCount; // how many images? - ICONDIRENTRY idEntries[1]; // the entries for each image + quint16 idReserved; // Reserved + quint16 idType; // resource type (1 for icons) + quint16 idCount; // how many images? + ICONDIRENTRY idEntries[1]; // the entries for each image } ICONDIR, *LPICONDIR; #define ICONDIR_SIZE 6 // Exclude the idEntries field -typedef struct { // BMP information header - quint32 biSize; // size of this struct - quint32 biWidth; // pixmap width - quint32 biHeight; // pixmap height - quint16 biPlanes; // should be 1 - quint16 biBitCount; // number of bits per pixel - quint32 biCompression; // compression method - quint32 biSizeImage; // size of image - quint32 biXPelsPerMeter; // horizontal resolution - quint32 biYPelsPerMeter; // vertical resolution - quint32 biClrUsed; // number of colors used - quint32 biClrImportant; // number of important colors +typedef struct { // BMP information header + quint32 biSize; // size of this struct + quint32 biWidth; // pixmap width + quint32 biHeight; // pixmap height + quint16 biPlanes; // should be 1 + quint16 biBitCount; // number of bits per pixel + quint32 biCompression; // compression method + quint32 biSizeImage; // size of image + quint32 biXPelsPerMeter; // horizontal resolution + quint32 biYPelsPerMeter; // vertical resolution + quint32 biClrUsed; // number of colors used + quint32 biClrImportant; // number of important colors } BMP_INFOHDR ,*LPBMP_INFOHDR; #define BMP_INFOHDR_SIZE 40 @@ -254,7 +254,7 @@ ICOReader::ICOReader(QIODevice * iodevice) int ICOReader::count() { if (readHeader()) - return iconDir.idCount; + return iconDir.idCount; return 0; } @@ -268,17 +268,17 @@ bool ICOReader::canRead(QIODevice *iodev) if (readIconDir(iodev, &ikonDir)) { qint64 readBytes = ICONDIR_SIZE; if (readIconDirEntry(iodev, &ikonDir.idEntries[0])) { - readBytes += ICONDIRENTRY_SIZE; - // ICO format does not have a magic identifier, so we read 6 different values, which will hopefully be enough to identify the file. - if ( ikonDir.idReserved == 0 - && ikonDir.idType == 1 - && ikonDir.idEntries[0].bReserved == 0 - && ikonDir.idEntries[0].wPlanes <= 1 - && ikonDir.idEntries[0].wBitCount <= 32 // Bits per pixel - && ikonDir.idEntries[0].dwBytesInRes >= 40 // Must be over 40, since sizeof (infoheader) == 40 - ) { - isProbablyICO = true; - } + readBytes += ICONDIRENTRY_SIZE; + // ICO format does not have a magic identifier, so we read 6 different values, which will hopefully be enough to identify the file. + if ( ikonDir.idReserved == 0 + && ikonDir.idType == 1 + && ikonDir.idEntries[0].bReserved == 0 + && ikonDir.idEntries[0].wPlanes <= 1 + && ikonDir.idEntries[0].wBitCount <= 32 // Bits per pixel + && ikonDir.idEntries[0].dwBytesInRes >= 40 // Must be over 40, since sizeof (infoheader) == 40 + ) { + isProbablyICO = true; + } if (iodev->isSequential()) { // Our structs might be padded due to alignment, so we need to fetch each member before we ungetChar() ! @@ -323,8 +323,7 @@ bool ICOReader::canRead(QIODevice *iodev) iodev->ungetChar((tmp >> 8) & 0xff); iodev->ungetChar(tmp & 0xff); } - - } + } if (!iodev->isSequential()) iodev->seek(oldPos); } @@ -334,11 +333,11 @@ bool ICOReader::canRead(QIODevice *iodev) bool ICOReader::readHeader() { if (iod && !headerRead) { - startpos = iod->pos(); - if (readIconDir(iod, &iconDir)) { - if (iconDir.idReserved == 0 || iconDir.idType == 1) - headerRead = true; - } + startpos = iod->pos(); + if (readIconDir(iod, &iconDir)) { + if (iconDir.idReserved == 0 || iconDir.idType == 1) + headerRead = true; + } } return headerRead; @@ -347,8 +346,8 @@ bool ICOReader::readHeader() bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry) { if (iod) { - if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) { - return readIconDirEntry(iod, iconEntry); + if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) { + return readIconDirEntry(iod, iconEntry); } } return false; @@ -360,45 +359,45 @@ bool ICOReader::readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header) { memset(&icoAttrib, 0, sizeof(IcoAttrib)); if (iod) { - if (iod->seek(startpos + iconEntry.dwImageOffset)) { - if (readBMPInfoHeader(iod, header)) { - - icoAttrib.nbits = header->biBitCount ? header->biBitCount : iconEntry.wBitCount; - icoAttrib.h = header->biHeight / 2; // this height is always double the iconEntry height (for the mask) - icoAttrib.w = header->biWidth; - - switch (icoAttrib.nbits) { - case 32: - case 24: - case 16: - icoAttrib.depth = 32; - break; - case 8: - case 4: - icoAttrib.depth = 8; - break; - default: - icoAttrib.depth = 1; - } - - if ( icoAttrib.depth == 32 ) // there's no colormap - icoAttrib.ncolors = 0; - else // # colors used - icoAttrib.ncolors = header->biClrUsed ? header->biClrUsed : 1 << icoAttrib.nbits; - //qDebug() << "Bits:" << icoAttrib.nbits << "Depth:" << icoAttrib.depth << "Ncols:" << icoAttrib.ncolors; - return TRUE; - } - } + if (iod->seek(startpos + iconEntry.dwImageOffset)) { + if (readBMPInfoHeader(iod, header)) { + + icoAttrib.nbits = header->biBitCount ? header->biBitCount : iconEntry.wBitCount; + icoAttrib.h = header->biHeight / 2; // this height is always double the iconEntry height (for the mask) + icoAttrib.w = header->biWidth; + + switch (icoAttrib.nbits) { + case 32: + case 24: + case 16: + icoAttrib.depth = 32; + break; + case 8: + case 4: + icoAttrib.depth = 8; + break; + default: + icoAttrib.depth = 1; + } + + if ( icoAttrib.depth == 32 ) // there's no colormap + icoAttrib.ncolors = 0; + else // # colors used + icoAttrib.ncolors = header->biClrUsed ? header->biClrUsed : 1 << icoAttrib.nbits; + //qDebug() << "Bits:" << icoAttrib.nbits << "Depth:" << icoAttrib.depth << "Ncols:" << icoAttrib.ncolors; + return TRUE; + } + } } return FALSE; } void ICOReader::findColorInfo(QImage & image) { - if (icoAttrib.ncolors > 0) { // set color table - readColorTable(image); + if (icoAttrib.ncolors > 0) { // set color table + readColorTable(image); } else if (icoAttrib.nbits == 16) { // don't support RGB values for 15/16 bpp - image = QImage(); + image = QImage(); } } @@ -406,29 +405,29 @@ void ICOReader::readColorTable(QImage & image) { if (iod) { image.setNumColors(icoAttrib.ncolors); - uchar rgb[4]; - for (int i=0; iread((char*)rgb, 4) != 4) { - image = QImage(); - break; - } - image.setColor(i, qRgb(rgb[2],rgb[1],rgb[0])); - } + uchar rgb[4]; + for (int i=0; iread((char*)rgb, 4) != 4) { + image = QImage(); + break; + } + image.setColor(i, qRgb(rgb[2],rgb[1],rgb[0])); + } } else { - image = QImage(); + image = QImage(); } } void ICOReader::readBMP(QImage & image) { - if (icoAttrib.nbits == 1) { // 1 bit BMP image - read1BitBMP(image); - } else if (icoAttrib.nbits == 4) { // 4 bit BMP image - read4BitBMP(image); + if (icoAttrib.nbits == 1) { // 1 bit BMP image + read1BitBMP(image); + } else if (icoAttrib.nbits == 4) { // 4 bit BMP image + read4BitBMP(image); } else if (icoAttrib.nbits == 8) { - read8BitBMP(image); + read8BitBMP(image); } else if (icoAttrib.nbits == 16 || icoAttrib.nbits == 24 || icoAttrib.nbits == 32 ) { // 16,24,32 bit BMP image - read16_24_32BMP(image); + read16_24_32BMP(image); } } @@ -442,17 +441,17 @@ void ICOReader::read1BitBMP(QImage & image) { if (iod) { - int h = image.height(); - int bpl = image.bytesPerLine(); + int h = image.height(); + int bpl = image.bytesPerLine(); - while (--h >= 0) { - if (iod->read((char*)image.scanLine(h),bpl) != bpl) { - image = QImage(); - break; - } - } + while (--h >= 0) { + if (iod->read((char*)image.scanLine(h),bpl) != bpl) { + image = QImage(); + break; + } + } } else { - image = QImage(); + image = QImage(); } } @@ -460,30 +459,30 @@ void ICOReader::read4BitBMP(QImage & image) { if (iod) { - int h = icoAttrib.h; - int buflen = ((icoAttrib.w+7)/8)*4; - uchar *buf = new uchar[buflen]; - Q_CHECK_PTR(buf); - - while (--h >= 0) { - if (iod->read((char*)buf,buflen) != buflen) { - image = QImage(); - break; - } - register uchar *p = image.scanLine(h); - uchar *b = buf; - for (int i=0; i> 4; - *p++ = *b++ & 0x0f; - } - if (icoAttrib.w & 1) // the last nibble - *p = *b >> 4; - } - - delete [] buf; + int h = icoAttrib.h; + int buflen = ((icoAttrib.w+7)/8)*4; + uchar *buf = new uchar[buflen]; + Q_CHECK_PTR(buf); + + while (--h >= 0) { + if (iod->read((char*)buf,buflen) != buflen) { + image = QImage(); + break; + } + register uchar *p = image.scanLine(h); + uchar *b = buf; + for (int i=0; i> 4; + *p++ = *b++ & 0x0f; + } + if (icoAttrib.w & 1) // the last nibble + *p = *b >> 4; + } + + delete [] buf; } else { - image = QImage(); + image = QImage(); } } @@ -491,52 +490,51 @@ void ICOReader::read8BitBMP(QImage & image) { if (iod) { - int h = icoAttrib.h; - int bpl = image.bytesPerLine(); + int h = icoAttrib.h; + int bpl = image.bytesPerLine(); - while (--h >= 0) { - if (iod->read((char *)image.scanLine(h), bpl) != bpl) { - image = QImage(); - break; - } - } + while (--h >= 0) { + if (iod->read((char *)image.scanLine(h), bpl) != bpl) { + image = QImage(); + break; + } + } } else { - image = QImage(); + image = QImage(); } } void ICOReader::read16_24_32BMP(QImage & image) { if (iod) { - - int h = icoAttrib.h; - register QRgb *p; - QRgb *end; - uchar *buf = new uchar[image.bytesPerLine()]; - int bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4; - uchar *b; - - while (--h >= 0) { - p = (QRgb *)image.scanLine(h); - end = p + icoAttrib.w; - if (iod->read((char *)buf, bpl) != bpl) { - image = QImage(); - break; - } - b = buf; - while (p < end) { + int h = icoAttrib.h; + register QRgb *p; + QRgb *end; + uchar *buf = new uchar[image.bytesPerLine()]; + int bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4; + uchar *b; + + while (--h >= 0) { + p = (QRgb *)image.scanLine(h); + end = p + icoAttrib.w; + if (iod->read((char *)buf, bpl) != bpl) { + image = QImage(); + break; + } + b = buf; + while (p < end) { if (icoAttrib.nbits == 24) *p++ = qRgb(*(b+2), *(b+1), *b); else if (icoAttrib.nbits == 32) *p++ = qRgba(*(b+2), *(b+1), *b, *(b+3)); - b += icoAttrib.nbits/8; - } - } + b += icoAttrib.nbits/8; + } + } - delete[] buf; + delete[] buf; } else { - image = QImage(); + image = QImage(); } } @@ -605,8 +603,8 @@ QList ICOReader::read(QIODevice * device) QList images; ICOReader reader(device); - for (int i=0; i & images) } maskImage = maskImage.convertToFormat(QImage::Format_Mono); - int nbits = 32; - int bpl_bmp = ((image.width()*nbits+31)/32)*4; + int nbits = 32; + int bpl_bmp = ((image.width()*nbits+31)/32)*4; entries[i].bColorCount = 0; entries[i].bReserved = 0; @@ -670,7 +668,7 @@ bool ICOReader::write(QIODevice * device, const QList & images) entries[i].dwBytesInRes = BMP_INFOHDR_SIZE + (bpl_bmp * image.height()) + (maskImage.bytesPerLine() * maskImage.height()); entries[i].wPlanes = 1; - if (i==0) + if (i == 0) entries[i].dwImageOffset = origOffset + ICONDIR_SIZE + (id.idCount * ICONDIRENTRY_SIZE); else @@ -695,7 +693,7 @@ bool ICOReader::write(QIODevice * device, const QList & images) uchar *b; memset( buf, 0, bpl_bmp ); int y; - for (y=image.height()-1; y>=0; y--) { // write the image bits + for (y = image.height() - 1; y >= 0; y--) { // write the image bits // 32 bits QRgb *p = (QRgb *)image.scanLine(y); QRgb *end = p + image.width(); @@ -717,13 +715,10 @@ bool ICOReader::write(QIODevice * device, const QList & images) maskImage.invertPixels(); // seems as though it needs this // NOTE! !! The mask is only flipped vertically - not horizontally !! - for (y=maskImage.height()-1; y>=0; y--) + for (y = maskImage.height() - 1; y >= 0; y--) buffer.write((char*)maskImage.scanLine(y), maskImage.bytesPerLine()); - } - - if (writeIconDir(device, id)) { int i; bool bOK = true; @@ -731,7 +726,7 @@ bool ICOReader::write(QIODevice * device, const QList & images) bOK = writeIconDirEntry(device, entries[i]); } if (bOK) { - for (i=0; iwrite(imageData[i]) == (int) imageData[i].size()); } -- cgit v0.12 From 33259249106e16052b60c55a35539c9f8cb0414d Mon Sep 17 00:00:00 2001 From: jasplin Date: Mon, 20 Apr 2009 11:44:28 +0200 Subject: Get rid of compiler warning. Reviewed-by: TrustMe --- src/gui/util/qcompleter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 7571dfe..a622385 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -1080,7 +1080,7 @@ void QCompleter::setPopup(QAbstractItemView *popup) popup->hide(); popup->setParent(0, Qt::Popup); - Qt::FocusPolicy origPolicy; + Qt::FocusPolicy origPolicy = Qt::NoFocus; if (d->widget) origPolicy = d->widget->focusPolicy(); popup->setFocusPolicy(Qt::NoFocus); -- cgit v0.12 From 0b15f59c648633357e9263e93c688e5462e3e01e Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 20 Apr 2009 11:39:52 +0200 Subject: Properly support the "prefer antialias" font style Since the introduction of the texture glyph cache we rendered these fonts as 8-bit gray masks which looked bad and cut off a few pixels for thin glyphs. Changed the preferred format of the font engine to be Raster_RGBMask. Task-number: 248141 Reviewed-by: Eskil B --- src/gui/text/qfontdatabase_win.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/text/qfontdatabase_win.cpp index c9f5586..780ae28 100644 --- a/src/gui/text/qfontdatabase_win.cpp +++ b/src/gui/text/qfontdatabase_win.cpp @@ -699,6 +699,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ } bool stockFont = false; + bool preferClearTypeAA = false; HFONT hfont = 0; @@ -799,10 +800,12 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ #endif if (request.styleStrategy & QFont::PreferAntialias) { - if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP) + if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP) { qual = 5; // == CLEARTYPE_QUALITY; - else + preferClearTypeAA = true; + } else { qual = ANTIALIASED_QUALITY; + } } else if (request.styleStrategy & QFont::NoAntialias) { qual = NONANTIALIASED_QUALITY; } @@ -884,6 +887,9 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ } QFontEngineWin *few = new QFontEngineWin(font_name, hfont, stockFont, lf); + if (preferClearTypeAA) + few->glyphFormat = QFontEngineGlyphCache::Raster_RGBMask; + // Also check for OpenType tables when using complex scripts // ### TODO: This only works for scripts that require OpenType. More generally // for scripts that do not require OpenType we should just look at the list of @@ -1134,7 +1140,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, QFontDatabasePr signature.fsUsb[1] = qFromBigEndian(table + 46); signature.fsUsb[2] = qFromBigEndian(table + 50); signature.fsUsb[3] = qFromBigEndian(table + 54); - + signature.fsCsb[0] = qFromBigEndian(table + 78); signature.fsCsb[1] = qFromBigEndian(table + 82); } -- cgit v0.12 From 2e3f7621d696bec6173810c75b042249645fa714 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Mon, 20 Apr 2009 12:32:31 +0200 Subject: This fix a bug on the QFileSystemModel with a custom icon provider We were calling the provider with invalid path, with the default one it fallback to all standard icons but with a custom one we call a public method with an invalid QFileInfo. It was happening on windows only for the My Drives view because in that case the parent path is null, my Drives is a logical view. Task-number: 251295 Reviewed-by: jasplin --- src/gui/dialogs/qfiledialog.cpp | 2 ++ src/gui/dialogs/qfilesystemmodel_p.h | 12 +++++-- .../auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 41 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index f70669c..9935a80 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1437,6 +1437,8 @@ void QFileDialog::setIconProvider(QFileIconProvider *provider) { Q_D(QFileDialog); d->model->setIconProvider(provider); + //It forces the refresh of all entries in the side bar, then we can get new icons + d->qFileDialogUi->sidebar->setUrls(d->qFileDialogUi->sidebar->urls()); } /*! diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index 77c35a2..0a1265a 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -163,7 +163,11 @@ public: info->icon = iconProvider->icon(QFileInfo(path)); QHash::const_iterator iterator; for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) { - iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) + if (!path.isEmpty()) + iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + else + iterator.value()->updateIcon(iconProvider, iterator.value()->fileName); } } @@ -172,7 +176,11 @@ public: info->displayType = iconProvider->type(QFileInfo(path)); QHash::const_iterator iterator; for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) { - iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) + if (!path.isEmpty()) + iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + else + iterator.value()->retranslateStrings(iconProvider, iterator.value()->fileName); } } diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index 826d278..59d57ce 100644 --- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -45,6 +45,7 @@ #include #include "../../shared/util.h" #include +#include #include //TESTED_CLASS= @@ -284,6 +285,33 @@ void tst_QFileSystemModel::readOnly() QVERIFY(model->flags(model->index(file.fileName())) & Qt::ItemIsEditable); } +class CustomFileIconProvider : public QFileIconProvider +{ +public: + CustomFileIconProvider() : QFileIconProvider() { + mb = qApp->style()->standardIcon(QStyle::SP_MessageBoxCritical); + dvd = qApp->style()->standardIcon(QStyle::SP_DriveDVDIcon); + } + + virtual QIcon icon(const QFileInfo &info) const + { + if (info.isDir()) + return mb; + + return QFileIconProvider::icon(info); + } + virtual QIcon icon(IconType type) const + { + if (type == QFileIconProvider::Folder) + return dvd; + + return QFileIconProvider::icon(type); + } +private: + QIcon mb; + QIcon dvd; +}; + void tst_QFileSystemModel::iconProvider() { QVERIFY(model->iconProvider()); @@ -292,6 +320,19 @@ void tst_QFileSystemModel::iconProvider() QCOMPARE(model->iconProvider(), p); model->setIconProvider(0); delete p; + + QFileSystemModel *myModel = new QFileSystemModel(); + myModel->setRootPath(QDir::homePath()); + //Let's wait to populate the model + QTest::qWait(250); + //We change the provider, icons must me updated + CustomFileIconProvider *custom = new CustomFileIconProvider(); + myModel->setIconProvider(custom); + + QPixmap mb = qApp->style()->standardIcon(QStyle::SP_MessageBoxCritical).pixmap(50, 50); + QCOMPARE(myModel->fileIcon(myModel->index(QDir::homePath())).pixmap(50, 50), mb); + delete myModel; + delete custom; } bool tst_QFileSystemModel::createFiles(const QString &test_path, const QStringList &initial_files, int existingFileCount, const QStringList &initial_dirs, const QString &dir) -- cgit v0.12 From cc8f9a20198590d219fe38421d0629002e574c20 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 Apr 2009 16:16:28 +0200 Subject: do not add UI_DIR to INCLUDEPATH if no FORMS are used Reviewed-by: mariusSO --- mkspecs/features/uic.prf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 0c7fb1b..d2985f9 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -34,10 +34,12 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ INCREDIBUILD_XGE += uic } -ui_dir_short = $$UI_HEADERS_DIR -win32:ui_dir_short ~= s,^.:,/, -contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR -else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR +!isEmpty(FORMS)|!isEmpty(FORMS3) { + ui_dir_short = $$UI_HEADERS_DIR + win32:ui_dir_short ~= s,^.:,/, + contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR + else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR +} # Backwards compatibility: Make shadow builds with default UI_DIR work # if the user did not add the source dir explicitly. -- cgit v0.12 From 100914d12d6c846c9de0460cb986b8794cce8c14 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Apr 2009 12:32:53 +0200 Subject: mac: remove special handling of the editor frame now that stylesheets work properly --- tools/linguist/linguist/messageeditor.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp index dc8b8e4..53cbbea 100644 --- a/tools/linguist/linguist/messageeditor.cpp +++ b/tools/linguist/linguist/messageeditor.cpp @@ -133,19 +133,12 @@ void MessageEditor::setupEditorPage() QFrame *editorPage = new QFrame; editorPage->setObjectName(QLatin1String("editorPage")); - // Due to CSS being rather broken on the Mac style at the moment, only - // use the border-image on non-Mac systems. editorPage->setStyleSheet(QLatin1String( -#ifndef Q_WS_MAC "QFrame#editorPage { border-image: url(:/images/transbox.png) 12 16 16 12 repeat;" " border-width: 12px 16px 16px 12px; }" -#endif "QFrame#editorPage { background-color: white; }" "QLabel { font-weight: bold; }" )); -#ifdef Q_WS_MAC - editorPage->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); -#endif editorPage->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); m_source = new FormWidget(tr("Source text"), false); -- cgit v0.12 From b4fa49153129644fef00efd96f76355c5e1435f8 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 20 Apr 2009 14:13:18 +0200 Subject: Fixed incorrect documentation. --- src/gui/kernel/qwidget.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 31fed5e..071e1bd 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2234,9 +2234,10 @@ WId QWidget::effectiveWinId() const The style sheet contains a textual description of customizations to the widget's style, as described in the \l{Qt Style Sheets} document. - \note Qt style sheets are currently not supported for QMacStyle - (the default style on Mac OS X). We plan to address this in some future - release. + Since Qt 4.5, Qt style sheets fully supports Mac OS X. + + \warning Qt style sheets are currently not supported for custom QStyle + subclasses. We plan to address this in some future release. \sa setStyle(), QApplication::styleSheet, {Qt Style Sheets} */ -- cgit v0.12 From beb6912526766edd7e8a9f9876d82272f798dbc3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Apr 2009 14:22:56 +0200 Subject: don't create double backslash in qdoc3 command on Windows Reviewed-by: janarve --- doc/doc.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/doc.pri b/doc/doc.pri index 6b77f88..46df3cb 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -24,7 +24,7 @@ $$unixstyle { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3 $$DOCS_GENERATION_DEFINES } else { QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/tools/qdoc3/$${QT_WINCONFIG}qdoc3.exe $$DOCS_GENERATION_DEFINES - QDOC = $$replace(QDOC, "/", "\\\\") + QDOC = $$replace(QDOC, "/", "\\") } macx { ADP_DOCS_QDOCCONF_FILE = qt-build-docs-with-xcode.qdocconf -- cgit v0.12 From 031adeaf42ddaef8d01338f6c59ba97170be5d53 Mon Sep 17 00:00:00 2001 From: jasplin Date: Mon, 20 Apr 2009 14:24:08 +0200 Subject: Fixed key sequence eating behavior for QShortcut and QAction. A disabled QShortcut should eat its key sequence even for complex sequences like "Ctrl-E 1". For example, a line edit with such a shortcut should not display 1 after typing "Ctrl-E" and then "1". The patch achieves this essentially by moving more of the decision making (of whether to eat the key secuence) from shortcutmap.cpp to qhortcut.cpp. Moreover, an invisible QAction should not eat any of its key sequences (primary nor alternates). In the example above, the line edit would display 1 when typing this sequence for an invisible action. The patch achieves this by temporarily unregistering all of the action's shortcuts while the action is invisible. Reviewed-by: mariusSO Task-number: 251246 --- src/gui/kernel/qaction.cpp | 47 +++++++++++++++++++++++++--------- src/gui/kernel/qaction_p.h | 1 + src/gui/kernel/qshortcut.cpp | 20 ++++++++------- src/gui/kernel/qshortcutmap.cpp | 9 +++---- tests/auto/qaction/tst_qaction.cpp | 33 ++++++++++++++++++++++++ tests/auto/qshortcut/tst_qshortcut.cpp | 7 +++-- 6 files changed, 86 insertions(+), 31 deletions(-) diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index abb17d7..4edc1ca 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -136,25 +136,27 @@ void QActionPrivate::redoGrab(QShortcutMap &map) void QActionPrivate::redoGrabAlternate(QShortcutMap &map) { Q_Q(QAction); - foreach (int id, alternateShortcutIds) - if (id) + for (int i = 0; i < alternateShortcutIds.size(); ++i) + if (int id = alternateShortcutIds.at(i)) map.removeShortcut(id, q); alternateShortcutIds.clear(); if (alternateShortcuts.isEmpty()) return; - foreach (const QKeySequence& alternate, alternateShortcuts) { + for (int i = 0; i < alternateShortcuts.size(); ++i) { + const QKeySequence &alternate = alternateShortcuts.at(i); if (!alternate.isEmpty()) alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext)); else alternateShortcutIds.append(0); } + if (!enabled) { - foreach (int id, alternateShortcutIds) - map.setShortcutEnabled(false, id, q); + for (int i = 0; i < alternateShortcutIds.size(); ++i) + map.setShortcutEnabled(false, alternateShortcutIds.at(i), q); } if (!autorepeat) { - foreach (int id, alternateShortcutIds) - map.setShortcutAutoRepeat(false, id, q); + for (int i = 0; i < alternateShortcutIds.size(); ++i) + map.setShortcutAutoRepeat(false, alternateShortcutIds.at(i), q); } } @@ -163,10 +165,26 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) Q_Q(QAction); if (shortcutId) map.setShortcutEnabled(enable, shortcutId, q); - foreach (int id, alternateShortcutIds) - if (id) + for (int i = 0; i < alternateShortcutIds.size(); ++i) + if (int id = alternateShortcutIds.at(i)) map.setShortcutEnabled(enable, id, q); } + +void QActionPrivate::removeAll(QShortcutMap &map) +{ + Q_Q(QAction); + if (shortcutId) { + map.removeShortcut(shortcutId, q); + shortcutId = 0; + } + + for (int i = 0; i < alternateShortcutIds.size(); ++i) + if (int id = alternateShortcutIds.at(i)) + map.removeShortcut(id, q); + + alternateShortcutIds.clear(); +} + #endif // QT_NO_SHORTCUT @@ -615,8 +633,8 @@ QAction::~QAction() #ifndef QT_NO_SHORTCUT if (d->shortcutId && qApp) { qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this); - foreach (int id, d->alternateShortcutIds) - qApp->d_func()->shortcutMap.removeShortcut(id, this); + for (int i = 0; i < d->alternateShortcutIds.size(); ++i) + qApp->d_func()->shortcutMap.removeShortcut(d->alternateShortcutIds.at(i), this); } #endif } @@ -1049,7 +1067,12 @@ void QAction::setVisible(bool b) d->visible = b; d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ; #ifndef QT_NO_SHORTCUT - d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap); + if (b) { + d->redoGrab(qApp->d_func()->shortcutMap); + d->redoGrabAlternate(qApp->d_func()->shortcutMap); + } else { + d->removeAll(qApp->d_func()->shortcutMap); + } #endif d->sendDataChanged(); } diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 0617ef5..a5b3731 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -111,6 +111,7 @@ public: void redoGrab(QShortcutMap &map); void redoGrabAlternate(QShortcutMap &map); void setShortcutEnabled(bool enable, QShortcutMap &map); + void removeAll(QShortcutMap &map); static QShortcutMap *globalMap; #endif // QT_NO_SHORTCUT diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index 50b6e59..f3c93c6 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -385,19 +385,21 @@ bool QShortcut::event(QEvent *e) { Q_D(QShortcut); bool handled = false; - if (d->sc_enabled && e->type() == QEvent::Shortcut) { + if (e->type() == QEvent::Shortcut) { QShortcutEvent *se = static_cast(e); if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){ + if (d->sc_enabled) { #ifndef QT_NO_WHATSTHIS - if (QWhatsThis::inWhatsThisMode()) { - QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); - handled = true; - } else + if (QWhatsThis::inWhatsThisMode()) { + QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); + handled = true; + } else #endif - if (se->isAmbiguous()) - emit activatedAmbiguously(); - else - emit activated(); + if (se->isAmbiguous()) + emit activatedAmbiguously(); + else + emit activated(); + } handled = true; } } diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index ed9654b..9766a69 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -370,9 +370,8 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) default: break; } - // If nextState is QKeySequence::ExactMatch && identicals.count == 0 - // we've only found disabled shortcuts - return identicalMatches > 0 || result == QKeySequence::PartialMatch; + + return true; } /*! \internal @@ -494,9 +493,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e) // We don't need partials, if we have identicals if (d->identicals.size()) break; - // We only care about enabled partials, so we don't consume - // key events when all partials are disabled! - partialFound |= (*it).enabled; + partialFound = true; } } ++it; diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp index 34f2dfd..8e4ae86 100644 --- a/tests/auto/qaction/tst_qaction.cpp +++ b/tests/auto/qaction/tst_qaction.cpp @@ -46,6 +46,7 @@ #include #include #include +#include //TESTED_CLASS= //TESTED_FILES= @@ -74,6 +75,7 @@ private slots: void setStandardKeys(); void alternateShortcuts(); void enabledVisibleInteraction(); + void invisibleActionWithComplexShortcut(); void task200823_tooltip(); private: @@ -322,5 +324,36 @@ void tst_QAction::task200823_tooltip() QCOMPARE(action->toolTip(), ref); } +void tst_QAction::invisibleActionWithComplexShortcut() +{ + QAction action(0); + action.setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E, Qt::Key_1)); + + QLineEdit edit; + edit.addAction(&action); + edit.show(); + QTest::qWait(100); + + QSignalSpy spy(&action, SIGNAL(triggered())); + + action.setVisible(true); + QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier); + QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier); + QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier); + QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier); + QCOMPARE(spy.count(), 1); + QCOMPARE(edit.text(), QLatin1String("")); + + edit.clear(); + spy.clear(); + action.setVisible(false); + QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier); + QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier); + QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier); + QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier); + QCOMPARE(spy.count(), 0); + QCOMPARE(edit.text(), QLatin1String("1")); +} + QTEST_MAIN(tst_QAction) #include "tst_qaction.moc" diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp index 69ebf74..cd80204 100644 --- a/tests/auto/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/qshortcut/tst_qshortcut.cpp @@ -987,17 +987,16 @@ void tst_QShortcut::keypressConsumption() cut1->setEnabled(false); cut2->setEnabled(false); - // Make sure keypresses is passed on, since all multiple keysequences - // with Ctrl+I are disabled + edit->clear(); sendKeyEvents(edit, Qt::CTRL + Qt::Key_I, 0); // Send key to edit QCOMPARE( currentResult, NoResult ); QCOMPARE( ambigResult, NoResult ); - QVERIFY(edit->toPlainText().endsWith("")); + QVERIFY(edit->toPlainText().isEmpty()); sendKeyEvents(edit, Qt::Key_A, 'a'); // Send key to edit QCOMPARE( currentResult, NoResult ); QCOMPARE( ambigResult, NoResult ); - QVERIFY(edit->toPlainText().endsWith("a")); + QVERIFY(edit->toPlainText().isEmpty()); clearAllShortcuts(); } -- cgit v0.12 From 0b14582aa47e1c255e1bbd68ef5ced2e69ec31a8 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Mon, 20 Apr 2009 14:45:07 +0200 Subject: Unable to build ActiveQt with Opensource edition. Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig --- examples/examples.pro | 2 +- src/activeqt/container/container.pro | 40 ++++++++++++++++-------------------- src/activeqt/control/control.pro | 30 ++++++++++++--------------- src/corelib/global/qglobal.h | 4 ++-- src/src.pro | 2 +- tools/activeqt/activeqt.pro | 11 ++++------ tools/tools.pro | 2 +- 7 files changed, 40 insertions(+), 51 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 2c4fc81..41501a0 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -33,7 +33,7 @@ embedded:SUBDIRS += qws } contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, dbus): SUBDIRS += dbus -win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt +win32: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro index ceedacf..d654f92 100644 --- a/src/activeqt/container/container.pro +++ b/src/activeqt/container/container.pro @@ -21,25 +21,21 @@ LIBS += -lole32 -loleaut32 !wince*:LIBS += -luser32 -lgdi32 -ladvapi32 win32-g++:LIBS += -luuid -contains(QT_EDITION, OpenSource|Console) { - message( "You are not licensed to use ActiveQt." ) -} else { - HEADERS = ../control/qaxaggregated.h \ - qaxbase.h \ - qaxwidget.h \ - qaxobject.h \ - qaxscript.h \ - qaxselect.h \ - ../shared/qaxtypes.h - - SOURCES = qaxbase.cpp \ - qaxdump.cpp \ - qaxwidget.cpp \ - qaxobject.cpp \ - qaxscript.cpp \ - qaxscriptwrapper.cpp \ - qaxselect.cpp \ - ../shared/qaxtypes.cpp - - FORMS = qaxselect.ui -} +HEADERS = ../control/qaxaggregated.h \ + qaxbase.h \ + qaxwidget.h \ + qaxobject.h \ + qaxscript.h \ + qaxselect.h \ + ../shared/qaxtypes.h + +SOURCES = qaxbase.cpp \ + qaxdump.cpp \ + qaxwidget.cpp \ + qaxobject.cpp \ + qaxscript.cpp \ + qaxscriptwrapper.cpp \ + qaxselect.cpp \ + ../shared/qaxtypes.cpp + +FORMS = qaxselect.ui diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro index 65b0251..bf3647e 100644 --- a/src/activeqt/control/control.pro +++ b/src/activeqt/control/control.pro @@ -24,20 +24,16 @@ win32-borland:DEFINES += QT_NEEDS_QMAIN LIBS += -luser32 -lole32 -loleaut32 -lgdi32 win32-g++:LIBS += -luuid -contains(QT_EDITION, OpenSource|Console) { - message( "You are not licensed to use ActiveQt." ) -} else { - HEADERS = qaxaggregated.h \ - qaxbindable.h \ - qaxfactory.h \ - ../shared/qaxtypes.h - - SOURCES = qaxserver.cpp \ - qaxserverbase.cpp \ - qaxbindable.cpp \ - qaxfactory.cpp \ - qaxservermain.cpp \ - qaxserverdll.cpp \ - qaxmain.cpp \ - ../shared/qaxtypes.cpp -} +HEADERS = qaxaggregated.h \ + qaxbindable.h \ + qaxfactory.h \ + ../shared/qaxtypes.h + +SOURCES = qaxserver.cpp \ + qaxserverbase.cpp \ + qaxbindable.cpp \ + qaxfactory.cpp \ + qaxservermain.cpp \ + qaxserverdll.cpp \ + qaxmain.cpp \ + ../shared/qaxtypes.cpp diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 81af295..d0855fe 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2265,9 +2265,9 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); | QT_MODULE_GRAPHICSVIEW \ | QT_MODULE_HELP \ | QT_MODULE_TEST \ - | QT_MODULE_DBUS) -#define QT_EDITION_DESKTOP (QT_EDITION_OPENSOURCE \ + | QT_MODULE_DBUS \ | QT_MODULE_ACTIVEQT) +#define QT_EDITION_DESKTOP (QT_EDITION_OPENSOURCE) #define QT_EDITION_UNIVERSAL QT_EDITION_DESKTOP #define QT_EDITION_ACADEMIC QT_EDITION_DESKTOP #define QT_EDITION_EDUCATIONAL QT_EDITION_DESKTOP diff --git a/src/src.pro b/src/src.pro index fb28882..f40c6ad 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,7 +13,7 @@ wince*:{ contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 } } -win32:!contains(QT_EDITION, OpenSource|Console): { +win32:{ SRC_SUBDIRS += src_activeqt !wince*: SRC_SUBDIRS += src_tools_idc } diff --git a/tools/activeqt/activeqt.pro b/tools/activeqt/activeqt.pro index a0e7de3..c50010c 100644 --- a/tools/activeqt/activeqt.pro +++ b/tools/activeqt/activeqt.pro @@ -2,10 +2,7 @@ TEMPLATE = subdirs CONFIG += ordered -contains(QT_EDITION, OpenSource|Console) { - message("You are not licensed to use ActiveQt.") -} else { - SUBDIRS = dumpdoc \ - dumpcpp \ - testcon -} +SUBDIRS = dumpdoc \ + dumpcpp \ + testcon + diff --git a/tools/tools.pro b/tools/tools.pro index ffc5d63..3325a57 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -15,7 +15,7 @@ no-png { SUBDIRS += linguist wince*: SUBDIRS = qtestlib designer unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt + win32:!wince*:SUBDIRS += activeqt } mac { -- cgit v0.12 From 68d6a91fd2db9ec95d9f46e7af10eff7da89f8f0 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Mon, 20 Apr 2009 15:47:41 +0200 Subject: Doc - Mentioned that ActiveQt is now part of the Open source versions of Qt. Reviewed-by: Prasanth Ullattil --- doc/src/activeqt.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc index ea13e59..3919823 100644 --- a/doc/src/activeqt.qdoc +++ b/doc/src/activeqt.qdoc @@ -73,7 +73,7 @@ To build the static libraries, change into the \c activeqt directory (usually \c QTDIR/src/activeqt), and run \c qmake and your make tool in both the \c container and the \c control subdirectory. - The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked + The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked into \c QTDIR/lib. If you are using a shared configuration of Qt enter the \c plugin @@ -81,8 +81,8 @@ plugin that integrates the QAxContainer module into \l{Qt Designer}. - The ActiveQt modules are part of the \l{Qt Full Framework Edition}. They - are \e not part of the \l{Open Source Versions of Qt}. + The ActiveQt modules are part of the \l{Qt Full Framework Edition} and + the \l{Open Source Versions}. \sa {QAxContainer Module}, {QAxServer Module} */ -- cgit v0.12 From c520a4c75d16948417f6c1a3f42508510be0b5f4 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Mon, 20 Apr 2009 10:02:05 +0200 Subject: Working on QGraphicsProxyWidget's handling of widget flags. --- src/gui/graphicsview/qgraphicsproxywidget.cpp | 6 +- src/gui/graphicsview/qgraphicswidget.cpp | 5 +- src/gui/graphicsview/qgraphicswidget_p.cpp | 3 +- .../tst_qgraphicsproxywidget.cpp | 64 ++++++++++++++++++ tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 79 ++++++++++++++++++++++ 5 files changed, 146 insertions(+), 11 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index e660879..f99fef9 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -460,7 +460,7 @@ void QGraphicsProxyWidgetPrivate::embedSubWindow(QWidget *subWin) { QWExtra *extra; if (!((extra = subWin->d_func()->extra) && extra->proxyWidget)) { - QGraphicsProxyWidget *subProxy = new QGraphicsProxyWidget(q_func()); + QGraphicsProxyWidget *subProxy = new QGraphicsProxyWidget(q_func(), subWin->windowFlags()); subProxy->d_func()->setWidget_helper(subWin, false); } } @@ -661,10 +661,6 @@ void QGraphicsProxyWidgetPrivate::setWidget_helper(QWidget *newWidget, bool auto if (newWidget->testAttribute(Qt::WA_SetCursor)) q->setCursor(widget->cursor()); #endif - Qt::WFlags flags = newWidget->windowFlags(); - if (newWidget->windowType() == Qt::Window) - flags &= ~Qt::Window; - q->setWindowFlags(flags); q->setEnabled(newWidget->isEnabled()); q->setVisible(newWidget->isVisible()); q->setLayoutDirection(newWidget->layoutDirection()); diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 2e7d82a..66930f2 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1039,10 +1039,6 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant & break; } case ItemParentHasChanged: { - // reset window type on parent change in order to automagically remove decorations etc. - Qt::WindowFlags wflags = d->windowFlags & ~Qt::WindowType_Mask; - d->adjustWindowFlags(&wflags); - setWindowFlags(wflags); // Deliver ParentChange. QEvent event(QEvent::ParentChange); QApplication::sendEvent(this, &event); @@ -1623,6 +1619,7 @@ void QGraphicsWidget::setWindowFlags(Qt::WindowFlags wFlags) return; bool wasPopup = (d->windowFlags & Qt::WindowType_Mask) == Qt::Popup; + d->adjustWindowFlags(&wFlags); d->windowFlags = wFlags; if (!d->setWindowFrameMargins) unsetWindowFrameMargins(); diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index 06ffe73..4b41a31 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -67,8 +67,7 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl focusNext = focusPrev = q; focusPolicy = Qt::NoFocus; - if (!parentItem) - adjustWindowFlags(&wFlags); + adjustWindowFlags(&wFlags); windowFlags = wFlags; q->setParentItem(parentItem); diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index b99f111..9d82ffd 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -175,6 +175,9 @@ private slots: void bypassGraphicsProxyWidget_data(); void bypassGraphicsProxyWidget(); void dragDrop(); + void windowFlags_data(); + void windowFlags(); + void comboboxWindowFlags(); }; // Subclass that exposes the protected functions. @@ -3153,6 +3156,67 @@ void tst_QGraphicsProxyWidget::dragDrop() QCOMPARE(edit->text(), QString("hei")); } +void tst_QGraphicsProxyWidget::windowFlags_data() +{ + QTest::addColumn("proxyFlags"); + QTest::addColumn("widgetFlags"); + QTest::addColumn("resultingProxyFlags"); + QTest::addColumn("resultingWidgetFlags"); + + QTest::newRow("proxy(0) widget(0)") << 0 << 0 << 0 << int(Qt::Window); + QTest::newRow("proxy(window)") << int(Qt::Window) << 0 << int(Qt::Window) << int(Qt::Window); + QTest::newRow("proxy(window) widget(window)") << int(Qt::Window) << int(Qt::Window) << int(Qt::Window) << int(Qt::Window); + QTest::newRow("proxy(0) widget(window)") << int(0) << int(Qt::Window) << int(0) << int(Qt::Window); +} + +void tst_QGraphicsProxyWidget::windowFlags() +{ + QFETCH(int, proxyFlags); + QFETCH(int, widgetFlags); + QFETCH(int, resultingProxyFlags); + QFETCH(int, resultingWidgetFlags); + Qt::WindowFlags proxyWFlags = Qt::WindowFlags(proxyFlags); + Qt::WindowFlags widgetWFlags = Qt::WindowFlags(widgetFlags); + Qt::WindowFlags resultingProxyWFlags = Qt::WindowFlags(resultingProxyFlags); + Qt::WindowFlags resultingWidgetWFlags = Qt::WindowFlags(resultingWidgetFlags); + + QGraphicsProxyWidget proxy(0, proxyWFlags); + QVERIFY((proxy.windowFlags() & proxyWFlags) == proxyWFlags); + + QWidget *widget = new QWidget(0, widgetWFlags); + QVERIFY((widget->windowFlags() & widgetWFlags) == widgetWFlags); + + proxy.setWidget(widget); + + if (resultingProxyFlags == 0) + QVERIFY(!proxy.windowFlags()); + else + QVERIFY((proxy.windowFlags() & resultingProxyWFlags) == resultingProxyWFlags); + QVERIFY((widget->windowFlags() & resultingWidgetWFlags) == resultingWidgetWFlags); +} + +void tst_QGraphicsProxyWidget::comboboxWindowFlags() +{ + QComboBox *comboBox = new QComboBox; + comboBox->addItem("Item 1"); + comboBox->addItem("Item 2"); + comboBox->addItem("Item 3"); + QWidget *embedWidget = comboBox; + + QGraphicsScene scene; + QGraphicsProxyWidget *proxy = scene.addWidget(embedWidget); + proxy->setWindowFlags(Qt::Window); + QVERIFY(embedWidget->isWindow()); + QVERIFY(proxy->isWindow()); + + comboBox->showPopup(); + + QCOMPARE(proxy->childItems().size(), 1); + QGraphicsItem *popupProxy = proxy->childItems().first(); + QVERIFY(popupProxy->isWindow()); + QVERIFY((static_cast(popupProxy)->windowFlags() & Qt::Popup) == Qt::Popup); +} + QTEST_MAIN(tst_QGraphicsProxyWidget) #include "tst_qgraphicsproxywidget.moc" diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index a737a37..56737c3 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -149,6 +149,8 @@ private slots: void explicitMouseGrabber(); void implicitMouseGrabber(); void popupMouseGrabber(); + void windowFlags_data(); + void windowFlags(); // Task fixes void task236127_bspTreeIndexFails(); @@ -2086,6 +2088,83 @@ void tst_QGraphicsWidget::popupMouseGrabber() QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget3); } +void tst_QGraphicsWidget::windowFlags_data() +{ + QTest::addColumn("inputFlags"); + QTest::addColumn("outputFlags"); + + QTest::newRow("nil") << 0 << 0; + + // Window types + QTest::newRow("Qt::Window") << int(Qt::Window) + << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint + | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + QTest::newRow("Qt::SubWindow") << int(Qt::SubWindow) + << int(Qt::SubWindow | Qt::WindowTitleHint | Qt::WindowSystemMenuHint + | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + QTest::newRow("Qt::Dialog") << int(Qt::Dialog) + << int(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowSystemMenuHint + | Qt::WindowContextHelpButtonHint); + QTest::newRow("Qt::Sheet") << int(Qt::Sheet) + << int(Qt::Sheet | Qt::WindowTitleHint | Qt::WindowSystemMenuHint + | Qt::WindowContextHelpButtonHint); + QTest::newRow("Qt::Tool") << int(Qt::Tool) + << int(Qt::Tool | Qt::WindowTitleHint | Qt::WindowSystemMenuHint); + + // Custom window flags + QTest::newRow("Qt::FramelessWindowHint") << int(Qt::FramelessWindowHint) + << int(Qt::FramelessWindowHint); + QTest::newRow("Qt::CustomizeWindowHint") << int(Qt::CustomizeWindowHint) + << int(Qt::CustomizeWindowHint); +} + +void tst_QGraphicsWidget::windowFlags() +{ + QFETCH(int, inputFlags); + QFETCH(int, outputFlags); + + // Construct with flags set already + QGraphicsWidget widget(0, Qt::WindowFlags(inputFlags)); + QCOMPARE(widget.windowFlags(), Qt::WindowFlags(outputFlags)); + + // Set flags after construction + QGraphicsWidget widget2; + widget2.setWindowFlags(Qt::WindowFlags(inputFlags)); + QCOMPARE(widget2.windowFlags(), Qt::WindowFlags(outputFlags)); + + // Reset flags + widget2.setWindowFlags(0); + QVERIFY(!widget2.windowFlags()); + + // Set flags back again + widget2.setWindowFlags(Qt::WindowFlags(inputFlags)); + QCOMPARE(widget2.windowFlags(), Qt::WindowFlags(outputFlags)); + + // Construct with custom flags set already + QGraphicsWidget widget3(0, Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + QCOMPARE(widget3.windowFlags(), Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + + // Set custom flags after construction + QGraphicsWidget widget4; + widget4.setWindowFlags(Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + QCOMPARE(widget4.windowFlags(), Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + + // Reset flags + widget4.setWindowFlags(0); + QVERIFY(!widget4.windowFlags()); + + // Set custom flags back again + widget4.setWindowFlags(Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + QCOMPARE(widget4.windowFlags(), Qt::WindowFlags(inputFlags | Qt::FramelessWindowHint)); + + QGraphicsWidget *widget5 = new QGraphicsWidget; + widget5->setWindowFlags(Qt::WindowFlags(inputFlags)); + QCOMPARE(widget5->windowFlags(), Qt::WindowFlags(outputFlags)); + QGraphicsWidget window(0, Qt::Window); + widget5->setParentItem(&window); + QCOMPARE(widget5->windowFlags(), Qt::WindowFlags(outputFlags)); +} + class ProxyStyle : public QCommonStyle { public: -- cgit v0.12 From 200cc0ddbcb4cea11e79c0b53e2a43bb9f9e18f7 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Mon, 20 Apr 2009 15:42:08 +0200 Subject: Fix QGraphicsProxyWidget's window flag handling This change fixes a few bugs and adds autotests for QGraphicsProxyWidget and QGraphicsWidget's window flag handling. The former behavior has been that you must set window flags on QGraphicsProxyWidget explicitly after calling proxy->setWidget(); otherwise both the flags from the embedded widget and the proxy would be partially ignored. Example: QLineEdit *edit = new QLineEdit(0, Qt::Window); // that's the default scene.addWidget(edit, Qt::Window); // proxy still has no window decos proxy->setWindowFlags(Qt::Window); // now it got decorations :-/ QGraphicsWidget's window flags are immune to reparenting, and are always polished with the necessary hints regardless of whether you set the flags during construction time or later. This is a feature QGraphicsWidget can provide because it allows toplevel widgets (without parents) to be normal widgets (i.e., non-windows). So the new behavior of QGraphicsProxyWidget is to respect its own window flags and ignore those of the embedded widget, regardless of what flags the embedded widget has when it's embedded. When QWidget auto-embeds child windows (file dialogs, popups, etc), it passes the correct window flags to the QGraphicsProxyWidget to ensure that the right flags are set. Task-number: 251407 Reviewed-by: Joao --- tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 9d82ffd..d856024 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3187,7 +3187,7 @@ void tst_QGraphicsProxyWidget::windowFlags() QVERIFY((widget->windowFlags() & widgetWFlags) == widgetWFlags); proxy.setWidget(widget); - + if (resultingProxyFlags == 0) QVERIFY(!proxy.windowFlags()); else -- cgit v0.12 From 90a362519e119ee93dc5cabeb318b4d16da94e82 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Mon, 20 Apr 2009 16:15:48 +0200 Subject: Fixup docs for QGraphicsProxyWidget::setWidget(). --- src/gui/graphicsview/qgraphicsproxywidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index f99fef9..e7467d0 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -544,6 +544,10 @@ QGraphicsProxyWidget::~QGraphicsProxyWidget() hidden or disabled after embedding is complete. The class documentation has a full overview over the shared state. + The embedded widget's window flags are ignored. QGraphicsProxyWidget's + window flags decide whether the widget, after embedding, should be given + window decorations or not. + After this function returns, QGraphicsProxyWidget will keep its state synchronized with that of \a widget whenever possible. -- cgit v0.12 From 30c0f2ea782239eb5165cc3f12cabc3da5b9eae0 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Mon, 20 Apr 2009 16:26:10 +0200 Subject: Doc update for QGraphicsProxyWidget::setWidget(). Reviewed-by: Joao Reviewed-by: Kavindra --- src/gui/graphicsview/qgraphicsproxywidget.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index e7467d0..01b7593 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -544,9 +544,8 @@ QGraphicsProxyWidget::~QGraphicsProxyWidget() hidden or disabled after embedding is complete. The class documentation has a full overview over the shared state. - The embedded widget's window flags are ignored. QGraphicsProxyWidget's - window flags decide whether the widget, after embedding, should be given - window decorations or not. + QGraphicsProxyWidget's window flags determine whether the widget, after + embedding, will be given window decorations or not. After this function returns, QGraphicsProxyWidget will keep its state synchronized with that of \a widget whenever possible. -- cgit v0.12 From d7072b5577e3c07e984885cf05d5f9b217c6f473 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 20 Apr 2009 17:03:14 +0200 Subject: Fix tabbar issues with Oxygen style Oxygen style was looking a bit broken when using 4.5 features such as close buttons and icons. This was because it re-implements the tabbartablabel primitive we needed to ensure spacing for the buttons. We had to modify the way we draw tabs slightly to make it more backward compatible so that oxygen get the same region as before and we ensure space for it in the CE_TabBarTab case instead. Note that the drawback to this approach is that the focus rect needs to be moved out of the tablabel and into the CE_TabBarTab case so it covers the entire tab which can potentially cause problems if people depend on the label to draw the focus rect. However the new case is also more consistent with how buttons draw their focus. Task-number: 251635 Reviewed-by: nrc --- src/gui/styles/qcommonstyle.cpp | 73 +++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 3cae08a..819965b 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1779,7 +1779,46 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, case CE_TabBarTab: if (const QStyleOptionTab *tab = qstyleoption_cast(opt)) { drawControl(CE_TabBarTabShape, tab, p, widget); - drawControl(CE_TabBarTabLabel, tab, p, widget); + + QStyleOptionTabV3 tabV3(*tab); + QRect labelRect = tabV3.rect; + QSize &left= tabV3.leftButtonSize; + QSize &right = tabV3.rightButtonSize; + const int spacing = 6 + 2; + + // left widget + if (!left.isEmpty()) { + if (tabV3.shape == QTabBar::RoundedEast || tabV3.shape == QTabBar::TriangularEast ) + labelRect.setTop(labelRect.top() + spacing + left.height()); + else if (tabV3.shape == QTabBar::RoundedWest|| tabV3.shape == QTabBar::TriangularWest) + labelRect.setBottom(labelRect.bottom() - spacing - left.height()); + else + labelRect.setLeft(labelRect.left() + spacing + left.width()); + } + + // right widget + if (!right.isEmpty()) { + if (tabV3.shape == QTabBar::RoundedEast || tabV3.shape == QTabBar::TriangularEast ) + labelRect.setBottom(labelRect.bottom() - spacing - right.height()); + else if (tabV3.shape == QTabBar::RoundedWest|| tabV3.shape == QTabBar::TriangularWest) + labelRect.setTop(labelRect.top() + spacing + right.height()); + else + labelRect.setRight(labelRect.right() - spacing - right.width()); + } + + tabV3.rect = visualRect(opt->direction, opt->rect, labelRect); + drawControl(CE_TabBarTabLabel, &tabV3, p, widget); + if (tabV3.state & State_HasFocus) { + const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth); + int x1, x2; + x1 = tab->rect.left(); + x2 = tab->rect.right() - 1; + QStyleOptionFocusRect fropt; + fropt.QStyleOption::operator=(*tab); + fropt.rect.setRect(x1 + 1 + OFFSET, tab->rect.y() + OFFSET, + x2 - x1 - 2*OFFSET, tab->rect.height() - 2*OFFSET); + drawPrimitive(PE_FrameFocusRect, &fropt, p, widget); + } } break; case CE_TabBarTabShape: @@ -1981,12 +2020,8 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, (tabV2.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled); - int offset = 4; + int offset = 6; int left = opt->rect.left(); - if (tabV2.leftButtonSize.isEmpty()) - offset += 2; - else - left += tabV2.leftButtonSize.width() + (6 + 2) + 2; QRect iconRect = QRect(left + offset, tr.center().y() - tabIcon.height() / 2, tabIconSize.width(), tabIconSize.height()); if (!verticalTabs) @@ -1997,20 +2032,6 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, drawItemText(p, tr, alignment, tab->palette, tab->state & State_Enabled, tab->text, QPalette::WindowText); if (verticalTabs) p->restore(); - - if (tabV2.state & State_HasFocus) { - const int OFFSET = 1 + pixelMetric(PM_DefaultFrameWidth); - - int x1, x2; - x1 = tabV2.rect.left(); - x2 = tabV2.rect.right() - 1; - - QStyleOptionFocusRect fropt; - fropt.QStyleOption::operator=(*tab); - fropt.rect.setRect(x1 + 1 + OFFSET, tabV2.rect.y() + OFFSET, - x2 - x1 - 2*OFFSET, tabV2.rect.height() - 2*OFFSET); - drawPrimitive(PE_FrameFocusRect, &fropt, p, widget); - } } break; #endif // QT_NO_TABBAR @@ -2858,12 +2879,6 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, tr.setRight(tr.right() - horizontalShift); } - // left widget - if (!tabV2.leftButtonSize.isEmpty()) { - tr.setLeft(tr.left() + 6 + 2 + - (verticalTabs ? tabV2.leftButtonSize.height() : tabV2.leftButtonSize.width())); - } - // icon if (!tabV2.icon.isNull()) { QSize iconSize = tabV2.iconSize; @@ -2885,12 +2900,6 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, tr.setLeft(tr.left() + tabIconSize.width() + offset + 2); } - // right widget - if (!tabV2.rightButtonSize.isEmpty()) { - tr.setRight(tr.right() - 6 - 2 - - (verticalTabs ? tabV2.rightButtonSize.height() : tabV2.rightButtonSize.width())); - } - if (!verticalTabs) tr = visualRect(opt->direction, opt->rect, tr); r = tr; -- cgit v0.12 From 07703ade86edcd6565c373f63e34306209d1a90a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 9 Apr 2008 13:04:02 +0200 Subject: don't detach in qHash() Signed-off-by: Thiago Macieira --- src/corelib/tools/qhash.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 540f43d..21d98b5 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -91,7 +91,7 @@ static uint hash(const QChar *p, int n) uint qHash(const QByteArray &key) { - return hash(reinterpret_cast(key.data()), key.size()); + return hash(reinterpret_cast(key.constData()), key.size()); } uint qHash(const QString &key) @@ -107,7 +107,7 @@ uint qHash(const QStringRef &key) uint qHash(const QBitArray &bitArray) { int m = bitArray.d.size() - 1; - uint result = hash(reinterpret_cast(bitArray.d.data()), qMax(0, m)); + uint result = hash(reinterpret_cast(bitArray.d.constData()), qMax(0, m)); // deal with the last 0 to 7 bits manually, because we can't trust that // the padding is initialized to 0 in bitArray.d -- cgit v0.12 From 2964be69e1db017082236ad8756b725fb4f7d4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Mon, 20 Apr 2009 12:43:26 +0200 Subject: Make sure the cached SVG image node uses the premultiplied format. Reviewed-by: Gunnar --- src/svg/qsvghandler.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 433a3ad..cb07c53 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -2541,6 +2541,9 @@ static QSvgNode *createImageNode(QSvgNode *parent, return 0; } + if (image.format() == QImage::Format_ARGB32) + image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + QSvgNode *img = new QSvgImage(parent, image, QRect(int(nx), -- cgit v0.12 From 01a671ff0bd380e5cff311cc233352c867a041a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Mon, 20 Apr 2009 12:46:53 +0200 Subject: Make sure we use a premultiplied alpha format for 32 bit EGL screens. Reviewed-by: Gunnar --- src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index b0ffbf1..65efdbc 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -104,7 +104,7 @@ bool PvrEglScreen::connect(const QString &displaySpec) break; case PVR2D_ARGB8888: d = 32; - setPixelFormat(QImage::Format_ARGB32); + setPixelFormat(QImage::Format_ARGB32_Premultiplied); break; default: pvrQwsDisplayClose(); -- cgit v0.12 From 556216129bf5738c6ad92807ece1dac233b8b96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Mon, 20 Apr 2009 17:51:47 +0200 Subject: Speed up texture uploads for hardware without n-pot-2 texture support. Implement a manual fast scale, so that we can do a scale, swizzle and mirror in the same loop without any temporary image copies. This potentially increases texture uploads on embedded hw with a factor of 10. Reviewed-by: Samuel --- src/opengl/qgl.cpp | 159 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 53 deletions(-) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 99df658..b8fa133 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1677,58 +1677,105 @@ static void qt_gl_clean_cache(qint64 cacheKey) static void convertToGLFormatHelper(QImage &dst, const QImage &img, GLenum texture_format) { - Q_ASSERT(dst.size() == img.size()); Q_ASSERT(dst.depth() == 32); Q_ASSERT(img.depth() == 32); - const int width = img.width(); - const int height = img.height(); - const uint *p = (const uint*) img.scanLine(img.height() - 1); - uint *q = (uint*) dst.scanLine(0); - - if (texture_format == GL_BGRA) { - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { - // mirror + swizzle - for (int i=0; i < height; ++i) { - const uint *end = p + width; - while (p < end) { - *q = ((*p << 24) & 0xff000000) - | ((*p >> 24) & 0x000000ff) - | ((*p << 8) & 0x00ff0000) - | ((*p >> 8) & 0x0000ff00); - p++; - q++; + if (dst.size() != img.size()) { + int target_width = dst.width(); + int target_height = dst.height(); + qreal sx = target_width / qreal(img.width()); + qreal sy = target_height / qreal(img.height()); + + quint32 *dest = (quint32 *) dst.scanLine(0); // NB! avoid detach here + uchar *srcPixels = (uchar *) img.scanLine(img.height() - 1); + int sbpl = img.bytesPerLine(); + int dbpl = dst.bytesPerLine(); + + int ix = 0x00010000 / sx; + int iy = 0x00010000 / sy; + + quint32 basex = int(0.5 * ix); + quint32 srcy = int(0.5 * iy); + + // scale, swizzle and mirror in one loop + while (target_height--) { + const uint *src = (const quint32 *) (srcPixels - (srcy >> 16) * sbpl); + int srcx = basex; + for (int x=0; x> 16]; + if (texture_format == GL_BGRA) { + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + dest[x] = ((src_pixel << 24) & 0xff000000) + | ((src_pixel >> 24) & 0x000000ff) + | ((src_pixel << 8) & 0x00ff0000) + | ((src_pixel >> 8) & 0x0000ff00); + } else { + dest[x] = src_pixel; + } + } else { // GL_RGBA + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + dest[x] = (src_pixel << 8) | ((src_pixel >> 24) & 0xff); + } else { + dest[x] = ((src_pixel << 16) & 0xff0000) + | ((src_pixel >> 16) & 0xff) + | (src_pixel & 0xff00ff00); + } } - p -= 2 * width; - } - } else { - const uint bytesPerLine = img.bytesPerLine(); - for (int i=0; i < height; ++i) { - memcpy(q, p, bytesPerLine); - q += width; - p -= width; + srcx += ix; } + dest = (quint32 *)(((uchar *) dest) + dbpl); + srcy += iy; } } else { - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { - for (int i=0; i < height; ++i) { - const uint *end = p + width; - while (p < end) { - *q = (*p << 8) | ((*p >> 24) & 0xFF); - p++; - q++; + const int width = img.width(); + const int height = img.height(); + const uint *p = (const uint*) img.scanLine(img.height() - 1); + uint *q = (uint*) dst.scanLine(0); + + if (texture_format == GL_BGRA) { + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + // mirror + swizzle + for (int i=0; i < height; ++i) { + const uint *end = p + width; + while (p < end) { + *q = ((*p << 24) & 0xff000000) + | ((*p >> 24) & 0x000000ff) + | ((*p << 8) & 0x00ff0000) + | ((*p >> 8) & 0x0000ff00); + p++; + q++; + } + p -= 2 * width; + } + } else { + const uint bytesPerLine = img.bytesPerLine(); + for (int i=0; i < height; ++i) { + memcpy(q, p, bytesPerLine); + q += width; + p -= width; } - p -= 2 * width; } } else { - for (int i=0; i < height; ++i) { - const uint *end = p + width; - while (p < end) { - *q = ((*p << 16) & 0xff0000) | ((*p >> 16) & 0xff) | (*p & 0xff00ff00); - p++; - q++; + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + for (int i=0; i < height; ++i) { + const uint *end = p + width; + while (p < end) { + *q = (*p << 8) | ((*p >> 24) & 0xff); + p++; + q++; + } + p -= 2 * width; + } + } else { + for (int i=0; i < height; ++i) { + const uint *end = p + width; + while (p < end) { + *q = ((*p << 16) & 0xff0000) | ((*p >> 16) & 0xff) | (*p & 0xff00ff00); + p++; + q++; + } + p -= 2 * width; } - p -= 2 * width; } } } @@ -1771,19 +1818,18 @@ GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint } // Scale the pixmap if needed. GL textures needs to have the - // dimensions 2^n+2(border) x 2^m+2(border). + // dimensions 2^n+2(border) x 2^m+2(border), unless we're using GL + // 2.0 or use the GL_TEXTURE_RECTANGLE texture target int tx_w = qt_next_power_of_two(image.width()); int tx_h = qt_next_power_of_two(image.height()); + bool scale = false; - // Note: the clean param is only true when a texture is bound - // from the QOpenGLPaintEngine - in that case we have to force - // a premultiplied texture format QImage img = image; if (( !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) && !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0) ) && (target == GL_TEXTURE_2D && (tx_w != image.width() || tx_h != image.height()))) { - img = image.scaled(tx_w, tx_h); + scale = true; } GLuint tx_id; @@ -1815,17 +1861,24 @@ GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint ptr = reinterpret_cast(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB)); } - if (ptr) { - QImage::Format target_format = img.format(); - if (clean || img.format() != QImage::Format_ARGB32) - target_format = QImage::Format_ARGB32_Premultiplied; + QImage::Format target_format = img.format(); + // Note: the clean param is only true when a texture is bound + // from the QOpenGLPaintEngine - in that case we have to force + // a premultiplied texture format + if (clean || img.format() != QImage::Format_ARGB32) + target_format = QImage::Format_ARGB32_Premultiplied; + if (img.format() != target_format) + img = img.convertToFormat(target_format); + if (ptr) { QImage buffer(ptr, img.width(), img.height(), target_format); - convertToGLFormatHelper(buffer, img.convertToFormat(target_format), texture_format); + convertToGLFormatHelper(buffer, img, texture_format); glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB); - glTexImage2D(target, 0, format, img.width(), img.height(), 0, texture_format, GL_UNSIGNED_BYTE, 0); + glTexImage2D(target, 0, format, img.width(), img.height(), 0, texture_format, + GL_UNSIGNED_BYTE, 0); } else { - QImage tx = convertToGLFormat(img, clean, texture_format); + QImage tx(scale ? QSize(tx_w, tx_h) : img.size(), target_format); + convertToGLFormatHelper(tx, img, texture_format); glTexImage2D(target, 0, format, tx.width(), tx.height(), 0, texture_format, GL_UNSIGNED_BYTE, tx.bits()); } -- cgit v0.12 From f8c7de54eaf3e9165e41f212a13dd794ce7063a9 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Tue, 21 Apr 2009 16:33:04 +1000 Subject: Missing debug .rc file with a clean shadow build When generating Windows Makefiles, qmake writes out a .rc file for each of debug and release (unless you've limited to just one build type). When doing a clean shadow build, the first .rc file is written into a directory that does not exist but the code was not handling the error case. The fix does 2 things. 1) Attempt to create the destination directory if we can't write the file. 2) Die with an error if we still can't write the file after doing #1. Reviewed-by: Marius Storm-Olsen --- qmake/generators/win32/winmakefile.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 60a27be..87f55cf 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -432,9 +432,21 @@ void Win32MakefileGenerator::processRcFileVar() writeRcFile = rcFile.readAll() != rcString; rcFile.close(); } - if (writeRcFile && rcFile.open(QFile::WriteOnly)) { - rcFile.write(rcString); - rcFile.close(); + if (writeRcFile) { + bool ok; + ok = rcFile.open(QFile::WriteOnly); + if (!ok) { + // The file can't be opened... try creating the containing + // directory first (needed for clean shadow builds) + QDir().mkpath(QFileInfo(rcFile).path()); + ok = rcFile.open(QFile::WriteOnly); + } + if (!ok) { + ::fprintf(stderr, "Cannot open for writing: %s", rcFile.fileName().toLatin1().constData()); + ::exit(1); + } + rcFile.write(rcString); + rcFile.close(); } if (project->values("QMAKE_WRITE_DEFAULT_RC").isEmpty()) project->values("RC_FILE").insert(0, rcFile.fileName()); -- cgit v0.12 From b2112b17e427274ac0610416b2941b091314f5ad Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 21 Apr 2009 16:50:01 +1000 Subject: BT: Remove turkish translation files created by previous change. Remove the *_tr_TR.ts files added in change 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from .pro files to prevent them coming back next time someone does "make ts". Reviewed-by: Trust Me --- tools/assistant/translations/qt_help.pro | 1 - tools/assistant/translations/translations.pro | 1 - tools/assistant/translations/translations_adp.pro | 1 - tools/designer/translations/translations.pro | 1 - tools/linguist/linguist/linguist.pro | 1 - translations/assistant_adp_tr_TR.ts | 967 --- translations/assistant_tr_TR.ts | 1059 ---- translations/designer_tr_TR.ts | 6950 --------------------- translations/linguist_tr_TR.ts | 1955 ------ translations/qt_help_tr_TR.ts | 355 -- 10 files changed, 11291 deletions(-) delete mode 100644 translations/assistant_adp_tr_TR.ts delete mode 100644 translations/assistant_tr_TR.ts delete mode 100644 translations/designer_tr_TR.ts delete mode 100644 translations/linguist_tr_TR.ts delete mode 100644 translations/qt_help_tr_TR.ts diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro index 1684ac5..efad6bf 100644 --- a/tools/assistant/translations/qt_help.pro +++ b/tools/assistant/translations/qt_help.pro @@ -43,7 +43,6 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qt_help_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts error("This is a dummy profile to be used for translations ONLY.") diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro index 84bde8c..58de554 100644 --- a/tools/assistant/translations/translations.pro +++ b/tools/assistant/translations/translations.pro @@ -44,6 +44,5 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/assistant_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro index f6ab62e..e3edca4 100644 --- a/tools/assistant/translations/translations_adp.pro +++ b/tools/assistant/translations/translations_adp.pro @@ -35,7 +35,6 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts error("This is a dummy profile to be used for translations ONLY.") diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro index 7294956..8395259 100644 --- a/tools/designer/translations/translations.pro +++ b/tools/designer/translations/translations.pro @@ -133,7 +133,6 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \ - $$[QT_INSTALL_TRANSLATIONS]/designer_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro index 417ef67..968293a 100644 --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro @@ -100,7 +100,6 @@ RESOURCES += linguist.qrc TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/linguist_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \ diff --git a/translations/assistant_adp_tr_TR.ts b/translations/assistant_adp_tr_TR.ts deleted file mode 100644 index bb86689..0000000 --- a/translations/assistant_adp_tr_TR.ts +++ /dev/null @@ -1,967 +0,0 @@ - - - - - AssistantServer - - - Qt Assistant - - - - - Failed to bind to port %1 - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - FontSettingsDialog - - - Font Settings - - - - - Font settings for: - - - - - Browser - - - - - Application - - - - - Use custom settings - - - - - HelpDialog - - - Open Link in Current Tab - - - - - Open Link in New Window - - - - - Open Link in New Tab - - - - - - Prepare... - - - - - - - Qt Assistant - - - - - Failed to load keyword index file -Assistant will not work! - - - - - Cannot open the index file %1 - - - - - - - Warning - - - - - - Documentation file %1 does not exist! -Skipping file. - - - - - - Parse Error - - - - - Documentation file %1 is not compatible! -Skipping file. - - - - - - Done - - - - - Failed to save fulltext search index -Assistant will not work! - - - - - Indexing files... - - - - - Reading dictionary... - - - - - - Full Text Search - - - - - Using a wildcard within phrases is not allowed. - - - - - The closing quotation mark is missing. - - - - - %n document(s) found. - - - - - - - Help - - - - - <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> - - - - - Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. - - - - - Con&tents - - - - - <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> - - - - - column 1 - - - - - &Index - - - - - &Look For: - - - - - Enter keyword - - - - - <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> - - - - - <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> - - - - - &Bookmarks - - - - - Displays the list of bookmarks. - - - - - Add new bookmark - - - - - Add the currently displayed page as a new bookmark. - - - - - &New - - - - - Delete bookmark - - - - - Delete the selected bookmark. - - - - - &Delete - - - - - &Search - - - - - Searching f&or: - - - - - Enter searchword(s). - - - - - <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> - - - - - <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> - - - - - Found &Documents: - - - - - Display the help page. - - - - - Display the help page for the full text search. - - - - - He&lp - - - - - Start searching. - - - - - Pressing this button starts the search. - - - - - Preparing... - - - - - HelpWindow - - - Help - - - - - Unable to launch web browser. - - - - - - OK - - - - - Failed to open link: '%1' - - - - - <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - - - - - Error... - - - - - Copy &Link Location - - - - - Open Link in New Tab - - - - - Open Link in New Window Shift+LMB - - - - - Index - - - Untitled - - - - - MainWindow - - - Sidebar - - - - - &Window - - - - - Minimize - - - - - Ctrl+M - - - - - Initializing Qt Assistant... - - - - - SHIFT+CTRL+= - - - - - Ctrl+T - - - - - Ctrl+I - - - - - Ctrl+B - - - - - Ctrl+S - - - - - Ctrl+] - - - - - Ctrl+[ - - - - - Views - - - - - Displays the main page of a specific documentation set. - - - - - - Qt Assistant - - - - - Failed to open about application contents in file: '%1' - - - - - ... - - - - - - Save Page - - - - - Cannot open file for writing! - - - - - Qt Assistant by Nokia - - - - - Toolbar - - - - - Go - - - - - &Help - - - - - &File - - - - - Boo&kmarks - - - - - &Go - - - - - &View - - - - - &Edit - - - - - &Print... - - - - - Print the currently displayed page. - - - - - Ctrl+P - - - - - E&xit - - - - - Quit Qt Assistant. - - - - - Ctrl+Q - - - - - &Copy - - - - - Copy the selected text to the clipboard. - - - - - Ctrl+C - - - - - &Find in Text... - - - - - Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. - - - - - Ctrl+F - - - - - Find &Next - - - - - F3 - - - - - Find &Previous - - - - - Shift+F3 - - - - - &Home - - - - - Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. - - - - - Ctrl+Home - - - - - &Previous - - - - - Go to the previous page. - - - - - Alt+Left - - - - - &Next - - - - - Go to the next page. - - - - - Alt+Right - - - - - About Qt Assistant - - - - - Display further information about Qt Assistant. - - - - - About Qt - - - - - Zoom &in - - - - - Zoom in on the document, i.e. increase the font size. - - - - - Ctrl++ - - - - - Zoom &out - - - - - Zoom out on the document, i.e. decrease the font size. - - - - - Ctrl+- - - - - - New Window - - - - - Open a new window. - - - - - Ctrl+N - - - - - &Close - - - - - Close the current window. - - - - - Ctrl+W - - - - - &Add Bookmark - - - - - Add the currently displayed page as a new bookmark. - - - - - What's This? - - - - - "What's This?" context sensitive help. - - - - - Shift+F1 - - - - - Add Tab - - - - - Ctrl+Alt+N - - - - - Next Tab - - - - - Ctrl+Alt+Right - - - - - Previous Tab - - - - - Ctrl+Alt+Left - - - - - Close Tab - - - - - Ctrl+Alt+Q - - - - - Qt Assistant Manual - - - - - F1 - - - - - Save Page As... - - - - - Ctrl+Alt+S - - - - - Sync with Table of Contents - - - - - Select the page in contents tab. - - - - - Font Settings... - - - - - QObject - - - Qt Assistant by Nokia - - - - - TabbedBrowser - - - ... - - - - - Add page - - - - - Close page - - - - - New Tab - - - - - Close Tab - - - - - Close Other Tabs - - - - - TabbedBrowser - - - - - Untitled - - - - - Previous - - - - - Next - - - - - Case Sensitive - - - - - Whole words - - - - - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped - - - - - TopicChooser - - - Choose a topic for <b>%1</b> - - - - - Choose Topic - - - - - Select a topic from the list and click the <b>Display</b>-button to open the online help. - - - - - &Topics - - - - - Displays a list of available help topics for the keyword. - - - - - Open the topic selected in the list. - - - - - &Display - - - - - Close the Dialog. - - - - - &Close - - - - diff --git a/translations/assistant_tr_TR.ts b/translations/assistant_tr_TR.ts deleted file mode 100644 index 0ca29df..0000000 --- a/translations/assistant_tr_TR.ts +++ /dev/null @@ -1,1059 +0,0 @@ - - - - - AboutDialog - - - &Close - - - - - AboutLabel - - - Warning - - - - - Unable to launch external application. - - - - - - OK - - - - - BookmarkDialog - - - Add Bookmark - - - - - Bookmark: - - - - - Add in Folder: - - - - - + - - - - - New Folder - - - - - - - - - Bookmarks - - - - - Delete Folder - - - - - Rename Folder - - - - - BookmarkManager - - - Bookmarks - - - - - Remove - - - - - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? - - - - - - New Folder - - - - - BookmarkWidget - - - Delete Folder - - - - - Rename Folder - - - - - Show Bookmark - - - - - Show Bookmark in New Tab - - - - - Delete Bookmark - - - - - Rename Bookmark - - - - - Filter: - - - - - Add - - - - - Remove - - - - - CentralWidget - - - Add new page - - - - - Close current page - - - - - Print Document - - - - - - unknown - - - - - Add New Page - - - - - Close This Page - - - - - Close Other Pages - - - - - Add Bookmark for this Page... - - - - - Search - - - - - ContentWindow - - - Open Link - - - - - Open Link in New Tab - - - - - FilterNameDialogClass - - - Add Filter Name - - - - - Filter Name: - - - - - FindWidget - - - Previous - - - - - Next - - - - - Case Sensitive - - - - - Whole words - - - - - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - HelpViewer - - - Open Link in New Tab - - - - - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - - - - - Help - - - - - Unable to launch external application. - - - - - - OK - - - - - Copy &Link Location - - - - - Open Link in New Tab Ctrl+LMB - - - - - IndexWindow - - - &Look for: - - - - - Open Link - - - - - Open Link in New Tab - - - - - InstallDialog - - - - Install Documentation - - - - - Downloading documentation info... - - - - - Download canceled. - - - - - - - Done. - - - - - The file %1 already exists. Do you want to overwrite it? - - - - - Unable to save the file %1: %2. - - - - - Downloading %1... - - - - - - - Download failed: %1. - - - - - Documentation info file is corrupt! - - - - - Download failed: Downloaded file is corrupted. - - - - - Installing documentation %1... - - - - - Error while installing documentation: -%1 - - - - - Available Documentation: - - - - - Install - - - - - Cancel - - - - - Close - - - - - Installation Path: - - - - - ... - - - - - MainWindow - - - - Index - - - - - - Contents - - - - - - Bookmarks - - - - - - Search - - - - - - - Qt Assistant - - - - - - Unfiltered - - - - - Looking for Qt Documentation... - - - - - &File - - - - - Page Set&up... - - - - - Print Preview... - - - - - &Print... - - - - - New &Tab - - - - - &Close Tab - - - - - &Quit - - - - - CTRL+Q - - - - - &Edit - - - - - &Copy selected Text - - - - - &Find in Text... - - - - - Find &Next - - - - - Find &Previous - - - - - Preferences... - - - - - &View - - - - - Zoom &in - - - - - Zoom &out - - - - - Normal &Size - - - - - Ctrl+0 - - - - - ALT+C - - - - - ALT+I - - - - - ALT+O - - - - - ALT+S - - - - - &Go - - - - - &Home - - - - - Ctrl+Home - - - - - &Back - - - - - &Forward - - - - - Sync with Table of Contents - - - - - Next Page - - - - - Ctrl+Alt+Right - - - - - Previous Page - - - - - Ctrl+Alt+Left - - - - - &Bookmarks - - - - - Add Bookmark... - - - - - CTRL+D - - - - - &Help - - - - - About... - - - - - Navigation Toolbar - - - - - &Window - - - - - Zoom - - - - - Minimize - - - - - Ctrl+M - - - - - Toolbars - - - - - Filter Toolbar - - - - - Filtered by: - - - - - Address Toolbar - - - - - Address: - - - - - Could not find the associated content item. - - - - - About %1 - - - - - Updating search index - - - - - PreferencesDialog - - - - - Add Documentation - - - - - Qt Compressed Help Files (*.qch) - - - - - The specified file is not a valid Qt Help File! - - - - - The namespace %1 is already registered! - - - - - Remove Documentation - - - - - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. - - - - - Cancel - - - - - OK - - - - - Use custom settings - - - - - PreferencesDialogClass - - - Preferences - - - - - Fonts - - - - - Font settings: - - - - - Browser - - - - - Application - - - - - Filters - - - - - Filter: - - - - - Attributes: - - - - - 1 - - - - - Add - - - - - Remove - - - - - Documentation - - - - - Registered Documentation: - - - - - Add... - - - - - Options - - - - - Homepage - - - - - Current Page - - - - - Restore to default - - - - - QObject - - - - Bookmark - - - - - The specified collection file does not exist! - - - - - Missing collection file! - - - - - Invalid URL! - - - - - Missing URL! - - - - - - - Unknown widget: %1 - - - - - - - Missing widget! - - - - - - The specified Qt help file does not exist! - - - - - - Missing help file! - - - - - Missing filter argument! - - - - - Unknown option: %1 - - - - - - Qt Assistant - - - - - Could not register documentation file -%1 - -Reason: -%2 - - - - - Documentation successfully registered. - - - - - Documentation successfully unregistered. - - - - - Could not unregister documentation file -%1 - -Reason: -%2 - - - - - Cannot load sqlite database driver! - - - - - The specified collection file could not be read! - - - - - RemoteControl - - - Debugging Remote Control - - - - - Received Command: %1 %2 - - - - - SearchWidget - - - &Copy - - - - - Copy &Link Location - - - - - - Open Link in New Tab - - - - - Select All - - - - - Open Link - - - - - TopicChooser - - - Choose a topic for <b>%1</b>: - - - - - Choose Topic - - - - - &Topics - - - - - &Display - - - - - &Close - - - - diff --git a/translations/designer_tr_TR.ts b/translations/designer_tr_TR.ts deleted file mode 100644 index 73ea53e..0000000 --- a/translations/designer_tr_TR.ts +++ /dev/null @@ -1,6950 +0,0 @@ - - - - - - - - The moose in the noose -ate the goose who was loose. - - - - - <object> - - - - - <signal> - - - - - <slot> - - - - - AbstractFindWidget - - - &Previous - - - - - &Next - - - - - &Case sensitive - - - - - Whole &words - - - - - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped - - - - - AddLinkDialog - - - Insert Link - - - - - Title: - - - - - URL: - - - - - AppFontDialog - - - Additional Fonts - - - - - AppFontManager - - - '%1' is not a file. - - - - - The font file '%1' does not have read permissions. - - - - - The font file '%1' is already loaded. - - - - - The font file '%1' could not be loaded. - - - - - '%1' is not a valid font id. - - - - - There is no loaded font matching the id '%1'. - - - - - The font '%1' (%2) could not be unloaded. - - - - - AppFontWidget - - - Fonts - - - - - Add font files - - - - - Remove current font file - - - - - Remove all font files - - - - - Add Font Files - - - - - Font files (*.ttf) - - - - - Error Adding Fonts - - - - - Error Removing Fonts - - - - - Remove Fonts - - - - - Would you like to remove all fonts? - - - - - AppearanceOptionsWidget - - - Form - - - - - User Interface Mode - - - - - AssistantClient - - - Unable to send request: Assistant is not responding. - - - - - The binary '%1' does not exist. - - - - - Unable to launch assistant (%1). - - - - - BrushManagerProxy - - - The element '%1' is missing the required attribute '%2'. - - - - - Empty brush name encountered. - - - - - An unexpected element '%1' was encountered. - - - - - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 - - - - - An error occurred when reading the resource file '%1' at line %2, column %3: %4 - - - - - BrushPropertyManager - - - No brush - - - - - Solid - - - - - Dense 1 - - - - - Dense 2 - - - - - Dense 3 - - - - - Dense 4 - - - - - Dense 5 - - - - - Dense 6 - - - - - Dense 7 - - - - - Horizontal - - - - - Vertical - - - - - Cross - - - - - Backward diagonal - - - - - Forward diagonal - - - - - Crossing diagonal - - - - - Style - - - - - Color - - - - - [%1, %2] - - - - - Command - - - - Change signal - - - - - - Change slot - - - - - Change signal-slot connection - - - - - Change sender - - - - - Change receiver - - - - - Create button group - - - - - Break button group - - - - - Break button group '%1' - - - - - Add buttons to group - - - - - - Add '%1' to '%2' - Command description for adding buttons to a QButtonGroup - - - - - Remove buttons from group - - - - - Remove '%1' from '%2' - Command description for removing buttons from a QButtonGroup - - - - - Add connection - - - - - Adjust connection - - - - - Delete connections - - - - - Change source - - - - - Change target - - - - - Morph %1/'%2' into %3 - MorphWidgetCommand description - - - - - Insert '%1' - - - - - Change Z-order of '%1' - - - - - Raise '%1' - - - - - Lower '%1' - - - - - Delete '%1' - - - - - Reparent '%1' - - - - - Promote to custom widget - - - - - Demote from custom widget - - - - - Lay out using grid - - - - - Lay out vertically - - - - - Lay out horizontally - - - - - Break layout - - - - - Simplify Grid Layout - - - - - - - Move Page - - - - - - - - Delete Page - - - - - - Page - - - - - - - page - - - - - - - - Insert Page - - - - - tab - - - - - Change Tab order - - - - - Create Menu Bar - - - - - Delete Menu Bar - - - - - Create Status Bar - - - - - Delete Status Bar - - - - - Add Tool Bar - - - - - Add Dock Window - - - - - Adjust Size of '%1' - - - - - Change Form Layout Item Geometry - - - - - Change Layout Item Geometry - - - - - Delete Subwindow - - - - - Insert Subwindow - - - - - subwindow - - - - - Subwindow - - - - - Change Table Contents - - - - - Change Tree Contents - - - - - - Add action - - - - - - Remove action - - - - - Add menu - - - - - Remove menu - - - - - Create submenu - - - - - Delete Tool Bar - - - - - Change layout of '%1' from %2 to %3 - - - - - Set action text - - - - - Insert action - - - - - - Move action - - - - - Change Title - - - - - Insert Menu - - - - - Changed '%1' of '%2' - - - - - Changed '%1' of %n objects - - - - - - - Reset '%1' of '%2' - - - - - Reset '%1' of %n objects - - - - - - - Add dynamic property '%1' to '%2' - - - - - Add dynamic property '%1' to %n objects - - - - - - - Remove dynamic property '%1' from '%2' - - - - - Remove dynamic property '%1' from %n objects - - - - - - - Change script - - - - - Change signals/slots - - - - - ConnectDialog - - - Configure Connection - - - - - GroupBox - - - - - Edit... - - - - - Show signals and slots inherited from QWidget - - - - - DPI_Chooser - - - Standard (96 x 96) - Embedded device standard screen resolution - - - - - Greenphone (179 x 185) - Embedded device screen resolution - - - - - High (192 x 192) - Embedded device high definition screen resolution - - - - - Designer - - - Qt Designer - - - - - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. - - - - - Perhaps you forgot to create a layout? - - - - - Invalid ui file: The root element <ui> is missing. - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - - This file cannot be read because it was created using %1. - - - - - This file was created using Designer from Qt-%1 and cannot be read. - - - - - The converted file could not be read. - - - - - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. - - - - - The old form has not been touched, but you will have to save the form under a new name. - - - - - This file was created using Designer from Qt-%1 and could not be read: -%2 - - - - - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. - - - - - This file cannot be read because the extra info extension failed to load. - - - - - Custom Widgets - - - - - Promoted Widgets - - - - - Unable to launch %1. - - - - - %1 timed out. - - - - - DesignerMetaEnum - - - %1 is not a valid enumeration value of '%2'. - - - - - '%1' could not be converted to an enumeration value of type '%2'. - - - - - DesignerMetaFlags - - - '%1' could not be converted to a flag value of type '%2'. - - - - - DeviceProfile - - - '%1' is not a number. - Reading a number for an embedded device profile - - - - - An invalid tag <%1> was encountered. - - - - - DeviceProfileDialog - - - &Family - - - - - &Point Size - - - - - Style - - - - - Device DPI - - - - - Name - - - - - DeviceSkin - - - The image file '%1' could not be loaded. - - - - - The skin directory '%1' does not contain a configuration file. - - - - - The skin configuration file '%1' could not be opened. - - - - - The skin configuration file '%1' could not be read: %2 - - - - - Syntax error: %1 - - - - - The skin "up" image file '%1' does not exist. - - - - - The skin "down" image file '%1' does not exist. - - - - - The skin "closed" image file '%1' does not exist. - - - - - The skin cursor image file '%1' does not exist. - - - - - Syntax error in area definition: %1 - - - - - Mismatch in number of areas, expected %1, got %2. - - - - - EmbeddedOptionsControl - - - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> - Format embedded device profile description - - - - - EmbeddedOptionsPage - - - Embedded Design - Tab in preferences dialog - - - - - Device Profiles - EmbeddedOptionsControl group box" - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - FontPropertyManager - - - PreferDefault - - - - - NoAntialias - - - - - PreferAntialias - - - - - Antialiasing - - - - - FormBuilder - - - Invalid stretch value for '%1': '%2' - Parsing layout stretch values - - - - - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values - - - - - FormEditorOptionsPage - - - %1 % - - - - - Preview Zoom - - - - - Default Zoom - - - - - Forms - Tab in preferences dialog - - - - - Default Grid - - - - - FormLayoutRowDialog - - - Add Form Layout Row - - - - - &Label text: - - - - - Field &type: - - - - - &Field name: - - - - - &Buddy: - - - - - &Row: - - - - - Label &name: - - - - - FormWindow - - - Unexpected element <%1> - - - - - Error while pasting clipboard contents at line %1, column %2: %3 - - - - - FormWindowSettings - - - Form Settings - - - - - Layout &Default - - - - - &Spacing: - - - - - &Margin: - - - - - &Layout Function - - - - - Ma&rgin: - - - - - Spa&cing: - - - - - &Pixmap Function - - - - - &Include Hints - - - - - Grid - - - - - Embedded Design - - - - - &Author - - - - - IconSelector - - - All Pixmaps ( - - - - - ItemPropertyBrowser - - - XX Icon Selected off - Sample string to determinate the width for the first column of the list item property browser - - - - - LanguageResourceDialog - - - Choose Resource - - - - - MainWindowBase - - - Main - Not currently used (main tool bar) - - - - - File - - - - - Edit - - - - - Tools - - - - - Form - - - - - Qt Designer - - - - - NewForm - - - Show this Dialog on Startup - - - - - C&reate - - - - - Recent - - - - - New Form - - - - - &Close - - - - - &Open... - - - - - &Recent Forms - - - - - Read error - - - - - A temporary form file could not be created in %1. - - - - - The temporary form file %1 could not be written. - - - - - NewFormWidget - - - Unable to open the form template file '%1': %2 - - - - - ObjectInspectorModel - - - Object - - - - - Class - - - - - separator - - - - - <noname> - - - - - ObjectNameDialog - - - Change Object Name - - - - - Object Name - - - - - PluginDialog - - - Plugin Information - - - - - 1 - - - - - PreferencesDialog - - - Preferences - - - - - PreviewConfigurationWidget - - - Default - - - - - None - - - - - Browse... - - - - - Form - - - - - Print/Preview Configuration - - - - - Style - - - - - Style sheet - - - - - ... - - - - - Device skin - - - - - PromotionModel - - - Not used - Usage of promoted widgets - - - - - Q3WizardContainer - - - - Page - - - - - QAbstractFormBuilder - - - Unexpected element <%1> - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - - Invalid ui file: The root element <ui> is missing. - - - - - The creation of a widget of the class '%1' failed. - - - - - Attempt to add child that is not of class QWizardPage to QWizard. - - - - - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. -This indicates an inconsistency in the ui-file. - - - - - Empty widget item in %1 '%2'. - - - - - Flags property are not supported yet. - - - - - While applying tab stops: The widget '%1' could not be found. - - - - - Invalid QButtonGroup reference '%1' referenced by '%2'. - - - - - This version of the uitools library is linked without script support. - - - - - QAxWidgetPlugin - - - ActiveX control - - - - - ActiveX control widget - - - - - QAxWidgetTaskMenu - - - Set Control - - - - - Reset Control - - - - - Licensed Control - - - - - The control requires a design-time license - - - - - QCoreApplication - - - %1 is not a promoted class. - - - - - The base class %1 is invalid. - - - - - The class %1 already exists. - - - - - Promoted Widgets - - - - - The class %1 cannot be removed - - - - - The class %1 cannot be removed because it is still referenced. - - - - - The class %1 cannot be renamed - - - - - The class %1 cannot be renamed to an empty name. - - - - - There is already a class named %1. - - - - - Cannot set an empty include file. - - - - - Exception at line %1: %2 - - - - - Unknown error - - - - - An error occurred while running the script for %1: %2 -Script: %3 - - - - - QDesigner - - - %1 - warning - - - - - Qt Designer - - - - - This application cannot be used for the Console edition of Qt - - - - - QDesignerActions - - - Saved %1. - - - - - %1 already exists. -Do you want to replace it? - - - - - Edit Widgets - - - - - &New... - - - - - &Open... - - - - - &Save - - - - - Save &As... - - - - - Save A&ll - - - - - Save As &Template... - - - - - - &Close - - - - - Save &Image... - - - - - &Print... - - - - - &Quit - - - - - View &Code... - - - - - &Minimize - - - - - Bring All to Front - - - - - Preferences... - - - - - Additional Fonts... - - - - - ALT+CTRL+S - - - - - CTRL+SHIFT+S - - - - - CTRL+Q - - - - - CTRL+R - - - - - CTRL+M - - - - - Qt Designer &Help - - - - - Current Widget Help - - - - - What's New in Qt Designer? - - - - - About Plugins - - - - - - About Qt Designer - - - - - About Qt - - - - - Clear &Menu - - - - - &Recent Forms - - - - - - Open Form - - - - - - - Designer UI files (*.%1);;All Files (*) - - - - - - Save Form As - - - - - Designer - - - - - Feature not implemented yet! - - - - - Code generation failed - - - - - Read error - - - - - %1 -Do you want to update the file location or generate a new form? - - - - - &Update - - - - - &New Form - - - - - - Save Form? - - - - - Could not open file - - - - - The file %1 could not be opened. -Reason: %2 -Would you like to retry or select a different file? - - - - - Select New File - - - - - Could not write file - - - - - It was not possible to write the entire file %1 to disk. -Reason:%2 -Would you like to retry? - - - - - - Assistant - - - - - &Close Preview - - - - - - The backup file %1 could not be written. - - - - - The backup directory %1 could not be created. - - - - - The temporary backup directory %1 could not be created. - - - - - Preview failed - - - - - Image files (*.%1) - - - - - - Save Image - - - - - Saved image %1. - - - - - The file %1 could not be written. - - - - - Please close all forms to enable the loading of additional fonts. - - - - - Printed %1. - - - - - QDesignerAppearanceOptionsPage - - - Appearance - Tab in preferences dialog - - - - - QDesignerAppearanceOptionsWidget - - - Docked Window - - - - - Multiple Top-Level Windows - - - - - Toolwindow Font - - - - - QDesignerAxWidget - - - Reset control - - - - - Set control - - - - - Control loaded - - - - - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". - - - - - QDesignerFormBuilder - - - Script errors occurred: - - - - - The preview failed to build. - - - - - Designer - - - - - QDesignerFormWindow - - - %1 - %2[*] - - - - - Save Form? - - - - - Do you want to save the changes to this document before closing? - - - - - If you don't save, your changes will be lost. - - - - - QDesignerMenu - - - Type Here - - - - - Add Separator - - - - - Insert separator - - - - - Remove separator - - - - - Remove action '%1' - - - - - - Add separator - - - - - Insert action - - - - - QDesignerMenuBar - - - Type Here - - - - - Remove Menu '%1' - - - - - Remove Menu Bar - - - - - Menu - - - - - QDesignerPluginManager - - - An XML error was encountered when parsing the XML of the custom widget %1: %2 - - - - - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. - - - - - The class attribute for the class %1 is missing. - - - - - The class attribute for the class %1 does not match the class name %2. - - - - - QDesignerPropertySheet - - - Dynamic Properties - - - - - QDesignerResource - - - The layout type '%1' is not supported, defaulting to grid. - - - - - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. -Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - - - - - Unexpected element <%1> - Parsing clipboard contents - - - - - Error while pasting clipboard contents at line %1, column %2: %3 - Parsing clipboard contents - - - - - Error while pasting clipboard contents: The root element <ui> is missing. - Parsing clipboard contents - - - - - QDesignerSharedSettings - - - The template path %1 could not be created. - - - - - An error has been encountered while parsing device profile XML: %1 - - - - - QDesignerToolWindow - - - Property Editor - - - - - Action Editor - - - - - Object Inspector - - - - - Resource Browser - - - - - Signal/Slot Editor - - - - - Widget Box - - - - - QDesignerWidgetBox - - - An error has been encountered at line %1 of %2: %3 - - - - - Unexpected element <%1> encountered when parsing for <widget> or <ui> - - - - - Unexpected end of file encountered when parsing widgets. - - - - - A widget element could not be found. - - - - - QDesignerWorkbench - - - &File - - - - - Edit - - - - - F&orm - - - - - Preview in - - - - - &View - - - - - &Settings - - - - - &Window - - - - - &Help - - - - - Toolbars - - - - - Save Forms? - - - - - There are %n forms with unsaved changes. Do you want to review these changes before quitting? - - - - - - - If you do not review your documents, all your changes will be lost. - - - - - Discard Changes - - - - - Review Changes - - - - - Backup Information - - - - - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? - - - - - The file <b>%1</b> could not be opened. - - - - - The file <b>%1</b> is not a valid Designer ui file. - - - - - QFormBuilder - - - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method - - - - - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. - - - - - QFormBuilder was unable to create a widget of the class '%1'. - - - - - The layout type `%1' is not supported. - - - - - The set-type property %1 could not be read. - - - - - The enumeration-type property %1 could not be read. - - - - - Reading properties of the type %1 is not supported yet. - - - - - The property %1 could not be written. The type %2 is not supported yet. - - - - - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. - - - - - The flag-value '%1' is invalid. Zero will be used instead. - - - - - QStackedWidgetEventFilter - - - Previous Page - - - - - Next Page - - - - - Delete - - - - - Before Current Page - - - - - After Current Page - - - - - Change Page Order... - - - - - Change Page Order - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QStackedWidgetPreviewEventFilter - - - Go to previous page of %1 '%2' (%3/%4). - - - - - Go to next page of %1 '%2' (%3/%4). - - - - - QTabWidgetEventFilter - - - Delete - - - - - Before Current Page - - - - - After Current Page - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QToolBoxHelper - - - Delete Page - - - - - Before Current Page - - - - - After Current Page - - - - - Change Page Order... - - - - - Change Page Order - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QtBoolEdit - - - - - True - - - - - - False - - - - - QtBoolPropertyManager - - - True - - - - - False - - - - - QtCharEdit - - - Clear Char - - - - - QtColorEditWidget - - - ... - - - - - QtColorPropertyManager - - - Red - - - - - Green - - - - - Blue - - - - - Alpha - - - - - QtCursorDatabase - - - Arrow - - - - - Up Arrow - - - - - Cross - - - - - Wait - - - - - IBeam - - - - - Size Vertical - - - - - Size Horizontal - - - - - Size Backslash - - - - - Size Slash - - - - - Size All - - - - - Blank - - - - - Split Vertical - - - - - Split Horizontal - - - - - Pointing Hand - - - - - Forbidden - - - - - Open Hand - - - - - Closed Hand - - - - - What's This - - - - - Busy - - - - - QtFontEditWidget - - - ... - - - - - Select Font - - - - - QtFontPropertyManager - - - Family - - - - - Point Size - - - - - Bold - - - - - Italic - - - - - Underline - - - - - Strikeout - - - - - Kerning - - - - - QtGradientDialog - - - Edit Gradient - - - - - QtGradientEditor - - - Start X - - - - - Start Y - - - - - Final X - - - - - Final Y - - - - - - Central X - - - - - - Central Y - - - - - Focal X - - - - - Focal Y - - - - - Radius - - - - - Angle - - - - - Form - - - - - Gradient Editor - - - - - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - Gradient Stops Editor - - - - - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. - - - - - Zoom - - - - - Reset Zoom - - - - - Position - - - - - Hue - - - - - H - - - - - Saturation - - - - - S - - - - - Sat - - - - - Value - - - - - V - - - - - Val - - - - - Alpha - - - - - A - - - - - Type - - - - - Spread - - - - - Color - - - - - Current stop's color - - - - - Show HSV specification - - - - - HSV - - - - - Show RGB specification - - - - - RGB - - - - - Current stop's position - - - - - % - - - - - Zoom In - - - - - Zoom Out - - - - - Toggle details extension - - - - - > - - - - - Linear Type - - - - - ... - - - - - Radial Type - - - - - Conical Type - - - - - Pad Spread - - - - - Repeat Spread - - - - - Reflect Spread - - - - - QtGradientStopsWidget - - - New Stop - - - - - Delete - - - - - Flip All - - - - - Select All - - - - - Zoom In - - - - - Zoom Out - - - - - Reset Zoom - - - - - QtGradientView - - - Grad - - - - - Remove Gradient - - - - - Are you sure you want to remove the selected gradient? - - - - - - New... - - - - - - Edit... - - - - - - Rename - - - - - - Remove - - - - - Gradient View - - - - - QtGradientViewDialog - - - - Select Gradient - - - - - QtKeySequenceEdit - - - Clear Shortcut - - - - - QtLocalePropertyManager - - - %1, %2 - - - - - Language - - - - - Country - - - - - QtPointFPropertyManager - - - (%1, %2) - - - - - X - - - - - Y - - - - - QtPointPropertyManager - - - (%1, %2) - - - - - X - - - - - Y - - - - - QtPropertyBrowserUtils - - - [%1, %2, %3] (%4) - - - - - [%1, %2] - - - - - QtRectFPropertyManager - - - [(%1, %2), %3 x %4] - - - - - X - - - - - Y - - - - - Width - - - - - Height - - - - - QtRectPropertyManager - - - [(%1, %2), %3 x %4] - - - - - X - - - - - Y - - - - - Width - - - - - Height - - - - - QtResourceEditorDialog - - - %1 already exists. -Do you want to replace it? - - - - - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. - - - - - %1 [read-only] - - - - - - %1 [missing] - - - - - <no prefix> - - - - - - New Resource File - - - - - - Resource files (*.qrc) - - - - - Import Resource File - - - - - newPrefix - - - - - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> - - - - - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> - - - - - Add Files - - - - - Incorrect Path - - - - - - - - Copy - - - - - Copy As... - - - - - Keep - - - - - Skip - - - - - Clone Prefix - - - - - Enter the suffix which you want to add to the names of the cloned files. -This could for example be a language extension like "_de". - - - - - - Copy As - - - - - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> - - - - - Could not overwrite %1. - - - - - Could not copy -%1 -to -%2 - - - - - A parse error occurred at line %1, column %2 of %3: -%4 - - - - - Save Resource File - - - - - Could not write %1: %2 - - - - - Edit Resources - - - - - New... - - - - - Open... - - - - - Open Resource File - - - - - - Remove - - - - - - Move Up - - - - - - Move Down - - - - - - Add Prefix - - - - - Add Files... - - - - - Change Prefix - - - - - Change Language - - - - - Change Alias - - - - - Clone Prefix... - - - - - Prefix / Path - - - - - Language / Alias - - - - - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> - - - - - Resource Warning - - - - - Dialog - - - - - New File - - - - - N - - - - - Remove File - - - - - R - - - - - I - - - - - New Resource - - - - - A - - - - - Remove Resource or File - - - - - QtResourceView - - - Size: %1 x %2 -%3 - - - - - Edit Resources... - - - - - Reload - - - - - Copy Path - - - - - QtResourceViewDialog - - - Select Resource - - - - - QtSizeFPropertyManager - - - %1 x %2 - - - - - Width - - - - - Height - - - - - QtSizePolicyPropertyManager - - - - <Invalid> - - - - - [%1, %2, %3, %4] - - - - - Horizontal Policy - - - - - Vertical Policy - - - - - Horizontal Stretch - - - - - Vertical Stretch - - - - - QtSizePropertyManager - - - %1 x %2 - - - - - Width - - - - - Height - - - - - QtToolBarDialog - - - Custom Toolbar - - - - - < S E P A R A T O R > - - - - - Customize Toolbars - - - - - 1 - - - - - Actions - - - - - Toolbars - - - - - Add new toolbar - - - - - New - - - - - Remove selected toolbar - - - - - Remove - - - - - Rename toolbar - - - - - Rename - - - - - Move action up - - - - - Up - - - - - Remove action from toolbar - - - - - <- - - - - - Add action to toolbar - - - - - -> - - - - - Move action down - - - - - Down - - - - - Current Toolbar Actions - - - - - QtTreePropertyBrowser - - - Property - - - - - Value - - - - - SaveFormAsTemplate - - - Add path... - - - - - Template Exists - - - - - A template with the name %1 already exists. -Do you want overwrite the template? - - - - - Overwrite Template - - - - - Open Error - - - - - There was an error opening template %1 for writing. Reason: %2 - - - - - Write Error - - - - - There was an error writing the template %1 to disk. Reason: %2 - - - - - Pick a directory to save templates in - - - - - Save Form As Template - - - - - &Name: - - - - - &Category: - - - - - ScriptErrorDialog - - - An error occurred while running the scripts for "%1": - - - - - - SelectSignalDialog - - - Go to slot - - - - - Select signal - - - - - signal - - - - - class - - - - - SignalSlotConnection - - - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) - - - - - SignalSlotDialogClass - - - Signals and slots - - - - - Slots - - - - - Add - - - - - ... - - - - - Delete - - - - - Signals - - - - - Spacer - - - Horizontal Spacer '%1', %2 x %3 - - - - - Vertical Spacer '%1', %2 x %3 - - - - - TemplateOptionsPage - - - Template Paths - Tab in preferences dialog - - - - - ToolBarManager - - - Configure Toolbars... - - - - - Window - - - - - Help - - - - - Style - - - - - Dock views - - - - - Toolbars - - - - - VersionDialog - - - <h3>%1</h3><br/><br/>Version %2 - - - - - Qt Designer - - - - - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> - - - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - - - WidgetDataBase - - - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. - - - - - qdesigner_internal::ActionEditor - - - New... - - - - - Edit... - - - - - Go to slot... - - - - - Copy - - - - - Cut - - - - - Paste - - - - - Select all - - - - - Delete - - - - - Actions - - - - - Configure Action Editor - - - - - Icon View - - - - - Detailed View - - - - - New action - - - - - Edit action - - - - - Remove action '%1' - - - - - Remove actions - - - - - Used In - - - - - qdesigner_internal::ActionModel - - - Name - - - - - Used - - - - - Text - - - - - Shortcut - - - - - Checkable - - - - - ToolTip - - - - - qdesigner_internal::BuddyEditor - - - Add buddy - - - - - Remove buddies - - - - - Remove %n buddies - - - - - - - Add %n buddies - - - - - - - Set automatically - - - - - qdesigner_internal::BuddyEditorPlugin - - - Edit Buddies - - - - - qdesigner_internal::BuddyEditorTool - - - Edit Buddies - - - - - qdesigner_internal::ButtonGroupMenu - - - Select members - - - - - Break - - - - - qdesigner_internal::ButtonTaskMenu - - - Assign to button group - - - - - Button group - - - - - New button group - - - - - Change text... - - - - - None - - - - - Button group '%1' - - - - - qdesigner_internal::CodeDialog - - - Save... - - - - - Copy All - - - - - &Find in Text... - - - - - A temporary form file could not be created in %1. - - - - - The temporary form file %1 could not be written. - - - - - %1 - [Code] - - - - - Save Code - - - - - Header Files (*.%1) - - - - - The file %1 could not be opened: %2 - - - - - The file %1 could not be written: %2 - - - - - %1 - Error - - - - - qdesigner_internal::ColorAction - - - Text Color - - - - - qdesigner_internal::ComboBoxTaskMenu - - - Edit Items... - - - - - Change Combobox Contents - - - - - qdesigner_internal::CommandLinkButtonTaskMenu - - - Change description... - - - - - qdesigner_internal::ConnectionEdit - - - Select All - - - - - Deselect All - - - - - Delete - - - - - qdesigner_internal::ConnectionModel - - - Sender - - - - - Signal - - - - - Receiver - - - - - Slot - - - - - <sender> - - - - - <signal> - - - - - <receiver> - - - - - <slot> - - - - - The connection already exists!<br>%1 - - - - - Signal and Slot Editor - - - - - qdesigner_internal::ContainerWidgetTaskMenu - - - Delete - - - - - Insert - - - - - Insert Page Before Current Page - - - - - Insert Page After Current Page - - - - - Add Subwindow - - - - - Subwindow - - - - - Page - - - - - Page %1 of %2 - - - - - qdesigner_internal::DPI_Chooser - - - System (%1 x %2) - System resolution - - - - - User defined - - - - - x - DPI X/Y separator - - - - - qdesigner_internal::DesignerPropertyManager - - - - AlignLeft - - - - - AlignHCenter - - - - - AlignRight - - - - - AlignJustify - - - - - AlignTop - - - - - - AlignVCenter - - - - - AlignBottom - - - - - %1, %2 - - - - - Customized (%n roles) - - - - - - - Inherited - - - - - Horizontal - - - - - Vertical - - - - - Normal Off - - - - - Normal On - - - - - Disabled Off - - - - - Disabled On - - - - - Active Off - - - - - Active On - - - - - Selected Off - - - - - Selected On - - - - - - translatable - - - - - - disambiguation - - - - - - comment - - - - - qdesigner_internal::DeviceProfileDialog - - - Device Profiles (*.%1) - - - - - Default - - - - - Save Profile - - - - - Save Profile - Error - - - - - Unable to open the file '%1' for writing: %2 - - - - - Open profile - - - - - - Open Profile - Error - - - - - Unable to open the file '%1' for reading: %2 - - - - - '%1' is not a valid profile: %2 - - - - - qdesigner_internal::Dialog - - - Dialog - - - - - StringList - - - - - New String - - - - - &New - - - - - Delete String - - - - - &Delete - - - - - &Value: - - - - - Move String Up - - - - - Up - - - - - Move String Down - - - - - Down - - - - - qdesigner_internal::EmbeddedOptionsControl - - - None - - - - - Add a profile - - - - - Edit the selected profile - - - - - Delete the selected profile - - - - - Add Profile - - - - - New profile - - - - - Edit Profile - - - - - Delete Profile - - - - - Would you like to delete the profile '%1'? - - - - - Default - - - - - qdesigner_internal::FilterWidget - - - <Filter> - - - - - qdesigner_internal::FormEditor - - - Resource File Changed - - - - - The file "%1" has changed outside Designer. Do you want to reload it? - - - - - qdesigner_internal::FormLayoutMenu - - - Add form layout row... - - - - - qdesigner_internal::FormWindow - - - Edit contents - - - - - F2 - - - - - Insert widget '%1' - - - - - Resize - - - - - - Key Move - - - - - Paste %n action(s) - - - - - - - Paste %n widget(s) - - - - - - - Paste (%1 widgets, %2 actions) - - - - - Cannot paste widgets. Designer could not find a container without a layout to paste into. - - - - - Break the layout of the container you want to paste into, select this container and then paste again. - - - - - Paste error - - - - - Raise widgets - - - - - Lower widgets - - - - - Select Ancestor - - - - - Lay out - - - - - - Drop widget - - - - - A QMainWindow-based form does not contain a central widget. - - - - - qdesigner_internal::FormWindowBase - - - Delete '%1' - - - - - Delete - - - - - qdesigner_internal::FormWindowManager - - - Cu&t - - - - - Cuts the selected widgets and puts them on the clipboard - - - - - &Copy - - - - - Copies the selected widgets to the clipboard - - - - - &Paste - - - - - Pastes the clipboard's contents - - - - - &Delete - - - - - Deletes the selected widgets - - - - - Select &All - - - - - Selects all widgets - - - - - Bring to &Front - - - - - - Raises the selected widgets - - - - - Send to &Back - - - - - - Lowers the selected widgets - - - - - Adjust &Size - - - - - Adjusts the size of the selected widget - - - - - Lay Out &Horizontally - - - - - Lays out the selected widgets horizontally - - - - - Lay Out &Vertically - - - - - Lays out the selected widgets vertically - - - - - Lay Out in a &Form Layout - - - - - Lays out the selected widgets in a form layout - - - - - Lay Out in a &Grid - - - - - Lays out the selected widgets in a grid - - - - - Lay Out Horizontally in S&plitter - - - - - Lays out the selected widgets horizontally in a splitter - - - - - Lay Out Vertically in Sp&litter - - - - - Lays out the selected widgets vertically in a splitter - - - - - &Break Layout - - - - - Breaks the selected layout - - - - - Si&mplify Grid Layout - - - - - Removes empty columns and rows - - - - - &Preview... - - - - - Preview current form - - - - - Form &Settings... - - - - - Break Layout - - - - - Adjust Size - - - - - Could not create form preview - Title of warning message box - - - - - Form Settings - %1 - - - - - qdesigner_internal::FormWindowSettings - - - None - - - - - Device Profile: %1 - - - - - qdesigner_internal::GridPanel - - - Form - - - - - Grid - - - - - Visible - - - - - Grid &X - - - - - Snap - - - - - Reset - - - - - Grid &Y - - - - - qdesigner_internal::GroupBoxTaskMenu - - - Change title... - - - - - qdesigner_internal::HtmlTextEdit - - - Insert HTML entity - - - - - qdesigner_internal::IconSelector - - - The pixmap file '%1' cannot be read. - - - - - The file '%1' does not appear to be a valid pixmap file: %2 - - - - - The file '%1' could not be read: %2 - - - - - Choose a Pixmap - - - - - Pixmap Read Error - - - - - ... - - - - - Normal Off - - - - - Normal On - - - - - Disabled Off - - - - - Disabled On - - - - - Active Off - - - - - Active On - - - - - Selected Off - - - - - Selected On - - - - - Choose Resource... - - - - - Choose File... - - - - - Reset - - - - - Reset All - - - - - qdesigner_internal::ItemListEditor - - - Properties &<< - - - - - - Properties &>> - - - - - Items List - - - - - New Item - - - - - &New - - - - - Delete Item - - - - - &Delete - - - - - Move Item Up - - - - - U - - - - - Move Item Down - - - - - D - - - - - qdesigner_internal::LabelTaskMenu - - - Change rich text... - - - - - Change plain text... - - - - - qdesigner_internal::LineEditTaskMenu - - - Change text... - - - - - qdesigner_internal::ListWidgetEditor - - - New Item - - - - - Edit List Widget - - - - - Edit Combobox - - - - - qdesigner_internal::ListWidgetTaskMenu - - - Edit Items... - - - - - Change List Contents - - - - - qdesigner_internal::MdiContainerWidgetTaskMenu - - - Next Subwindow - - - - - Previous Subwindow - - - - - Tile - - - - - Cascade - - - - - qdesigner_internal::MenuTaskMenu - - - Remove - - - - - qdesigner_internal::MorphMenu - - - Morph into - - - - - qdesigner_internal::NewActionDialog - - - New Action... - - - - - &Text: - - - - - Object &name: - - - - - &Icon: - - - - - Shortcut: - - - - - Checkable: - - - - - ToolTip: - - - - - ... - - - - - qdesigner_internal::NewDynamicPropertyDialog - - - Set Property Name - - - - - The current object already has a property named '%1'. -Please select another, unique one. - - - - - The '_q_' prefix is reserved for the Qt library. -Please select another name. - - - - - Create Dynamic Property - - - - - Property Name - - - - - horizontalSpacer - - - - - Property Type - - - - - qdesigner_internal::NewFormWidget - - - Default size - - - - - QVGA portrait (240x320) - - - - - QVGA landscape (320x240) - - - - - VGA portrait (480x640) - - - - - VGA landscape (640x480) - - - - - Widgets - New Form Dialog Categories - - - - - Custom Widgets - - - - - None - - - - - Error loading form - - - - - Internal error: No template selected. - - - - - 0 - - - - - Choose a template for a preview - - - - - Embedded Design - - - - - Device: - - - - - Screen Size: - - - - - qdesigner_internal::NewPromotedClassPanel - - - Add - - - - - New Promoted Class - - - - - Base class name: - - - - - Promoted class name: - - - - - Header file: - - - - - Global include - - - - - Reset - - - - - qdesigner_internal::ObjectInspector - - - &Find in Text... - - - - - qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - - - Change Current Page - - - - - qdesigner_internal::OrderDialog - - - Index %1 (%2) - - - - - %1 %2 - - - - - Change Page Order - - - - - Page Order - - - - - Move page up - - - - - Move page down - - - - - qdesigner_internal::PaletteEditor - - - Edit Palette - - - - - Tune Palette - - - - - Show Details - - - - - Compute Details - - - - - Quick - - - - - Preview - - - - - Disabled - - - - - Inactive - - - - - Active - - - - - qdesigner_internal::PaletteEditorButton - - - Change Palette - - - - - qdesigner_internal::PaletteModel - - - Color Role - - - - - Active - - - - - Inactive - - - - - Disabled - - - - - qdesigner_internal::PixmapEditor - - - Choose Resource... - - - - - Choose File... - - - - - Copy Path - - - - - Paste Path - - - - - - ... - - - - - qdesigner_internal::PlainTextEditorDialog - - - Edit text - - - - - qdesigner_internal::PluginDialog - - - Components - - - - - Plugin Information - - - - - Refresh - - - - - Scan for newly installed custom widget plugins. - - - - - Qt Designer couldn't find any plugins - - - - - Qt Designer found the following plugins - - - - - New custom widget plugins have been found. - - - - - qdesigner_internal::PreviewActionGroup - - - %1 Style - - - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - - - Load Custom Device Skin - - - - - All QVFB Skins (*.%1) - - - - - %1 - Duplicate Skin - - - - - The skin '%1' already exists. - - - - - %1 - Error - - - - - %1 is not a valid skin directory: -%2 - - - - - qdesigner_internal::PreviewDeviceSkin - - - &Close - - - - - qdesigner_internal::PreviewManager - - - %1 - [Preview] - - - - - qdesigner_internal::PreviewWidget - - - Preview Window - - - - - LineEdit - - - - - ComboBox - - - - - PushButton - - - - - ButtonGroup2 - - - - - CheckBox1 - - - - - CheckBox2 - - - - - ButtonGroup - - - - - RadioButton1 - - - - - RadioButton2 - - - - - RadioButton3 - - - - - qdesigner_internal::PromotionModel - - - Name - - - - - Header file - - - - - Global include - - - - - Usage - - - - - qdesigner_internal::PromotionTaskMenu - - - Promoted widgets... - - - - - Promote to ... - - - - - Change signals/slots... - - - - - Promote to - - - - - Demote to %1 - - - - - qdesigner_internal::PropertyEditor - - - Add Dynamic Property... - - - - - Remove Dynamic Property - - - - - Sorting - - - - - Color Groups - - - - - Tree View - - - - - Drop Down Button View - - - - - String... - - - - - Bool... - - - - - Other... - - - - - Configure Property Editor - - - - - Object: %1 -Class: %2 - - - - - qdesigner_internal::PropertyLineEdit - - - Insert line break - - - - - qdesigner_internal::QDesignerPromotionDialog - - - Promoted Widgets - - - - - Promoted Classes - - - - - Promote - - - - - Change signals/slots... - - - - - %1 - Error - - - - - qdesigner_internal::QDesignerResource - - - Loading qrc file - - - - - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> - - - - - New location for %1 - - - - - Resource files (*.qrc) - - - - - qdesigner_internal::QDesignerTaskMenu - - - Change objectName... - - - - - Change toolTip... - - - - - Change whatsThis... - - - - - Change styleSheet... - - - - - Create Menu Bar - - - - - Add Tool Bar - - - - - Create Status Bar - - - - - Remove Status Bar - - - - - Change script... - - - - - Change signals/slots... - - - - - Go to slot... - - - - - Size Constraints - - - - - Set Minimum Width - - - - - Set Minimum Height - - - - - Set Minimum Size - - - - - Set Maximum Width - - - - - Set Maximum Height - - - - - Set Maximum Size - - - - - Edit ToolTip - - - - - Edit WhatsThis - - - - - no signals available - - - - - Set size constraint on %n widget(s) - - - - - - - qdesigner_internal::QDesignerWidgetBox - - - - Unexpected element <%1> - - - - - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 -%5 - - - - - The XML code specified for the widget %1 does not contain any widget elements. -%2 - - - - - qdesigner_internal::QtGradientEditor - - - Linear - - - - - Radial - - - - - Conical - - - - - Pad - - - - - Repeat - - - - - Reflect - - - - - qdesigner_internal::QtGradientStopsController - - - H - - - - - S - - - - - V - - - - - - Hue - - - - - Sat - - - - - Val - - - - - Saturation - - - - - Value - - - - - R - - - - - G - - - - - B - - - - - Red - - - - - Green - - - - - Blue - - - - - qdesigner_internal::RichTextEditorDialog - - - Edit text - - - - - Rich Text - - - - - Source - - - - - &OK - - - - - &Cancel - - - - - qdesigner_internal::RichTextEditorToolBar - - - Bold - - - - - CTRL+B - - - - - Italic - - - - - CTRL+I - - - - - Underline - - - - - CTRL+U - - - - - Left Align - - - - - Center - - - - - Right Align - - - - - Justify - - - - - Superscript - - - - - Subscript - - - - - Insert &Link - - - - - Insert &Image - - - - - qdesigner_internal::ScriptDialog - - - Edit script - - - - - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. - - - - - Syntax error - - - - - qdesigner_internal::ScriptErrorDialog - - - Script errors - - - - - qdesigner_internal::SignalSlotDialog - - - There is already a slot with the signature '%1'. - - - - - There is already a signal with the signature '%1'. - - - - - %1 - Duplicate Signature - - - - - - Signals/Slots of %1 - - - - - qdesigner_internal::SignalSlotEditorPlugin - - - Edit Signals/Slots - - - - - F4 - - - - - qdesigner_internal::SignalSlotEditorTool - - - Edit Signals/Slots - - - - - qdesigner_internal::StatusBarTaskMenu - - - Remove - - - - - qdesigner_internal::StringListEditorButton - - - Change String List - - - - - qdesigner_internal::StyleSheetEditorDialog - - - - Valid Style Sheet - - - - - Add Resource... - - - - - Add Gradient... - - - - - Add Color... - - - - - Add Font... - - - - - Edit Style Sheet - - - - - Invalid Style Sheet - - - - - qdesigner_internal::TabOrderEditor - - - Start from Here - - - - - Restart - - - - - Tab Order List... - - - - - Tab Order List - - - - - Tab Order - - - - - qdesigner_internal::TabOrderEditorPlugin - - - Edit Tab Order - - - - - qdesigner_internal::TabOrderEditorTool - - - Edit Tab Order - - - - - qdesigner_internal::TableWidgetEditor - - - New Column - - - - - New Row - - - - - &Columns - - - - - &Rows - - - - - Properties &<< - - - - - - Properties &>> - - - - - Edit Table Widget - - - - - &Items - - - - - Table Items - - - - - qdesigner_internal::TableWidgetTaskMenu - - - Edit Items... - - - - - qdesigner_internal::TemplateOptionsWidget - - - Pick a directory to save templates in - - - - - Form - - - - - Additional Template Paths - - - - - ... - - - - - qdesigner_internal::TextEditTaskMenu - - - Edit HTML - - - - - Change HTML... - - - - - Edit Text - - - - - Change Plain Text... - - - - - qdesigner_internal::TextEditor - - - Choose Resource... - - - - - Choose File... - - - - - ... - - - - - Choose a File - - - - - qdesigner_internal::ToolBarEventFilter - - - Insert Separator before '%1' - - - - - Append Separator - - - - - Remove action '%1' - - - - - Remove Toolbar '%1' - - - - - Insert Separator - - - - - qdesigner_internal::TreeWidgetEditor - - - New Column - - - - - &Columns - - - - - Per column properties - - - - - Common properties - - - - - - New Item - - - - - - New Subitem - - - - - Properties &<< - - - - - - Properties &>> - - - - - Edit Tree Widget - - - - - &Items - - - - - Tree Items - - - - - 1 - - - - - &New - - - - - New &Subitem - - - - - Delete Item - - - - - &Delete - - - - - Move Item Left (before Parent Item) - - - - - L - - - - - Move Item Right (as a First Subitem of the Next Sibling Item) - - - - - R - - - - - Move Item Up - - - - - U - - - - - Move Item Down - - - - - D - - - - - qdesigner_internal::TreeWidgetTaskMenu - - - Edit Items... - - - - - qdesigner_internal::WidgetBox - - - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. - - - - - qdesigner_internal::WidgetBoxTreeWidget - - - Scratchpad - - - - - Custom Widgets - - - - - Expand all - - - - - Collapse all - - - - - List View - - - - - Icon View - - - - - Remove - - - - - Edit name - - - - - qdesigner_internal::WidgetDataBase - - - A custom widget plugin whose class name (%1) matches that of an existing class has been found. - - - - - qdesigner_internal::WidgetEditorTool - - - Edit Widgets - - - - - qdesigner_internal::WidgetFactory - - - The custom widget factory registered for widgets of class %1 returned 0. - - - - - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. - - - - - %1 Widget - - - - - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. - - - - - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. -This indicates an inconsistency in the ui-file. - - - - - Cannot create style '%1'. - - - - - qdesigner_internal::WizardContainerWidgetTaskMenu - - - Next - - - - - Back - - - - - qdesigner_internal::ZoomMenu - - - %1 % - Zoom factor - - - - diff --git a/translations/linguist_tr_TR.ts b/translations/linguist_tr_TR.ts deleted file mode 100644 index 1a1baa8..0000000 --- a/translations/linguist_tr_TR.ts +++ /dev/null @@ -1,1955 +0,0 @@ - - - - - - - - (New Entry) - - - - - AboutDialog - - - Qt Linguist - - - - - BatchTranslationDialog - - - Qt Linguist - Batch Translation - - - - - Options - - - - - Set translated entries to finished - - - - - Retranslate entries with existing translation - - - - - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - - - - - Translate also finished entries - - - - - Phrase book preference - - - - - Move up - - - - - Move down - - - - - The batch translator will search through the selected phrase books in the order given above. - - - - - &Run - - - - - Cancel - - - - - Batch Translation of '%1' - Qt Linguist - - - - - Searching, please wait... - - - - - &Cancel - - - - - Linguist batch translator - - - - - Batch translated %n entries - - - - - - - DataModel - - - <qt>Duplicate messages found in '%1': - - - - - <p>[more duplicates omitted] - - - - - <p>* Context: %1<br>* Source: %2 - - - - - <br>* Comment: %3 - - - - - Linguist does not know the plural rules for '%1'. -Will assume a single universal form. - - - - - Cannot create '%2': %1 - - - - - Universal Form - - - - - ErrorsView - - - Accelerator possibly superfluous in translation. - - - - - Accelerator possibly missing in translation. - - - - - Translation does not end with the same punctuation as the source text. - - - - - A phrase book suggestion for '%1' was ignored. - - - - - Translation does not refer to the same place markers as in the source text. - - - - - Translation does not contain the necessary %n place marker. - - - - - Unknown error - - - - - FindDialog - - - - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - - - - - Find - - - - - This window allows you to search for some text in the translation source file. - - - - - &Find what: - - - - - Type in the text to search for. - - - - - Options - - - - - Source texts are searched when checked. - - - - - &Source texts - - - - - Translations are searched when checked. - - - - - &Translations - - - - - Texts such as 'TeX' and 'tex' are considered as different when checked. - - - - - &Match case - - - - - Comments and contexts are searched when checked. - - - - - &Comments - - - - - Ignore &accelerators - - - - - Click here to find the next occurrence of the text you typed in. - - - - - Find Next - - - - - Click here to close this window. - - - - - Cancel - - - - - LRelease - - - Generated %n translation(s) (%1 finished and %2 unfinished) - - - - - - - - Ignored %n untranslated source text(s) - - - - - - - - MainWindow - - - - This is the application's main window. - - - - - Source text - - - - - - Index - - - - - - Context - - - - - Items - - - - - This panel lists the source contexts. - - - - - Strings - - - - - Phrases and guesses - - - - - Sources and Forms - - - - - Warnings - - - - - MOD - status bar: file(s) modified - - - - - Loading... - - - - - - Loading File - Qt Linguist - - - - - The file '%1' does not seem to be related to the currently open file(s) '%2'. - -Close the open file(s) first? - - - - - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. - -Skip loading the first named file? - - - - - %n translation unit(s) loaded. - - - - - - - Related files (%1);; - - - - - Open Translation Files - - - - - - File saved. - - - - - - - Release - - - - - Qt message files for released applications (*.qm) -All files (*) - - - - - - File created. - - - - - - Printing... - - - - - Context: %1 - - - - - finished - - - - - unresolved - - - - - obsolete - - - - - - Printing... (page %1) - - - - - - Printing completed - - - - - - Printing aborted - - - - - Search wrapped. - - - - - - - - - - - - - - Qt Linguist - - - - - - Cannot find the string '%1'. - - - - - Search And Translate in '%1' - Qt Linguist - - - - - - - Translate - Qt Linguist - - - - - Translated %n entry(s) - - - - - - - No more occurrences of '%1'. Start over? - - - - - Create New Phrase Book - - - - - Qt phrase books (*.qph) -All files (*) - - - - - Phrase book created. - - - - - Open Phrase Book - - - - - Qt phrase books (*.qph);;All files (*) - - - - - %n phrase(s) loaded. - - - - - - - - - Add to phrase book - - - - - No appropriate phrasebook found. - - - - - Adding entry to phrasebook %1 - - - - - Select phrase book to add to - - - - - Unable to launch Qt Assistant (%1) - - - - - Version %1 - - - - - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - - - - - Do you want to save the modified files? - - - - - Do you want to save '%1'? - - - - - Qt Linguist[*] - - - - - %1[*] - Qt Linguist - - - - - - No untranslated translation units left. - - - - - &Window - - - - - Minimize - - - - - Ctrl+M - - - - - Display the manual for %1. - - - - - Display information about %1. - - - - - &Save '%1' - - - - - Save '%1' &As... - - - - - Release '%1' - - - - - Release '%1' As... - - - - - &Close '%1' - - - - - - &Save - - - - - - - Save &As... - - - - - - - Release As... - - - - - - &Close - - - - - Save All - - - - - - &Release All - - - - - Close All - - - - - &Release - - - - - Translation File &Settings for '%1'... - - - - - &Batch Translation of '%1'... - - - - - Search And &Translate in '%1'... - - - - - - Translation File &Settings... - - - - - - &Batch Translation... - - - - - Search And &Translate... - - - - - - File - - - - - - Edit - - - - - - Translation - - - - - - Validation - - - - - - Help - - - - - Cannot read from phrase book '%1'. - - - - - Close this phrase book. - - - - - Enables you to add, modify, or delete entries in this phrase book. - - - - - Print the entries in this phrase book. - - - - - Cannot create phrase book '%1'. - - - - - Do you want to save phrase book '%1'? - - - - - All - - - - - MainWindow - - - - - &Phrases - - - - - &Close Phrase Book - - - - - &Edit Phrase Book - - - - - &Print Phrase Book - - - - - V&alidation - - - - - &View - - - - - Vie&ws - - - - - &Toolbars - - - - - &Help - - - - - &Translation - - - - - &File - - - - - Recently Opened &Files - - - - - &Edit - - - - - &Open... - - - - - Open a Qt translation source file (TS file) for editing - - - - - Ctrl+O - - - - - E&xit - - - - - Close this window and exit. - - - - - Ctrl+Q - - - - - Save - - - - - Save changes made to this Qt translation source file - - - - - Save As... - - - - - Save changes made to this Qt translation source file into a new file. - - - - - Create a Qt message file suitable for released applications from the current message file. - - - - - &Print... - - - - - Print a list of all the translation units in the current translation source file. - - - - - Ctrl+P - - - - - &Undo - - - - - Undo the last editing operation performed on the current translation. - - - - - Ctrl+Z - - - - - &Redo - - - - - Redo an undone editing operation performed on the translation. - - - - - Ctrl+Y - - - - - Cu&t - - - - - Copy the selected translation text to the clipboard and deletes it. - - - - - Ctrl+X - - - - - &Copy - - - - - Copy the selected translation text to the clipboard. - - - - - Ctrl+C - - - - - &Paste - - - - - Paste the clipboard text into the translation. - - - - - Ctrl+V - - - - - Select &All - - - - - Select the whole translation text. - - - - - Ctrl+A - - - - - &Find... - - - - - Search for some text in the translation source file. - - - - - Ctrl+F - - - - - Find &Next - - - - - Continue the search where it was left. - - - - - F3 - - - - - &Prev Unfinished - - - - - Previous unfinished item. - - - - - Move to the previous unfinished item. - - - - - Ctrl+K - - - - - &Next Unfinished - - - - - Next unfinished item. - - - - - Move to the next unfinished item. - - - - - Ctrl+J - - - - - P&rev - - - - - Move to previous item. - - - - - Move to the previous item. - - - - - Ctrl+Shift+K - - - - - Ne&xt - - - - - Next item. - - - - - Move to the next item. - - - - - Ctrl+Shift+J - - - - - &Done and Next - - - - - Mark item as done and move to the next unfinished item. - - - - - Mark this item as done and move to the next unfinished item. - - - - - Copy from source text - - - - - Copies the source text into the translation field. - - - - - Ctrl+B - - - - - &Accelerators - - - - - Toggle the validity check of accelerators. - - - - - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. - - - - - &Ending Punctuation - - - - - Toggle the validity check of ending punctuation. - - - - - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. - - - - - &Phrase matches - - - - - Toggle checking that phrase suggestions are used. - - - - - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. - - - - - Place &Marker Matches - - - - - Toggle the validity check of place markers. - - - - - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. - - - - - &New Phrase Book... - - - - - Create a new phrase book. - - - - - Ctrl+N - - - - - &Open Phrase Book... - - - - - Open a phrase book to assist translation. - - - - - Ctrl+H - - - - - &Reset Sorting - - - - - Sort the items back in the same order as in the message file. - - - - - &Display guesses - - - - - Set whether or not to display translation guesses. - - - - - &Statistics - - - - - Display translation statistics. - - - - - &Manual - - - - - F1 - - - - - About Qt Linguist - - - - - About Qt - - - - - Display information about the Qt toolkit by Trolltech. - - - - - &What's This? - - - - - What's This? - - - - - Enter What's This? mode. - - - - - Shift+F1 - - - - - &Search And Translate... - - - - - Replace the translation on all entries that matches the search source text. - - - - - Batch translate all entries using the information in the phrase books. - - - - - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - - - - - Open/Refresh Form &Preview - - - - - Form Preview Tool - - - - - F5 - - - - - &Add to Phrase Book - - - - - Ctrl+T - - - - - Open Read-O&nly... - - - - - &Save All - - - - - Ctrl+S - - - - - Close - - - - - &Close All - - - - - Ctrl+W - - - - - MessageEditor - - - German - - - - - Japanese - - - - - French - - - - - Polish - - - - - Chinese - - - - - This whole panel allows you to view and edit the translation of some source text. - - - - - Source text - - - - - This area shows the source text. - - - - - Source text (Plural) - - - - - This area shows the plural form of the source text. - - - - - Developer comments - - - - - This area shows a comment that may guide you, and the context in which the text occurs. - - - - - Here you can enter comments for your own use. They have no effect on the translated applications. - - - - - %1 translation (%2) - - - - - This is where you can enter or modify the translation of the above source text. - - - - - %1 translation - - - - - %1 translator comments - - - - - '%1' -Line: %2 - - - - - MessageModel - - - Completion status for %1 - - - - - <file header> - - - - - <context comment> - - - - - <unnamed context> - - - - - MsgEdit - - - - This is the right panel of the main window. - - - - - PhraseBookBox - - - - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - - - - - %1[*] - Qt Linguist - - - - - Qt Linguist - - - - - Cannot save phrase book '%1'. - - - - - Edit Phrase Book - - - - - This window allows you to add, modify, or delete entries in a phrase book. - - - - - &Translation: - - - - - This is the phrase in the target language corresponding to the source phrase. - - - - - S&ource phrase: - - - - - This is a definition for the source phrase. - - - - - This is the phrase in the source language. - - - - - &Definition: - - - - - Click here to add the phrase to the phrase book. - - - - - &New Entry - - - - - Click here to remove the entry from the phrase book. - - - - - &Remove Entry - - - - - Settin&gs... - - - - - Click here to save the changes made. - - - - - &Save - - - - - Click here to close this window. - - - - - Close - - - - - PhraseModel - - - Source phrase - - - - - Translation - - - - - Definition - - - - - PhraseView - - - Insert - - - - - Edit - - - - - Guess (%1) - - - - - Guess - - - - - QObject - - - Translation files (%1);; - - - - - All files (*) - - - - - - - - - - - Qt Linguist - - - - - C++ source files - - - - - Java source files - - - - - GNU Gettext localization files - - - - - Compiled Qt translations - - - - - Qt Linguist 'Phrase Book' - - - - - Qt Script source files - - - - - Qt translation sources (format 1.1) - - - - - Qt translation sources (format 2.0) - - - - - Qt translation sources (latest format) - - - - - Qt Designer form files - - - - - Qt Jambi form files - - - - - XLIFF localization files - - - - - SourceCodeView - - - <i>Source code not available</i> - - - - - <i>File %1 not available</i> - - - - - <i>File %1 not readable</i> - - - - - Statistics - - - Statistics - - - - - Close - - - - - Translation - - - - - Source - - - - - 0 - - - - - Words: - - - - - Characters: - - - - - Characters (with spaces): - - - - - TranslateDialog - - - This window allows you to search for some text in the translation source file. - - - - - Type in the text to search for. - - - - - Find &source text: - - - - - &Translate to: - - - - - Search options - - - - - Texts such as 'TeX' and 'tex' are considered as different when checked. - - - - - Match &case - - - - - Mark new translation as &finished - - - - - Click here to find the next occurrence of the text you typed in. - - - - - Find Next - - - - - Translate - - - - - Translate All - - - - - Click here to close this window. - - - - - Cancel - - - - - TranslationSettingsDialog - - - Source language - - - - - Language - - - - - Country/Region - - - - - Target language - - - - - Any Country - - - - - - Settings for '%1' - Qt Linguist - - - - diff --git a/translations/qt_help_tr_TR.ts b/translations/qt_help_tr_TR.ts deleted file mode 100644 index 7e2d8d1..0000000 --- a/translations/qt_help_tr_TR.ts +++ /dev/null @@ -1,355 +0,0 @@ - - - - - QCLuceneResultWidget - - - Search Results - - - - - Note: - - - - - The search results may not be complete since the documentation is still being indexed! - - - - - Your search did not match any documents. - - - - - (The reason for this might be that the documentation is still being indexed.) - - - - - QHelpCollectionHandler - - - The collection file is not set up yet! - - - - - Cannot load sqlite database driver! - - - - - - Cannot open collection file: %1 - - - - - Cannot create tables in file %1! - - - - - The specified collection file already exists! - - - - - Cannot create directory: %1 - - - - - Cannot copy collection file: %1 - - - - - Unknown filter! - - - - - Cannot register filter %1! - - - - - Cannot open documentation file %1! - - - - - Invalid documentation file! - - - - - The namespace %1 was not registered! - - - - - Namespace %1 already exists! - - - - - Cannot register namespace! - - - - - Cannot open database to optimize! - - - - - QHelpDBReader - - - Cannot open database '%1' '%2': %3 - - - - - QHelpEngineCore - - - The specified namespace does not exist! - - - - - QHelpEngineCorePrivate - - - Cannot open documentation file %1: %2! - - - - - QHelpGenerator - - - Invalid help data! - - - - - No output file name specified! - - - - - The file %1 cannot be overwritten! - - - - - Building up file structure... - - - - - Cannot open data base file %1! - - - - - Cannot register namespace %1! - - - - - Insert custom filters... - - - - - Insert help data for filter section (%1 of %2)... - - - - - Documentation successfully generated. - - - - - Some tables already exist! - - - - - Cannot create tables! - - - - - Cannot register virtual folder! - - - - - Insert files... - - - - - The file %1 does not exist! Skipping it. - - - - - Cannot open file %1! Skipping it. - - - - - The filter %1 is already registered! - - - - - Cannot register filter %1! - - - - - Insert indices... - - - - - Insert contents... - - - - - Cannot insert contents! - - - - - Cannot register contents! - - - - - QHelpSearchQueryWidget - - - Search for: - - - - - Search - - - - - Advanced search - - - - - words <B>similar</B> to: - - - - - <B>without</B> the words: - - - - - with <B>exact phrase</B>: - - - - - with <B>all</B> of the words: - - - - - with <B>at least one</B> of the words: - - - - - QHelpSearchResultWidget - - - 0 - 0 of 0 Hits - - - - - QHelpSearchResultWidgetPrivate - - - %1 - %2 of %3 Hits - - - - - QObject - - - Untitled - - - - - Unknown token. - - - - - Unknown token. Expected "QtHelpProject"! - - - - - Error in line %1: %2 - - - - - A virtual folder must not contain a '/' character! - - - - - A namespace must not contain a '/' character! - - - - - Missing namespace in QtHelpProject. - - - - - Missing virtual folder in QtHelpProject - - - - - Missing attribute in keyword at line %1. - - - - - The input file %1 could not be opened! - - - - -- cgit v0.12 From 6050f49596833bff7e298b60c2d32b5dad29db22 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 21 Apr 2009 16:50:01 +1000 Subject: BT: Remove turkish translation files created by previous change. Remove the *_tr_TR.ts files added in change 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from .pro files to prevent them coming back next time someone does "make ts". Reviewed-by: Trust Me (cherry picked from commit b2112b17e427274ac0610416b2941b091314f5ad) --- tools/assistant/translations/qt_help.pro | 1 - tools/assistant/translations/translations.pro | 1 - tools/assistant/translations/translations_adp.pro | 1 - tools/designer/translations/translations.pro | 1 - tools/linguist/linguist/linguist.pro | 1 - translations/assistant_adp_tr_TR.ts | 967 --- translations/assistant_tr_TR.ts | 1059 ---- translations/designer_tr_TR.ts | 6950 --------------------- translations/linguist_tr_TR.ts | 1955 ------ translations/qt_help_tr_TR.ts | 355 -- 10 files changed, 11291 deletions(-) delete mode 100644 translations/assistant_adp_tr_TR.ts delete mode 100644 translations/assistant_tr_TR.ts delete mode 100644 translations/designer_tr_TR.ts delete mode 100644 translations/linguist_tr_TR.ts delete mode 100644 translations/qt_help_tr_TR.ts diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro index 1684ac5..efad6bf 100644 --- a/tools/assistant/translations/qt_help.pro +++ b/tools/assistant/translations/qt_help.pro @@ -43,7 +43,6 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/qt_help_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts error("This is a dummy profile to be used for translations ONLY.") diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro index 84bde8c..58de554 100644 --- a/tools/assistant/translations/translations.pro +++ b/tools/assistant/translations/translations.pro @@ -44,6 +44,5 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/assistant_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro index f6ab62e..e3edca4 100644 --- a/tools/assistant/translations/translations_adp.pro +++ b/tools/assistant/translations/translations_adp.pro @@ -35,7 +35,6 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts error("This is a dummy profile to be used for translations ONLY.") diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro index 7294956..8395259 100644 --- a/tools/designer/translations/translations.pro +++ b/tools/designer/translations/translations.pro @@ -133,7 +133,6 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \ - $$[QT_INSTALL_TRANSLATIONS]/designer_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro index 417ef67..968293a 100644 --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro @@ -100,7 +100,6 @@ RESOURCES += linguist.qrc TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/linguist_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \ diff --git a/translations/assistant_adp_tr_TR.ts b/translations/assistant_adp_tr_TR.ts deleted file mode 100644 index bb86689..0000000 --- a/translations/assistant_adp_tr_TR.ts +++ /dev/null @@ -1,967 +0,0 @@ - - - - - AssistantServer - - - Qt Assistant - - - - - Failed to bind to port %1 - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - FontSettingsDialog - - - Font Settings - - - - - Font settings for: - - - - - Browser - - - - - Application - - - - - Use custom settings - - - - - HelpDialog - - - Open Link in Current Tab - - - - - Open Link in New Window - - - - - Open Link in New Tab - - - - - - Prepare... - - - - - - - Qt Assistant - - - - - Failed to load keyword index file -Assistant will not work! - - - - - Cannot open the index file %1 - - - - - - - Warning - - - - - - Documentation file %1 does not exist! -Skipping file. - - - - - - Parse Error - - - - - Documentation file %1 is not compatible! -Skipping file. - - - - - - Done - - - - - Failed to save fulltext search index -Assistant will not work! - - - - - Indexing files... - - - - - Reading dictionary... - - - - - - Full Text Search - - - - - Using a wildcard within phrases is not allowed. - - - - - The closing quotation mark is missing. - - - - - %n document(s) found. - - - - - - - Help - - - - - <b>Help</b><p>Choose the topic you want help on from the contents list, or search the index for keywords.</p> - - - - - Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search. - - - - - Con&tents - - - - - <b>Help topics organized by category.</b><p>Double-click an item to see the topics in that category. To view a topic, just double-click it.</p> - - - - - column 1 - - - - - &Index - - - - - &Look For: - - - - - Enter keyword - - - - - <b>Enter a keyword.</b><p>The list will select an item that matches the entered string best.</p> - - - - - <b>List of available help topics.</b><p>Double-click on an item to open its help page. If more than one is found, you must specify which page you want.</p> - - - - - &Bookmarks - - - - - Displays the list of bookmarks. - - - - - Add new bookmark - - - - - Add the currently displayed page as a new bookmark. - - - - - &New - - - - - Delete bookmark - - - - - Delete the selected bookmark. - - - - - &Delete - - - - - &Search - - - - - Searching f&or: - - - - - Enter searchword(s). - - - - - <b>Enter search word(s).</b><p>Enter here the word(s) you are looking for. The words may contain wildcards (*). For a sequence of words quote them.</p> - - - - - <b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p> - - - - - Found &Documents: - - - - - Display the help page. - - - - - Display the help page for the full text search. - - - - - He&lp - - - - - Start searching. - - - - - Pressing this button starts the search. - - - - - Preparing... - - - - - HelpWindow - - - Help - - - - - Unable to launch web browser. - - - - - - OK - - - - - Failed to open link: '%1' - - - - - <div align="center"><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - - - - - Error... - - - - - Copy &Link Location - - - - - Open Link in New Tab - - - - - Open Link in New Window Shift+LMB - - - - - Index - - - Untitled - - - - - MainWindow - - - Sidebar - - - - - &Window - - - - - Minimize - - - - - Ctrl+M - - - - - Initializing Qt Assistant... - - - - - SHIFT+CTRL+= - - - - - Ctrl+T - - - - - Ctrl+I - - - - - Ctrl+B - - - - - Ctrl+S - - - - - Ctrl+] - - - - - Ctrl+[ - - - - - Views - - - - - Displays the main page of a specific documentation set. - - - - - - Qt Assistant - - - - - Failed to open about application contents in file: '%1' - - - - - ... - - - - - - Save Page - - - - - Cannot open file for writing! - - - - - Qt Assistant by Nokia - - - - - Toolbar - - - - - Go - - - - - &Help - - - - - &File - - - - - Boo&kmarks - - - - - &Go - - - - - &View - - - - - &Edit - - - - - &Print... - - - - - Print the currently displayed page. - - - - - Ctrl+P - - - - - E&xit - - - - - Quit Qt Assistant. - - - - - Ctrl+Q - - - - - &Copy - - - - - Copy the selected text to the clipboard. - - - - - Ctrl+C - - - - - &Find in Text... - - - - - Open the Find dialog. Qt Assistant will search the currently displayed page for the text you enter. - - - - - Ctrl+F - - - - - Find &Next - - - - - F3 - - - - - Find &Previous - - - - - Shift+F3 - - - - - &Home - - - - - Go to the home page. Qt Assistant's home page is the Qt Reference Documentation. - - - - - Ctrl+Home - - - - - &Previous - - - - - Go to the previous page. - - - - - Alt+Left - - - - - &Next - - - - - Go to the next page. - - - - - Alt+Right - - - - - About Qt Assistant - - - - - Display further information about Qt Assistant. - - - - - About Qt - - - - - Zoom &in - - - - - Zoom in on the document, i.e. increase the font size. - - - - - Ctrl++ - - - - - Zoom &out - - - - - Zoom out on the document, i.e. decrease the font size. - - - - - Ctrl+- - - - - - New Window - - - - - Open a new window. - - - - - Ctrl+N - - - - - &Close - - - - - Close the current window. - - - - - Ctrl+W - - - - - &Add Bookmark - - - - - Add the currently displayed page as a new bookmark. - - - - - What's This? - - - - - "What's This?" context sensitive help. - - - - - Shift+F1 - - - - - Add Tab - - - - - Ctrl+Alt+N - - - - - Next Tab - - - - - Ctrl+Alt+Right - - - - - Previous Tab - - - - - Ctrl+Alt+Left - - - - - Close Tab - - - - - Ctrl+Alt+Q - - - - - Qt Assistant Manual - - - - - F1 - - - - - Save Page As... - - - - - Ctrl+Alt+S - - - - - Sync with Table of Contents - - - - - Select the page in contents tab. - - - - - Font Settings... - - - - - QObject - - - Qt Assistant by Nokia - - - - - TabbedBrowser - - - ... - - - - - Add page - - - - - Close page - - - - - New Tab - - - - - Close Tab - - - - - Close Other Tabs - - - - - TabbedBrowser - - - - - Untitled - - - - - Previous - - - - - Next - - - - - Case Sensitive - - - - - Whole words - - - - - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped - - - - - TopicChooser - - - Choose a topic for <b>%1</b> - - - - - Choose Topic - - - - - Select a topic from the list and click the <b>Display</b>-button to open the online help. - - - - - &Topics - - - - - Displays a list of available help topics for the keyword. - - - - - Open the topic selected in the list. - - - - - &Display - - - - - Close the Dialog. - - - - - &Close - - - - diff --git a/translations/assistant_tr_TR.ts b/translations/assistant_tr_TR.ts deleted file mode 100644 index 0ca29df..0000000 --- a/translations/assistant_tr_TR.ts +++ /dev/null @@ -1,1059 +0,0 @@ - - - - - AboutDialog - - - &Close - - - - - AboutLabel - - - Warning - - - - - Unable to launch external application. - - - - - - OK - - - - - BookmarkDialog - - - Add Bookmark - - - - - Bookmark: - - - - - Add in Folder: - - - - - + - - - - - New Folder - - - - - - - - - Bookmarks - - - - - Delete Folder - - - - - Rename Folder - - - - - BookmarkManager - - - Bookmarks - - - - - Remove - - - - - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? - - - - - - New Folder - - - - - BookmarkWidget - - - Delete Folder - - - - - Rename Folder - - - - - Show Bookmark - - - - - Show Bookmark in New Tab - - - - - Delete Bookmark - - - - - Rename Bookmark - - - - - Filter: - - - - - Add - - - - - Remove - - - - - CentralWidget - - - Add new page - - - - - Close current page - - - - - Print Document - - - - - - unknown - - - - - Add New Page - - - - - Close This Page - - - - - Close Other Pages - - - - - Add Bookmark for this Page... - - - - - Search - - - - - ContentWindow - - - Open Link - - - - - Open Link in New Tab - - - - - FilterNameDialogClass - - - Add Filter Name - - - - - Filter Name: - - - - - FindWidget - - - Previous - - - - - Next - - - - - Case Sensitive - - - - - Whole words - - - - - <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - HelpViewer - - - Open Link in New Tab - - - - - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> - - - - - Help - - - - - Unable to launch external application. - - - - - - OK - - - - - Copy &Link Location - - - - - Open Link in New Tab Ctrl+LMB - - - - - IndexWindow - - - &Look for: - - - - - Open Link - - - - - Open Link in New Tab - - - - - InstallDialog - - - - Install Documentation - - - - - Downloading documentation info... - - - - - Download canceled. - - - - - - - Done. - - - - - The file %1 already exists. Do you want to overwrite it? - - - - - Unable to save the file %1: %2. - - - - - Downloading %1... - - - - - - - Download failed: %1. - - - - - Documentation info file is corrupt! - - - - - Download failed: Downloaded file is corrupted. - - - - - Installing documentation %1... - - - - - Error while installing documentation: -%1 - - - - - Available Documentation: - - - - - Install - - - - - Cancel - - - - - Close - - - - - Installation Path: - - - - - ... - - - - - MainWindow - - - - Index - - - - - - Contents - - - - - - Bookmarks - - - - - - Search - - - - - - - Qt Assistant - - - - - - Unfiltered - - - - - Looking for Qt Documentation... - - - - - &File - - - - - Page Set&up... - - - - - Print Preview... - - - - - &Print... - - - - - New &Tab - - - - - &Close Tab - - - - - &Quit - - - - - CTRL+Q - - - - - &Edit - - - - - &Copy selected Text - - - - - &Find in Text... - - - - - Find &Next - - - - - Find &Previous - - - - - Preferences... - - - - - &View - - - - - Zoom &in - - - - - Zoom &out - - - - - Normal &Size - - - - - Ctrl+0 - - - - - ALT+C - - - - - ALT+I - - - - - ALT+O - - - - - ALT+S - - - - - &Go - - - - - &Home - - - - - Ctrl+Home - - - - - &Back - - - - - &Forward - - - - - Sync with Table of Contents - - - - - Next Page - - - - - Ctrl+Alt+Right - - - - - Previous Page - - - - - Ctrl+Alt+Left - - - - - &Bookmarks - - - - - Add Bookmark... - - - - - CTRL+D - - - - - &Help - - - - - About... - - - - - Navigation Toolbar - - - - - &Window - - - - - Zoom - - - - - Minimize - - - - - Ctrl+M - - - - - Toolbars - - - - - Filter Toolbar - - - - - Filtered by: - - - - - Address Toolbar - - - - - Address: - - - - - Could not find the associated content item. - - - - - About %1 - - - - - Updating search index - - - - - PreferencesDialog - - - - - Add Documentation - - - - - Qt Compressed Help Files (*.qch) - - - - - The specified file is not a valid Qt Help File! - - - - - The namespace %1 is already registered! - - - - - Remove Documentation - - - - - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. - - - - - Cancel - - - - - OK - - - - - Use custom settings - - - - - PreferencesDialogClass - - - Preferences - - - - - Fonts - - - - - Font settings: - - - - - Browser - - - - - Application - - - - - Filters - - - - - Filter: - - - - - Attributes: - - - - - 1 - - - - - Add - - - - - Remove - - - - - Documentation - - - - - Registered Documentation: - - - - - Add... - - - - - Options - - - - - Homepage - - - - - Current Page - - - - - Restore to default - - - - - QObject - - - - Bookmark - - - - - The specified collection file does not exist! - - - - - Missing collection file! - - - - - Invalid URL! - - - - - Missing URL! - - - - - - - Unknown widget: %1 - - - - - - - Missing widget! - - - - - - The specified Qt help file does not exist! - - - - - - Missing help file! - - - - - Missing filter argument! - - - - - Unknown option: %1 - - - - - - Qt Assistant - - - - - Could not register documentation file -%1 - -Reason: -%2 - - - - - Documentation successfully registered. - - - - - Documentation successfully unregistered. - - - - - Could not unregister documentation file -%1 - -Reason: -%2 - - - - - Cannot load sqlite database driver! - - - - - The specified collection file could not be read! - - - - - RemoteControl - - - Debugging Remote Control - - - - - Received Command: %1 %2 - - - - - SearchWidget - - - &Copy - - - - - Copy &Link Location - - - - - - Open Link in New Tab - - - - - Select All - - - - - Open Link - - - - - TopicChooser - - - Choose a topic for <b>%1</b>: - - - - - Choose Topic - - - - - &Topics - - - - - &Display - - - - - &Close - - - - diff --git a/translations/designer_tr_TR.ts b/translations/designer_tr_TR.ts deleted file mode 100644 index 73ea53e..0000000 --- a/translations/designer_tr_TR.ts +++ /dev/null @@ -1,6950 +0,0 @@ - - - - - - - - The moose in the noose -ate the goose who was loose. - - - - - <object> - - - - - <signal> - - - - - <slot> - - - - - AbstractFindWidget - - - &Previous - - - - - &Next - - - - - &Case sensitive - - - - - Whole &words - - - - - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped - - - - - AddLinkDialog - - - Insert Link - - - - - Title: - - - - - URL: - - - - - AppFontDialog - - - Additional Fonts - - - - - AppFontManager - - - '%1' is not a file. - - - - - The font file '%1' does not have read permissions. - - - - - The font file '%1' is already loaded. - - - - - The font file '%1' could not be loaded. - - - - - '%1' is not a valid font id. - - - - - There is no loaded font matching the id '%1'. - - - - - The font '%1' (%2) could not be unloaded. - - - - - AppFontWidget - - - Fonts - - - - - Add font files - - - - - Remove current font file - - - - - Remove all font files - - - - - Add Font Files - - - - - Font files (*.ttf) - - - - - Error Adding Fonts - - - - - Error Removing Fonts - - - - - Remove Fonts - - - - - Would you like to remove all fonts? - - - - - AppearanceOptionsWidget - - - Form - - - - - User Interface Mode - - - - - AssistantClient - - - Unable to send request: Assistant is not responding. - - - - - The binary '%1' does not exist. - - - - - Unable to launch assistant (%1). - - - - - BrushManagerProxy - - - The element '%1' is missing the required attribute '%2'. - - - - - Empty brush name encountered. - - - - - An unexpected element '%1' was encountered. - - - - - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 - - - - - An error occurred when reading the resource file '%1' at line %2, column %3: %4 - - - - - BrushPropertyManager - - - No brush - - - - - Solid - - - - - Dense 1 - - - - - Dense 2 - - - - - Dense 3 - - - - - Dense 4 - - - - - Dense 5 - - - - - Dense 6 - - - - - Dense 7 - - - - - Horizontal - - - - - Vertical - - - - - Cross - - - - - Backward diagonal - - - - - Forward diagonal - - - - - Crossing diagonal - - - - - Style - - - - - Color - - - - - [%1, %2] - - - - - Command - - - - Change signal - - - - - - Change slot - - - - - Change signal-slot connection - - - - - Change sender - - - - - Change receiver - - - - - Create button group - - - - - Break button group - - - - - Break button group '%1' - - - - - Add buttons to group - - - - - - Add '%1' to '%2' - Command description for adding buttons to a QButtonGroup - - - - - Remove buttons from group - - - - - Remove '%1' from '%2' - Command description for removing buttons from a QButtonGroup - - - - - Add connection - - - - - Adjust connection - - - - - Delete connections - - - - - Change source - - - - - Change target - - - - - Morph %1/'%2' into %3 - MorphWidgetCommand description - - - - - Insert '%1' - - - - - Change Z-order of '%1' - - - - - Raise '%1' - - - - - Lower '%1' - - - - - Delete '%1' - - - - - Reparent '%1' - - - - - Promote to custom widget - - - - - Demote from custom widget - - - - - Lay out using grid - - - - - Lay out vertically - - - - - Lay out horizontally - - - - - Break layout - - - - - Simplify Grid Layout - - - - - - - Move Page - - - - - - - - Delete Page - - - - - - Page - - - - - - - page - - - - - - - - Insert Page - - - - - tab - - - - - Change Tab order - - - - - Create Menu Bar - - - - - Delete Menu Bar - - - - - Create Status Bar - - - - - Delete Status Bar - - - - - Add Tool Bar - - - - - Add Dock Window - - - - - Adjust Size of '%1' - - - - - Change Form Layout Item Geometry - - - - - Change Layout Item Geometry - - - - - Delete Subwindow - - - - - Insert Subwindow - - - - - subwindow - - - - - Subwindow - - - - - Change Table Contents - - - - - Change Tree Contents - - - - - - Add action - - - - - - Remove action - - - - - Add menu - - - - - Remove menu - - - - - Create submenu - - - - - Delete Tool Bar - - - - - Change layout of '%1' from %2 to %3 - - - - - Set action text - - - - - Insert action - - - - - - Move action - - - - - Change Title - - - - - Insert Menu - - - - - Changed '%1' of '%2' - - - - - Changed '%1' of %n objects - - - - - - - Reset '%1' of '%2' - - - - - Reset '%1' of %n objects - - - - - - - Add dynamic property '%1' to '%2' - - - - - Add dynamic property '%1' to %n objects - - - - - - - Remove dynamic property '%1' from '%2' - - - - - Remove dynamic property '%1' from %n objects - - - - - - - Change script - - - - - Change signals/slots - - - - - ConnectDialog - - - Configure Connection - - - - - GroupBox - - - - - Edit... - - - - - Show signals and slots inherited from QWidget - - - - - DPI_Chooser - - - Standard (96 x 96) - Embedded device standard screen resolution - - - - - Greenphone (179 x 185) - Embedded device screen resolution - - - - - High (192 x 192) - Embedded device high definition screen resolution - - - - - Designer - - - Qt Designer - - - - - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. - - - - - Perhaps you forgot to create a layout? - - - - - Invalid ui file: The root element <ui> is missing. - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - - This file cannot be read because it was created using %1. - - - - - This file was created using Designer from Qt-%1 and cannot be read. - - - - - The converted file could not be read. - - - - - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. - - - - - The old form has not been touched, but you will have to save the form under a new name. - - - - - This file was created using Designer from Qt-%1 and could not be read: -%2 - - - - - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. - - - - - This file cannot be read because the extra info extension failed to load. - - - - - Custom Widgets - - - - - Promoted Widgets - - - - - Unable to launch %1. - - - - - %1 timed out. - - - - - DesignerMetaEnum - - - %1 is not a valid enumeration value of '%2'. - - - - - '%1' could not be converted to an enumeration value of type '%2'. - - - - - DesignerMetaFlags - - - '%1' could not be converted to a flag value of type '%2'. - - - - - DeviceProfile - - - '%1' is not a number. - Reading a number for an embedded device profile - - - - - An invalid tag <%1> was encountered. - - - - - DeviceProfileDialog - - - &Family - - - - - &Point Size - - - - - Style - - - - - Device DPI - - - - - Name - - - - - DeviceSkin - - - The image file '%1' could not be loaded. - - - - - The skin directory '%1' does not contain a configuration file. - - - - - The skin configuration file '%1' could not be opened. - - - - - The skin configuration file '%1' could not be read: %2 - - - - - Syntax error: %1 - - - - - The skin "up" image file '%1' does not exist. - - - - - The skin "down" image file '%1' does not exist. - - - - - The skin "closed" image file '%1' does not exist. - - - - - The skin cursor image file '%1' does not exist. - - - - - Syntax error in area definition: %1 - - - - - Mismatch in number of areas, expected %1, got %2. - - - - - EmbeddedOptionsControl - - - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> - Format embedded device profile description - - - - - EmbeddedOptionsPage - - - Embedded Design - Tab in preferences dialog - - - - - Device Profiles - EmbeddedOptionsControl group box" - - - - - FontPanel - - - Font - - - - - &Writing system - - - - - &Family - - - - - &Style - - - - - &Point size - - - - - FontPropertyManager - - - PreferDefault - - - - - NoAntialias - - - - - PreferAntialias - - - - - Antialiasing - - - - - FormBuilder - - - Invalid stretch value for '%1': '%2' - Parsing layout stretch values - - - - - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values - - - - - FormEditorOptionsPage - - - %1 % - - - - - Preview Zoom - - - - - Default Zoom - - - - - Forms - Tab in preferences dialog - - - - - Default Grid - - - - - FormLayoutRowDialog - - - Add Form Layout Row - - - - - &Label text: - - - - - Field &type: - - - - - &Field name: - - - - - &Buddy: - - - - - &Row: - - - - - Label &name: - - - - - FormWindow - - - Unexpected element <%1> - - - - - Error while pasting clipboard contents at line %1, column %2: %3 - - - - - FormWindowSettings - - - Form Settings - - - - - Layout &Default - - - - - &Spacing: - - - - - &Margin: - - - - - &Layout Function - - - - - Ma&rgin: - - - - - Spa&cing: - - - - - &Pixmap Function - - - - - &Include Hints - - - - - Grid - - - - - Embedded Design - - - - - &Author - - - - - IconSelector - - - All Pixmaps ( - - - - - ItemPropertyBrowser - - - XX Icon Selected off - Sample string to determinate the width for the first column of the list item property browser - - - - - LanguageResourceDialog - - - Choose Resource - - - - - MainWindowBase - - - Main - Not currently used (main tool bar) - - - - - File - - - - - Edit - - - - - Tools - - - - - Form - - - - - Qt Designer - - - - - NewForm - - - Show this Dialog on Startup - - - - - C&reate - - - - - Recent - - - - - New Form - - - - - &Close - - - - - &Open... - - - - - &Recent Forms - - - - - Read error - - - - - A temporary form file could not be created in %1. - - - - - The temporary form file %1 could not be written. - - - - - NewFormWidget - - - Unable to open the form template file '%1': %2 - - - - - ObjectInspectorModel - - - Object - - - - - Class - - - - - separator - - - - - <noname> - - - - - ObjectNameDialog - - - Change Object Name - - - - - Object Name - - - - - PluginDialog - - - Plugin Information - - - - - 1 - - - - - PreferencesDialog - - - Preferences - - - - - PreviewConfigurationWidget - - - Default - - - - - None - - - - - Browse... - - - - - Form - - - - - Print/Preview Configuration - - - - - Style - - - - - Style sheet - - - - - ... - - - - - Device skin - - - - - PromotionModel - - - Not used - Usage of promoted widgets - - - - - Q3WizardContainer - - - - Page - - - - - QAbstractFormBuilder - - - Unexpected element <%1> - - - - - An error has occurred while reading the ui file at line %1, column %2: %3 - - - - - Invalid ui file: The root element <ui> is missing. - - - - - The creation of a widget of the class '%1' failed. - - - - - Attempt to add child that is not of class QWizardPage to QWizard. - - - - - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. -This indicates an inconsistency in the ui-file. - - - - - Empty widget item in %1 '%2'. - - - - - Flags property are not supported yet. - - - - - While applying tab stops: The widget '%1' could not be found. - - - - - Invalid QButtonGroup reference '%1' referenced by '%2'. - - - - - This version of the uitools library is linked without script support. - - - - - QAxWidgetPlugin - - - ActiveX control - - - - - ActiveX control widget - - - - - QAxWidgetTaskMenu - - - Set Control - - - - - Reset Control - - - - - Licensed Control - - - - - The control requires a design-time license - - - - - QCoreApplication - - - %1 is not a promoted class. - - - - - The base class %1 is invalid. - - - - - The class %1 already exists. - - - - - Promoted Widgets - - - - - The class %1 cannot be removed - - - - - The class %1 cannot be removed because it is still referenced. - - - - - The class %1 cannot be renamed - - - - - The class %1 cannot be renamed to an empty name. - - - - - There is already a class named %1. - - - - - Cannot set an empty include file. - - - - - Exception at line %1: %2 - - - - - Unknown error - - - - - An error occurred while running the script for %1: %2 -Script: %3 - - - - - QDesigner - - - %1 - warning - - - - - Qt Designer - - - - - This application cannot be used for the Console edition of Qt - - - - - QDesignerActions - - - Saved %1. - - - - - %1 already exists. -Do you want to replace it? - - - - - Edit Widgets - - - - - &New... - - - - - &Open... - - - - - &Save - - - - - Save &As... - - - - - Save A&ll - - - - - Save As &Template... - - - - - - &Close - - - - - Save &Image... - - - - - &Print... - - - - - &Quit - - - - - View &Code... - - - - - &Minimize - - - - - Bring All to Front - - - - - Preferences... - - - - - Additional Fonts... - - - - - ALT+CTRL+S - - - - - CTRL+SHIFT+S - - - - - CTRL+Q - - - - - CTRL+R - - - - - CTRL+M - - - - - Qt Designer &Help - - - - - Current Widget Help - - - - - What's New in Qt Designer? - - - - - About Plugins - - - - - - About Qt Designer - - - - - About Qt - - - - - Clear &Menu - - - - - &Recent Forms - - - - - - Open Form - - - - - - - Designer UI files (*.%1);;All Files (*) - - - - - - Save Form As - - - - - Designer - - - - - Feature not implemented yet! - - - - - Code generation failed - - - - - Read error - - - - - %1 -Do you want to update the file location or generate a new form? - - - - - &Update - - - - - &New Form - - - - - - Save Form? - - - - - Could not open file - - - - - The file %1 could not be opened. -Reason: %2 -Would you like to retry or select a different file? - - - - - Select New File - - - - - Could not write file - - - - - It was not possible to write the entire file %1 to disk. -Reason:%2 -Would you like to retry? - - - - - - Assistant - - - - - &Close Preview - - - - - - The backup file %1 could not be written. - - - - - The backup directory %1 could not be created. - - - - - The temporary backup directory %1 could not be created. - - - - - Preview failed - - - - - Image files (*.%1) - - - - - - Save Image - - - - - Saved image %1. - - - - - The file %1 could not be written. - - - - - Please close all forms to enable the loading of additional fonts. - - - - - Printed %1. - - - - - QDesignerAppearanceOptionsPage - - - Appearance - Tab in preferences dialog - - - - - QDesignerAppearanceOptionsWidget - - - Docked Window - - - - - Multiple Top-Level Windows - - - - - Toolwindow Font - - - - - QDesignerAxWidget - - - Reset control - - - - - Set control - - - - - Control loaded - - - - - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". - - - - - QDesignerFormBuilder - - - Script errors occurred: - - - - - The preview failed to build. - - - - - Designer - - - - - QDesignerFormWindow - - - %1 - %2[*] - - - - - Save Form? - - - - - Do you want to save the changes to this document before closing? - - - - - If you don't save, your changes will be lost. - - - - - QDesignerMenu - - - Type Here - - - - - Add Separator - - - - - Insert separator - - - - - Remove separator - - - - - Remove action '%1' - - - - - - Add separator - - - - - Insert action - - - - - QDesignerMenuBar - - - Type Here - - - - - Remove Menu '%1' - - - - - Remove Menu Bar - - - - - Menu - - - - - QDesignerPluginManager - - - An XML error was encountered when parsing the XML of the custom widget %1: %2 - - - - - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. - - - - - The class attribute for the class %1 is missing. - - - - - The class attribute for the class %1 does not match the class name %2. - - - - - QDesignerPropertySheet - - - Dynamic Properties - - - - - QDesignerResource - - - The layout type '%1' is not supported, defaulting to grid. - - - - - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. -Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. - - - - - Unexpected element <%1> - Parsing clipboard contents - - - - - Error while pasting clipboard contents at line %1, column %2: %3 - Parsing clipboard contents - - - - - Error while pasting clipboard contents: The root element <ui> is missing. - Parsing clipboard contents - - - - - QDesignerSharedSettings - - - The template path %1 could not be created. - - - - - An error has been encountered while parsing device profile XML: %1 - - - - - QDesignerToolWindow - - - Property Editor - - - - - Action Editor - - - - - Object Inspector - - - - - Resource Browser - - - - - Signal/Slot Editor - - - - - Widget Box - - - - - QDesignerWidgetBox - - - An error has been encountered at line %1 of %2: %3 - - - - - Unexpected element <%1> encountered when parsing for <widget> or <ui> - - - - - Unexpected end of file encountered when parsing widgets. - - - - - A widget element could not be found. - - - - - QDesignerWorkbench - - - &File - - - - - Edit - - - - - F&orm - - - - - Preview in - - - - - &View - - - - - &Settings - - - - - &Window - - - - - &Help - - - - - Toolbars - - - - - Save Forms? - - - - - There are %n forms with unsaved changes. Do you want to review these changes before quitting? - - - - - - - If you do not review your documents, all your changes will be lost. - - - - - Discard Changes - - - - - Review Changes - - - - - Backup Information - - - - - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? - - - - - The file <b>%1</b> could not be opened. - - - - - The file <b>%1</b> is not a valid Designer ui file. - - - - - QFormBuilder - - - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method - - - - - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. - - - - - QFormBuilder was unable to create a widget of the class '%1'. - - - - - The layout type `%1' is not supported. - - - - - The set-type property %1 could not be read. - - - - - The enumeration-type property %1 could not be read. - - - - - Reading properties of the type %1 is not supported yet. - - - - - The property %1 could not be written. The type %2 is not supported yet. - - - - - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. - - - - - The flag-value '%1' is invalid. Zero will be used instead. - - - - - QStackedWidgetEventFilter - - - Previous Page - - - - - Next Page - - - - - Delete - - - - - Before Current Page - - - - - After Current Page - - - - - Change Page Order... - - - - - Change Page Order - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QStackedWidgetPreviewEventFilter - - - Go to previous page of %1 '%2' (%3/%4). - - - - - Go to next page of %1 '%2' (%3/%4). - - - - - QTabWidgetEventFilter - - - Delete - - - - - Before Current Page - - - - - After Current Page - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QToolBoxHelper - - - Delete Page - - - - - Before Current Page - - - - - After Current Page - - - - - Change Page Order... - - - - - Change Page Order - - - - - Page %1 of %2 - - - - - Insert Page - - - - - QtBoolEdit - - - - - True - - - - - - False - - - - - QtBoolPropertyManager - - - True - - - - - False - - - - - QtCharEdit - - - Clear Char - - - - - QtColorEditWidget - - - ... - - - - - QtColorPropertyManager - - - Red - - - - - Green - - - - - Blue - - - - - Alpha - - - - - QtCursorDatabase - - - Arrow - - - - - Up Arrow - - - - - Cross - - - - - Wait - - - - - IBeam - - - - - Size Vertical - - - - - Size Horizontal - - - - - Size Backslash - - - - - Size Slash - - - - - Size All - - - - - Blank - - - - - Split Vertical - - - - - Split Horizontal - - - - - Pointing Hand - - - - - Forbidden - - - - - Open Hand - - - - - Closed Hand - - - - - What's This - - - - - Busy - - - - - QtFontEditWidget - - - ... - - - - - Select Font - - - - - QtFontPropertyManager - - - Family - - - - - Point Size - - - - - Bold - - - - - Italic - - - - - Underline - - - - - Strikeout - - - - - Kerning - - - - - QtGradientDialog - - - Edit Gradient - - - - - QtGradientEditor - - - Start X - - - - - Start Y - - - - - Final X - - - - - Final Y - - - - - - Central X - - - - - - Central Y - - - - - Focal X - - - - - Focal Y - - - - - Radius - - - - - Angle - - - - - Form - - - - - Gradient Editor - - - - - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - Gradient Stops Editor - - - - - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. - - - - - Zoom - - - - - Reset Zoom - - - - - Position - - - - - Hue - - - - - H - - - - - Saturation - - - - - S - - - - - Sat - - - - - Value - - - - - V - - - - - Val - - - - - Alpha - - - - - A - - - - - Type - - - - - Spread - - - - - Color - - - - - Current stop's color - - - - - Show HSV specification - - - - - HSV - - - - - Show RGB specification - - - - - RGB - - - - - Current stop's position - - - - - % - - - - - Zoom In - - - - - Zoom Out - - - - - Toggle details extension - - - - - > - - - - - Linear Type - - - - - ... - - - - - Radial Type - - - - - Conical Type - - - - - Pad Spread - - - - - Repeat Spread - - - - - Reflect Spread - - - - - QtGradientStopsWidget - - - New Stop - - - - - Delete - - - - - Flip All - - - - - Select All - - - - - Zoom In - - - - - Zoom Out - - - - - Reset Zoom - - - - - QtGradientView - - - Grad - - - - - Remove Gradient - - - - - Are you sure you want to remove the selected gradient? - - - - - - New... - - - - - - Edit... - - - - - - Rename - - - - - - Remove - - - - - Gradient View - - - - - QtGradientViewDialog - - - - Select Gradient - - - - - QtKeySequenceEdit - - - Clear Shortcut - - - - - QtLocalePropertyManager - - - %1, %2 - - - - - Language - - - - - Country - - - - - QtPointFPropertyManager - - - (%1, %2) - - - - - X - - - - - Y - - - - - QtPointPropertyManager - - - (%1, %2) - - - - - X - - - - - Y - - - - - QtPropertyBrowserUtils - - - [%1, %2, %3] (%4) - - - - - [%1, %2] - - - - - QtRectFPropertyManager - - - [(%1, %2), %3 x %4] - - - - - X - - - - - Y - - - - - Width - - - - - Height - - - - - QtRectPropertyManager - - - [(%1, %2), %3 x %4] - - - - - X - - - - - Y - - - - - Width - - - - - Height - - - - - QtResourceEditorDialog - - - %1 already exists. -Do you want to replace it? - - - - - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. - - - - - %1 [read-only] - - - - - - %1 [missing] - - - - - <no prefix> - - - - - - New Resource File - - - - - - Resource files (*.qrc) - - - - - Import Resource File - - - - - newPrefix - - - - - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> - - - - - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> - - - - - Add Files - - - - - Incorrect Path - - - - - - - - Copy - - - - - Copy As... - - - - - Keep - - - - - Skip - - - - - Clone Prefix - - - - - Enter the suffix which you want to add to the names of the cloned files. -This could for example be a language extension like "_de". - - - - - - Copy As - - - - - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> - - - - - Could not overwrite %1. - - - - - Could not copy -%1 -to -%2 - - - - - A parse error occurred at line %1, column %2 of %3: -%4 - - - - - Save Resource File - - - - - Could not write %1: %2 - - - - - Edit Resources - - - - - New... - - - - - Open... - - - - - Open Resource File - - - - - - Remove - - - - - - Move Up - - - - - - Move Down - - - - - - Add Prefix - - - - - Add Files... - - - - - Change Prefix - - - - - Change Language - - - - - Change Alias - - - - - Clone Prefix... - - - - - Prefix / Path - - - - - Language / Alias - - - - - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> - - - - - Resource Warning - - - - - Dialog - - - - - New File - - - - - N - - - - - Remove File - - - - - R - - - - - I - - - - - New Resource - - - - - A - - - - - Remove Resource or File - - - - - QtResourceView - - - Size: %1 x %2 -%3 - - - - - Edit Resources... - - - - - Reload - - - - - Copy Path - - - - - QtResourceViewDialog - - - Select Resource - - - - - QtSizeFPropertyManager - - - %1 x %2 - - - - - Width - - - - - Height - - - - - QtSizePolicyPropertyManager - - - - <Invalid> - - - - - [%1, %2, %3, %4] - - - - - Horizontal Policy - - - - - Vertical Policy - - - - - Horizontal Stretch - - - - - Vertical Stretch - - - - - QtSizePropertyManager - - - %1 x %2 - - - - - Width - - - - - Height - - - - - QtToolBarDialog - - - Custom Toolbar - - - - - < S E P A R A T O R > - - - - - Customize Toolbars - - - - - 1 - - - - - Actions - - - - - Toolbars - - - - - Add new toolbar - - - - - New - - - - - Remove selected toolbar - - - - - Remove - - - - - Rename toolbar - - - - - Rename - - - - - Move action up - - - - - Up - - - - - Remove action from toolbar - - - - - <- - - - - - Add action to toolbar - - - - - -> - - - - - Move action down - - - - - Down - - - - - Current Toolbar Actions - - - - - QtTreePropertyBrowser - - - Property - - - - - Value - - - - - SaveFormAsTemplate - - - Add path... - - - - - Template Exists - - - - - A template with the name %1 already exists. -Do you want overwrite the template? - - - - - Overwrite Template - - - - - Open Error - - - - - There was an error opening template %1 for writing. Reason: %2 - - - - - Write Error - - - - - There was an error writing the template %1 to disk. Reason: %2 - - - - - Pick a directory to save templates in - - - - - Save Form As Template - - - - - &Name: - - - - - &Category: - - - - - ScriptErrorDialog - - - An error occurred while running the scripts for "%1": - - - - - - SelectSignalDialog - - - Go to slot - - - - - Select signal - - - - - signal - - - - - class - - - - - SignalSlotConnection - - - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) - - - - - SignalSlotDialogClass - - - Signals and slots - - - - - Slots - - - - - Add - - - - - ... - - - - - Delete - - - - - Signals - - - - - Spacer - - - Horizontal Spacer '%1', %2 x %3 - - - - - Vertical Spacer '%1', %2 x %3 - - - - - TemplateOptionsPage - - - Template Paths - Tab in preferences dialog - - - - - ToolBarManager - - - Configure Toolbars... - - - - - Window - - - - - Help - - - - - Style - - - - - Dock views - - - - - Toolbars - - - - - VersionDialog - - - <h3>%1</h3><br/><br/>Version %2 - - - - - Qt Designer - - - - - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> - - - - - %1<br/>%2<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/> - - - - - WidgetDataBase - - - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. - - - - - qdesigner_internal::ActionEditor - - - New... - - - - - Edit... - - - - - Go to slot... - - - - - Copy - - - - - Cut - - - - - Paste - - - - - Select all - - - - - Delete - - - - - Actions - - - - - Configure Action Editor - - - - - Icon View - - - - - Detailed View - - - - - New action - - - - - Edit action - - - - - Remove action '%1' - - - - - Remove actions - - - - - Used In - - - - - qdesigner_internal::ActionModel - - - Name - - - - - Used - - - - - Text - - - - - Shortcut - - - - - Checkable - - - - - ToolTip - - - - - qdesigner_internal::BuddyEditor - - - Add buddy - - - - - Remove buddies - - - - - Remove %n buddies - - - - - - - Add %n buddies - - - - - - - Set automatically - - - - - qdesigner_internal::BuddyEditorPlugin - - - Edit Buddies - - - - - qdesigner_internal::BuddyEditorTool - - - Edit Buddies - - - - - qdesigner_internal::ButtonGroupMenu - - - Select members - - - - - Break - - - - - qdesigner_internal::ButtonTaskMenu - - - Assign to button group - - - - - Button group - - - - - New button group - - - - - Change text... - - - - - None - - - - - Button group '%1' - - - - - qdesigner_internal::CodeDialog - - - Save... - - - - - Copy All - - - - - &Find in Text... - - - - - A temporary form file could not be created in %1. - - - - - The temporary form file %1 could not be written. - - - - - %1 - [Code] - - - - - Save Code - - - - - Header Files (*.%1) - - - - - The file %1 could not be opened: %2 - - - - - The file %1 could not be written: %2 - - - - - %1 - Error - - - - - qdesigner_internal::ColorAction - - - Text Color - - - - - qdesigner_internal::ComboBoxTaskMenu - - - Edit Items... - - - - - Change Combobox Contents - - - - - qdesigner_internal::CommandLinkButtonTaskMenu - - - Change description... - - - - - qdesigner_internal::ConnectionEdit - - - Select All - - - - - Deselect All - - - - - Delete - - - - - qdesigner_internal::ConnectionModel - - - Sender - - - - - Signal - - - - - Receiver - - - - - Slot - - - - - <sender> - - - - - <signal> - - - - - <receiver> - - - - - <slot> - - - - - The connection already exists!<br>%1 - - - - - Signal and Slot Editor - - - - - qdesigner_internal::ContainerWidgetTaskMenu - - - Delete - - - - - Insert - - - - - Insert Page Before Current Page - - - - - Insert Page After Current Page - - - - - Add Subwindow - - - - - Subwindow - - - - - Page - - - - - Page %1 of %2 - - - - - qdesigner_internal::DPI_Chooser - - - System (%1 x %2) - System resolution - - - - - User defined - - - - - x - DPI X/Y separator - - - - - qdesigner_internal::DesignerPropertyManager - - - - AlignLeft - - - - - AlignHCenter - - - - - AlignRight - - - - - AlignJustify - - - - - AlignTop - - - - - - AlignVCenter - - - - - AlignBottom - - - - - %1, %2 - - - - - Customized (%n roles) - - - - - - - Inherited - - - - - Horizontal - - - - - Vertical - - - - - Normal Off - - - - - Normal On - - - - - Disabled Off - - - - - Disabled On - - - - - Active Off - - - - - Active On - - - - - Selected Off - - - - - Selected On - - - - - - translatable - - - - - - disambiguation - - - - - - comment - - - - - qdesigner_internal::DeviceProfileDialog - - - Device Profiles (*.%1) - - - - - Default - - - - - Save Profile - - - - - Save Profile - Error - - - - - Unable to open the file '%1' for writing: %2 - - - - - Open profile - - - - - - Open Profile - Error - - - - - Unable to open the file '%1' for reading: %2 - - - - - '%1' is not a valid profile: %2 - - - - - qdesigner_internal::Dialog - - - Dialog - - - - - StringList - - - - - New String - - - - - &New - - - - - Delete String - - - - - &Delete - - - - - &Value: - - - - - Move String Up - - - - - Up - - - - - Move String Down - - - - - Down - - - - - qdesigner_internal::EmbeddedOptionsControl - - - None - - - - - Add a profile - - - - - Edit the selected profile - - - - - Delete the selected profile - - - - - Add Profile - - - - - New profile - - - - - Edit Profile - - - - - Delete Profile - - - - - Would you like to delete the profile '%1'? - - - - - Default - - - - - qdesigner_internal::FilterWidget - - - <Filter> - - - - - qdesigner_internal::FormEditor - - - Resource File Changed - - - - - The file "%1" has changed outside Designer. Do you want to reload it? - - - - - qdesigner_internal::FormLayoutMenu - - - Add form layout row... - - - - - qdesigner_internal::FormWindow - - - Edit contents - - - - - F2 - - - - - Insert widget '%1' - - - - - Resize - - - - - - Key Move - - - - - Paste %n action(s) - - - - - - - Paste %n widget(s) - - - - - - - Paste (%1 widgets, %2 actions) - - - - - Cannot paste widgets. Designer could not find a container without a layout to paste into. - - - - - Break the layout of the container you want to paste into, select this container and then paste again. - - - - - Paste error - - - - - Raise widgets - - - - - Lower widgets - - - - - Select Ancestor - - - - - Lay out - - - - - - Drop widget - - - - - A QMainWindow-based form does not contain a central widget. - - - - - qdesigner_internal::FormWindowBase - - - Delete '%1' - - - - - Delete - - - - - qdesigner_internal::FormWindowManager - - - Cu&t - - - - - Cuts the selected widgets and puts them on the clipboard - - - - - &Copy - - - - - Copies the selected widgets to the clipboard - - - - - &Paste - - - - - Pastes the clipboard's contents - - - - - &Delete - - - - - Deletes the selected widgets - - - - - Select &All - - - - - Selects all widgets - - - - - Bring to &Front - - - - - - Raises the selected widgets - - - - - Send to &Back - - - - - - Lowers the selected widgets - - - - - Adjust &Size - - - - - Adjusts the size of the selected widget - - - - - Lay Out &Horizontally - - - - - Lays out the selected widgets horizontally - - - - - Lay Out &Vertically - - - - - Lays out the selected widgets vertically - - - - - Lay Out in a &Form Layout - - - - - Lays out the selected widgets in a form layout - - - - - Lay Out in a &Grid - - - - - Lays out the selected widgets in a grid - - - - - Lay Out Horizontally in S&plitter - - - - - Lays out the selected widgets horizontally in a splitter - - - - - Lay Out Vertically in Sp&litter - - - - - Lays out the selected widgets vertically in a splitter - - - - - &Break Layout - - - - - Breaks the selected layout - - - - - Si&mplify Grid Layout - - - - - Removes empty columns and rows - - - - - &Preview... - - - - - Preview current form - - - - - Form &Settings... - - - - - Break Layout - - - - - Adjust Size - - - - - Could not create form preview - Title of warning message box - - - - - Form Settings - %1 - - - - - qdesigner_internal::FormWindowSettings - - - None - - - - - Device Profile: %1 - - - - - qdesigner_internal::GridPanel - - - Form - - - - - Grid - - - - - Visible - - - - - Grid &X - - - - - Snap - - - - - Reset - - - - - Grid &Y - - - - - qdesigner_internal::GroupBoxTaskMenu - - - Change title... - - - - - qdesigner_internal::HtmlTextEdit - - - Insert HTML entity - - - - - qdesigner_internal::IconSelector - - - The pixmap file '%1' cannot be read. - - - - - The file '%1' does not appear to be a valid pixmap file: %2 - - - - - The file '%1' could not be read: %2 - - - - - Choose a Pixmap - - - - - Pixmap Read Error - - - - - ... - - - - - Normal Off - - - - - Normal On - - - - - Disabled Off - - - - - Disabled On - - - - - Active Off - - - - - Active On - - - - - Selected Off - - - - - Selected On - - - - - Choose Resource... - - - - - Choose File... - - - - - Reset - - - - - Reset All - - - - - qdesigner_internal::ItemListEditor - - - Properties &<< - - - - - - Properties &>> - - - - - Items List - - - - - New Item - - - - - &New - - - - - Delete Item - - - - - &Delete - - - - - Move Item Up - - - - - U - - - - - Move Item Down - - - - - D - - - - - qdesigner_internal::LabelTaskMenu - - - Change rich text... - - - - - Change plain text... - - - - - qdesigner_internal::LineEditTaskMenu - - - Change text... - - - - - qdesigner_internal::ListWidgetEditor - - - New Item - - - - - Edit List Widget - - - - - Edit Combobox - - - - - qdesigner_internal::ListWidgetTaskMenu - - - Edit Items... - - - - - Change List Contents - - - - - qdesigner_internal::MdiContainerWidgetTaskMenu - - - Next Subwindow - - - - - Previous Subwindow - - - - - Tile - - - - - Cascade - - - - - qdesigner_internal::MenuTaskMenu - - - Remove - - - - - qdesigner_internal::MorphMenu - - - Morph into - - - - - qdesigner_internal::NewActionDialog - - - New Action... - - - - - &Text: - - - - - Object &name: - - - - - &Icon: - - - - - Shortcut: - - - - - Checkable: - - - - - ToolTip: - - - - - ... - - - - - qdesigner_internal::NewDynamicPropertyDialog - - - Set Property Name - - - - - The current object already has a property named '%1'. -Please select another, unique one. - - - - - The '_q_' prefix is reserved for the Qt library. -Please select another name. - - - - - Create Dynamic Property - - - - - Property Name - - - - - horizontalSpacer - - - - - Property Type - - - - - qdesigner_internal::NewFormWidget - - - Default size - - - - - QVGA portrait (240x320) - - - - - QVGA landscape (320x240) - - - - - VGA portrait (480x640) - - - - - VGA landscape (640x480) - - - - - Widgets - New Form Dialog Categories - - - - - Custom Widgets - - - - - None - - - - - Error loading form - - - - - Internal error: No template selected. - - - - - 0 - - - - - Choose a template for a preview - - - - - Embedded Design - - - - - Device: - - - - - Screen Size: - - - - - qdesigner_internal::NewPromotedClassPanel - - - Add - - - - - New Promoted Class - - - - - Base class name: - - - - - Promoted class name: - - - - - Header file: - - - - - Global include - - - - - Reset - - - - - qdesigner_internal::ObjectInspector - - - &Find in Text... - - - - - qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - - - Change Current Page - - - - - qdesigner_internal::OrderDialog - - - Index %1 (%2) - - - - - %1 %2 - - - - - Change Page Order - - - - - Page Order - - - - - Move page up - - - - - Move page down - - - - - qdesigner_internal::PaletteEditor - - - Edit Palette - - - - - Tune Palette - - - - - Show Details - - - - - Compute Details - - - - - Quick - - - - - Preview - - - - - Disabled - - - - - Inactive - - - - - Active - - - - - qdesigner_internal::PaletteEditorButton - - - Change Palette - - - - - qdesigner_internal::PaletteModel - - - Color Role - - - - - Active - - - - - Inactive - - - - - Disabled - - - - - qdesigner_internal::PixmapEditor - - - Choose Resource... - - - - - Choose File... - - - - - Copy Path - - - - - Paste Path - - - - - - ... - - - - - qdesigner_internal::PlainTextEditorDialog - - - Edit text - - - - - qdesigner_internal::PluginDialog - - - Components - - - - - Plugin Information - - - - - Refresh - - - - - Scan for newly installed custom widget plugins. - - - - - Qt Designer couldn't find any plugins - - - - - Qt Designer found the following plugins - - - - - New custom widget plugins have been found. - - - - - qdesigner_internal::PreviewActionGroup - - - %1 Style - - - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - - - Load Custom Device Skin - - - - - All QVFB Skins (*.%1) - - - - - %1 - Duplicate Skin - - - - - The skin '%1' already exists. - - - - - %1 - Error - - - - - %1 is not a valid skin directory: -%2 - - - - - qdesigner_internal::PreviewDeviceSkin - - - &Close - - - - - qdesigner_internal::PreviewManager - - - %1 - [Preview] - - - - - qdesigner_internal::PreviewWidget - - - Preview Window - - - - - LineEdit - - - - - ComboBox - - - - - PushButton - - - - - ButtonGroup2 - - - - - CheckBox1 - - - - - CheckBox2 - - - - - ButtonGroup - - - - - RadioButton1 - - - - - RadioButton2 - - - - - RadioButton3 - - - - - qdesigner_internal::PromotionModel - - - Name - - - - - Header file - - - - - Global include - - - - - Usage - - - - - qdesigner_internal::PromotionTaskMenu - - - Promoted widgets... - - - - - Promote to ... - - - - - Change signals/slots... - - - - - Promote to - - - - - Demote to %1 - - - - - qdesigner_internal::PropertyEditor - - - Add Dynamic Property... - - - - - Remove Dynamic Property - - - - - Sorting - - - - - Color Groups - - - - - Tree View - - - - - Drop Down Button View - - - - - String... - - - - - Bool... - - - - - Other... - - - - - Configure Property Editor - - - - - Object: %1 -Class: %2 - - - - - qdesigner_internal::PropertyLineEdit - - - Insert line break - - - - - qdesigner_internal::QDesignerPromotionDialog - - - Promoted Widgets - - - - - Promoted Classes - - - - - Promote - - - - - Change signals/slots... - - - - - %1 - Error - - - - - qdesigner_internal::QDesignerResource - - - Loading qrc file - - - - - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> - - - - - New location for %1 - - - - - Resource files (*.qrc) - - - - - qdesigner_internal::QDesignerTaskMenu - - - Change objectName... - - - - - Change toolTip... - - - - - Change whatsThis... - - - - - Change styleSheet... - - - - - Create Menu Bar - - - - - Add Tool Bar - - - - - Create Status Bar - - - - - Remove Status Bar - - - - - Change script... - - - - - Change signals/slots... - - - - - Go to slot... - - - - - Size Constraints - - - - - Set Minimum Width - - - - - Set Minimum Height - - - - - Set Minimum Size - - - - - Set Maximum Width - - - - - Set Maximum Height - - - - - Set Maximum Size - - - - - Edit ToolTip - - - - - Edit WhatsThis - - - - - no signals available - - - - - Set size constraint on %n widget(s) - - - - - - - qdesigner_internal::QDesignerWidgetBox - - - - Unexpected element <%1> - - - - - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 -%5 - - - - - The XML code specified for the widget %1 does not contain any widget elements. -%2 - - - - - qdesigner_internal::QtGradientEditor - - - Linear - - - - - Radial - - - - - Conical - - - - - Pad - - - - - Repeat - - - - - Reflect - - - - - qdesigner_internal::QtGradientStopsController - - - H - - - - - S - - - - - V - - - - - - Hue - - - - - Sat - - - - - Val - - - - - Saturation - - - - - Value - - - - - R - - - - - G - - - - - B - - - - - Red - - - - - Green - - - - - Blue - - - - - qdesigner_internal::RichTextEditorDialog - - - Edit text - - - - - Rich Text - - - - - Source - - - - - &OK - - - - - &Cancel - - - - - qdesigner_internal::RichTextEditorToolBar - - - Bold - - - - - CTRL+B - - - - - Italic - - - - - CTRL+I - - - - - Underline - - - - - CTRL+U - - - - - Left Align - - - - - Center - - - - - Right Align - - - - - Justify - - - - - Superscript - - - - - Subscript - - - - - Insert &Link - - - - - Insert &Image - - - - - qdesigner_internal::ScriptDialog - - - Edit script - - - - - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. - - - - - Syntax error - - - - - qdesigner_internal::ScriptErrorDialog - - - Script errors - - - - - qdesigner_internal::SignalSlotDialog - - - There is already a slot with the signature '%1'. - - - - - There is already a signal with the signature '%1'. - - - - - %1 - Duplicate Signature - - - - - - Signals/Slots of %1 - - - - - qdesigner_internal::SignalSlotEditorPlugin - - - Edit Signals/Slots - - - - - F4 - - - - - qdesigner_internal::SignalSlotEditorTool - - - Edit Signals/Slots - - - - - qdesigner_internal::StatusBarTaskMenu - - - Remove - - - - - qdesigner_internal::StringListEditorButton - - - Change String List - - - - - qdesigner_internal::StyleSheetEditorDialog - - - - Valid Style Sheet - - - - - Add Resource... - - - - - Add Gradient... - - - - - Add Color... - - - - - Add Font... - - - - - Edit Style Sheet - - - - - Invalid Style Sheet - - - - - qdesigner_internal::TabOrderEditor - - - Start from Here - - - - - Restart - - - - - Tab Order List... - - - - - Tab Order List - - - - - Tab Order - - - - - qdesigner_internal::TabOrderEditorPlugin - - - Edit Tab Order - - - - - qdesigner_internal::TabOrderEditorTool - - - Edit Tab Order - - - - - qdesigner_internal::TableWidgetEditor - - - New Column - - - - - New Row - - - - - &Columns - - - - - &Rows - - - - - Properties &<< - - - - - - Properties &>> - - - - - Edit Table Widget - - - - - &Items - - - - - Table Items - - - - - qdesigner_internal::TableWidgetTaskMenu - - - Edit Items... - - - - - qdesigner_internal::TemplateOptionsWidget - - - Pick a directory to save templates in - - - - - Form - - - - - Additional Template Paths - - - - - ... - - - - - qdesigner_internal::TextEditTaskMenu - - - Edit HTML - - - - - Change HTML... - - - - - Edit Text - - - - - Change Plain Text... - - - - - qdesigner_internal::TextEditor - - - Choose Resource... - - - - - Choose File... - - - - - ... - - - - - Choose a File - - - - - qdesigner_internal::ToolBarEventFilter - - - Insert Separator before '%1' - - - - - Append Separator - - - - - Remove action '%1' - - - - - Remove Toolbar '%1' - - - - - Insert Separator - - - - - qdesigner_internal::TreeWidgetEditor - - - New Column - - - - - &Columns - - - - - Per column properties - - - - - Common properties - - - - - - New Item - - - - - - New Subitem - - - - - Properties &<< - - - - - - Properties &>> - - - - - Edit Tree Widget - - - - - &Items - - - - - Tree Items - - - - - 1 - - - - - &New - - - - - New &Subitem - - - - - Delete Item - - - - - &Delete - - - - - Move Item Left (before Parent Item) - - - - - L - - - - - Move Item Right (as a First Subitem of the Next Sibling Item) - - - - - R - - - - - Move Item Up - - - - - U - - - - - Move Item Down - - - - - D - - - - - qdesigner_internal::TreeWidgetTaskMenu - - - Edit Items... - - - - - qdesigner_internal::WidgetBox - - - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. - - - - - qdesigner_internal::WidgetBoxTreeWidget - - - Scratchpad - - - - - Custom Widgets - - - - - Expand all - - - - - Collapse all - - - - - List View - - - - - Icon View - - - - - Remove - - - - - Edit name - - - - - qdesigner_internal::WidgetDataBase - - - A custom widget plugin whose class name (%1) matches that of an existing class has been found. - - - - - qdesigner_internal::WidgetEditorTool - - - Edit Widgets - - - - - qdesigner_internal::WidgetFactory - - - The custom widget factory registered for widgets of class %1 returned 0. - - - - - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. - - - - - %1 Widget - - - - - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. - - - - - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. -This indicates an inconsistency in the ui-file. - - - - - Cannot create style '%1'. - - - - - qdesigner_internal::WizardContainerWidgetTaskMenu - - - Next - - - - - Back - - - - - qdesigner_internal::ZoomMenu - - - %1 % - Zoom factor - - - - diff --git a/translations/linguist_tr_TR.ts b/translations/linguist_tr_TR.ts deleted file mode 100644 index 1a1baa8..0000000 --- a/translations/linguist_tr_TR.ts +++ /dev/null @@ -1,1955 +0,0 @@ - - - - - - - - (New Entry) - - - - - AboutDialog - - - Qt Linguist - - - - - BatchTranslationDialog - - - Qt Linguist - Batch Translation - - - - - Options - - - - - Set translated entries to finished - - - - - Retranslate entries with existing translation - - - - - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked. - - - - - Translate also finished entries - - - - - Phrase book preference - - - - - Move up - - - - - Move down - - - - - The batch translator will search through the selected phrase books in the order given above. - - - - - &Run - - - - - Cancel - - - - - Batch Translation of '%1' - Qt Linguist - - - - - Searching, please wait... - - - - - &Cancel - - - - - Linguist batch translator - - - - - Batch translated %n entries - - - - - - - DataModel - - - <qt>Duplicate messages found in '%1': - - - - - <p>[more duplicates omitted] - - - - - <p>* Context: %1<br>* Source: %2 - - - - - <br>* Comment: %3 - - - - - Linguist does not know the plural rules for '%1'. -Will assume a single universal form. - - - - - Cannot create '%2': %1 - - - - - Universal Form - - - - - ErrorsView - - - Accelerator possibly superfluous in translation. - - - - - Accelerator possibly missing in translation. - - - - - Translation does not end with the same punctuation as the source text. - - - - - A phrase book suggestion for '%1' was ignored. - - - - - Translation does not refer to the same place markers as in the source text. - - - - - Translation does not contain the necessary %n place marker. - - - - - Unknown error - - - - - FindDialog - - - - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - - - - - Find - - - - - This window allows you to search for some text in the translation source file. - - - - - &Find what: - - - - - Type in the text to search for. - - - - - Options - - - - - Source texts are searched when checked. - - - - - &Source texts - - - - - Translations are searched when checked. - - - - - &Translations - - - - - Texts such as 'TeX' and 'tex' are considered as different when checked. - - - - - &Match case - - - - - Comments and contexts are searched when checked. - - - - - &Comments - - - - - Ignore &accelerators - - - - - Click here to find the next occurrence of the text you typed in. - - - - - Find Next - - - - - Click here to close this window. - - - - - Cancel - - - - - LRelease - - - Generated %n translation(s) (%1 finished and %2 unfinished) - - - - - - - - Ignored %n untranslated source text(s) - - - - - - - - MainWindow - - - - This is the application's main window. - - - - - Source text - - - - - - Index - - - - - - Context - - - - - Items - - - - - This panel lists the source contexts. - - - - - Strings - - - - - Phrases and guesses - - - - - Sources and Forms - - - - - Warnings - - - - - MOD - status bar: file(s) modified - - - - - Loading... - - - - - - Loading File - Qt Linguist - - - - - The file '%1' does not seem to be related to the currently open file(s) '%2'. - -Close the open file(s) first? - - - - - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. - -Skip loading the first named file? - - - - - %n translation unit(s) loaded. - - - - - - - Related files (%1);; - - - - - Open Translation Files - - - - - - File saved. - - - - - - - Release - - - - - Qt message files for released applications (*.qm) -All files (*) - - - - - - File created. - - - - - - Printing... - - - - - Context: %1 - - - - - finished - - - - - unresolved - - - - - obsolete - - - - - - Printing... (page %1) - - - - - - Printing completed - - - - - - Printing aborted - - - - - Search wrapped. - - - - - - - - - - - - - - Qt Linguist - - - - - - Cannot find the string '%1'. - - - - - Search And Translate in '%1' - Qt Linguist - - - - - - - Translate - Qt Linguist - - - - - Translated %n entry(s) - - - - - - - No more occurrences of '%1'. Start over? - - - - - Create New Phrase Book - - - - - Qt phrase books (*.qph) -All files (*) - - - - - Phrase book created. - - - - - Open Phrase Book - - - - - Qt phrase books (*.qph);;All files (*) - - - - - %n phrase(s) loaded. - - - - - - - - - Add to phrase book - - - - - No appropriate phrasebook found. - - - - - Adding entry to phrasebook %1 - - - - - Select phrase book to add to - - - - - Unable to launch Qt Assistant (%1) - - - - - Version %1 - - - - - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p> - - - - - Do you want to save the modified files? - - - - - Do you want to save '%1'? - - - - - Qt Linguist[*] - - - - - %1[*] - Qt Linguist - - - - - - No untranslated translation units left. - - - - - &Window - - - - - Minimize - - - - - Ctrl+M - - - - - Display the manual for %1. - - - - - Display information about %1. - - - - - &Save '%1' - - - - - Save '%1' &As... - - - - - Release '%1' - - - - - Release '%1' As... - - - - - &Close '%1' - - - - - - &Save - - - - - - - Save &As... - - - - - - - Release As... - - - - - - &Close - - - - - Save All - - - - - - &Release All - - - - - Close All - - - - - &Release - - - - - Translation File &Settings for '%1'... - - - - - &Batch Translation of '%1'... - - - - - Search And &Translate in '%1'... - - - - - - Translation File &Settings... - - - - - - &Batch Translation... - - - - - Search And &Translate... - - - - - - File - - - - - - Edit - - - - - - Translation - - - - - - Validation - - - - - - Help - - - - - Cannot read from phrase book '%1'. - - - - - Close this phrase book. - - - - - Enables you to add, modify, or delete entries in this phrase book. - - - - - Print the entries in this phrase book. - - - - - Cannot create phrase book '%1'. - - - - - Do you want to save phrase book '%1'? - - - - - All - - - - - MainWindow - - - - - &Phrases - - - - - &Close Phrase Book - - - - - &Edit Phrase Book - - - - - &Print Phrase Book - - - - - V&alidation - - - - - &View - - - - - Vie&ws - - - - - &Toolbars - - - - - &Help - - - - - &Translation - - - - - &File - - - - - Recently Opened &Files - - - - - &Edit - - - - - &Open... - - - - - Open a Qt translation source file (TS file) for editing - - - - - Ctrl+O - - - - - E&xit - - - - - Close this window and exit. - - - - - Ctrl+Q - - - - - Save - - - - - Save changes made to this Qt translation source file - - - - - Save As... - - - - - Save changes made to this Qt translation source file into a new file. - - - - - Create a Qt message file suitable for released applications from the current message file. - - - - - &Print... - - - - - Print a list of all the translation units in the current translation source file. - - - - - Ctrl+P - - - - - &Undo - - - - - Undo the last editing operation performed on the current translation. - - - - - Ctrl+Z - - - - - &Redo - - - - - Redo an undone editing operation performed on the translation. - - - - - Ctrl+Y - - - - - Cu&t - - - - - Copy the selected translation text to the clipboard and deletes it. - - - - - Ctrl+X - - - - - &Copy - - - - - Copy the selected translation text to the clipboard. - - - - - Ctrl+C - - - - - &Paste - - - - - Paste the clipboard text into the translation. - - - - - Ctrl+V - - - - - Select &All - - - - - Select the whole translation text. - - - - - Ctrl+A - - - - - &Find... - - - - - Search for some text in the translation source file. - - - - - Ctrl+F - - - - - Find &Next - - - - - Continue the search where it was left. - - - - - F3 - - - - - &Prev Unfinished - - - - - Previous unfinished item. - - - - - Move to the previous unfinished item. - - - - - Ctrl+K - - - - - &Next Unfinished - - - - - Next unfinished item. - - - - - Move to the next unfinished item. - - - - - Ctrl+J - - - - - P&rev - - - - - Move to previous item. - - - - - Move to the previous item. - - - - - Ctrl+Shift+K - - - - - Ne&xt - - - - - Next item. - - - - - Move to the next item. - - - - - Ctrl+Shift+J - - - - - &Done and Next - - - - - Mark item as done and move to the next unfinished item. - - - - - Mark this item as done and move to the next unfinished item. - - - - - Copy from source text - - - - - Copies the source text into the translation field. - - - - - Ctrl+B - - - - - &Accelerators - - - - - Toggle the validity check of accelerators. - - - - - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. - - - - - &Ending Punctuation - - - - - Toggle the validity check of ending punctuation. - - - - - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. - - - - - &Phrase matches - - - - - Toggle checking that phrase suggestions are used. - - - - - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. - - - - - Place &Marker Matches - - - - - Toggle the validity check of place markers. - - - - - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. - - - - - &New Phrase Book... - - - - - Create a new phrase book. - - - - - Ctrl+N - - - - - &Open Phrase Book... - - - - - Open a phrase book to assist translation. - - - - - Ctrl+H - - - - - &Reset Sorting - - - - - Sort the items back in the same order as in the message file. - - - - - &Display guesses - - - - - Set whether or not to display translation guesses. - - - - - &Statistics - - - - - Display translation statistics. - - - - - &Manual - - - - - F1 - - - - - About Qt Linguist - - - - - About Qt - - - - - Display information about the Qt toolkit by Trolltech. - - - - - &What's This? - - - - - What's This? - - - - - Enter What's This? mode. - - - - - Shift+F1 - - - - - &Search And Translate... - - - - - Replace the translation on all entries that matches the search source text. - - - - - Batch translate all entries using the information in the phrase books. - - - - - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file. - - - - - Open/Refresh Form &Preview - - - - - Form Preview Tool - - - - - F5 - - - - - &Add to Phrase Book - - - - - Ctrl+T - - - - - Open Read-O&nly... - - - - - &Save All - - - - - Ctrl+S - - - - - Close - - - - - &Close All - - - - - Ctrl+W - - - - - MessageEditor - - - German - - - - - Japanese - - - - - French - - - - - Polish - - - - - Chinese - - - - - This whole panel allows you to view and edit the translation of some source text. - - - - - Source text - - - - - This area shows the source text. - - - - - Source text (Plural) - - - - - This area shows the plural form of the source text. - - - - - Developer comments - - - - - This area shows a comment that may guide you, and the context in which the text occurs. - - - - - Here you can enter comments for your own use. They have no effect on the translated applications. - - - - - %1 translation (%2) - - - - - This is where you can enter or modify the translation of the above source text. - - - - - %1 translation - - - - - %1 translator comments - - - - - '%1' -Line: %2 - - - - - MessageModel - - - Completion status for %1 - - - - - <file header> - - - - - <context comment> - - - - - <unnamed context> - - - - - MsgEdit - - - - This is the right panel of the main window. - - - - - PhraseBookBox - - - - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - - - - - %1[*] - Qt Linguist - - - - - Qt Linguist - - - - - Cannot save phrase book '%1'. - - - - - Edit Phrase Book - - - - - This window allows you to add, modify, or delete entries in a phrase book. - - - - - &Translation: - - - - - This is the phrase in the target language corresponding to the source phrase. - - - - - S&ource phrase: - - - - - This is a definition for the source phrase. - - - - - This is the phrase in the source language. - - - - - &Definition: - - - - - Click here to add the phrase to the phrase book. - - - - - &New Entry - - - - - Click here to remove the entry from the phrase book. - - - - - &Remove Entry - - - - - Settin&gs... - - - - - Click here to save the changes made. - - - - - &Save - - - - - Click here to close this window. - - - - - Close - - - - - PhraseModel - - - Source phrase - - - - - Translation - - - - - Definition - - - - - PhraseView - - - Insert - - - - - Edit - - - - - Guess (%1) - - - - - Guess - - - - - QObject - - - Translation files (%1);; - - - - - All files (*) - - - - - - - - - - - Qt Linguist - - - - - C++ source files - - - - - Java source files - - - - - GNU Gettext localization files - - - - - Compiled Qt translations - - - - - Qt Linguist 'Phrase Book' - - - - - Qt Script source files - - - - - Qt translation sources (format 1.1) - - - - - Qt translation sources (format 2.0) - - - - - Qt translation sources (latest format) - - - - - Qt Designer form files - - - - - Qt Jambi form files - - - - - XLIFF localization files - - - - - SourceCodeView - - - <i>Source code not available</i> - - - - - <i>File %1 not available</i> - - - - - <i>File %1 not readable</i> - - - - - Statistics - - - Statistics - - - - - Close - - - - - Translation - - - - - Source - - - - - 0 - - - - - Words: - - - - - Characters: - - - - - Characters (with spaces): - - - - - TranslateDialog - - - This window allows you to search for some text in the translation source file. - - - - - Type in the text to search for. - - - - - Find &source text: - - - - - &Translate to: - - - - - Search options - - - - - Texts such as 'TeX' and 'tex' are considered as different when checked. - - - - - Match &case - - - - - Mark new translation as &finished - - - - - Click here to find the next occurrence of the text you typed in. - - - - - Find Next - - - - - Translate - - - - - Translate All - - - - - Click here to close this window. - - - - - Cancel - - - - - TranslationSettingsDialog - - - Source language - - - - - Language - - - - - Country/Region - - - - - Target language - - - - - Any Country - - - - - - Settings for '%1' - Qt Linguist - - - - diff --git a/translations/qt_help_tr_TR.ts b/translations/qt_help_tr_TR.ts deleted file mode 100644 index 7e2d8d1..0000000 --- a/translations/qt_help_tr_TR.ts +++ /dev/null @@ -1,355 +0,0 @@ - - - - - QCLuceneResultWidget - - - Search Results - - - - - Note: - - - - - The search results may not be complete since the documentation is still being indexed! - - - - - Your search did not match any documents. - - - - - (The reason for this might be that the documentation is still being indexed.) - - - - - QHelpCollectionHandler - - - The collection file is not set up yet! - - - - - Cannot load sqlite database driver! - - - - - - Cannot open collection file: %1 - - - - - Cannot create tables in file %1! - - - - - The specified collection file already exists! - - - - - Cannot create directory: %1 - - - - - Cannot copy collection file: %1 - - - - - Unknown filter! - - - - - Cannot register filter %1! - - - - - Cannot open documentation file %1! - - - - - Invalid documentation file! - - - - - The namespace %1 was not registered! - - - - - Namespace %1 already exists! - - - - - Cannot register namespace! - - - - - Cannot open database to optimize! - - - - - QHelpDBReader - - - Cannot open database '%1' '%2': %3 - - - - - QHelpEngineCore - - - The specified namespace does not exist! - - - - - QHelpEngineCorePrivate - - - Cannot open documentation file %1: %2! - - - - - QHelpGenerator - - - Invalid help data! - - - - - No output file name specified! - - - - - The file %1 cannot be overwritten! - - - - - Building up file structure... - - - - - Cannot open data base file %1! - - - - - Cannot register namespace %1! - - - - - Insert custom filters... - - - - - Insert help data for filter section (%1 of %2)... - - - - - Documentation successfully generated. - - - - - Some tables already exist! - - - - - Cannot create tables! - - - - - Cannot register virtual folder! - - - - - Insert files... - - - - - The file %1 does not exist! Skipping it. - - - - - Cannot open file %1! Skipping it. - - - - - The filter %1 is already registered! - - - - - Cannot register filter %1! - - - - - Insert indices... - - - - - Insert contents... - - - - - Cannot insert contents! - - - - - Cannot register contents! - - - - - QHelpSearchQueryWidget - - - Search for: - - - - - Search - - - - - Advanced search - - - - - words <B>similar</B> to: - - - - - <B>without</B> the words: - - - - - with <B>exact phrase</B>: - - - - - with <B>all</B> of the words: - - - - - with <B>at least one</B> of the words: - - - - - QHelpSearchResultWidget - - - 0 - 0 of 0 Hits - - - - - QHelpSearchResultWidgetPrivate - - - %1 - %2 of %3 Hits - - - - - QObject - - - Untitled - - - - - Unknown token. - - - - - Unknown token. Expected "QtHelpProject"! - - - - - Error in line %1: %2 - - - - - A virtual folder must not contain a '/' character! - - - - - A namespace must not contain a '/' character! - - - - - Missing namespace in QtHelpProject. - - - - - Missing virtual folder in QtHelpProject - - - - - Missing attribute in keyword at line %1. - - - - - The input file %1 could not be opened! - - - - -- cgit v0.12 From 292a37301950a64f211e3a2909ff64884b73e1cc Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Mon, 20 Apr 2009 18:49:21 +0200 Subject: Fix a bug in QFileDialog sidebar when the bookmark has an hidden parent If the bookmark in the sidebar has an hidden parent and the QFileDialog is set up to not show hidden files, then clicking on the bookmark move the current dir to root (like if the bookmark was invalid) instead of entering in the dir. The fix was to fetch the parent dir and the bookmark dir when the user select it in the sidebar. Task-number: 251321 Reviewed-by: jasplin --- src/gui/dialogs/qfiledialog.cpp | 5 ++++- src/gui/dialogs/qfilesystemmodel.h | 2 ++ tests/auto/qfiledialog/tst_qfiledialog.cpp | 34 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 9935a80..d786f3e 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -693,7 +693,10 @@ void QFileDialog::setVisible(bool visible) */ void QFileDialogPrivate::_q_goToUrl(const QUrl &url) { - QModelIndex idx = model->index(url.toLocalFile()); + //The shortcut in the side bar may have a parent that is not fetched yet (e.g. an hidden file) + //so we force the fetching + QFileSystemModelPrivate::QFileSystemNode *node = model->d_func()->node(url.toLocalFile(), true); + QModelIndex idx = model->d_func()->index(node); _q_enterDirectory(idx); } diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h index 52ecaf9..995268b 100644 --- a/src/gui/dialogs/qfilesystemmodel.h +++ b/src/gui/dialogs/qfilesystemmodel.h @@ -158,6 +158,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_performDelayedSort()) Q_PRIVATE_SLOT(d_func(), void _q_fileSystemChanged(const QString &path, const QList > &)) Q_PRIVATE_SLOT(d_func(), void _q_resolvedName(const QString &fileName, const QString &resolvedName)) + + friend class QFileDialogPrivate; }; inline bool QFileSystemModel::rmdir(const QModelIndex &aindex) const diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 695bfe7..981d445 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -157,6 +157,7 @@ private slots: void task228844_ensurePreviousSorting(); void task239706_editableFilterCombo(); void task218353_relativePaths(); + void task251321_sideBarHiddenEntries(); private: QByteArray userSettings; @@ -1852,5 +1853,38 @@ void tst_QFiledialog::task218353_relativePaths() appDir.rmdir("test"); } +void tst_QFiledialog::task251321_sideBarHiddenEntries() +{ + QNonNativeFileDialog fd; + + QDir current = QDir::currentPath(); + current.mkdir(".hidden"); + QDir hiddenDir = QDir(".hidden"); + hiddenDir.mkdir("subdir"); + QDir hiddenSubDir = QDir(".hidden/subdir"); + hiddenSubDir.mkdir("happy"); + hiddenSubDir.mkdir("happy2"); + + QList urls; + urls << QUrl::fromLocalFile(hiddenSubDir.absolutePath()); + fd.setSidebarUrls(urls); + fd.show(); + QTest::qWait(250); + + QSidebar *sidebar = qFindChild(&fd, "sidebar"); + sidebar->setFocus(); + sidebar->selectUrl(QUrl::fromLocalFile(hiddenSubDir.absolutePath())); + QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center()); + QTest::qWait(250); + + QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + QCOMPARE(model->rowCount(model->index(hiddenSubDir.absolutePath())), 2); + + hiddenSubDir.rmdir("happy2"); + hiddenSubDir.rmdir("happy"); + hiddenDir.rmdir("subdir"); + current.rmdir(".hidden"); +} + QTEST_MAIN(tst_QFiledialog) #include "tst_qfiledialog.moc" -- cgit v0.12 From b108e0479c6ec872ab767b8b81420b28ca1886cf Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 21 Apr 2009 10:17:56 +0200 Subject: There is no way to delete a invalid entry in the sidebar of QFileDialog. We can't remove an item in the sidebar if the bookmark is not valid (i.e. link to a non existing directory). ItemViews doesn't allow you to have disabled items and to select them at the same time, so i have implemented a delegate that paint in gray if the bookmark is invalid. So you can click on it and delete it. Task-number: 251341 Reviewed-by: jasplin --- src/gui/dialogs/qsidebar.cpp | 21 ++++++-- src/gui/dialogs/qsidebar_p.h | 13 ++++- tests/auto/qfiledialog/tst_qfiledialog.cpp | 82 ++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 4 deletions(-) diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp index 1bd2b7d..bfdb37e 100644 --- a/src/gui/dialogs/qsidebar.cpp +++ b/src/gui/dialogs/qsidebar.cpp @@ -55,6 +55,18 @@ QT_BEGIN_NAMESPACE +void QSideBarDelegate::initStyleOption(QStyleOptionViewItem *option, + const QModelIndex &index) const +{ + QStyledItemDelegate::initStyleOption(option,index); + QVariant value = index.data(QUrlModel::EnabledRole); + if (value.isValid()) { + //If the bookmark/entry is not enabled then we paint it in gray + if (!qvariant_cast(value)) + option->state &= ~QStyle::State_Enabled; + } +} + /*! QUrlModel lets you have indexes from a QFileSystemModel to a list. When QFileSystemModel changes them QUrlModel will automatically update. @@ -88,9 +100,6 @@ Qt::ItemFlags QUrlModel::flags(const QModelIndex &index) const if (index.data(Qt::DecorationRole).isNull()) flags &= ~Qt::ItemIsEnabled; - if (invalidUrls.contains(index.data(UrlRole).toUrl())) - flags &= ~Qt::ItemIsEnabled; - return flags; } @@ -193,6 +202,11 @@ void QUrlModel::setUrl(const QModelIndex &index, const QUrl &url, const QModelIn newName = QFileInfo(url.toLocalFile()).fileName(); if (!invalidUrls.contains(url)) invalidUrls.append(url); + //The bookmark is invalid then we set to false the EnabledRole + setData(index, false, EnabledRole); + } else { + //The bookmark is valid then we set to true the EnabledRole + setData(index, true, EnabledRole); } // Make sure that we have at least 32x32 images @@ -356,6 +370,7 @@ void QSidebar::init(QFileSystemModel *model, const QList &newUrls) urlModel = new QUrlModel(this); urlModel->setFileSystemModel(model); setModel(urlModel); + setItemDelegate(new QSideBarDelegate(this)); connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(clicked(const QModelIndex &))); diff --git a/src/gui/dialogs/qsidebar_p.h b/src/gui/dialogs/qsidebar_p.h index ecbbb37..56fd6d4 100644 --- a/src/gui/dialogs/qsidebar_p.h +++ b/src/gui/dialogs/qsidebar_p.h @@ -55,6 +55,7 @@ #include #include +#include #include #ifndef QT_NO_FILEDIALOG @@ -62,13 +63,23 @@ QT_BEGIN_NAMESPACE class QFileSystemModel; + +class QSideBarDelegate : public QStyledItemDelegate +{ + public: + QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {} + void initStyleOption(QStyleOptionViewItem *option, + const QModelIndex &index) const; +}; + class Q_AUTOTEST_EXPORT QUrlModel : public QStandardItemModel { Q_OBJECT public: enum Roles { - UrlRole = Qt::UserRole + 1 + UrlRole = Qt::UserRole + 1, + EnabledRole = Qt::UserRole + 2 }; QUrlModel(QObject *parent = 0); diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 981d445..13b13d6 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -158,6 +158,7 @@ private slots: void task239706_editableFilterCombo(); void task218353_relativePaths(); void task251321_sideBarHiddenEntries(); + void task251341_sideBarRemoveEntries(); private: QByteArray userSettings; @@ -1886,5 +1887,86 @@ void tst_QFiledialog::task251321_sideBarHiddenEntries() current.rmdir(".hidden"); } +class MyQSideBar : public QSidebar +{ +public : + MyQSideBar(QWidget *parent = 0) : QSidebar(parent) + {} + + void removeSelection() { + QList idxs = selectionModel()->selectedIndexes(); + QList indexes; + for (int i = 0; i < idxs.count(); i++) + indexes.append(idxs.at(i)); + + for (int i = 0; i < indexes.count(); ++i) + if (!indexes.at(i).data(Qt::UserRole + 1).toUrl().path().isEmpty()) + model()->removeRow(indexes.at(i).row()); + } +}; + +void tst_QFiledialog::task251341_sideBarRemoveEntries() +{ + QNonNativeFileDialog fd; + + QDir current = QDir::currentPath(); + current.mkdir("testDir"); + QDir testSubDir = QDir("testDir"); + + QList urls; + urls << QUrl::fromLocalFile(testSubDir.absolutePath()); + urls << QUrl::fromLocalFile("NotFound"); + fd.setSidebarUrls(urls); + fd.show(); + QTest::qWait(250); + + QSidebar *sidebar = qFindChild(&fd, "sidebar"); + sidebar->setFocus(); + //We enter in the first bookmark + sidebar->selectUrl(QUrl::fromLocalFile(testSubDir.absolutePath())); + QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(0, 0)).center()); + QTest::qWait(250); + + QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); + //There is no file + QCOMPARE(model->rowCount(model->index(testSubDir.absolutePath())), 0); + //Icon is not enabled QUrlModel::EnabledRole + QVariant value = sidebar->model()->index(0, 0).data(Qt::UserRole + 2); + QCOMPARE(qvariant_cast(value), true); + + sidebar->setFocus(); + //We enter in the second bookmark which is invalid + sidebar->selectUrl(QUrl::fromLocalFile("NotFound")); + QTest::mouseClick(sidebar->viewport(), Qt::LeftButton, 0, sidebar->visualRect(sidebar->model()->index(1, 0)).center()); + QTest::qWait(250); + + //We fallback to root because the entry in the bookmark is invalid + QCOMPARE(model->rowCount(model->index("NotFound")), model->rowCount(model->index(model->rootPath()))); + //Icon is not enabled QUrlModel::EnabledRole + value = sidebar->model()->index(1, 0).data(Qt::UserRole + 2); + QCOMPARE(qvariant_cast(value), false); + + MyQSideBar mySideBar; + mySideBar.init(model, urls); + mySideBar.show(); + mySideBar.selectUrl(QUrl::fromLocalFile(testSubDir.absolutePath())); + QTest::qWait(1000); + mySideBar.removeSelection(); + + //We remove the first entry + QList expected; + expected << QUrl::fromLocalFile("NotFound"); + QCOMPARE(mySideBar.urls(), expected); + + mySideBar.selectUrl(QUrl::fromLocalFile("NotFound")); + mySideBar.removeSelection(); + + //We remove the second entry + expected.clear(); + QCOMPARE(mySideBar.urls(), expected); + + current.rmdir("testDir"); +} + QTEST_MAIN(tst_QFiledialog) #include "tst_qfiledialog.moc" -- cgit v0.12 From 5306337bf3ba9b770824ae889e31e991a4e03ade Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 20 Apr 2009 17:35:25 +0200 Subject: Fixes: Qt expects hardcoded wacom device identifiers from xorg.conf Task: 210132 RevBy: Bradley T. Hughes Details:Make wacom detection use atoms instead of string compares --- src/gui/kernel/qapplication_x11.cpp | 18 +++++++----------- src/gui/kernel/qt_x11_p.h | 4 ++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index b1270bc..366e576 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -294,6 +294,10 @@ static const char * x11_atomnames = { // XEMBED "_XEMBED\0" "_XEMBED_INFO\0" + + "Wacom Stylus\0" + "Wacom Cursor\0" + "Wacom Eraser\0" }; Q_GUI_EXPORT QX11Data *qt_x11Data = 0; @@ -2350,13 +2354,6 @@ void qt_init(QApplicationPrivate *priv, int, XAxisInfoPtr a; XDevice *dev = 0; -#if !defined(Q_OS_IRIX) - // XFree86 divides a stylus and eraser into 2 devices, so we must do for both... - const QString XFREENAMESTYLUS = QLatin1String("stylus"); - const QString XFREENAMEPEN = QLatin1String("pen"); - const QString XFREENAMEERASER = QLatin1String("eraser"); -#endif - if (X11->ptrXListInputDevices) { devices = X11->ptrXListInputDevices(X11->display, &ndev); if (!devices) @@ -2371,18 +2368,17 @@ void qt_init(QApplicationPrivate *priv, int, gotStylus = false; gotEraser = false; - QString devName = QString::fromLocal8Bit(devs->name).toLower(); #if defined(Q_OS_IRIX) + QString devName = QString::fromLocal8Bit(devs->name).toLower(); if (devName == QLatin1String(WACOM_NAME)) { deviceType = QTabletEvent::Stylus; gotStylus = true; } #else - if (devName.startsWith(XFREENAMEPEN) - || devName.startsWith(XFREENAMESTYLUS)) { + if (devs->type == ATOM(XWacomStylus)) { deviceType = QTabletEvent::Stylus; gotStylus = true; - } else if (devName.startsWith(XFREENAMEERASER)) { + } else if (devs->type == ATOM(XWacomEraser)) { deviceType = QTabletEvent::XFreeEraser; gotEraser = true; } diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 563b7e9..b9ace9d 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -652,6 +652,10 @@ struct QX11Data _XEMBED, _XEMBED_INFO, + XWacomStylus, + XWacomCursor, + XWacomEraser, + NPredefinedAtoms, _QT_SETTINGS_TIMESTAMP = NPredefinedAtoms, -- cgit v0.12 From e43b059ea932f3e21f592c74b1723b4c6cb5465f Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Tue, 21 Apr 2009 11:44:55 +0200 Subject: Fixes: Incorrect textIndent() values in ODF RevBy: Simon Hausmann Task: 247952 Details: Use pixelToPoint on the text-indent values. --- src/gui/text/qtextodfwriter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 1edc3b8..75e89d2 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -477,7 +477,7 @@ void QTextOdfWriter::writeBlockFormat(QXmlStreamWriter &writer, QTextBlockFormat if (format.hasProperty(QTextFormat::BlockRightMargin)) writer.writeAttribute(foNS, QString::fromLatin1("margin-right"), pixelToPoint(qMax(qreal(0.), format.rightMargin())) ); if (format.hasProperty(QTextFormat::TextIndent)) - writer.writeAttribute(foNS, QString::fromLatin1("text-indent"), QString::number(format.textIndent())); + writer.writeAttribute(foNS, QString::fromLatin1("text-indent"), pixelToPoint(format.textIndent())); if (format.hasProperty(QTextFormat::PageBreakPolicy)) { if (format.pageBreakPolicy() & QTextFormat::PageBreak_AlwaysBefore) writer.writeAttribute(foNS, QString::fromLatin1("break-before"), QString::fromLatin1("page")); -- cgit v0.12 From 3ca6dde968488dfe005ffcdc88dbf6a0c1467438 Mon Sep 17 00:00:00 2001 From: Martin Pejcoch Date: Tue, 21 Apr 2009 12:05:02 +0200 Subject: Fixed a typo. Reviewed-by: Kavindra --- doc/src/snippets/code/src_qdbus_qdbusargument.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp index b982510..efd54ac 100644 --- a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp +++ b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp @@ -4,7 +4,7 @@ struct MyStructure int count; QString name; }; -QT_DECLARE_METATYPE(MyStructure) +Q_DECLARE_METATYPE(MyStructure) // Marshall the MyStructure data into a D-Bus argument QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct) -- cgit v0.12 From be7ee29e4b40d2496041873bba753761a6d7b8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 21 Apr 2009 12:05:27 +0200 Subject: Fix crash in OpenGL paint engine with hq antialiasing and TxProject Use painter paths instead of rectangles for perspective transformed rects, as the rectangles might have been clipped. Task-number: 251485 Reviewed-by: Trond --- src/opengl/qpaintengine_opengl.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 88fd379..ec6e33b 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -3716,8 +3716,14 @@ void QOpenGLPaintEngine::drawRects(const QRectF *rects, int rectCount) d->disableClipping(); GLuint program = qt_gl_program_cache()->getProgram(d->drawable.context(), FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA, 0, true); - QGLRectMaskGenerator maskGenerator(path, d->matrix, d->offscreen, program); - d->addItem(qt_mask_texture_cache()->getMask(maskGenerator, d)); + + if (d->matrix.type() >= QTransform::TxProject) { + QGLPathMaskGenerator maskGenerator(path, d->matrix, d->offscreen, program); + d->addItem(qt_mask_texture_cache()->getMask(maskGenerator, d)); + } else { + QGLRectMaskGenerator maskGenerator(path, d->matrix, d->offscreen, program); + d->addItem(qt_mask_texture_cache()->getMask(maskGenerator, d)); + } d->enableClipping(); } -- cgit v0.12 From 57f8033b7c1b26dfc91e257d1aaf9266ae67cc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 21 Apr 2009 12:08:17 +0200 Subject: Fix non-opaque text from widget palette being blitted, not blended. QPainter inherits some properties from the widget, among other font and pen. These are set in the painter's state in initFrom(), but in 4.5 we forgot to call QPaintEngineEx::penChanged() to let an extended paint engine know that the pen has changed. This caused the raster engine to believe it could blit non-opaque text, due to the fast_text flag not being correctly updated. Task-number: 251534 Reviewed-by: Paul --- src/gui/painting/qpainter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 2fa6a56..ffb273e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1484,7 +1484,9 @@ void QPainter::initFrom(const QWidget *widget) d->state->bgBrush = pal.brush(widget->backgroundRole()); d->state->deviceFont = QFont(widget->font(), const_cast (widget)); d->state->font = d->state->deviceFont; - if (d->engine) { + if (d->extended) { + d->extended->penChanged(); + } else if (d->engine) { d->engine->setDirty(QPaintEngine::DirtyPen); d->engine->setDirty(QPaintEngine::DirtyBrush); d->engine->setDirty(QPaintEngine::DirtyFont); -- cgit v0.12 From eb1411f550ab131162fd61bf81e9b22e0a75e26a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 21 Apr 2009 12:48:00 +0200 Subject: QTableWidget header items not re-translated by QUiLoader. Task: 251691 Translate correct header item (fix to new feature). Reviewed-by: Oswald Buddenhagen --- tools/designer/src/uitools/quiloader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp index d3d1d54..67bd29c 100644 --- a/tools/designer/src/uitools/quiloader.cpp +++ b/tools/designer/src/uitools/quiloader.cpp @@ -259,9 +259,9 @@ public: const int row_cnt = tablew->rowCount(); const int col_cnt = tablew->columnCount(); for (int j = 0; j < col_cnt; ++j) - reTranslateTableItem(tablew->verticalHeaderItem(j), m_className); + reTranslateTableItem(tablew->horizontalHeaderItem(j), m_className); for (int i = 0; i < row_cnt; ++i) { - reTranslateTableItem(tablew->horizontalHeaderItem(i), m_className); + reTranslateTableItem(tablew->verticalHeaderItem(i), m_className); for (int j = 0; j < col_cnt; ++j) reTranslateTableItem(tablew->item(i, j), m_className); } -- cgit v0.12 From 92f07dcd690d596e2d6cc32211c142cd0e25fd97 Mon Sep 17 00:00:00 2001 From: kh Date: Tue, 21 Apr 2009 12:49:50 +0200 Subject: Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1 should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes --- tools/qdoc3/test/assistant.qdocconf | 4 ++-- tools/qdoc3/test/designer.qdocconf | 4 ++-- tools/qdoc3/test/linguist.qdocconf | 4 ++-- tools/qdoc3/test/qmake.qdocconf | 4 ++-- tools/qdoc3/test/qt-build-docs.qdocconf | 12 ++++++------ tools/qdoc3/test/qt.qdocconf | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 7bb6bbf..cd5a877 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.450 +qhp.Assistant.namespace = com.trolltech.assistant.451 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Assistant.filterAttributes = qt 4.5.0 tools assistant +qhp.Assistant.filterAttributes = qt 4.5.1 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 26636cd..bfafed0 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.450 +qhp.Designer.namespace = com.trolltech.designer.451 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Designer.filterAttributes = qt 4.5.0 tools designer +qhp.Designer.filterAttributes = qt 4.5.1 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 5e889a8..d917100 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.450 +qhp.Linguist.namespace = com.trolltech.linguist.451 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Linguist.filterAttributes = qt 4.5.0 tools linguist +qhp.Linguist.filterAttributes = qt 4.5.1 tools linguist qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index c357cfb..d236f81 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.450 +qhp.qmake.namespace = com.trolltech.qmake.451 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.qmake.filterAttributes = qt 4.5.0 tools qmake +qhp.qmake.filterAttributes = qt 4.5.1 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 25cdc5a..e6edb29 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -20,10 +20,10 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.450 +qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML @@ -33,11 +33,11 @@ qhp.Qt.extraFiles = classic.css \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.0 +qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 4d401a4..aa1088e 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -25,7 +25,7 @@ qhp.Qt.file = qt.qhp qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML @@ -35,11 +35,11 @@ qhp.Qt.extraFiles = classic.css \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.0 +qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes -- cgit v0.12 From 6a3735a47de8a9851e7795cf023d95d81867260d Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 13:38:30 +0200 Subject: BT: Fix lock-up & crash in the Elastic Nodes example Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao --- examples/graphicsview/elasticnodes/edge.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/graphicsview/elasticnodes/edge.cpp b/examples/graphicsview/elasticnodes/edge.cpp index 4018c25..e32a35a 100644 --- a/examples/graphicsview/elasticnodes/edge.cpp +++ b/examples/graphicsview/elasticnodes/edge.cpp @@ -93,11 +93,16 @@ void Edge::adjust() QLineF line(mapFromItem(source, 0, 0), mapFromItem(dest, 0, 0)); qreal length = line.length(); - QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length); prepareGeometryChange(); - sourcePoint = line.p1() + edgeOffset; - destPoint = line.p2() - edgeOffset; + + if (!qFuzzyCompare(length, qreal(0.0))) { + QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length); + sourcePoint = line.p1() + edgeOffset; + destPoint = line.p2() - edgeOffset; + } else { + sourcePoint = destPoint = line.p1(); + } } QRectF Edge::boundingRect() const -- cgit v0.12 From b050659c691626bc46ef9ba87a934d06add7f39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 21 Apr 2009 13:41:04 +0200 Subject: Fixed typos 'indended' -> 'intended' --- src/gui/math3d/qgenericmatrix.cpp | 6 +++--- src/gui/math3d/qmatrix4x4.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp index 734c1e6..a77ca42 100644 --- a/src/gui/math3d/qgenericmatrix.cpp +++ b/src/gui/math3d/qgenericmatrix.cpp @@ -224,7 +224,7 @@ QT_BEGIN_NAMESPACE /*! \fn InnerT *QGenericMatrix::data() - Returns a pointer to the raw data of this matrix. This is indended + Returns a pointer to the raw data of this matrix. This is intended for use with raw GL functions. \sa constData() @@ -234,7 +234,7 @@ QT_BEGIN_NAMESPACE \fn const InnerT *QGenericMatrix::data() const Returns a constant pointer to the raw data of this matrix. - This is indended for use with raw GL functions. + This is intended for use with raw GL functions. \sa constData() */ @@ -243,7 +243,7 @@ QT_BEGIN_NAMESPACE \fn const InnerT *QGenericMatrix::constData() const Returns a constant pointer to the raw data of this matrix. - This is indended for use with raw GL functions. + This is intended for use with raw GL functions. \sa data() */ diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 649532d..a8dabf3 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1435,7 +1435,7 @@ QTransform QMatrix4x4::toTransform() const /*! \fn float *QMatrix4x4::data() - Returns a pointer to the raw data of this matrix. This is indended + Returns a pointer to the raw data of this matrix. This is intended for use with raw GL functions. \sa constData(), inferSpecialType() @@ -1445,7 +1445,7 @@ QTransform QMatrix4x4::toTransform() const \fn const float *QMatrix4x4::data() const Returns a constant pointer to the raw data of this matrix. - This is indended for use with raw GL functions. + This is intended for use with raw GL functions. \sa constData() */ @@ -1454,7 +1454,7 @@ QTransform QMatrix4x4::toTransform() const \fn const float *QMatrix4x4::constData() const Returns a constant pointer to the raw data of this matrix. - This is indended for use with raw GL functions. + This is intended for use with raw GL functions. \sa data() */ -- cgit v0.12 From df9977ebce528047c39d5cf35f452bb2f42cf2e9 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Tue, 21 Apr 2009 14:00:38 +0200 Subject: Fixed a flicker when switching current source in Phonon::MediaObject Task-number: 251776 --- src/3rdparty/phonon/ds9/mediaobject.cpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 93a19b0..1d0b69d 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -519,6 +519,15 @@ namespace Phonon qSwap(m_graphs[0], m_graphs[1]); //swap the graphs + if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid && + catchComError(currentGraph()->renderResult())) { + setState(Phonon::ErrorState); + return; + } + + //we need to play the next media + play(); + //we tell the video widgets to switch now to the new source #ifndef QT_NO_PHONON_VIDEO for (int i = 0; i < m_videoWidgets.count(); ++i) { @@ -527,15 +536,6 @@ namespace Phonon #endif //QT_NO_PHONON_VIDEO emit currentSourceChanged(currentGraph()->mediaSource()); - - if (currentGraph()->isLoading()) { - //will simply tell that when loading is finished - //it should start the playback - play(); - } - - - emit metaDataChanged(currentGraph()->metadata()); if (nextGraph()->hasVideo() != currentGraph()->hasVideo()) { @@ -548,15 +548,6 @@ namespace Phonon #ifndef QT_NO_PHONON_MEDIACONTROLLER setTitles(currentGraph()->titles()); #endif //QT_NO_PHONON_MEDIACONTROLLER - - //this manages only gapless transitions - if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid) { - if (catchComError(currentGraph()->renderResult())) { - setState(Phonon::ErrorState); - } else { - play(); - } - } } Phonon::State MediaObject::state() const -- cgit v0.12 From 49b4685a185f6932bcf4c685dc211cf2c4a3dddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Tue, 21 Apr 2009 14:52:11 +0200 Subject: Fix a problem where QPrintDialog/Unix didn't update print-to-file states. Setting a QPrinter to print to e.g. a PDF file and then passing the QPrinter object to a QPrintDialog didn't update the printer combobox and filename lineedit states correctly. Task-number: 224728 Reviewed-by: Samuel --- src/gui/dialogs/qprintdialog_unix.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 76c22d0..87a4e65 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -727,7 +727,9 @@ void QUnixPrintWidgetPrivate::updateWidget() widget.printers->removeItem(widget.printers->count()-1); // remove separator filePrintersAdded = false; } - if (printer && filePrintersAdded && printer->printerName().isEmpty()) { + if (printer && filePrintersAdded && (printer->outputFormat() != QPrinter::NativeFormat + || printer->printerName().isEmpty())) + { if (printer->outputFormat() == QPrinter::PdfFormat) widget.printers->setCurrentIndex(widget.printers->count() - 2); else if (printer->outputFormat() == QPrinter::PostScriptFormat) -- cgit v0.12 From 95b7c50e503dd4743e22c35f341aa31105ea7d73 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 21 Apr 2009 15:25:51 +0200 Subject: We don't need to call two times itemChange when an item is deleted. Previously we were calling two times itemChange on the parent to give QGraphicsItem::ItemChildAddedChange. We don't need that. One is enough. BT : yes Task-number: BT Reviewed-by: Andreas --- src/gui/graphicsview/qgraphicsscene.cpp | 6 ----- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 35 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 9881960..b75c422 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -697,12 +697,6 @@ void QGraphicsScenePrivate::_q_removeItemLater(QGraphicsItem *item) { Q_Q(QGraphicsScene); - if (QGraphicsItem *parent = item->d_func()->parent) { - parent->itemChange(QGraphicsItem::ItemChildRemovedChange, - qVariantFromValue(item)); - parent->d_func()->children.removeAll(item); - } - // Clear focus on the item to remove any reference in the focusWidget // chain. item->clearFocus(); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 5565aa6..583a959 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -3654,6 +3654,8 @@ void tst_QGraphicsItem::defaultItemTest_QGraphicsEllipseItem() class ItemChangeTester : public QGraphicsRectItem { public: + ItemChangeTester(){} + ItemChangeTester(QGraphicsItem *parent) : QGraphicsRectItem(parent) {} QVariant itemChangeReturnValue; QGraphicsScene *itemSceneChangeTargetScene; @@ -3928,6 +3930,39 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(tester.changes.last(), QGraphicsItem::ItemChildRemovedChange); QCOMPARE(qVariantValue(tester.values.last()), (QGraphicsItem *)&testerHelper); + + // ItemChildRemovedChange 1 + ItemChangeTester *test = new ItemChangeTester; + test->itemSceneChangeTargetScene = 0; + int count = 0; + QGraphicsScene *scene = new QGraphicsScene; + scene->addItem(test); + count = test->changes.size(); + //We test here the fact that when a child is deleted the parent receive only one ItemChildRemovedChange + QGraphicsRectItem *child = new QGraphicsRectItem(test); + //We received ItemChildAddedChange + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildAddedChange); + delete child; + child = 0; + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildRemovedChange); + + ItemChangeTester *childTester = new ItemChangeTester(test); + //Changes contains all sceneHasChanged and so on, we don't want to test that + int childCount = childTester->changes.size(); + //We received ItemChildAddedChange + QCOMPARE(test->changes.size(), ++count); + child = new QGraphicsRectItem(childTester); + //We received ItemChildAddedChange + QCOMPARE(childTester->changes.size(), ++childCount); + QCOMPARE(childTester->changes.last(), QGraphicsItem::ItemChildAddedChange); + //Delete the child of the top level with all its children + delete childTester; + //Only one removal + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildRemovedChange); + delete scene; } { // ItemChildRemovedChange 2 -- cgit v0.12 From 924feac07729b680fbd337e3773c747b64e1da61 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 21 Apr 2009 15:50:18 +0200 Subject: BT: Make things work on 10.3 The #ifdef was typed wrong. Reviewed-by: Prasanth Ullattil --- src/gui/kernel/qt_mac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp index b1247e8..44e10a8 100644 --- a/src/gui/kernel/qt_mac.cpp +++ b/src/gui/kernel/qt_mac.cpp @@ -131,7 +131,7 @@ QColor qcolorForTheme(ThemeBrush brush) QColor qcolorForThemeTextColor(ThemeTextColor themeColor) { -#ifdef QT_OS_MAC32 +#ifdef Q_OS_MAC32 RGBColor c; GetThemeTextColor(themeColor, 32, true, &c); QColor color = QColor(c.red / 265, c.green / 256, c.blue / 256); -- cgit v0.12 From 08feb22f9a924ce120da8b5c6e1669d2a630dd54 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 15:57:05 +0200 Subject: BT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck) This fixes a bug in 4.5.0 where cached items that call update() after they have been moved or transformed failed to get a call to paint(), so the last cache image was used to draw. The easiest way to reproduce this bug is in the Elastic Nodes example. If you press, wait, then release, the nodes will consistently move to sunken state, then back to normal state. But if you click quickly while moving the mouse, the nodes will stay sunken. The bug was that the item was marked as dirty as a result of being moved, and when the mouse button was released, the node item's call to update() was discarded, as the item was "already dirty". The fix is to allow invalidation of the cache even if the item is marked as dirty. Reviewed-by: bnilsen --- src/gui/graphicsview/qgraphicsitem.cpp | 14 ++++++++- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 42 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index d1b8393..3e8d38f 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3950,17 +3950,29 @@ bool QGraphicsItemPrivate::isProxyWidget() const */ void QGraphicsItem::update(const QRectF &rect) { - if ((rect.isEmpty() && !rect.isNull()) || d_ptr->discardUpdateRequest()) + if (rect.isEmpty() && !rect.isNull()) return; if (CacheMode(d_ptr->cacheMode) != NoCache) { QGraphicsItemCache *cache = d_ptr->extraItemCache(); + if (d_ptr->discardUpdateRequest(/* ignoreVisibleBit = */ false, + /* ignoreClipping = */ false, + /* ignoreDirtyBit = */ true)) { + return; + } + + // Invalidate cache. if (rect.isNull()) { cache->allExposed = true; cache->exposed.clear(); } else { cache->exposed.append(rect); } + // Only invalidate cache; item is already dirty. + if (d_ptr->dirty) + return; + } else if (d_ptr->discardUpdateRequest()) { + return; } // Effectively the same as updateHelper(rect); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 583a959..77b7948 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -214,6 +214,7 @@ private slots: void tabChangesFocus(); void tabChangesFocus_data(); void cacheMode(); + void updateCachedItemAfterMove(); // task specific tests below me void task141694_textItemEnsureVisible(); @@ -6073,5 +6074,46 @@ void tst_QGraphicsItem::cacheMode() QCOMPARE(testerChild2->repaints, 6); } +void tst_QGraphicsItem::updateCachedItemAfterMove() +{ + // A simple item that uses ItemCoordinateCache + EventTester *tester = new EventTester; + tester->setCacheMode(QGraphicsItem::ItemCoordinateCache); + + // Add to a scene, show in a view, ensure it's painted and reset its + // repaint counter. + QGraphicsScene scene; + scene.addItem(tester); + QGraphicsView view(&scene); + view.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&view); +#endif + QTest::qWait(125); + tester->repaints = 0; + + // Move the item, should not cause repaints + tester->setPos(10, 0); + QTest::qWait(125); + QCOMPARE(tester->repaints, 0); + + // Move then update, should cause one repaint + tester->setPos(20, 0); + tester->update(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); + + // Hiding the item doesn't cause a repaint + tester->hide(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); + + // Moving a hidden item doesn't cause a repaint + tester->setPos(30, 0); + tester->update(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); +} + QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" -- cgit v0.12 From 183cb6052c45d7c83e36c78da4e2c59c768209c7 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 16:05:42 +0200 Subject: BT: Revert "Fixes: Don't fill the pixmap because we will copy the cache into it." This reverts commit 0985805ab3c7de5b15c115a98afb15944b6d93b9. The Elastic Nodes example shows a black background for the cache pixmap if the call to fill isn't there. Alexis and I both agree that it makes no sense that we fill the pixmap with transparent pixels instead of just drawing with QPainter::CompositionMode_Source, but since this regression was introduced after 4.5.0 was released we must revert before we investigate further. Reviewed-by: Alexis --- src/gui/graphicsview/qgraphicsscene.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index b75c422..13f70e5 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4890,9 +4890,11 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte if (newCacheIndent != deviceData->cacheIndent || deviceRect.size() != pix.size()) { QPoint diff = newCacheIndent - deviceData->cacheIndent; QPixmap newPix(deviceRect.size()); + // ### Investigate removing this fill (test with Plasma and + // graphicssystem raster). + newPix.fill(Qt::transparent); if (!pix.isNull()) { QPainter newPixPainter(&newPix); - newPixPainter.setCompositionMode(QPainter::CompositionMode_Source); newPixPainter.drawPixmap(-diff, pix); newPixPainter.end(); } -- cgit v0.12 From e6f48d43307326e14146a9d3d184d784d6ee8a4c Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 21 Apr 2009 17:15:18 +0200 Subject: Fix Q3FileDialog bug that make impossible to rename twice a file The line edit (to rename the file) contains a guard to avoid double emit when the editing is finished but this flag was not set back properly so it was making the line edit not usable afterwards. Task-number: 251779 Reviewed-by: bnilsen --- src/qt3support/dialogs/q3filedialog.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp index 4874b6d..1ec0cfc 100644 --- a/src/qt3support/dialogs/q3filedialog.cpp +++ b/src/qt3support/dialogs/q3filedialog.cpp @@ -631,6 +631,7 @@ public: protected: void keyPressEvent(QKeyEvent *e); void focusOutEvent(QFocusEvent *e); + void emitDoRename(); signals: void cancelRename(); @@ -1143,16 +1144,20 @@ void QRenameEdit::keyPressEvent(QKeyEvent *e) void QRenameEdit::focusOutEvent(QFocusEvent *) { - if (!doRenameAlreadyEmitted) { - doRenameAlreadyEmitted = true; - emit doRename(); - } + if (!doRenameAlreadyEmitted) + emitDoRename(); } void QRenameEdit::slotReturnPressed() { + emitDoRename(); +} + +void QRenameEdit::emitDoRename() +{ doRenameAlreadyEmitted = true; emit doRename(); + doRenameAlreadyEmitted = false; } /************************************************************************ -- cgit v0.12 From 0b3ef41cdc8fef79d184e91d2542cc34f7dec5e1 Mon Sep 17 00:00:00 2001 From: kh Date: Tue, 21 Apr 2009 17:31:08 +0200 Subject: Fix incorrect year and version number in assistant docs. Should have been part of 8aa8997f18afb85cb17f5b2a875a004302df4c72 Sorry the HOWTO file was not entirely clear that the *.qch needs to be updated too. Task-number: 251421 Reviewed-by: kh --- tools/assistant/tools/assistant/assistant.qch | Bin 366592 -> 368640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/assistant/tools/assistant/assistant.qch b/tools/assistant/tools/assistant/assistant.qch index 550cd89..64763f7 100644 Binary files a/tools/assistant/tools/assistant/assistant.qch and b/tools/assistant/tools/assistant/assistant.qch differ -- cgit v0.12 From c36ff16f66ffd65839ba1e254ac557e491db6bf4 Mon Sep 17 00:00:00 2001 From: kh Date: Tue, 21 Apr 2009 18:00:04 +0200 Subject: correct the HowTo Task-number: none Reviewed-by: kh --- tools/assistant/tools/assistant/doc/HOWTO | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/assistant/tools/assistant/doc/HOWTO b/tools/assistant/tools/assistant/doc/HOWTO index 0e5b67b..a014347 100644 --- a/tools/assistant/tools/assistant/doc/HOWTO +++ b/tools/assistant/tools/assistant/doc/HOWTO @@ -1,9 +1,8 @@ How to build/ update a new assistant.qch for Assistant internal help -- in case of update: +- update: - open assistant.qdocconf, update year and qt version -- all other cases: - ..\..\..\..\qdoc3\debug\qdoc3.exe assistant.qdocconf will generate an folder html containing all required stuff @@ -12,6 +11,6 @@ How to build/ update a new assistant.qch for Assistant internal help - rebuild assistant -- to test you changes: +- to test your changes: - remove assistant.qch in your cache directory - restart assistant -- cgit v0.12 From 4f64ff3e8902529700336c7ad3aa9fccf5ca3e0b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Apr 2009 18:17:06 +0200 Subject: Add license headers for these two files, which are new in 4.6 and didn't have it --- .../auto/qprocess/testProcessEnvironment/main.cpp | 34 ++++++++++++++++++++++ tests/auto/selftests/xunit/tst_xunit.cpp | 34 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/tests/auto/qprocess/testProcessEnvironment/main.cpp b/tests/auto/qprocess/testProcessEnvironment/main.cpp index 098d13e..b5e75bc 100644 --- a/tests/auto/qprocess/testProcessEnvironment/main.cpp +++ b/tests/auto/qprocess/testProcessEnvironment/main.cpp @@ -3,6 +3,40 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** +** This file is part of the test suite 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** ****************************************************************************/ #include diff --git a/tests/auto/selftests/xunit/tst_xunit.cpp b/tests/auto/selftests/xunit/tst_xunit.cpp index b42582e..d0b585f 100644 --- a/tests/auto/selftests/xunit/tst_xunit.cpp +++ b/tests/auto/selftests/xunit/tst_xunit.cpp @@ -3,6 +3,40 @@ ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** +** This file is part of the test suite 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** ****************************************************************************/ #include -- cgit v0.12 From 161f51a1167ea95414b88195f61753047ca4a708 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 28 Jan 2009 10:36:53 -0800 Subject: Fix some keyboard issues Without this patch Alt-modifiers doesn't work. The extra mappings are needed for certain keys to work right on atleast one known DirectFB implementation/hardware combination. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbkeyboard.cpp | 130 ++++++++++++++++++--- 1 file changed, 112 insertions(+), 18 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp index cd19f69..368b9f9 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp @@ -173,6 +173,22 @@ void QDirectFBKeyboardHandlerPrivate::readKeyboardData() Qt::KeyboardModifiers modifiers = Qt::NoModifier; + // Not implemented: + // if (input.modifiers & DIMM_SUPER) + // if (input.modifiers & DIMM_HYPER) + + if (!(input.flags & DIEF_KEYSYMBOL) || + !(input.flags & DIEF_KEYID) || + !(input.type & (DIET_KEYPRESS|DIET_KEYRELEASE))) + { + static bool first = true; + if (first) { + qWarning("QDirectFBKeyboardHandler - Getting unexpected non-keyboard related events"); + first = false; + } + break; + } + if (input.flags & DIEF_MODIFIERS) { if (input.modifiers & DIMM_SHIFT) modifiers |= Qt::ShiftModifier; @@ -185,31 +201,15 @@ void QDirectFBKeyboardHandlerPrivate::readKeyboardData() if (input.modifiers & DIMM_META) modifiers |= Qt::MetaModifier; } - // Not implemented: - // if (input.modifiers & DIMM_SUPER) - // if (input.modifiers & DIMM_HYPER) - if ( !(input.flags & DIEF_KEYSYMBOL) || - !(input.flags & DIEF_KEYID) || - !(input.type & (DIET_KEYPRESS | DIET_KEYRELEASE)) ) - { - static int warningCount = 0; - if (!warningCount) { - qWarning("QDirectFBKeyboardHandler - Getting unexpected non-keyboard related events"); - warningCount = 100; - } - else - warningCount--; - break; - } - bool press = input.type & DIET_KEYPRESS; + const bool press = input.type & DIET_KEYPRESS; DFBInputDeviceKeySymbol symbol = input.key_symbol; int unicode = -1; int keycode = 0; keycode = keymap()->value(symbol); - if (keycode == 0 && DFB_KEY_TYPE(symbol) == DIKT_UNICODE) + if (DFB_KEY_TYPE(symbol) == DIKT_UNICODE) unicode = symbol; if (unicode != -1 || keycode != 0) { @@ -314,6 +314,100 @@ KeyMap::KeyMap() insert(DIKS_DEAD_SEMIVOICED_SOUND , Qt::Key_Dead_Semivoiced_Sound); insert(DIKS_DEAD_TILDE , Qt::Key_Dead_Tilde); insert(DIKS_DEAD_VOICED_SOUND , Qt::Key_Dead_Voiced_Sound); + insert(DIKS_SPACE , Qt::Key_Space); + insert(DIKS_EXCLAMATION_MARK , Qt::Key_Exclam); + insert(DIKS_QUOTATION , Qt::Key_QuoteDbl); + insert(DIKS_NUMBER_SIGN , Qt::Key_NumberSign); + insert(DIKS_DOLLAR_SIGN , Qt::Key_Dollar); + insert(DIKS_PERCENT_SIGN , Qt::Key_Percent); + insert(DIKS_AMPERSAND , Qt::Key_Ampersand); + insert(DIKS_APOSTROPHE , Qt::Key_Apostrophe); + insert(DIKS_PARENTHESIS_LEFT , Qt::Key_ParenLeft); + insert(DIKS_PARENTHESIS_RIGHT , Qt::Key_ParenRight); + insert(DIKS_ASTERISK , Qt::Key_Asterisk); + insert(DIKS_PLUS_SIGN , Qt::Key_Plus); + insert(DIKS_COMMA , Qt::Key_Comma); + insert(DIKS_MINUS_SIGN , Qt::Key_Minus); + insert(DIKS_PERIOD , Qt::Key_Period); + insert(DIKS_SLASH , Qt::Key_Slash); + insert(DIKS_0 , Qt::Key_0); + insert(DIKS_1 , Qt::Key_1); + insert(DIKS_2 , Qt::Key_2); + insert(DIKS_3 , Qt::Key_3); + insert(DIKS_4 , Qt::Key_4); + insert(DIKS_5 , Qt::Key_5); + insert(DIKS_6 , Qt::Key_6); + insert(DIKS_7 , Qt::Key_7); + insert(DIKS_8 , Qt::Key_8); + insert(DIKS_9 , Qt::Key_9); + insert(DIKS_COLON , Qt::Key_Colon); + insert(DIKS_SEMICOLON , Qt::Key_Semicolon); + insert(DIKS_LESS_THAN_SIGN , Qt::Key_Less); + insert(DIKS_EQUALS_SIGN , Qt::Key_Equal); + insert(DIKS_GREATER_THAN_SIGN , Qt::Key_Greater); + insert(DIKS_QUESTION_MARK , Qt::Key_Question); + insert(DIKS_AT , Qt::Key_At); + insert(DIKS_CAPITAL_A , Qt::Key_A); + insert(DIKS_CAPITAL_B , Qt::Key_B); + insert(DIKS_CAPITAL_C , Qt::Key_C); + insert(DIKS_CAPITAL_D , Qt::Key_D); + insert(DIKS_CAPITAL_E , Qt::Key_E); + insert(DIKS_CAPITAL_F , Qt::Key_F); + insert(DIKS_CAPITAL_G , Qt::Key_G); + insert(DIKS_CAPITAL_H , Qt::Key_H); + insert(DIKS_CAPITAL_I , Qt::Key_I); + insert(DIKS_CAPITAL_J , Qt::Key_J); + insert(DIKS_CAPITAL_K , Qt::Key_K); + insert(DIKS_CAPITAL_L , Qt::Key_L); + insert(DIKS_CAPITAL_M , Qt::Key_M); + insert(DIKS_CAPITAL_N , Qt::Key_N); + insert(DIKS_CAPITAL_O , Qt::Key_O); + insert(DIKS_CAPITAL_P , Qt::Key_P); + insert(DIKS_CAPITAL_Q , Qt::Key_Q); + insert(DIKS_CAPITAL_R , Qt::Key_R); + insert(DIKS_CAPITAL_S , Qt::Key_S); + insert(DIKS_CAPITAL_T , Qt::Key_T); + insert(DIKS_CAPITAL_U , Qt::Key_U); + insert(DIKS_CAPITAL_V , Qt::Key_V); + insert(DIKS_CAPITAL_W , Qt::Key_W); + insert(DIKS_CAPITAL_X , Qt::Key_X); + insert(DIKS_CAPITAL_Y , Qt::Key_Y); + insert(DIKS_CAPITAL_Z , Qt::Key_Z); + insert(DIKS_SQUARE_BRACKET_LEFT , Qt::Key_BracketLeft); + insert(DIKS_BACKSLASH , Qt::Key_Backslash); + insert(DIKS_SQUARE_BRACKET_RIGHT , Qt::Key_BracketRight); + insert(DIKS_CIRCUMFLEX_ACCENT , Qt::Key_AsciiCircum); + insert(DIKS_UNDERSCORE , Qt::Key_Underscore); + insert(DIKS_SMALL_A , Qt::Key_A); + insert(DIKS_SMALL_B , Qt::Key_B); + insert(DIKS_SMALL_C , Qt::Key_C); + insert(DIKS_SMALL_D , Qt::Key_D); + insert(DIKS_SMALL_E , Qt::Key_E); + insert(DIKS_SMALL_F , Qt::Key_F); + insert(DIKS_SMALL_G , Qt::Key_G); + insert(DIKS_SMALL_H , Qt::Key_H); + insert(DIKS_SMALL_I , Qt::Key_I); + insert(DIKS_SMALL_J , Qt::Key_J); + insert(DIKS_SMALL_K , Qt::Key_K); + insert(DIKS_SMALL_L , Qt::Key_L); + insert(DIKS_SMALL_M , Qt::Key_M); + insert(DIKS_SMALL_N , Qt::Key_N); + insert(DIKS_SMALL_O , Qt::Key_O); + insert(DIKS_SMALL_P , Qt::Key_P); + insert(DIKS_SMALL_Q , Qt::Key_Q); + insert(DIKS_SMALL_R , Qt::Key_R); + insert(DIKS_SMALL_S , Qt::Key_S); + insert(DIKS_SMALL_T , Qt::Key_T); + insert(DIKS_SMALL_U , Qt::Key_U); + insert(DIKS_SMALL_V , Qt::Key_V); + insert(DIKS_SMALL_W , Qt::Key_W); + insert(DIKS_SMALL_X , Qt::Key_X); + insert(DIKS_SMALL_Y , Qt::Key_Y); + insert(DIKS_SMALL_Z , Qt::Key_Z); + insert(DIKS_CURLY_BRACKET_LEFT , Qt::Key_BraceLeft); + insert(DIKS_VERTICAL_BAR , Qt::Key_Bar); + insert(DIKS_CURLY_BRACKET_RIGHT , Qt::Key_BraceRight); + insert(DIKS_TILDE , Qt::Key_AsciiTilde); } #include "qdirectfbkeyboard.moc" -- cgit v0.12 From 0ded26da02d0786b08e2bf52a7e68abf7c4c8701 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 22 Apr 2009 08:56:00 +1000 Subject: Fixes unit tests always giving 0 exit code when Qt is configured with `-developer-build'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was an undocumented hack to make it easier for our autotest scripts to detect crashes in unit tests. Going forward, it should not be required. Reviewed-by: Shane Bradley Acked-by: Jesper Thomschütz --- src/testlib/qtestcase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index f17d95d..b5200dc 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1481,7 +1481,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) } #endif -#if defined(QTEST_NOEXITCODE) || (defined(QT_BUILD_INTERNAL) && !defined(QTEST_FORCE_EXITCODE)) +#if defined(QTEST_NOEXITCODE) return 0; #else -- cgit v0.12 From 8035636cfecab04a2ad89709ebfb59f8ccd7fd22 Mon Sep 17 00:00:00 2001 From: kh Date: Tue, 21 Apr 2009 12:49:50 +0200 Subject: Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1 should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes (cherry picked from commit 92f07dcd690d596e2d6cc32211c142cd0e25fd97) --- tools/qdoc3/test/assistant.qdocconf | 4 ++-- tools/qdoc3/test/designer.qdocconf | 4 ++-- tools/qdoc3/test/linguist.qdocconf | 4 ++-- tools/qdoc3/test/qmake.qdocconf | 4 ++-- tools/qdoc3/test/qt-build-docs.qdocconf | 12 ++++++------ tools/qdoc3/test/qt.qdocconf | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 7bb6bbf..cd5a877 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.450 +qhp.Assistant.namespace = com.trolltech.assistant.451 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Assistant.filterAttributes = qt 4.5.0 tools assistant +qhp.Assistant.filterAttributes = qt 4.5.1 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 26636cd..bfafed0 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.450 +qhp.Designer.namespace = com.trolltech.designer.451 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Designer.filterAttributes = qt 4.5.0 tools designer +qhp.Designer.filterAttributes = qt 4.5.1 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 5e889a8..d917100 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.450 +qhp.Linguist.namespace = com.trolltech.linguist.451 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Linguist.filterAttributes = qt 4.5.0 tools linguist +qhp.Linguist.filterAttributes = qt 4.5.1 tools linguist qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index c357cfb..d236f81 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.450 +qhp.qmake.namespace = com.trolltech.qmake.451 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.qmake.filterAttributes = qt 4.5.0 tools qmake +qhp.qmake.filterAttributes = qt 4.5.1 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 25cdc5a..e6edb29 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -20,10 +20,10 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.450 +qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML @@ -33,11 +33,11 @@ qhp.Qt.extraFiles = classic.css \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.0 +qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 4d401a4..aa1088e 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -25,7 +25,7 @@ qhp.Qt.file = qt.qhp qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML @@ -35,11 +35,11 @@ qhp.Qt.extraFiles = classic.css \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.0 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.0 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.0 +qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.1 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes -- cgit v0.12 From 727ca7a3b6a63b7b76ffe03c4eea72fe37ba2def Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 13:38:30 +0200 Subject: BT: Fix lock-up & crash in the Elastic Nodes example Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao (cherry picked from commit 6a3735a47de8a9851e7795cf023d95d81867260d) --- examples/graphicsview/elasticnodes/edge.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/graphicsview/elasticnodes/edge.cpp b/examples/graphicsview/elasticnodes/edge.cpp index b43b134..81ae4da 100644 --- a/examples/graphicsview/elasticnodes/edge.cpp +++ b/examples/graphicsview/elasticnodes/edge.cpp @@ -93,11 +93,16 @@ void Edge::adjust() QLineF line(mapFromItem(source, 0, 0), mapFromItem(dest, 0, 0)); qreal length = line.length(); - QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length); prepareGeometryChange(); - sourcePoint = line.p1() + edgeOffset; - destPoint = line.p2() - edgeOffset; + + if (!qFuzzyCompare(length, qreal(0.0))) { + QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length); + sourcePoint = line.p1() + edgeOffset; + destPoint = line.p2() - edgeOffset; + } else { + sourcePoint = destPoint = line.p1(); + } } QRectF Edge::boundingRect() const -- cgit v0.12 From c585c0906e7ffe119231efb77f3681a25ffdba44 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 21 Apr 2009 15:25:51 +0200 Subject: We don't need to call two times itemChange when an item is deleted. Previously we were calling two times itemChange on the parent to give QGraphicsItem::ItemChildAddedChange. We don't need that. One is enough. BT : yes Task-number: BT Reviewed-by: Andreas (cherry picked from commit 95b7c50e503dd4743e22c35f341aa31105ea7d73) --- src/gui/graphicsview/qgraphicsscene.cpp | 6 ----- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 35 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index e946f0f..5cd69b3 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -697,12 +697,6 @@ void QGraphicsScenePrivate::_q_removeItemLater(QGraphicsItem *item) { Q_Q(QGraphicsScene); - if (QGraphicsItem *parent = item->d_func()->parent) { - parent->itemChange(QGraphicsItem::ItemChildRemovedChange, - qVariantFromValue(item)); - parent->d_func()->children.removeAll(item); - } - // Clear focus on the item to remove any reference in the focusWidget // chain. item->clearFocus(); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index ef84f50..2d221f9 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -3658,6 +3658,8 @@ void tst_QGraphicsItem::defaultItemTest_QGraphicsEllipseItem() class ItemChangeTester : public QGraphicsRectItem { public: + ItemChangeTester(){} + ItemChangeTester(QGraphicsItem *parent) : QGraphicsRectItem(parent) {} QVariant itemChangeReturnValue; QGraphicsScene *itemSceneChangeTargetScene; @@ -3932,6 +3934,39 @@ void tst_QGraphicsItem::itemChange() QCOMPARE(tester.changes.size(), ++changeCount); QCOMPARE(tester.changes.last(), QGraphicsItem::ItemChildRemovedChange); QCOMPARE(qVariantValue(tester.values.last()), (QGraphicsItem *)&testerHelper); + + // ItemChildRemovedChange 1 + ItemChangeTester *test = new ItemChangeTester; + test->itemSceneChangeTargetScene = 0; + int count = 0; + QGraphicsScene *scene = new QGraphicsScene; + scene->addItem(test); + count = test->changes.size(); + //We test here the fact that when a child is deleted the parent receive only one ItemChildRemovedChange + QGraphicsRectItem *child = new QGraphicsRectItem(test); + //We received ItemChildAddedChange + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildAddedChange); + delete child; + child = 0; + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildRemovedChange); + + ItemChangeTester *childTester = new ItemChangeTester(test); + //Changes contains all sceneHasChanged and so on, we don't want to test that + int childCount = childTester->changes.size(); + //We received ItemChildAddedChange + QCOMPARE(test->changes.size(), ++count); + child = new QGraphicsRectItem(childTester); + //We received ItemChildAddedChange + QCOMPARE(childTester->changes.size(), ++childCount); + QCOMPARE(childTester->changes.last(), QGraphicsItem::ItemChildAddedChange); + //Delete the child of the top level with all its children + delete childTester; + //Only one removal + QCOMPARE(test->changes.size(), ++count); + QCOMPARE(test->changes.last(), QGraphicsItem::ItemChildRemovedChange); + delete scene; } { // ItemChildRemovedChange 2 -- cgit v0.12 From 830751ef09d7605ce3152ffe507c98aa92ca47a2 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Tue, 21 Apr 2009 15:50:18 +0200 Subject: BT: Make things work on 10.3 The #ifdef was typed wrong. Reviewed-by: Prasanth Ullattil (cherry picked from commit 924feac07729b680fbd337e3773c747b64e1da61) --- src/gui/kernel/qt_mac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/kernel/qt_mac.cpp index 801c532..6acd0da 100644 --- a/src/gui/kernel/qt_mac.cpp +++ b/src/gui/kernel/qt_mac.cpp @@ -131,7 +131,7 @@ QColor qcolorForTheme(ThemeBrush brush) QColor qcolorForThemeTextColor(ThemeTextColor themeColor) { -#ifdef QT_OS_MAC32 +#ifdef Q_OS_MAC32 RGBColor c; GetThemeTextColor(themeColor, 32, true, &c); QColor color = QColor(c.red / 265, c.green / 256, c.blue / 256); -- cgit v0.12 From 386eee20daaf77fd3b0a2c4c33de00083d538c65 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 15:57:05 +0200 Subject: BT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck) This fixes a bug in 4.5.0 where cached items that call update() after they have been moved or transformed failed to get a call to paint(), so the last cache image was used to draw. The easiest way to reproduce this bug is in the Elastic Nodes example. If you press, wait, then release, the nodes will consistently move to sunken state, then back to normal state. But if you click quickly while moving the mouse, the nodes will stay sunken. The bug was that the item was marked as dirty as a result of being moved, and when the mouse button was released, the node item's call to update() was discarded, as the item was "already dirty". The fix is to allow invalidation of the cache even if the item is marked as dirty. Reviewed-by: bnilsen (cherry picked from commit 08feb22f9a924ce120da8b5c6e1669d2a630dd54) --- src/gui/graphicsview/qgraphicsitem.cpp | 14 ++++++++- tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 42 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index de4332c..d02052d 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3950,17 +3950,29 @@ bool QGraphicsItemPrivate::isProxyWidget() const */ void QGraphicsItem::update(const QRectF &rect) { - if ((rect.isEmpty() && !rect.isNull()) || d_ptr->discardUpdateRequest()) + if (rect.isEmpty() && !rect.isNull()) return; if (CacheMode(d_ptr->cacheMode) != NoCache) { QGraphicsItemCache *cache = d_ptr->extraItemCache(); + if (d_ptr->discardUpdateRequest(/* ignoreVisibleBit = */ false, + /* ignoreClipping = */ false, + /* ignoreDirtyBit = */ true)) { + return; + } + + // Invalidate cache. if (rect.isNull()) { cache->allExposed = true; cache->exposed.clear(); } else { cache->exposed.append(rect); } + // Only invalidate cache; item is already dirty. + if (d_ptr->dirty) + return; + } else if (d_ptr->discardUpdateRequest()) { + return; } // Effectively the same as updateHelper(rect); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 2d221f9..0f7c827 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -218,6 +218,7 @@ private slots: void tabChangesFocus(); void tabChangesFocus_data(); void cacheMode(); + void updateCachedItemAfterMove(); // task specific tests below me void task141694_textItemEnsureVisible(); @@ -6077,6 +6078,47 @@ void tst_QGraphicsItem::cacheMode() QCOMPARE(testerChild2->repaints, 6); } +void tst_QGraphicsItem::updateCachedItemAfterMove() +{ + // A simple item that uses ItemCoordinateCache + EventTester *tester = new EventTester; + tester->setCacheMode(QGraphicsItem::ItemCoordinateCache); + + // Add to a scene, show in a view, ensure it's painted and reset its + // repaint counter. + QGraphicsScene scene; + scene.addItem(tester); + QGraphicsView view(&scene); + view.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&view); +#endif + QTest::qWait(125); + tester->repaints = 0; + + // Move the item, should not cause repaints + tester->setPos(10, 0); + QTest::qWait(125); + QCOMPARE(tester->repaints, 0); + + // Move then update, should cause one repaint + tester->setPos(20, 0); + tester->update(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); + + // Hiding the item doesn't cause a repaint + tester->hide(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); + + // Moving a hidden item doesn't cause a repaint + tester->setPos(30, 0); + tester->update(); + QTest::qWait(125); + QCOMPARE(tester->repaints, 1); +} + QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" #endif -- cgit v0.12 From a8b6d332a6639b5dd2f3ac938251b12b7e4ad406 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Tue, 21 Apr 2009 16:05:42 +0200 Subject: BT: Revert "Fixes: Don't fill the pixmap because we will copy the cache into it." This reverts commit 0985805ab3c7de5b15c115a98afb15944b6d93b9. The Elastic Nodes example shows a black background for the cache pixmap if the call to fill isn't there. Alexis and I both agree that it makes no sense that we fill the pixmap with transparent pixels instead of just drawing with QPainter::CompositionMode_Source, but since this regression was introduced after 4.5.0 was released we must revert before we investigate further. Reviewed-by: Alexis (cherry picked from commit 183cb6052c45d7c83e36c78da4e2c59c768209c7) --- src/gui/graphicsview/qgraphicsscene.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 5cd69b3..0012d98 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4890,9 +4890,11 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte if (newCacheIndent != deviceData->cacheIndent || deviceRect.size() != pix.size()) { QPoint diff = newCacheIndent - deviceData->cacheIndent; QPixmap newPix(deviceRect.size()); + // ### Investigate removing this fill (test with Plasma and + // graphicssystem raster). + newPix.fill(Qt::transparent); if (!pix.isNull()) { QPainter newPixPainter(&newPix); - newPixPainter.setCompositionMode(QPainter::CompositionMode_Source); newPixPainter.drawPixmap(-diff, pix); newPixPainter.end(); } -- cgit v0.12 From 8cfb0638c650b906fc0ddede4e5c1c391e81307c Mon Sep 17 00:00:00 2001 From: kh Date: Tue, 21 Apr 2009 17:31:08 +0200 Subject: Fix incorrect year and version number in assistant docs. Should have been part of 8aa8997f18afb85cb17f5b2a875a004302df4c72 Sorry the HOWTO file was not entirely clear that the *.qch needs to be updated too. Task-number: 251421 Reviewed-by: kh (cherry picked from commit 0b3ef41cdc8fef79d184e91d2542cc34f7dec5e1) --- tools/assistant/tools/assistant/assistant.qch | Bin 366592 -> 368640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/assistant/tools/assistant/assistant.qch b/tools/assistant/tools/assistant/assistant.qch index 550cd89..64763f7 100644 Binary files a/tools/assistant/tools/assistant/assistant.qch and b/tools/assistant/tools/assistant/assistant.qch differ -- cgit v0.12 From dade8b3a709d6889e049f8a20de5378e7bb28beb Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 22 Apr 2009 08:27:59 +0200 Subject: Fix the code snippet for executing a test, it should be CONFIG not QT Task-number: 251848 Reviewed-by: TrustMe --- doc/src/snippets/code/doc_src_qtestlib.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index ff52b2f..494fa10 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -61,7 +61,7 @@ void TestQString::toUpper() //! [9] -/myTestDirectory$ qmake -project "QT += testlib" +/myTestDirectory$ qmake -project "CONFIG += testlib" /myTestDirectory$ qmake /myTestDirectory$ make //! [9] -- cgit v0.12 From e5fa2cf55c8370ca58f82ba1ef37a54649bd42c8 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 22 Apr 2009 08:32:21 +0200 Subject: Fix my previous commit since I missed the q out of qtestlib Task-number: 251848 Reviewed-by: TrustMe --- doc/src/snippets/code/doc_src_qtestlib.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index 494fa10..a0e4944 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -61,7 +61,7 @@ void TestQString::toUpper() //! [9] -/myTestDirectory$ qmake -project "CONFIG += testlib" +/myTestDirectory$ qmake -project "CONFIG += qtestlib" /myTestDirectory$ qmake /myTestDirectory$ make //! [9] -- cgit v0.12 From 9792ddf1e5d3f5e6713765b53ea031fa4e6eff4e Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 22 Apr 2009 09:30:00 +0200 Subject: Fix double entries in the sidebar of QFileDialog The problem is QUrl == operator is case sensitive. On Windows we don't want double entries for C:\dev or c:\dev so i convert the url in lower case and compare them (on Windows only) to avoid duplicate entries. Task-number:226483 Reviewed-by:jasplin --- src/gui/dialogs/qsidebar.cpp | 4 ++++ tests/auto/qsidebar/tst_qsidebar.cpp | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp index bfdb37e..26108d7 100644 --- a/src/gui/dialogs/qsidebar.cpp +++ b/src/gui/dialogs/qsidebar.cpp @@ -248,7 +248,11 @@ void QUrlModel::addUrls(const QList &list, int row, bool move) if (!url.isValid() || url.scheme() != QLatin1String("file")) continue; for (int j = 0; move && j < rowCount(); ++j) { +#if defined(Q_OS_WIN) + if (index(j, 0).data(UrlRole).toUrl().toLocalFile().toLower() == url.toLocalFile().toLower()) { +#else if (index(j, 0).data(UrlRole) == url) { +#endif removeRow(j); if (j <= row) row--; diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp index 7a262e6..705e222 100644 --- a/tests/auto/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/qsidebar/tst_qsidebar.cpp @@ -176,6 +176,32 @@ void tst_QSidebar::addUrls() qsidebar.addUrls(urls, -1); qsidebar.addUrls(moreUrls, -1); QCOMPARE(qsidebar.urls()[0], urls[0]); + + QList doubleUrls; + //tow exact same paths, we have only one entry + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); + qsidebar.setUrls(emptyUrls); + qsidebar.addUrls(doubleUrls, 1); + QCOMPARE(qsidebar.urls().size(), 1); + +#if defined(Q_OS_WIN) + //Windows is case insensitive so no duplicate entries in that case + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath().toUpper()); + qsidebar.setUrls(emptyUrls); + qsidebar.addUrls(doubleUrls, 1); + QCOMPARE(qsidebar.urls().size(), 1); +#else + //Two different paths we should have two entries + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath()); + doubleUrls << QUrl::fromLocalFile(QDir::home().absolutePath().toUpper()); + qsidebar.setUrls(emptyUrls); + qsidebar.addUrls(doubleUrls, 1); + QCOMPARE(qsidebar.urls().size(), 2); +#endif + + } void tst_QSidebar::goToUrl() -- cgit v0.12 From a9d0e4f830687b33c3a93cce2a3b8d77cc3546cc Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 22 Apr 2009 10:47:11 +0200 Subject: Compile fix for static builds on Windows for QtOpenGL apps. Reviewed-by: Thiago --- src/opengl/qwindowsurface_gl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 837ccf2..b41adf9 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE // QGLGraphicsSystem // #ifdef Q_WS_WIN -Q_GUI_EXPORT bool qt_win_owndc_required; +extern Q_GUI_EXPORT bool qt_win_owndc_required; #endif QGLGraphicsSystem::QGLGraphicsSystem() : QGraphicsSystem() -- cgit v0.12 From e238e7b06f4c90c4b36621ade07329264fa7bed3 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 22 Apr 2009 10:18:26 +0200 Subject: Fixes: Wacom tool-id lookup expects hardcoded wacom device identifiers from xorg.conf Details: use device name previously found using x-atoms instead of a hardcoded one. RevBy: Thiago Macieira Task: 210132 (followup) --- src/gui/kernel/qapplication_x11.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 366e576..4814f1a 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1583,6 +1583,7 @@ static PtrWacomConfigOpenDevice ptrWacomConfigOpenDevice = 0; static PtrWacomConfigGetRawParam ptrWacomConfigGetRawParam = 0; static PtrWacomConfigCloseDevice ptrWacomConfigCloseDevice = 0; static PtrWacomConfigTerm ptrWacomConfigTerm = 0; +Q_GLOBAL_STATIC(QByteArray, wacomDeviceName) #endif #endif @@ -2377,6 +2378,8 @@ void qt_init(QApplicationPrivate *priv, int, #else if (devs->type == ATOM(XWacomStylus)) { deviceType = QTabletEvent::Stylus; + if (wacomDeviceName()->isEmpty()) + wacomDeviceName()->append(devs->name); gotStylus = true; } else if (devs->type == ATOM(XWacomEraser)) { deviceType = QTabletEvent::XFreeEraser; @@ -4511,8 +4514,7 @@ void fetchWacomToolId(int &deviceType, qint64 &serialId) WACOMCONFIG *config = ptrWacomConfigInit(X11->display, 0); if (config == 0) return; - const char *name = "stylus"; // TODO get this from the X config instead (users may have called it differently) - WACOMDEVICE *device = ptrWacomConfigOpenDevice (config, name); + WACOMDEVICE *device = ptrWacomConfigOpenDevice (config, wacomDeviceName()->constData()); if (device == 0) return; unsigned keys[1]; -- cgit v0.12 From 5cba8ea7d6b793ba0012dfc387e6859ace7c664a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Tue, 21 Apr 2009 16:59:55 +0200 Subject: Fix more NaNs in Elastic Nodes example Don't try to draw zero-length lines. Don't draw lines if nodes are superimposed. Reviewed-by: Andreas --- examples/graphicsview/elasticnodes/edge.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/graphicsview/elasticnodes/edge.cpp b/examples/graphicsview/elasticnodes/edge.cpp index e32a35a..eb02143 100644 --- a/examples/graphicsview/elasticnodes/edge.cpp +++ b/examples/graphicsview/elasticnodes/edge.cpp @@ -96,7 +96,7 @@ void Edge::adjust() prepareGeometryChange(); - if (!qFuzzyCompare(length, qreal(0.0))) { + if (length > qreal(20.)) { QPointF edgeOffset((line.dx() * 10) / length, (line.dy() * 10) / length); sourcePoint = line.p1() + edgeOffset; destPoint = line.p2() - edgeOffset; @@ -124,12 +124,15 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) if (!source || !dest) return; - // Draw the line itself QLineF line(sourcePoint, destPoint); + if (qFuzzyCompare(line.length(), qreal(0.))) + return; + + // Draw the line itself painter->setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); painter->drawLine(line); - // Draw the arrows if there's enough room + // Draw the arrows double angle = ::acos(line.dx() / line.length()); if (line.dy() >= 0) angle = TwoPi - angle; -- cgit v0.12 From e8468f21d24b85114a8841413f9328a17f7bc54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 22 Apr 2009 12:05:08 +0200 Subject: Fix crash in drawPixmap when painting on a null pixmap We need to check if the engine is null before we do the thread test. Reviewed-by: Thiago --- src/gui/painting/qpainter.cpp | 6 +++--- tests/auto/qpainter/tst_qpainter.cpp | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ffb273e..65d87fa 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5167,6 +5167,9 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) Q_D(QPainter); + if (!d->engine) + return; + #ifndef QT_NO_DEBUG qt_painter_thread_test(d->device->devType(), "drawPixmap()"); #endif @@ -5176,9 +5179,6 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) return; } - if (!d->engine) - return; - qreal x = p.x(); qreal y = p.y(); diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index 8b43f9b..c81bf67 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -3792,8 +3792,11 @@ void tst_QPainter::imageBlending() void tst_QPainter::paintOnNullPixmap() { + QPixmap pix(16, 16); + QPixmap textPixmap; QPainter p(&textPixmap); + p.drawPixmap(10, 10, pix); p.end(); QPixmap textPixmap2(16,16); -- cgit v0.12 From 65398953e6ebaab177046b9516f15920b1f9d1a4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 22 Apr 2009 12:48:58 +0200 Subject: Remove git merge conflict markers Reviewed-by: Trust me --- tools/qdoc3/test/linguist.qdocconf | 1 - tools/qdoc3/test/qmake.qdocconf | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 9a9c5b0..f4ee211 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -18,7 +18,6 @@ qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png qhp.Linguist.filterAttributes = qt 4.6.0 tools linguist ->>>>>>> 4.5:tools/qdoc3/test/linguist.qdocconf qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 62cd4ff..642e3be 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -18,7 +18,6 @@ qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png qhp.qmake.filterAttributes = qt 4.6.0 tools qmake ->>>>>>> 4.5:tools/qdoc3/test/qmake.qdocconf qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual -- cgit v0.12 From a8d14ae567c7e847c6dbba644c36fbc6c6afc468 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 2 Apr 2009 09:31:50 +0200 Subject: Work on getting unified toolbars to look more native. Basically we try to get the toggled look correct and we've shrunk the size of the toolbar by a good 10 pixels. We still look a bit "off" for toggled on Tiger, but frankely that look is a bit odd. We are a bit taller than the pure Cocoa toolbar (2 px), but given that we are embedding our QToolbar, that's probably the best we can do. All-in-all, it looks much better. --- src/gui/kernel/kernel.pri | 2 +- src/gui/mac/images/leopard-unified-toolbar-on.png | Bin 0 -> 356 bytes src/gui/mac/maccursors.qrc | 9 --- src/gui/mac/macresources.qrc | 12 ++++ src/gui/styles/qmacstyle_mac.mm | 50 +++++++++++----- src/gui/styles/qstylehelper.cpp | 70 ++++++++++++++++++++-- src/gui/styles/qstylehelper_p.h | 3 + src/gui/widgets/qmainwindowlayout_mac.mm | 4 +- 8 files changed, 117 insertions(+), 33 deletions(-) create mode 100644 src/gui/mac/images/leopard-unified-toolbar-on.png delete mode 100644 src/gui/mac/maccursors.qrc create mode 100644 src/gui/mac/macresources.qrc diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index cb2b014..a1b982a 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -193,7 +193,7 @@ embedded { MENU_NIB.path = Resources MENU_NIB.version = Versions QMAKE_BUNDLE_DATA += MENU_NIB - RESOURCES += mac/maccursors.qrc + RESOURCES += mac/macresources.qrc LIBS += -framework AppKit } diff --git a/src/gui/mac/images/leopard-unified-toolbar-on.png b/src/gui/mac/images/leopard-unified-toolbar-on.png new file mode 100644 index 0000000..6716597 Binary files /dev/null and b/src/gui/mac/images/leopard-unified-toolbar-on.png differ diff --git a/src/gui/mac/maccursors.qrc b/src/gui/mac/maccursors.qrc deleted file mode 100644 index d80a63b..0000000 --- a/src/gui/mac/maccursors.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - -images/copyarrowcursor.png -images/forbiddencursor.png -images/spincursor.png -images/waitcursor.png -images/pluscursor.png - - diff --git a/src/gui/mac/macresources.qrc b/src/gui/mac/macresources.qrc new file mode 100644 index 0000000..9696002 --- /dev/null +++ b/src/gui/mac/macresources.qrc @@ -0,0 +1,12 @@ + + +images/copyarrowcursor.png +images/forbiddencursor.png +images/spincursor.png +images/waitcursor.png +images/pluscursor.png + + +images/leopard-unified-toolbar-on.png + + diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 5d08c58..e32c5e2 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -2649,6 +2649,9 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW case PM_MenuHMargin: ret = 0; break; + case PM_ToolBarFrameWidth: + ret = 0; + break; default: ret = QWindowsStyle::pixelMetric(metric, opt, widget); break; @@ -3679,8 +3682,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) { needText = true; if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { - pr.setHeight(pixmap.size().height() + 6); - cr.adjust(0, pr.bottom(), 0, -3); + pr.setHeight(pixmap.size().height()); + cr.adjust(0, pr.bottom() + 1, 0, 1); alignment |= Qt::AlignCenter; } else { pr.setWidth(pixmap.width() + 8); @@ -3688,7 +3691,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter alignment |= Qt::AlignLeft | Qt::AlignVCenter; } } - if (down) { + if (opt->state & State_Sunken) { pr.translate(shiftX, shiftY); pixmap = darkenPixmap(pixmap); } @@ -3718,7 +3721,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } drawItemText(p, cr, alignment, pal, tb->state & State_Enabled, tb->text, role); - if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5 && down) { + if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5 && + (tb->state & State_Sunken)) { // Draw a "drop shadow" in earlier versions. drawItemText(p, cr.adjusted(0, 1, 0, 1), alignment, tb->palette, tb->state & State_Enabled, tb->text); @@ -4544,9 +4548,10 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter case CE_ToolBar: { // For unified tool bars, draw nothing. if (w) { - if (QMainWindow * mainWindow = qobject_cast(w->window())) + if (QMainWindow * mainWindow = qobject_cast(w->window())) { if (mainWindow->unifiedTitleAndToolBarOnMac()) break; + } } // draw background gradient @@ -5270,6 +5275,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex if (const QStyleOptionToolButton *tb = qstyleoption_cast(opt)) { if (widget && qobject_cast(widget->parentWidget())) { +// p->fillRect(tb->rect, QColor(155, 0, 155, 155)); if (tb->subControls & SC_ToolButtonMenu) { QStyleOption arrowOpt(0); arrowOpt.rect = subControlRect(cc, tb, SC_ToolButtonMenu, widget); @@ -5282,16 +5288,22 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex drawToolbarButtonArrow(tb->rect, tds, cg); } if (tb->state & State_On) { - QPen oldPen = p->pen(); - p->setPen(QColor(0, 0, 0, 0x3a)); - p->fillRect(tb->rect.adjusted(1, 1, -1, -1), QColor(0, 0, 0, 0x12)); - p->drawLine(tb->rect.left() + 1, tb->rect.top(), - tb->rect.right() - 1, tb->rect.top()); - p->drawLine(tb->rect.left() + 1, tb->rect.bottom(), - tb->rect.right() - 1, tb->rect.bottom()); - p->drawLine(tb->rect.topLeft(), tb->rect.bottomLeft()); - p->drawLine(tb->rect.topRight(), tb->rect.bottomRight()); - p->setPen(oldPen); + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) { + static QPixmap pm(QLatin1String(":/trolltech/mac/style/images/leopard-unified-toolbar-on.png")); + p->setRenderHint(QPainter::SmoothPixmapTransform); + QStyleHelper::drawBorderPixmap(pm, p, tb->rect, 2, 2, 2, 2); + } else { + QPen oldPen = p->pen(); + p->setPen(QColor(0, 0, 0, 0x3a)); + p->fillRect(tb->rect.adjusted(1, 1, -1, -1), QColor(0, 0, 0, 0x12)); + p->drawLine(tb->rect.left() + 1, tb->rect.top(), + tb->rect.right() - 1, tb->rect.top()); + p->drawLine(tb->rect.left() + 1, tb->rect.bottom(), + tb->rect.right() - 1, tb->rect.bottom()); + p->drawLine(tb->rect.topLeft(), tb->rect.bottomLeft()); + p->drawLine(tb->rect.topRight(), tb->rect.bottomRight()); + p->setPen(oldPen); + } } drawControl(CE_ToolButtonLabel, opt, p, widget); } else { @@ -6009,6 +6021,14 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, } break; case CT_ToolButton: + if (widget && qobject_cast(widget->parentWidget())) { + sz.rwidth() += 4; + if (sz.height() <= 32) { + // Workaround strange HIToolBar bug when getting constraints. + sz.rheight() += 1; + } + return sz; + } sz.rwidth() += 10; sz.rheight() += 10; return sz; diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp index 3320970..69f8cd2 100644 --- a/src/gui/styles/qstylehelper.cpp +++ b/src/gui/styles/qstylehelper.cpp @@ -50,9 +50,10 @@ QT_BEGIN_NAMESPACE -const bool QStyleHelper::UsePixmapCache = true; +namespace QStyleHelper { +const bool UsePixmapCache = true; -QString QStyleHelper::uniqueName(const QString &key, const QStyleOption *option, const QSize &size) +QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size) { QString tmp; const QStyleOptionComplex *complexOption = qstyleoption_cast(option); @@ -74,7 +75,7 @@ QString QStyleHelper::uniqueName(const QString &key, const QStyleOption *option, #ifndef QT_NO_DIAL -int QStyleHelper::calcBigLineSize(int radius) +int calcBigLineSize(int radius) { int bigLineSize = radius / 6; if (bigLineSize < 4) @@ -107,7 +108,7 @@ static QPointF calcRadialPos(const QStyleOptionSlider *dial, qreal offset) return pos; } -qreal QStyleHelper::angle(const QPointF &p1, const QPointF &p2) +qreal angle(const QPointF &p1, const QPointF &p2) { static const qreal rad_factor = 180 / Q_PI; qreal _angle = 0; @@ -139,7 +140,7 @@ qreal QStyleHelper::angle(const QPointF &p1, const QPointF &p2) return _angle; } -QPolygonF QStyleHelper::calcLines(const QStyleOptionSlider *dial) +QPolygonF calcLines(const QStyleOptionSlider *dial) { QPolygonF poly; int width = dial->rect.width(); @@ -182,7 +183,7 @@ QPolygonF QStyleHelper::calcLines(const QStyleOptionSlider *dial) // This will draw a nice and shiny QDial for us. We don't want // all the shinyness in QWindowsStyle, hence we place it here -void QStyleHelper::drawDial(const QStyleOptionSlider *option, QPainter *painter) +void drawDial(const QStyleOptionSlider *option, QPainter *painter) { QPalette pal = option->palette; QColor buttonColor = pal.button().color(); @@ -292,4 +293,61 @@ void QStyleHelper::drawDial(const QStyleOptionSlider *option, QPainter *painter) } #endif //QT_NO_DIAL +void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, + int left, int top, int right, + int bottom) +{ + QSize size = pixmap.size(); + //painter->setRenderHint(QPainter::SmoothPixmapTransform); + + //top + if (top > 0) { + painter->drawPixmap(QRect(rect.left() + left, rect.top(), rect.width() -right - left, top), pixmap, + QRect(left, 0, size.width() -right - left, top)); + + //top-left + if(left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top(), left, top), pixmap, + QRect(0, 0, left, top)); + + //top-right + if (right > 0) + painter->drawPixmap(QRect(rect.left() + rect.width() - right, rect.top(), right, top), pixmap, + QRect(size.width() - right, 0, right, top)); + } + + //left + if (left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top()+top, left, rect.height() - top - bottom), pixmap, + QRect(0, top, left, size.height() - bottom - top)); + + //center + painter->drawPixmap(QRect(rect.left() + left, rect.top()+top, rect.width() -right - left, + rect.height() - bottom - top), pixmap, + QRect(left, top, size.width() -right -left, + size.height() - bottom - top)); + //right + if (right > 0) + painter->drawPixmap(QRect(rect.left() +rect.width() - right, rect.top()+top, right, rect.height() - top - bottom), pixmap, + QRect(size.width() - right, top, right, size.height() - bottom - top)); + + //bottom + if (bottom > 0) { + painter->drawPixmap(QRect(rect.left() +left, rect.top() + rect.height() - bottom, + rect.width() - right - left, bottom), pixmap, + QRect(left, size.height() - bottom, + size.width() - right - left, bottom)); + //bottom-left + if (left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top() + rect.height() - bottom, left, bottom), pixmap, + QRect(0, size.height() - bottom, left, bottom)); + + //bottom-right + if (right > 0) + painter->drawPixmap(QRect(rect.left() + rect.width() - right, rect.top() + rect.height() - bottom, right, bottom), pixmap, + QRect(size.width() - right, size.height() - bottom, right, bottom)); + + } +} +} QT_END_NAMESPACE diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h index d9b2e28..24b4948 100644 --- a/src/gui/styles/qstylehelper_p.h +++ b/src/gui/styles/qstylehelper_p.h @@ -32,6 +32,9 @@ namespace QStyleHelper int calcBigLineSize(int radius); void drawDial(const QStyleOptionSlider *dial, QPainter *painter); #endif //QT_NO_DIAL + void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, + int left = 0, int top = 0, int right = 0, + int bottom = 0); } QT_END_NAMESPACE diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index c807afb..53e1ad5 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -502,11 +502,11 @@ void QMainWindowLayout::fixSizeInUnifiedToolbar(QToolBar *tb) const QMacCocoaAutoReleasePool pool; QWidgetItem layoutItem(tb); QSize size = layoutItem.maximumSize(); - NSSize nssize = NSMakeSize(size.width(), size.height()); + NSSize nssize = NSMakeSize(size.width(), size.height() - 2); [item setMaxSize:nssize]; size = layoutItem.minimumSize(); nssize.width = size.width(); - nssize.height = size.height(); + nssize.height = size.height() - 2; [item setMinSize:nssize]; } } -- cgit v0.12 From 7ba85aba8686d83dc8557a9fb6d4504fbbeec349 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 22 Apr 2009 11:58:41 +0200 Subject: Fix Transformed driver on 8-bit displays Task-number: 250971 Reviewed-by: Tom --- src/gui/embedded/qscreentransformed_qws.cpp | 4 +++- src/gui/painting/qmemrotate.cpp | 1 + src/gui/painting/qmemrotate_p.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp index f988789..46ac1d1 100644 --- a/src/gui/embedded/qscreentransformed_qws.cpp +++ b/src/gui/embedded/qscreentransformed_qws.cpp @@ -410,7 +410,9 @@ void QTransformedScreen::blit(const QImage &image, const QPoint &topLeft, #endif #ifdef QT_QWS_DEPTH_8 case 8: - if (image.depth() == 16) + if (image.format() == QImage::Format_RGB444) + SET_BLIT_FUNC(quint8, qrgb444, trans, func); + else if (image.depth() == 16) SET_BLIT_FUNC(quint8, quint16, trans, func); else SET_BLIT_FUNC(quint8, quint32, trans, func); diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index 7ad0e42..4058143 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -537,6 +537,7 @@ QT_IMPL_MEMROTATE(quint32, quint24) QT_IMPL_MEMROTATE(quint32, quint18) QT_IMPL_MEMROTATE(quint32, quint8) QT_IMPL_MEMROTATE(quint16, quint8) +QT_IMPL_MEMROTATE(qrgb444, quint8) QT_IMPL_MEMROTATE(quint8, quint8) #ifdef QT_QWS_DEPTH_GENERIC QT_IMPL_MEMROTATE(quint32, qrgb_generic16) diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index bd6006b..c1eb93e 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -90,6 +90,7 @@ QT_DECL_MEMROTATE(quint32, quint24); QT_DECL_MEMROTATE(quint32, quint18); QT_DECL_MEMROTATE(quint32, quint8); QT_DECL_MEMROTATE(quint16, quint8); +QT_DECL_MEMROTATE(qrgb444, quint8); QT_DECL_MEMROTATE(quint8, quint8); #ifdef QT_QWS_DEPTH_GENERIC QT_DECL_MEMROTATE(quint32, qrgb_generic16); -- cgit v0.12 From 1b1da000ba15530f2070a57ea97bb3166fb67331 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 22 Apr 2009 22:11:22 +1000 Subject: Make make_qfeatures_dot_h script generate the current copyright header. Update the script, and update the generated file. Reviewed-by: Thiago Reviewed-by: Paul Olav Tvete --- src/corelib/global/qfeatures.h | 54 +++++++++++++++++++-------------------- util/scripts/make_qfeatures_dot_h | 41 +++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 32 deletions(-) diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 6d55f7c..2189723 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -120,6 +120,9 @@ // QMovie //#define QT_NO_MOVIE +// QNetworkInterface +//#define QT_NO_NETWORKINTERFACE + // QNetworkProxy //#define QT_NO_NETWORKPROXY @@ -198,12 +201,12 @@ // Qt Prerendered Font Format //#define QT_NO_QWS_QPF -// Raster Paint Engine callback functions -//#define QT_NO_RASTERCALLBACKS - // Qt Prerendered Font Format 2 //#define QT_NO_QWS_QPF2 +// Raster Paint Engine callback functions +//#define QT_NO_RASTERCALLBACKS + // Resize Handler //#define QT_NO_RESIZEHANDLER @@ -273,9 +276,6 @@ // HtmlParser //#define QT_NO_TEXTHTMLPARSER -// OdfWriter -//#define QT_NO_TEXTODFWRITER - // QTextStream //#define QT_NO_TEXTSTREAM @@ -316,6 +316,11 @@ #define QT_NO_BUTTONGROUP #endif +// QClipboard +#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES)) +#define QT_NO_CLIPBOARD +#endif + // Codecs #if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC)) #define QT_NO_CODECS @@ -376,11 +381,6 @@ #define QT_NO_PHONON_VOLUMESLIDER #endif -// QPrinter -#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM)) -#define QT_NO_PRINTER -#endif - // QProcess #if !defined(QT_NO_PROCESS) && (defined(QT_NO_THREAD)) #define QT_NO_PROCESS @@ -481,11 +481,6 @@ #define QT_NO_XMLSTREAMWRITER #endif -// Odf Writer -#if !defined(QT_NO_TEXTODFWRITER) && (defined(QT_NO_XMLSTREAMWRITER)) -#define QT_NO_TEXTODFWRITER -#endif - // Context menu #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU)) #define QT_NO_CONTEXTMENU @@ -511,11 +506,21 @@ #define QT_NO_LIBRARY #endif +// QPrinter +#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_PICTURE)) +#define QT_NO_PRINTER +#endif + // QScrollArea #if !defined(QT_NO_SCROLLAREA) && (defined(QT_NO_SCROLLBAR)) #define QT_NO_SCROLLAREA #endif +// OdfWriter +#if !defined(QT_NO_TEXTODFWRITER) && (defined(QT_NO_XMLSTREAMWRITER)) +#define QT_NO_TEXTODFWRITER +#endif + // QToolButton #if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_ICON) || defined(QT_NO_ACTION)) #define QT_NO_TOOLBUTTON @@ -636,16 +641,6 @@ #define QT_NO_WHATSTHIS #endif -// QClipboard -#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES)) -#define QT_NO_CLIPBOARD -#endif - -// Common UNIX Printing System -#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) -#define QT_NO_CUPS -#endif - // QDirModel #if !defined(QT_NO_DIRMODEL) && (defined(QT_NO_ITEMVIEWS)) #define QT_NO_DIRMODEL @@ -726,6 +721,11 @@ #define QT_NO_COMPLETER #endif +// Common UNIX Printing System +#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) +#define QT_NO_CUPS +#endif + // QDataWidgetMapper #if !defined(QT_NO_DATAWIDGETMAPPER) && (defined(QT_NO_ITEMVIEWS) || defined(QT_NO_PROPERTIES)) #define QT_NO_DATAWIDGETMAPPER @@ -757,7 +757,7 @@ #endif // QPrintPreviewWidget -#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_PICTURE)) +#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER)) #define QT_NO_PRINTPREVIEWWIDGET #endif diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h index c434649..5ca8c88 100755 --- a/util/scripts/make_qfeatures_dot_h +++ b/util/scripts/make_qfeatures_dot_h @@ -2,9 +2,9 @@ # # Usage: make_qfeatures_dot_h # -# Generates core/base/qfeatures.h from core/base/qfeatures.txt. +# Generates src/corelib/global/qfeatures.h from src/corelib/global/qfeatures.txt. # -# The tools/qfeatures.txt file can contain redundancies, and this program +# The qfeatures.txt file can contain redundancies, and this program # will show them. # @@ -85,11 +85,42 @@ open OUT, ">$ENV{QTDIR}/src/corelib/global/qfeatures.h" print OUT "/**************************************************************************** ** -** Copyright (C) 1992-\$THISYEAR\$ \$TROLLTECH\$. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info\@nokia.com) ** -** This file is part of the \$MODULE\$ of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** -** \$TROLLTECH_DUAL_LICENSE\$ +** \$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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales\@nokia.com. +** \$QT_END_LICENSE\$ ** ****************************************************************************/ -- cgit v0.12 From fa4049c9ba8446a582a9bd003d5cdf98ae0505eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Apr 2009 13:25:56 +0200 Subject: Doc fixes Reviewed-by: Thiago --- doc/src/phonon-api.qdoc | 4 ++-- src/corelib/kernel/qcoreevent.cpp | 1 + src/gui/kernel/qapplication.cpp | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc index 3d04c68..501b5a5 100644 --- a/doc/src/phonon-api.qdoc +++ b/doc/src/phonon-api.qdoc @@ -4457,12 +4457,12 @@ */ /*! - \fn QList Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const + \fn QList Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const \internal */ /*! - \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const + \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const \internal */ diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index 3fcfc98..11a2d3c 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -260,6 +260,7 @@ QT_BEGIN_NAMESPACE \omitvalue ApplicationActivated \omitvalue ApplicationDeactivated \omitvalue MacGLWindowChange + \omitvalue MacGLClearDrawable \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut \omitvalue CocoaRequestModal diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 09f0f91..1624b9d 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -832,12 +832,13 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, #endif // Q_WS_X11 +extern void qInitDrawhelperAsm(); /*! + \fn void QApplicationPrivate::initialize() + Initializes the QApplication object, called from the constructors. */ -extern void qInitDrawhelperAsm(); - void QApplicationPrivate::initialize() { QWidgetPrivate::mapper = new QWidgetMapper; -- cgit v0.12 From 1187d1b2063b42378d9cd1a940bcd7eecb24fb69 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 22 Apr 2009 23:32:40 +1000 Subject: Make all qdoc footers consistent with the main Qt docs. Use the same copyright message in all doc footers. As a side-effect, this change also removes most of the remaining THISYEAR placeholders, and fixes some footers that try to use 110% of the page width. Reviewed-by: Thiago --- tools/assistant/tools/assistant/doc/assistant.qdocconf | 3 +-- tools/qdoc3/test/carbide-eclipse-integration.qdocconf | 6 +++--- tools/qdoc3/test/jambi.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates.qdocconf | 3 +-- tools/qdoc3/test/qt-inc.qdocconf | 2 +- tools/qdoc3/test/standalone-eclipse-integration.qdocconf | 6 +++--- util/qlalr/doc/qlalr.qdocconf | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 0d2271d..f71bc08 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -10,8 +10,7 @@ description = "Qt Assistant" HTML.{postheader,address} = "" HTML.footer = "


\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2009 Nokia Corporation " \ - "and/or its subsidiary(-ies)Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt 4.5.1
" diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf index 683048d..7fe489e 100644 --- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf @@ -6,7 +6,7 @@ macro.TheEclipseIntegration = Carbide.c++ HTML.footer = "


\n" \ "\n" \ - "\n" \ - "\n" \ - "\n" \ + "\n" \ + "\n" \ + "\n" \ "
Copyright © 2009 Nokia CorporationTrademarks
Carbide.c++
Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Carbide.c++
" diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf index 3644b69..5288b22 100644 --- a/tools/qdoc3/test/jambi.qdocconf +++ b/tools/qdoc3/test/jambi.qdocconf @@ -41,7 +41,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © \$THISYEAR\$ TrolltechCopyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Jambi \\version
" diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index f09192a..dc027d0 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -25,8 +25,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © %THISYEAR% Nokia Corporation " \ - "and/or its subsidiary(-ies)Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt \\version
" diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 97893dc..18d3faf 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -140,7 +140,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © %THISYEAR% TrolltechCopyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt \\version
" diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index c3c4291..08b6070 100644 --- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf @@ -5,7 +5,7 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration HTML.footer = "


\n" \ "\n" \ - "\n" \ - "\n" \ - "\n" \ + "\n" \ + "\n" \ + "\n" \ "
Copyright © 2009 Nokia CorporationTrademarks
Qt Eclipse Integration 1.4.3
Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt Eclipse Integration 1.4.3
" diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf index d97ff7d..a97ef6a 100644 --- a/util/qlalr/doc/qlalr.qdocconf +++ b/util/qlalr/doc/qlalr.qdocconf @@ -59,7 +59,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © \$THISYEAR\$ TrolltechCopyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt \\version
" -- cgit v0.12 From f8be94bf4e8fa359bfc71a10aa7dc6b12daf5dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Wed, 22 Apr 2009 15:57:06 +0200 Subject: Fix QPrinter::pageRect() for Windows printers, when fullPage() is set. When QPrinter::fullPage() was set, pageRect() returned the same as paperRect(). Under Windows, there is always a non-printable area that was not taken into account in the fullPage() case. Task-number: 248881 Reviewed-by: Kim --- src/gui/painting/qprintengine_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index c8674b7..7601beb 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -1532,7 +1532,7 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const value = rect; } else { value = QTransform(1/d->stretch_x, 0, 0, 1/d->stretch_y, 0, 0) - .mapRect(d->fullPage ? d->devPaperRect : d->devPageRect); + .mapRect(d->fullPage ? d->devPhysicalPageRect : d->devPageRect); } break; -- cgit v0.12 From 3696886a327fc4894518c5570b02d5238dcede8a Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 22 Apr 2009 15:55:28 +0200 Subject: QGtkStyle: Fix broken transparency on line edits in Clearlooks This basically uses a workaround to hint to our gtk theme that we do not want it to fill our line edit backgrouns with the background brush. This was suggested by Benjamin berg. More information can be found here: https://bugzilla.mozilla.org/show_bug.cgi?id=405421 Reviewed-by: Tor Arne --- src/gui/styles/qgtkstyle.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b7fa575..ca71da2 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -951,14 +951,15 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element, "interior-focus", &interior_focus, "focus-line-width", &focus_line_width, NULL); + // See https://bugzilla.mozilla.org/show_bug.cgi?id=405421 for info about this hack + g_object_set_data(G_OBJECT(gtkEntry), "transparent-bg-hint", GINT_TO_POINTER(TRUE)); + if (!interior_focus && option->state & State_HasFocus) rect.adjust(focus_line_width, focus_line_width, -focus_line_width, -focus_line_width); - gtkPainter.paintShadow(gtkEntry, "entry", rect, option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, gtkEntry->style, option->state & State_HasFocus ? QLS("focus") : QString()); - if (!interior_focus && option->state & State_HasFocus) gtkPainter.paintShadow(gtkEntry, "entry", option->rect, option->state & State_Enabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, -- cgit v0.12 From cf9db492ac60568bd159c3749dfa11e2347b9927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 22 Apr 2009 14:49:24 +0200 Subject: Prevent QTransform::type() from returning TxScale instead of TxProject. We have code that assumes that m33 = 1 if the type is TxScale. Instead of changing all that code it's better to just return TxProject as type when m33 is different from 1. Reviewed-by: Simon Hausmann --- src/gui/painting/qtransform.cpp | 4 ++-- tests/auto/qtransform/tst_qtransform.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 39e429d..af27fd5 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1880,7 +1880,7 @@ const QMatrix &QTransform::toAffine() const QTransform::TransformationType QTransform::type() const { if (m_dirty >= m_type) { - if (m_dirty > TxShear && (!qFuzzyCompare(m_13 + 1, 1) || !qFuzzyCompare(m_23 + 1, 1))) + if (m_dirty > TxShear && (!qFuzzyCompare(m_13 + 1, 1) || !qFuzzyCompare(m_23 + 1, 1) || !qFuzzyCompare(m_33, 1))) m_type = TxProject; else if (m_dirty > TxScale && (!qFuzzyCompare(affine._m12 + 1, 1) || !qFuzzyCompare(affine._m21 + 1, 1))) { const qreal dot = affine._m11 * affine._m12 + affine._m21 * affine._m22; @@ -1888,7 +1888,7 @@ QTransform::TransformationType QTransform::type() const m_type = TxRotate; else m_type = TxShear; - } else if (m_dirty > TxTranslate && (!qFuzzyCompare(affine._m11, 1) || !qFuzzyCompare(affine._m22, 1) || !qFuzzyCompare(m_33, 1))) + } else if (m_dirty > TxTranslate && (!qFuzzyCompare(affine._m11, 1) || !qFuzzyCompare(affine._m22, 1))) m_type = TxScale; else if (m_dirty > TxNone && (!qFuzzyCompare(affine._dx + 1, 1) || !qFuzzyCompare(affine._dy + 1, 1))) m_type = TxTranslate; diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/qtransform/tst_qtransform.cpp index 8516ddb..74c405e 100644 --- a/tests/auto/qtransform/tst_qtransform.cpp +++ b/tests/auto/qtransform/tst_qtransform.cpp @@ -593,6 +593,16 @@ void tst_QTransform::types() m3.translate(5.0f, 5.0f); QCOMPARE(m3.type(), QTransform::TxScale); QCOMPARE(m3.inverted().type(), QTransform::TxScale); + + m3.setMatrix(1.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 2.0f); + QCOMPARE(m3.type(), QTransform::TxProject); + + m3.setMatrix(0.0f, 2.0f, 0.0f, + 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f); + QCOMPARE(m3.type(), QTransform::TxProject); } -- cgit v0.12 From fd9cdaa55da455b90eacec571aeb2c84fa55f7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 22 Apr 2009 16:27:44 +0200 Subject: Improve the icon parsing for files with a slightly wrong BMP header. The reason it failed was that we always expected the height property of the BMP header to be double the height of the icon. The kde_favicon.ico did not fulfill this requirement. We can fix that by simply reading from the ICONDIR entry instead, since that has always the correct height. Task-number: 229829 Reviewed-by: alexis --- src/plugins/imageformats/ico/qicohandler.cpp | 60 ++++++++++----------- tests/auto/qimagereader/baseline/35floppy.ico | Bin 0 -> 4286 bytes tests/auto/qimagereader/baseline/kde_favicon.ico | Bin 0 -> 1150 bytes .../auto/qimagereader/baseline/semitransparent.ico | Bin 0 -> 9662 bytes tests/auto/qimagereader/tst_qimagereader.cpp | 30 +++++++++++ 5 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 tests/auto/qimagereader/baseline/35floppy.ico create mode 100644 tests/auto/qimagereader/baseline/kde_favicon.ico create mode 100644 tests/auto/qimagereader/baseline/semitransparent.ico diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index aa53370..da5ae15 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -80,7 +80,7 @@ typedef struct typedef struct { // BMP information header quint32 biSize; // size of this struct quint32 biWidth; // pixmap width - quint32 biHeight; // pixmap height + quint32 biHeight; // pixmap height (specifies the combined height of the XOR and AND masks) quint16 biPlanes; // should be 1 quint16 biBitCount; // number of bits per pixel quint32 biCompression; // compression method @@ -108,7 +108,7 @@ private: bool readHeader(); bool readIconEntry(int index, ICONDIRENTRY * iconEntry); - bool readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header); + bool readBMPHeader(quint32 imageOffset, BMP_INFOHDR * header); void findColorInfo(QImage & image); void readColorTable(QImage & image); @@ -343,7 +343,7 @@ bool ICOReader::readHeader() return headerRead; } -bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry) +bool ICOReader::readIconEntry(int index, ICONDIRENTRY *iconEntry) { if (iod) { if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) { @@ -355,37 +355,12 @@ bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry) -bool ICOReader::readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header) +bool ICOReader::readBMPHeader(quint32 imageOffset, BMP_INFOHDR * header) { - memset(&icoAttrib, 0, sizeof(IcoAttrib)); if (iod) { - if (iod->seek(startpos + iconEntry.dwImageOffset)) { + if (iod->seek(startpos + imageOffset)) { if (readBMPInfoHeader(iod, header)) { - - icoAttrib.nbits = header->biBitCount ? header->biBitCount : iconEntry.wBitCount; - icoAttrib.h = header->biHeight / 2; // this height is always double the iconEntry height (for the mask) - icoAttrib.w = header->biWidth; - - switch (icoAttrib.nbits) { - case 32: - case 24: - case 16: - icoAttrib.depth = 32; - break; - case 8: - case 4: - icoAttrib.depth = 8; - break; - default: - icoAttrib.depth = 1; - } - - if ( icoAttrib.depth == 32 ) // there's no colormap - icoAttrib.ncolors = 0; - else // # colors used - icoAttrib.ncolors = header->biClrUsed ? header->biClrUsed : 1 << icoAttrib.nbits; - //qDebug() << "Bits:" << icoAttrib.nbits << "Depth:" << icoAttrib.depth << "Ncols:" << icoAttrib.ncolors; - return TRUE; + return TRUE; } } } @@ -548,7 +523,28 @@ QImage ICOReader::iconAt(int index) if (readIconEntry(index, &iconEntry)) { BMP_INFOHDR header; - if (readBMPHeader(iconEntry, &header)) { + if (readBMPHeader(iconEntry.dwImageOffset, &header)) { + icoAttrib.nbits = header.biBitCount ? header.biBitCount : iconEntry.wBitCount; + + switch (icoAttrib.nbits) { + case 32: + case 24: + case 16: + icoAttrib.depth = 32; + break; + case 8: + case 4: + icoAttrib.depth = 8; + break; + default: + icoAttrib.depth = 1; + } + if (icoAttrib.depth == 32) // there's no colormap + icoAttrib.ncolors = 0; + else // # colors used + icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits; + icoAttrib.w = iconEntry.bWidth; + icoAttrib.h = iconEntry.bHeight; QImage::Format format = QImage::Format_ARGB32; if (icoAttrib.nbits == 24) diff --git a/tests/auto/qimagereader/baseline/35floppy.ico b/tests/auto/qimagereader/baseline/35floppy.ico new file mode 100644 index 0000000..59fd37e Binary files /dev/null and b/tests/auto/qimagereader/baseline/35floppy.ico differ diff --git a/tests/auto/qimagereader/baseline/kde_favicon.ico b/tests/auto/qimagereader/baseline/kde_favicon.ico new file mode 100644 index 0000000..15bcdbb Binary files /dev/null and b/tests/auto/qimagereader/baseline/kde_favicon.ico differ diff --git a/tests/auto/qimagereader/baseline/semitransparent.ico b/tests/auto/qimagereader/baseline/semitransparent.ico new file mode 100644 index 0000000..dd23de9 Binary files /dev/null and b/tests/auto/qimagereader/baseline/semitransparent.ico differ diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index 3841111..8f7094c 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -153,6 +153,9 @@ private slots: void autoDetectImageFormat(); void fileNameProbing(); + + void pixelCompareWithBaseline_data(); + void pixelCompareWithBaseline(); }; // Testing get/set functions @@ -1368,5 +1371,32 @@ void tst_QImageReader::fileNameProbing() QCOMPARE(r.fileName(), name); } +void tst_QImageReader::pixelCompareWithBaseline_data() +{ + QTest::addColumn("fileName"); + + QTest::newRow("floppy (16px,32px - 16 colors)") << "35floppy.ico"; + QTest::newRow("semitransparent") << "semitransparent.ico"; + QTest::newRow("slightlybroken") << "kde_favicon.ico"; +} + +void tst_QImageReader::pixelCompareWithBaseline() +{ + QFETCH(QString, fileName); + + QImage icoImg; + // might fail if the plugin does not exist, which is ok. + if (icoImg.load(QString::fromAscii("images/%1").arg(fileName))) { + QString baselineFileName = QString::fromAscii("baseline/%1").arg(fileName); +#if 0 + icoImg.save(baselineFileName); +#else + QImage baseImg; + QVERIFY(baseImg.load(baselineFileName)); + QCOMPARE(baseImg, icoImg); +#endif + } +} + QTEST_MAIN(tst_QImageReader) #include "tst_qimagereader.moc" -- cgit v0.12 From cb14e8b90c71afb851c3165fc009e4fa11dd04c9 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Apr 2009 09:46:29 -0700 Subject: Take out STATIC_ALLOC of primary surface creation We never resize this surface anyway so it's not necessary. Make it possible to enable with an option. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 041d522..65c027d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -833,15 +833,15 @@ bool QDirectFBScreen::connect(const QString &displaySpec) description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_WIDTH); if (::setIntOption(displayArgs, QLatin1String("height"), &description.height)) description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_HEIGHT); - description.caps = DFBSurfaceCapabilities(DSCAPS_PRIMARY - | DSCAPS_DOUBLE - | DSCAPS_STATIC_ALLOC); - if (displayArgs.contains(QLatin1String("forcepremultiplied"), - Qt::CaseInsensitive)) { - description.caps = DFBSurfaceCapabilities(description.caps - | DSCAPS_PREMULTIPLIED); + uint caps = DSCAPS_PRIMARY|DSCAPS_DOUBLE; + if (displayArgs.contains(QLatin1String("static_alloc"))) + caps |= DSCAPS_STATIC_ALLOC; + + if (displayArgs.contains(QLatin1String("forcepremultiplied"), Qt::CaseInsensitive)) { + caps |= DSCAPS_PREMULTIPLIED; } + description.caps = DFBSurfaceCapabilities(caps); // We don't track the primary surface as it's released in disconnect d_ptr->dfbSurface = createDFBSurface(&description, DontTrackSurface); if (!d_ptr->dfbSurface) { -- cgit v0.12 From 5a7f626f3c6d5d5e2ceaa2c7db9de5b51deca637 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Apr 2009 09:41:54 -0700 Subject: Unify IDirectFBSurface->Lock() calls Certain compilers warns on this kind of code: uchar *mem = ...; (void**)(&mem) dereferencing type punned pointer etc. Since we had this for every call to Lock I put it all into a convenience function. Also fix some issues where we memcpy'ed more bytes than necessary (when stride != w * depth() / 8) and fix issue with QDirectFBScreen::solidFill with pixelFormat == RGB32 Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbpaintdevice.cpp | 19 ++----- .../gfxdrivers/directfb/qdirectfbpixmap.cpp | 19 ++++--- .../gfxdrivers/directfb/qdirectfbscreen.cpp | 64 ++++++++++++++-------- src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 2 + 4 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index 2a2ef5c..924090c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -56,23 +56,16 @@ IDirectFBSurface *QDirectFBPaintDevice::directFBSurface() const } -// Locks the dfb surface and creates a QImage (lockedImage) from the pointer -void QDirectFBPaintDevice::lockDirectFB() { - +void QDirectFBPaintDevice::lockDirectFB() +{ if (lockedImage) return; // Already locked - void *mem; - int w, h; - DFBResult result = dfbSurface->Lock(dfbSurface, DSLF_WRITE, &mem, &bpl); - if (result != DFB_OK || !mem) { - DirectFBError("QDirectFBPixmapData::buffer()", result); - return; + if (uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl)) { + const QSize s = size(); + lockedImage = new QImage(mem, s.width(), s.height(), bpl, + QDirectFBScreen::getImageFormat(dfbSurface)); } - - dfbSurface->GetSize(dfbSurface, &w, &h); - lockedImage = new QImage(static_cast(mem), w, h, bpl, - QDirectFBScreen::getImageFormat(dfbSurface)); } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index 0a1696a..a6017b8 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -267,16 +267,17 @@ void QDirectFBPixmapData::fill(const QColor &color) if (forceRaster) { // in DSPF_RGB32 all dfb drawing causes the Alpha byte to be // set to 0. This causes issues for the raster engine. - char *mem; - int bpl; - const int h = QPixmapData::height(); - dfbSurface->Lock(dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - const int c = color.rgba(); - for (int i = 0; i < h; ++i) { - memset(mem, c, bpl); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl); + if (mem) { + const int h = QPixmapData::height(); + const int w = QPixmapData::width() * 4; // 4 bytes per 32 bit pixel + const int c = color.rgba(); + for (int i = 0; i < h; ++i) { + memset(mem, c, w); + mem += bpl; + } + dfbSurface->Unlock(dfbSurface); } - dfbSurface->Unlock(dfbSurface); } else { dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(), color.alpha()); diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 65c027d..490eeb0 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -159,15 +159,17 @@ IDirectFBSurface* QDirectFBScreen::createDFBSurface(const QImage &img, SurfaceCr IDirectFBSurface *surface = createDFBSurface(&desc, options); #ifdef QT_NO_DIRECTFB_PREALLOCATED if (surface) { - char *mem; int bpl; - surface->Lock(surface, DSLF_WRITE, (void**)&mem, &bpl); - const int h = img.height(); - for (int i = 0; i < h; ++i) { - memcpy(mem, img.scanLine(i), bpl); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(surface, DSLF_WRITE, &bpl); + if (mem) { + const int h = img.height(); + const int w = img.width() * img.depth() / 8; + for (int i = 0; i < h; ++i) { + memcpy(mem, img.scanLine(i), w); + mem += bpl; + } + surface->Unlock(surface); } - surface->Unlock(surface); } #endif #ifndef QT_NO_DIRECTFB_PALETTE @@ -317,15 +319,17 @@ IDirectFBSurface *QDirectFBScreen::copyToDFBSurface(const QImage &img, imgSurface->Release(imgSurface); #else // QT_NO_DIRECTFB_PREALLOCATED Q_ASSERT(image.format() == pixmapFormat); - char *mem; int bpl; - dfbSurface->Lock(dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - const int w = image.width() * image.depth() / 8; - for (int i = 0; i < image.height(); ++i) { - memcpy(mem, image.scanLine(i), w); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl); + if (mem) { + const int h = image.height(); + const int w = image.width() * image.depth() / 8; + for (int i=0; iUnlock(dfbSurface); } - dfbSurface->Unlock(dfbSurface); #endif return dfbSurface; } @@ -1188,23 +1192,23 @@ void QDirectFBScreen::blit(IDirectFBSurface *src, const QPoint &topLeft, points.data(), n); } +// This function is only ever called by QScreen::drawBackground which +// is only ever called by QScreen::compose which is never called with +// DirectFB so it's really a noop. void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion) { if (region.isEmpty()) return; if (QDirectFBScreen::getImageFormat(d_ptr->dfbSurface) == QImage::Format_RGB32) { - uchar *mem; - int bpl; - d_ptr->dfbSurface->Lock(d_ptr->dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - QImage img(mem, w, h, bpl, QImage::Format_RGB32); - QPainter p(&img); - p.setBrush(color); - p.setPen(Qt::NoPen); - const QVector rects = region.rects(); - p.drawRects(rects.constData(), rects.size()); - p.end(); + data = QDirectFBScreen::lockSurface(d_ptr->dfbSurface, DSLF_WRITE, &lstep); + if (!data) + return; + + QScreen::solidFill(color, region); d_ptr->dfbSurface->Unlock(d_ptr->dfbSurface); + data = 0; + lstep = 0; } else { d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, color.red(), color.green(), color.blue(), @@ -1241,3 +1245,15 @@ bool QDirectFBScreen::initSurfaceDescriptionPixelFormat(DFBSurfaceDescription *d } return true; } + +uchar *QDirectFBScreen::lockSurface(IDirectFBSurface *surface, DFBSurfaceLockFlags flags, int *bpl) +{ + void *mem; + const DFBResult result = surface->Lock(surface, flags, static_cast(&mem), bpl); + if (result != DFB_OK) { + DirectFBError("QDirectFBPixmapData::lockSurface()", result); + } + + return reinterpret_cast(mem); +} + diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index f394ac1..8dd38dc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -127,6 +127,8 @@ public: const QImage &image); #endif + static uchar *lockSurface(IDirectFBSurface *surface, DFBSurfaceLockFlags flags, int *bpl = 0); + private: void compose(const QRegion &r); void blit(IDirectFBSurface *src, const QPoint &topLeft, -- cgit v0.12 From b250e23a418f991bb979158e119bdb78cddc8228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 22 Apr 2009 19:24:10 +0200 Subject: Don't emit QApplication::focusChanged for no reason The Qt::NoFocusReason is used when Qt temporarily moves the focus to the QMenuBar while switching from one widget to another. While this did not result in a QFocusEvent, it did result in emitting the QApplication::focusChanged signal. This in turn caused a slowness in Qt Creator, since it wanted to update the current context and find filter. The fix here makes sure the focusChanged signal is not emitted when the focus reason is Qt::NoFocusReason, since these focus changes are not interesting for the application. Reviewed-by: mae --- src/gui/kernel/qapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 1624b9d..d0b1790 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -2100,8 +2100,8 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) if (that) QApplication::sendEvent(that->style(), &in); } + emit qApp->focusChanged(prev, focus_widget); } - emit qApp->focusChanged(prev, focus_widget); } } -- cgit v0.12 From 5c5d5cf6f70155d0920d8727696785d8348d65fb Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 22 Apr 2009 20:12:45 +0200 Subject: Show filter extensions in the GTK file dialog if no name is provided In the GTK+ file dialog filters are only represented by names such as "All files", while the actual extensions are hidden. You can create a filter without a name in Qt however so in this case we have to fall back to showing the file extensions instead. Task-number: 251928 Reviewed-by: rosch --- src/gui/styles/gtksymbols.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index acb8437..0842ec7 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -746,9 +746,9 @@ static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent, foreach (const QString &rawfilter, filters) { GtkFileFilter *gtkFilter = QGtk::gtk_file_filter_new (); QString name = rawfilter.left(rawfilter.indexOf(QLatin1Char('('))); - QGtk::gtk_file_filter_set_name(gtkFilter, qPrintable(name)); - QStringList extensions = extract_filter(rawfilter); + QGtk::gtk_file_filter_set_name(gtkFilter, qPrintable(name.isEmpty() ? extensions.join(QLS(", ")) : name)); + foreach (const QString &fileExtension, extensions) { QGtk::gtk_file_filter_add_pattern (gtkFilter, qPrintable(fileExtension)); } -- cgit v0.12 From 8d7729cd116d40b0ab0bc65a709fe7b70ba84e64 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Apr 2009 11:57:46 -0700 Subject: Kill some warnings Refactor two small things so that we don't get warnings when QT_DIRECTFB_NO_(OPAQUEDETECTION|MOUSE|KEYBOARD) is defined Reviewed-by: Shane McLaughlin --- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 3 +++ src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index a6017b8..f9172cc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -160,6 +160,9 @@ static bool checkForAlphaPixels(const QImage &img) void QDirectFBPixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags) { +#ifdef QT_NO_DIRECTFB_OPAQUE_DETECTION + Q_UNUSED(flags); +#endif Q_ASSERT(img.depth() != 1); // these should be handled by QRasterPixmapData if (img.hasAlphaChannel() #ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 490eeb0..b2b8e9b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -956,16 +956,15 @@ void QDirectFBScreen::disconnect() bool QDirectFBScreen::initDevice() { - QWSServer *server = QWSServer::instance(); #ifndef QT_NO_DIRECTFB_MOUSE if (qgetenv("QWS_MOUSE_PROTO").isEmpty()) { - server->setDefaultMouse("None"); + QWSServer::instance()->->setDefaultMouse("None"); d_ptr->mouse = new QDirectFBMouseHandler; } #endif #ifndef QT_NO_DIRECTFB_KEYBOARD if (qgetenv("QWS_KEYBOARD").isEmpty()) { - server->setDefaultKeyboard("None"); + QWSServer::instance()->->setDefaultKeyboard("None"); d_ptr->keyboard = new QDirectFBKeyboardHandler(QString()); } #endif -- cgit v0.12 From 08218fb6dbcc4f133c20cdc3a4e6575606924a29 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Apr 2009 12:31:03 -0700 Subject: Compile Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index b2b8e9b..3e54e7f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -958,13 +958,13 @@ bool QDirectFBScreen::initDevice() { #ifndef QT_NO_DIRECTFB_MOUSE if (qgetenv("QWS_MOUSE_PROTO").isEmpty()) { - QWSServer::instance()->->setDefaultMouse("None"); + QWSServer::instance()->setDefaultMouse("None"); d_ptr->mouse = new QDirectFBMouseHandler; } #endif #ifndef QT_NO_DIRECTFB_KEYBOARD if (qgetenv("QWS_KEYBOARD").isEmpty()) { - QWSServer::instance()->->setDefaultKeyboard("None"); + QWSServer::instance()->setDefaultKeyboard("None"); d_ptr->keyboard = new QDirectFBKeyboardHandler(QString()); } #endif -- cgit v0.12 From d64d13102d3d53d0aa43597408d7abf3fecb57a3 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Apr 2009 15:09:59 -0700 Subject: Convert bitmaps to alpha pixmap format Ideally we'd let raster pixmap data handle this but QPixmap::fromImage creates a QPixmapData::PixmapType regardless of the bit depth of the image so we have to handle this case. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index f9172cc..ea9bb3a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -157,13 +157,13 @@ static bool checkForAlphaPixels(const QImage &img) return false; } -void QDirectFBPixmapData::fromImage(const QImage &img, +void QDirectFBPixmapData::fromImage(const QImage &i, Qt::ImageConversionFlags flags) { #ifdef QT_NO_DIRECTFB_OPAQUE_DETECTION Q_UNUSED(flags); #endif - Q_ASSERT(img.depth() != 1); // these should be handled by QRasterPixmapData + const QImage img = (i.depth() == 1 ? i.convertToFormat(screen->alphaPixmapFormat()) : i); if (img.hasAlphaChannel() #ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION && (flags & Qt::NoOpaqueDetection || ::checkForAlphaPixels(img)) -- cgit v0.12 From ed24cd82444faeeda0a171a9082808ebb667e092 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 23 Apr 2009 08:41:39 +1000 Subject: Fixes compile on linux-g++-32 and linux-g++-64. Broken by a8d14ae567c7e847c6dbba644c36fbc6c6afc468 --- src/gui/styles/qstylehelper_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h index 24b4948..711bd2d 100644 --- a/src/gui/styles/qstylehelper_p.h +++ b/src/gui/styles/qstylehelper_p.h @@ -19,6 +19,7 @@ QT_BEGIN_NAMESPACE class QPainter; +class QPixmap; class QStyleOptionSlider; class QStyleOption; -- cgit v0.12 From 7fa8e95d1b87403aab14dd326520600bc028a195 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 23 Apr 2009 09:06:43 +1000 Subject: Fixes memory leak in QSvgWidget. `q' is 0 during construction of QSvgWidgetPrivate, thus each QSvgWidget instance was creating a QSvgRenderer with no parent. Acked-by: Thiago Macieira Reviewed-by: Shane Bradley --- src/svg/qsvgwidget.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index a4200ca..ac8595f 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -83,18 +83,6 @@ class QSvgWidgetPrivate : public QWidgetPrivate { Q_DECLARE_PUBLIC(QSvgWidget) public: - QSvgWidgetPrivate() - : QWidgetPrivate() - { - Q_Q(QSvgWidget); - renderer = new QSvgRenderer(q); - } - QSvgWidgetPrivate(const QString &file) - : QWidgetPrivate() - { - Q_Q(QSvgWidget); - renderer = new QSvgRenderer(file, q); - } QSvgRenderer *renderer; }; @@ -104,6 +92,7 @@ public: QSvgWidget::QSvgWidget(QWidget *parent) : QWidget(*new QSvgWidgetPrivate, parent, 0) { + d_func()->renderer = new QSvgRenderer(this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), this, SLOT(update())); } @@ -113,8 +102,9 @@ QSvgWidget::QSvgWidget(QWidget *parent) of the specified \a file. */ QSvgWidget::QSvgWidget(const QString &file, QWidget *parent) - : QWidget(*new QSvgWidgetPrivate(file), parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, 0) { + d_func()->renderer = new QSvgRenderer(file, this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), this, SLOT(update())); } -- cgit v0.12 From 99d243860548d6be8a68dfd027c51530351d12cb Mon Sep 17 00:00:00 2001 From: jasplin Date: Thu, 23 Apr 2009 08:48:15 +0200 Subject: Removed dead code. Reviewed-by: TrustMe --- src/gui/kernel/qshortcutmap.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 9766a69..415d71e 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -359,8 +359,6 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) else e->ignore(); - int identicalMatches = d->identicals.count(); - switch(result) { case QKeySequence::NoMatch: return stateWasAccepted; -- cgit v0.12 From 389c4fdebe681eb3af5a2431c390323f52a03c17 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 23 Apr 2009 09:24:23 +0200 Subject: Carbon/Cocoa: It is possible to resize a widget above its maximum size This is not strange since we never did anything to limit a resize within the max min boundries. This patch factores out the code that ensures this into a private function that is called both as a reaction to a resize event, but also if resize is done programatically. Task-number: 251893 Reviewed-by: Trenton Schulz --- src/gui/kernel/qwidget_mac.mm | 88 ++++++++++++++++++++++++------------------- src/gui/kernel/qwidget_p.h | 1 + 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 37dc79c..a00f969 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4001,6 +4001,33 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) } } +void QWidgetPrivate::applyMaxAndMinSizeConstraints(int &w, int &h) +{ + if (QWExtra *extra = extraData()) { + w = qMin(w, extra->maxw); + h = qMin(h, extra->maxh); + w = qMax(w, extra->minw); + h = qMax(h, extra->minh); + + // Deal with size increment + if (QTLWExtra *top = topData()) { + if(top->incw) { + w = w/top->incw; + w *= top->incw; + } + if(top->inch) { + h = h/top->inch; + h *= top->inch; + } + } + } + + if (isRealWindow()) { + w = qMax(0, w); + h = qMax(0, h); + } +} + void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) { Q_Q(QWidget); @@ -4011,7 +4038,9 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) QMacCocoaAutoReleasePool pool; bool realWindow = isRealWindow(); + if (realWindow && !(w == 0 && h == 0) && !q->testAttribute(Qt::WA_DontShowOnScreen)) { + applyMaxAndMinSizeConstraints(w, h); topData()->isSetGeometry = 1; topData()->isMove = isMove; #ifndef QT_MAC_USE_COCOA @@ -4037,10 +4066,26 @@ void QWidgetPrivate::setGeometry_sys_helper(int x, int y, int w, int h, bool isM { Q_Q(QWidget); bool realWindow = isRealWindow(); - if(QWExtra *extra = extraData()) { // any size restrictions? - if(realWindow) { + + QPoint oldp = q->pos(); + QSize olds = q->size(); + const bool isResize = (olds != QSize(w, h)); + + if (!realWindow && !isResize && QPoint(x, y) == oldp) + return; + + if (isResize) + data.window_state = data.window_state & ~Qt::WindowMaximized; + + const bool visible = q->isVisible(); + data.crect = QRect(x, y, w, h); + + if (realWindow) { + if (QWExtra *extra = extraData()) { + applyMaxAndMinSizeConstraints(w, h); qt_mac_update_sizer(q); - if(q->windowFlags() & Qt::WindowMaximizeButtonHint) { + + if (q->windowFlags() & Qt::WindowMaximizeButtonHint) { #ifndef QT_MAC_USE_COCOA OSWindowRef window = qt_mac_window_for(q); if(extra->maxw && extra->maxh && extra->maxw == extra->minw @@ -4051,43 +4096,8 @@ void QWidgetPrivate::setGeometry_sys_helper(int x, int y, int w, int h, bool isM } #endif } - } - - w = qMin(w,extra->maxw); - h = qMin(h,extra->maxh); - w = qMax(w,extra->minw); - h = qMax(h,extra->minh); - - // Deal with size increment - if(QTLWExtra *top = topData()) { - if(top->incw) { - w = w/top->incw; - w *= top->incw; - } - if(top->inch) { - h = h/top->inch; - h *= top->inch; - } - } - } - - if (realWindow) { - w = qMax(0, w); - h = qMax(0, h); - } - - QPoint oldp = q->pos(); - QSize olds = q->size(); - const bool isResize = (olds != QSize(w, h)); - if(!realWindow && !isResize && QPoint(x, y) == oldp) - return; - if(isResize && q->isMaximized()) - data.window_state = data.window_state & ~Qt::WindowMaximized; - const bool visible = q->isVisible(); - data.crect = QRect(x, y, w, h); - if(realWindow) { - if(QWExtra *extra = extraData()) { //set constraints + // Update max and min constraints: const float max_f(20000); #ifndef QT_MAC_USE_COCOA #define SF(x) ((x > max_f) ? max_f : x) diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 9e93f66..423e833 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -257,6 +257,7 @@ public: void macUpdateIsOpaque(); void setEnabled_helper_sys(bool enable); bool isRealWindow() const; + void applyMaxAndMinSizeConstraints(int &w, int &h); #endif void raise_sys(); -- cgit v0.12 From 74934cba48910e366d96e4e596e8676d8434fe24 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 18 Mar 2009 17:29:19 +0100 Subject: Adding 2bpp support to qvfb --- tools/qvfb/config.ui | 1655 ++++++++++++++++++++++------------------------- tools/qvfb/qvfb.cpp | 3 + tools/qvfb/qvfbview.cpp | 61 ++ 3 files changed, 855 insertions(+), 864 deletions(-) diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui index 7a45bfe..ac91d3e 100644 --- a/tools/qvfb/config.ui +++ b/tools/qvfb/config.ui @@ -1,4 +1,5 @@ - + + ********************************************************************* ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). @@ -40,181 +41,145 @@ ** ********************************************************************* Config - - + + 0 0 600 - 650 + 665 - + Configure - + true - - + + 6 - - 8 - - - 8 - - - 8 - - + 8 - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - - + + + 0 0 - + Size - - + + 6 - - 11 - - - 11 - - - 11 - - + 11 - - - 176x220 "SmartPhone" + + + 176x220 "SmartPhone" - - - 240x320 "PDA" + + + 240x320 "PDA" - - - 320x240 "TV" / "QVGA" + + + 320x240 "TV" / "QVGA" - - - 640x480 "VGA" + + + 640x480 "VGA" - - + + 800x600 - - + + 1024x768 - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - - + + + 0 0 - + Custom - - + + 1 - + 1280 - + 16 - + 400 - - + + 1 - + 1024 - + 16 - + 300 @@ -225,92 +190,84 @@ - - + + Depth - - - 6 - - - 11 - - - 11 - - - 11 - - - 11 - + - - + + 1 bit monochrome - - + + + 2 bit grayscale + + + + + + 4 bit grayscale - - + + 8 bit - - + + 12 (16) bit - - + + 15 bit - - + + 16 bit - - + + 18 bit - - + + 24 bit - - + + 32 bit - - + + 32 bit ARGB @@ -321,39 +278,30 @@ - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Skin - - - + + + 0 0 - + None @@ -362,25 +310,25 @@ - - + + Emulate touch screen (no mouse move) - - + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) - + Qt::Vertical - + 20 10 @@ -389,204 +337,192 @@ - - - + + + 0 0 - - <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. - + true - - + + Gamma - - + + 11 - - 11 - - - 11 - - - 11 - - - 6 - - + 6 - - - + + + Blue - - - + + + - - - + + + 128 128 128 - - - + + + 0 0 255 - - - + + + 127 127 255 - - - + + + 38 38 255 - - - + + + 0 0 127 - - - + + + 0 0 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -595,153 +531,153 @@ - - - + + + 128 128 128 - - - + + + 0 0 255 - - - + + + 127 127 255 - - - + + + 38 38 255 - - - + + + 0 0 127 - - - + + + 0 0 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -750,153 +686,153 @@ - - - + + + 128 128 128 - - - + + + 0 0 255 - - - + + + 127 127 255 - - - + + + 38 38 255 - - - + + + 0 0 127 - - - + + + 0 0 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -906,183 +842,183 @@ - + 400 - + 100 - + Qt::Horizontal - - - + + + 1.0 - - - + + + Green - - - + + + - - - + + + 128 128 128 - - - + + + 0 255 0 - - - + + + 127 255 127 - - - + + + 38 255 38 - - - + + + 0 127 0 - - - + + + 0 170 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1091,153 +1027,153 @@ - - - + + + 128 128 128 - - - + + + 0 255 0 - - - + + + 127 255 127 - - - + + + 38 255 38 - - - + + + 0 127 0 - - - + + + 0 170 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1246,153 +1182,153 @@ - - - + + + 128 128 128 - - - + + + 0 255 0 - - - + + + 127 255 127 - - - + + + 38 255 38 - - - + + + 0 127 0 - - - + + + 0 170 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1402,190 +1338,190 @@ - + 400 - + 100 - + Qt::Horizontal - - - + + + 1.0 - - - + + + All - - - + + + 1.0 - - - + + + - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 127 127 127 - - - + + + 170 170 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1594,153 +1530,153 @@ - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 127 127 127 - - - + + + 170 170 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1749,153 +1685,153 @@ - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 127 127 127 - - - + + + 170 170 170 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -1905,183 +1841,183 @@ - + 400 - + 100 - + Qt::Horizontal - - - + + + Red - - - + + + 1.0 - - - + + + - - - + + + 128 128 128 - - - + + + 255 0 0 - - - + + + 255 127 127 - - - + + + 255 38 38 - - - + + + 127 0 0 - - - + + + 170 0 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -2090,153 +2026,153 @@ - - - + + + 128 128 128 - - - + + + 255 0 0 - - - + + + 255 127 127 - - - + + + 255 38 38 - - - + + + 127 0 0 - - - + + + 170 0 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -2245,153 +2181,153 @@ - - - + + + 128 128 128 - - - + + + 255 0 0 - - - + + + 255 127 127 - - - + + + 255 38 38 - - - + + + 127 0 0 - - - + + + 170 0 0 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 220 220 220 - - - + + + 0 0 0 - - - + + + 10 95 137 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 0 0 0 - - - + + + 232 232 232 @@ -2401,53 +2337,44 @@ - + 400 - + 100 - + Qt::Horizontal - - - + + + Set all to 1.0 - - + + - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + 40 20 @@ -2456,24 +2383,24 @@ - - + + &OK - + true - + true - - + + &Cancel - + true @@ -2482,7 +2409,7 @@ - + GammaView @@ -2498,11 +2425,11 @@ size_custom click() - + 152 193 - + 94 199 @@ -2514,11 +2441,11 @@ size_custom click() - + 259 196 - + 64 188 diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index 62149a1..0fb3577 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -678,6 +678,8 @@ void QVFb::configure() int d; if ( config->depth_1->isChecked() ) d=1; + else if ( config->depth_2gray->isChecked() ) + d=2; else if ( config->depth_4gray->isChecked() ) d=4; else if ( config->depth_8->isChecked() ) @@ -741,6 +743,7 @@ void QVFb::chooseSize(const QSize& sz) void QVFb::chooseDepth(int depth, QVFbView::PixelFormat displayFormat) { config->depth_1->setChecked(depth==1); + config->depth_2gray->setChecked(depth==2); config->depth_4gray->setChecked(depth==4); config->depth_8->setChecked(depth==8); config->depth_12->setChecked(depth==12); diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 53a5360..c2df8fd 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -457,6 +457,67 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const } break; } + + case 2: { + if (requiredSize > buffer.size()) + buffer.resize(requiredSize); + + // XXX: hw: replace by drawhelper functionality + + const int pixelsPerByte = 4; + quint8 *src = reinterpret_cast(mView->data()) + + r.y() * mView->linestep() + r.x() / pixelsPerByte; + const int align = qMin(r.width(), (4 - (r.x() & 3)) & 3); + const int doAlign = (align > 0 ? 1 : 0); + const int tail = qMin(r.width(), (r.width() - align) & 3); + const int doTail = (tail > 0 ? 1 : 0); + const int width8 = (r.width() - align) / pixelsPerByte; + const int stride = mView->linestep() - (width8 + doAlign); + + uchar *b = reinterpret_cast(buffer.data()); + img = QImage(b, r.width(), r.height(), QImage::Format_RGB32); + for (int y = 0; y < r.height(); ++y) { + quint32 *dest = reinterpret_cast(img.scanLine(y)); + quint8 c; + + if (doAlign) { + switch (align) { + case 3: c = ((*src & 0x30) >> 4) * 0x55; + *dest++ = qRgb(c, c, c); + case 2: c = ((*src & 0x0c) >> 2) * 0x55; + *dest++ = qRgb(c, c, c); + case 1: c = ((*src & 0x03)) * 0x55; + *dest++ = qRgb(c, c, c); + } + ++src; + } + for (int i = 0; i < width8; ++i) { + c = ((*src & 0xc0) >> 6) * 0x55; + *dest++ = qRgb(c, c, c); + c = ((*src & 0x30) >> 4) * 0x55; + *dest++ = qRgb(c, c, c); + c = ((*src & 0x0c) >> 2) * 0x55; + *dest++ = qRgb(c, c, c); + c = ((*src & 0x03)) * 0x55; + *dest++ = qRgb(c, c, c); + + ++src; + } + if (doTail) { + switch (tail) { + case 3: c = ((*src & 0x0c) >> 2) * 0x55; + dest[2] = qRgb(c, c, c); + case 2: c = ((*src & 0x30) >> 4) * 0x55; + dest[1] = qRgb(c, c, c); + case 1: c = ((*src & 0xc0) >> 6) * 0x55; + dest[0] = qRgb(c, c, c); + } + } + src += stride; + } + break; + } + case 4: { if (requiredSize > buffer.size()) buffer.resize(requiredSize); -- cgit v0.12 From e8974548e30a28738b46c681a7e50c27aab27db6 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 23 Apr 2009 11:11:02 +0200 Subject: Add BGR format to qvfb --- tools/qvfb/config.ui | 10 ++++++++++ tools/qvfb/qvfbview.cpp | 5 ++++- tools/qvfb/qvfbview.h | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui index ac91d3e..82a3d38 100644 --- a/tools/qvfb/config.ui +++ b/tools/qvfb/config.ui @@ -272,6 +272,16 @@ + + + + Swap red and blue channels + + + BGR format + + + diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index c2df8fd..e7c99ed 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -89,7 +89,7 @@ QVFbAbstractView::~QVFbAbstractView() QVFbView::QVFbView(int id, int w, int h, int d, Rotation r, QWidget *parent) : QVFbAbstractView(parent), - viewdepth(d), viewFormat(DefaultFormat), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15), + viewdepth(d), viewFormat(DefaultFormat), rgb_swapped(0), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15), contentsWidth(w), contentsHeight(h), gred(1.0), ggreen(1.0), gblue(1.0), gammatable(0), refreshRate(30), animation(0), hzm(0.0), vzm(0.0), mView(0), @@ -601,6 +601,9 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const break; } + if (rgb_swapped) + img = img.rgbSwapped(); + if ( brightness != 255 ) { if (img.format() == QImage::Format_Indexed8) { QVector c = img.colorTable(); diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h index d533613..1d43bdc 100644 --- a/tools/qvfb/qvfbview.h +++ b/tools/qvfb/qvfbview.h @@ -77,6 +77,7 @@ public: virtual int displayHeight() const = 0; virtual int displayDepth() const = 0; virtual PixelFormat displayFormat() const { return DefaultFormat; } + virtual bool rgbSwapped() const { return false; } virtual Rotation displayRotation() const = 0; virtual void setGamma(double gr, double gg, double gb) = 0; @@ -105,6 +106,7 @@ public slots: virtual void skinKeyPressEvent( int code, const QString& text, bool autorep=FALSE ) = 0; virtual void skinKeyReleaseEvent( int code, const QString& text, bool autorep=FALSE ) = 0; virtual void setViewFormat(PixelFormat) {} + virtual void setRgbSwapped( bool ) {}; virtual void embedDisplay(WId) {} }; @@ -120,6 +122,7 @@ public: int displayHeight() const; int displayDepth() const; PixelFormat displayFormat() const; + bool rgbSwapped() const { return rgb_swapped; } Rotation displayRotation() const; bool touchScreenEmulation() const { return emulateTouchscreen; } @@ -151,6 +154,7 @@ public slots: void skinKeyPressEvent(int code, const QString& text, bool autorep=FALSE); void skinKeyReleaseEvent(int code, const QString& text, bool autorep=FALSE); void setViewFormat(PixelFormat); + void setRgbSwapped(bool b) { rgb_swapped = b; } #ifdef Q_WS_X11 void embedDisplay(WId id); #endif @@ -180,6 +184,7 @@ private: void setDirty(const QRect&); int viewdepth; // "faked" depth PixelFormat viewFormat; + bool rgb_swapped; int rsh; int gsh; int bsh; -- cgit v0.12 From d11cf4b8795a0f39e76432aa805f098388579d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Thu, 23 Apr 2009 11:44:57 +0200 Subject: Disable MIT-SHM usage on BGR server layouts under X11. Since the raster engine always assumes RGB layout in a QImage, we can't support this out of the box. Task-number: 248720 Reviewed-by: Samuel --- src/gui/kernel/qapplication_x11.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index b1270bc..f1fb001 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -398,7 +398,7 @@ extern bool qt_xdnd_dragging; // gui or non-gui from qapplication.cpp extern bool qt_is_gui_used; -/*! +/*! \internal Try to resolve a \a symbol from \a library with the version specified by \a vernum. @@ -836,7 +836,7 @@ bool QApplicationPrivate::x11_apply_settings() } int kdeSessionVersion = QString::fromLocal8Bit(qgetenv("KDE_SESSION_VERSION")).toInt(); - + if (!appFont) { QFont font(QApplication::font()); QString fontDescription; @@ -1948,11 +1948,17 @@ void qt_init(QApplicationPrivate *priv, int, { QString displayName = QLatin1String(XDisplayName(NULL)); - // apparently MITSHM only works for local displays, so do a quick check here - // to determine whether the display is local or not (not 100 % accurate) + // MITSHM only works for local displays, so do a quick check here + // to determine whether the display is local or not (not 100 % accurate). + // BGR server layouts are not supported either, since it requires the raster + // engine to work on a QImage with BGR layout. bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0; - if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) - X11->use_mitshm = mitshm_pixmaps; + if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) { + Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display)); + X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000 + && defaultVisual->green_mask == 0xff00 + && defaultVisual->blue_mask == 0xff); + } } #endif // QT_NO_MITSHM -- cgit v0.12 From 662f33a5b39f31579a2557a4d81469cfe30815c7 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 23 Apr 2009 11:29:12 +0200 Subject: Allow QThread to start a QTimer and QEventLoop before QCoreApplication is constructed Fix a regression from 4.3 to 4.4 that prevented QThread from starting timers and event loops before QCoreApplication was instantiated. Even though this is documented not to work, it seems that people have been relying on it. This reverts commit e52e5acdfa198cd079bbfe3a9302debf46c7cadd which attempted to work around not calling g_thread_init() multiple times. The proper fix is to serialize the g_thread_supported() checks in the Glib event dispatcher. Task-number: 248191 Reviewed-by: denis --- src/corelib/kernel/qeventdispatcher_glib.cpp | 3 +++ src/corelib/kernel/qeventloop.cpp | 5 +++-- src/corelib/thread/qthread_unix.cpp | 3 +-- src/corelib/thread/qthread_win.cpp | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 3fd768a..3c5b277 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -42,6 +42,7 @@ #include "qeventdispatcher_glib_p.h" #include "qeventdispatcher_unix_p.h" +#include #include #include "qcoreapplication.h" @@ -224,6 +225,8 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) : mainContext(context) { if (qgetenv("QT_NO_THREADED_GLIB").isEmpty()) { + static int dummyValue = 0; // only used for its address + QMutexLocker locker(QMutexPool::instance()->get(&dummyValue)); if (!g_thread_supported()) g_thread_init(NULL); } diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 92bdf73..600f787 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -188,8 +188,9 @@ int QEventLoop::exec(ProcessEventsFlags flags) d->threadData->eventLoops.push(this); // remove posted quit events when entering a new event loop - if (qApp->thread() == thread()) - QCoreApplication::removePostedEvents(qApp, QEvent::Quit); + QCoreApplication *app = QCoreApplication::instance(); + if (app && app->thread() == thread()) + QCoreApplication::removePostedEvents(app, QEvent::Quit); #if defined(QT_NO_EXCEPTIONS) while (!d->exit) diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index f602821..8f1c698 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -180,8 +180,7 @@ void *QThreadPrivate::start(void *arg) data->quitNow = false; // ### TODO: allow the user to create a custom event dispatcher - if (QCoreApplication::instance()) - createEventDispatcher(data); + createEventDispatcher(data); emit thr->started(); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 27193c6..7094e3d 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -292,8 +292,7 @@ unsigned int __stdcall QThreadPrivate::start(void *arg) data->quitNow = false; // ### TODO: allow the user to create a custom event dispatcher - if (QCoreApplication::instance()) - createEventDispatcher(data); + createEventDispatcher(data); #if !defined(QT_NO_DEBUG) && defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) // sets the name of the current thread. -- cgit v0.12 From 9accbe7e4de80e36462a38bd8686f2fea1153808 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 23 Apr 2009 13:00:44 +0200 Subject: Add WebKit examples to the Qt Demo Reviewed-by: Kavindra --- demos/qtdemo/xml/examples.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 03b59f3..0969945 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -213,6 +213,10 @@ + + + + -- cgit v0.12 From 18d1f6cad1eac37d9e9fe4ba933e57b7c84c6f99 Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Thu, 23 Apr 2009 11:10:12 +0200 Subject: Add fancy browser as the new example Reviewed-by: Simon Hausmann --- doc/src/examples.qdoc | 1 + doc/src/examples/fancybrowser.qdoc | 51 ++++++++ doc/src/images/fancybrowser-example.png | Bin 0 -> 98031 bytes examples/webkit/fancybrowser/fancybrowser.pro | 11 ++ examples/webkit/fancybrowser/jquery.min.js | 19 +++ examples/webkit/fancybrowser/jquery.qrc | 5 + examples/webkit/fancybrowser/main.cpp | 51 ++++++++ examples/webkit/fancybrowser/mainwindow.cpp | 167 ++++++++++++++++++++++++++ examples/webkit/fancybrowser/mainwindow.h | 76 ++++++++++++ examples/webkit/webkit.pro | 3 +- 10 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 doc/src/examples/fancybrowser.qdoc create mode 100644 doc/src/images/fancybrowser-example.png create mode 100644 examples/webkit/fancybrowser/fancybrowser.pro create mode 100644 examples/webkit/fancybrowser/jquery.min.js create mode 100644 examples/webkit/fancybrowser/jquery.qrc create mode 100644 examples/webkit/fancybrowser/main.cpp create mode 100644 examples/webkit/fancybrowser/mainwindow.cpp create mode 100644 examples/webkit/fancybrowser/mainwindow.h diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index e3c2291..2b7aea3 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -348,6 +348,7 @@ \list \o \l{webkit/previewer}{Previewer}\raisedaster \o \l{webkit/formextractor}{Form Extractor} + \o \l{webkit/fancybrowser}{Fancy Browser} \endlist \section1 Widgets diff --git a/doc/src/examples/fancybrowser.qdoc b/doc/src/examples/fancybrowser.qdoc new file mode 100644 index 0000000..9001c20 --- /dev/null +++ b/doc/src/examples/fancybrowser.qdoc @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the documentation 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example webkit/fancybrowser + \title Fancy Browser Example + + The Fancy Browser example shows how to use jQuery with QtWebKit to + make a web browser with some special effects and content manipulation. + + \image fancybrowser-example.png + +*/ diff --git a/doc/src/images/fancybrowser-example.png b/doc/src/images/fancybrowser-example.png new file mode 100644 index 0000000..717ac9d Binary files /dev/null and b/doc/src/images/fancybrowser-example.png differ diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro new file mode 100644 index 0000000..3de3036 --- /dev/null +++ b/examples/webkit/fancybrowser/fancybrowser.pro @@ -0,0 +1,11 @@ +QT += webkit +HEADERS = mainwindow.h +SOURCES = main.cpp \ + mainwindow.cpp +RESOURCES = jquery.qrc + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser +sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser +INSTALLS += target sources diff --git a/examples/webkit/fancybrowser/jquery.min.js b/examples/webkit/fancybrowser/jquery.min.js new file mode 100644 index 0000000..b1ae21d --- /dev/null +++ b/examples/webkit/fancybrowser/jquery.min.js @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/examples/webkit/fancybrowser/jquery.qrc b/examples/webkit/fancybrowser/jquery.qrc new file mode 100644 index 0000000..1022d68 --- /dev/null +++ b/examples/webkit/fancybrowser/jquery.qrc @@ -0,0 +1,5 @@ + + + jquery.min.js + + diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkit/fancybrowser/main.cpp new file mode 100644 index 0000000..5936469 --- /dev/null +++ b/examples/webkit/fancybrowser/main.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include "mainwindow.h" + +int main(int argc, char * argv[]) +{ + QApplication app(argc, argv); + MainWindow *browser = new MainWindow; + browser->show(); + return app.exec(); +} diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp new file mode 100644 index 0000000..bf61f9c --- /dev/null +++ b/examples/webkit/fancybrowser/mainwindow.cpp @@ -0,0 +1,167 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include "mainwindow.h" + +MainWindow::MainWindow() +{ + progress = 0; + + QFile file; + file.setFileName(":/jquery.min.js"); + file.open(QIODevice::ReadOnly); + jQuery = file.readAll(); + file.close(); + + view = new QWebView(this); + view->load(QUrl("http://www.google.com/ncr")); + connect(view, SIGNAL(loadFinished(bool)), SLOT(adjustLocation())); + connect(view, SIGNAL(titleChanged(const QString&)), SLOT(adjustTitle())); + connect(view, SIGNAL(loadProgress(int)), SLOT(setProgress(int))); + connect(view, SIGNAL(loadFinished(bool)), SLOT(finishLoading(bool))); + + locationEdit = new QLineEdit(this); + locationEdit->setSizePolicy(QSizePolicy::Expanding, locationEdit->sizePolicy().verticalPolicy()); + connect(locationEdit, SIGNAL(returnPressed()), SLOT(changeLocation())); + + QToolBar *toolBar = addToolBar(tr("Navigation")); + toolBar->addAction(view->pageAction(QWebPage::Back)); + toolBar->addAction(view->pageAction(QWebPage::Forward)); + toolBar->addAction(view->pageAction(QWebPage::Reload)); + toolBar->addAction(view->pageAction(QWebPage::Stop)); + toolBar->addWidget(locationEdit); + + QMenu *effectMenu = menuBar()->addMenu(tr("&Effect")); + effectMenu->addAction("Highlight all links", this, SLOT(highlightAllLinks())); + + QAction *rotateAction = new QAction(this); + rotateAction->setIcon(style()->standardIcon(QStyle::SP_FileDialogDetailedView)); + rotateAction->setCheckable(true); + rotateAction->setText(tr("Turn images upside down")); + connect(rotateAction, SIGNAL(toggled(bool)), this, SLOT(rotateImages(bool))); + effectMenu->addAction(rotateAction); + + QMenu *toolsMenu = menuBar()->addMenu(tr("&Tools")); + toolsMenu->addAction(tr("Remove GIF images"), this, SLOT(removeGifImages())); + toolsMenu->addAction(tr("Remove all inline frames"), this, SLOT(removeInlineFrames())); + toolsMenu->addAction(tr("Remove all object elements"), this, SLOT(removeObjectElements())); + toolsMenu->addAction(tr("Remove all embedded elements"), this, SLOT(removeEmbeddedElements())); + + setCentralWidget(view); +} + +void MainWindow::adjustLocation() +{ + locationEdit->setText(view->url().toString()); +} + +void MainWindow::changeLocation() +{ + QUrl url = QUrl(locationEdit->text()); + locationEdit->setText(url.toString()); + view->load(url); + view->setFocus(); +} + +void MainWindow::adjustTitle() +{ + if (progress <= 0 || progress >= 100) + setWindowTitle(view->title()); + else + setWindowTitle(QString("%1 (%2%)").arg(view->title()).arg(progress)); +} + +void MainWindow::setProgress(int p) +{ + progress = p; + adjustTitle(); +} + +void MainWindow::finishLoading(bool) +{ + progress = 100; + adjustTitle(); + view->page()->mainFrame()->evaluateJavaScript(jQuery); +} + +void MainWindow::highlightAllLinks() +{ + QString code = "$('a').each( function () { $(this).css('background-color', 'yellow') } )"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + +void MainWindow::rotateImages(bool toggle) +{ + QString code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s') } )"; + view->page()->mainFrame()->evaluateJavaScript(code); + if (toggle) + code = "$('img').each( function () { $(this).css('-webkit-transform', 'rotate(180deg)') } )"; + else + code = "$('img').each( function () { $(this).css('-webkit-transform', 'rotate(0deg)') } )"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + +void MainWindow::removeGifImages() +{ + QString code = "$('[src*=gif]').remove()"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + +void MainWindow::removeInlineFrames() +{ + QString code = "$('iframe').remove()"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + +void MainWindow::removeObjectElements() +{ + QString code = "$('object').remove()"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + +void MainWindow::removeEmbeddedElements() +{ + QString code = "$('embed').remove()"; + view->page()->mainFrame()->evaluateJavaScript(code); +} + diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkit/fancybrowser/mainwindow.h new file mode 100644 index 0000000..9362ca7 --- /dev/null +++ b/examples/webkit/fancybrowser/mainwindow.h @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +QT_BEGIN_NAMESPACE +class QWebView; +class QLineEdit; +QT_END_NAMESPACE + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(); + +protected slots: + + void adjustLocation(); + void changeLocation(); + void adjustTitle(); + void setProgress(int p); + void finishLoading(bool); + + void highlightAllLinks(); + void rotateImages(bool toggle); + void removeGifImages(); + void removeInlineFrames(); + void removeObjectElements(); + void removeEmbeddedElements(); + +private: + QString jQuery; + QWebView *view; + QLineEdit *locationEdit; + int progress; +}; diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro index 3777eec..a49830a 100644 --- a/examples/webkit/webkit.pro +++ b/examples/webkit/webkit.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += formextractor \ - previewer + previewer \ + fancybrowser # install target.path = $$[QT_INSTALL_EXAMPLES]/webkit -- cgit v0.12 From 67c6eef7832c1337b4262518d377c0af3fef2e70 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 23 Apr 2009 13:06:05 +0200 Subject: Add the fancybrowser to the examples in qtdemo Reviewed-by: Kavindra --- demos/qtdemo/xml/examples.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 0969945..07c2691 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -216,6 +216,7 @@ + -- cgit v0.12 From 148cb8d26d46067676677fde1cfb81d5d5c6d81b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 23 Apr 2009 13:06:19 +0200 Subject: Mention the jQuery MIT license in the 3rdparty license file, used in the fancybrowser example Reviewed-by: Kavindra --- doc/src/licenses.qdoc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc index b42b882..1c3f6d2 100644 --- a/doc/src/licenses.qdoc +++ b/doc/src/licenses.qdoc @@ -239,6 +239,24 @@ \o Parts of the internal QImageSmoothScaler::scale() function use code based on pnmscale.c by Jef Poskanzer. \endlist + + \hr + + jQuery JavaScript Library v1.3.2 + http://jquery.com/ + + Copyright (c) 2009 John Resig + Dual licensed under the MIT and GPL licenses. + http://docs.jquery.com/License + + Sizzle CSS Selector Engine - v0.9.3 + Copyright 2009, The Dojo Foundation + Released under the MIT, BSD, and GPL Licenses. + More information: http://sizzlejs.com/ + + \list + \o examples/webkit/fancybrowser/jquery.min.js + \endlist */ /*! -- cgit v0.12 From f58b35586cb703395fb123f7ea3e4b9b99033e63 Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 14:18:06 +0200 Subject: cleanup, normalized connect, etc... Task-number: none Reviewed-by: TrustMe --- tools/assistant/tools/assistant/mainwindow.cpp | 48 +++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index bcafacc..dbfac90 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -134,10 +134,10 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) dock->setWidget(m_searchWidget); addDockWidget(Qt::LeftDockWidgetArea, dock); - connect(m_searchWidget, SIGNAL(requestShowLink(const QUrl&)), - m_centralWidget, SLOT(setSource(const QUrl&))); - connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(const QUrl&)), - m_centralWidget, SLOT(setSourceInNewTab(const QUrl&))); + connect(m_searchWidget, SIGNAL(requestShowLink(QUrl)), m_centralWidget, + SLOT(setSource(QUrl))); + connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(QUrl)), + m_centralWidget, SLOT(setSourceInNewTab(QUrl))); #endif QString defWindowTitle = tr("Qt Assistant"); @@ -304,6 +304,7 @@ bool MainWindow::initHelpDB() hc.addCustomFilter(tr("Unfiltered"), QStringList()); hc.setCustomValue(unfiltered, 1); } + m_helpEngine->blockSignals(true); m_helpEngine->setCurrentFilter(tr("Unfiltered")); m_helpEngine->blockSignals(false); @@ -318,10 +319,10 @@ bool MainWindow::initHelpDB() void MainWindow::lookForNewQtDocumentation() { m_qtDocInstaller = new QtDocInstaller(m_helpEngine->collectionFile()); - connect(m_qtDocInstaller, SIGNAL(errorMessage(const QString&)), - this, SLOT(displayInstallationError(const QString&))); - connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)), - this, SLOT(qtDocumentationInstalled(bool))); + connect(m_qtDocInstaller, SIGNAL(errorMessage(QString)), this, + SLOT(displayInstallationError(QString))); + connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)), this, + SLOT(qtDocumentationInstalled(bool))); QString versionKey = QString(QLatin1String("qtVersion%1$$$qt")). arg(QLatin1String(QT_VERSION_STR)); @@ -353,8 +354,8 @@ void MainWindow::checkInitState() if (!m_connectedInitSignals) { connect(m_helpEngine->contentModel(), SIGNAL(contentsCreated()), this, SLOT(checkInitState())); - connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), - this, SLOT(checkInitState())); + connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), this, + SLOT(checkInitState())); m_connectedInitSignals = true; } } else { @@ -601,8 +602,8 @@ void MainWindow::setupFilterToolbar() connect(m_helpEngine, SIGNAL(setupFinished()), this, SLOT(setupFilterCombo())); - connect(m_filterCombo, SIGNAL(activated(const QString&)), this, - SLOT(filterDocumentation(const QString&))); + connect(m_filterCombo, SIGNAL(activated(QString)), this, + SLOT(filterDocumentation(QString))); setupFilterCombo(); } @@ -626,12 +627,12 @@ void MainWindow::setupAddressToolbar() toolBarMenu()->addAction(addressToolBar->toggleViewAction()); // address lineedit - connect(m_addressLineEdit, SIGNAL(returnPressed()), - this, SLOT(gotoAddress())); - connect(m_centralWidget, SIGNAL(currentViewerChanged()), - this, SLOT(showNewAddress())); - connect(m_centralWidget, SIGNAL(sourceChanged(const QUrl&)), - this, SLOT(showNewAddress(const QUrl&))); + connect(m_addressLineEdit, SIGNAL(returnPressed()), this, + SLOT(gotoAddress())); + connect(m_centralWidget, SIGNAL(currentViewerChanged()), this, + SLOT(showNewAddress())); + connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this, + SLOT(showNewAddress(QUrl))); } void MainWindow::updateAboutMenuText() @@ -712,10 +713,10 @@ void MainWindow::showPreferences() { PreferencesDialog dia(m_helpEngine, this); - connect(&dia, SIGNAL(updateApplicationFont()), - this, SLOT(updateApplicationFont())); - connect(&dia, SIGNAL(updateBrowserFont()), - m_centralWidget, SLOT(updateBrowserFont())); + connect(&dia, SIGNAL(updateApplicationFont()), this, + SLOT(updateApplicationFont())); + connect(&dia, SIGNAL(updateBrowserFont()), m_centralWidget, + SLOT(updateBrowserFont())); dia.showDialog(); } @@ -950,8 +951,7 @@ QWidget* MainWindow::setupBookmarkWidget() { m_bookmarkManager = new BookmarkManager(m_helpEngine); m_bookmarkWidget = new BookmarkWidget(m_bookmarkManager, this); - connect(m_bookmarkWidget, SIGNAL(addBookmark()), - this, SLOT(addBookmark())); + connect(m_bookmarkWidget, SIGNAL(addBookmark()), this, SLOT(addBookmark())); return m_bookmarkWidget; } -- cgit v0.12 From bc5995bd76dc665aab343263b51185cdfc9fd086 Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 14:20:24 +0200 Subject: Set the current filter if one gets passed by commandline. Task-number: none Reviewed-by: kh --- tools/assistant/tools/assistant/mainwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index dbfac90..cd6cdf1 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -228,6 +228,9 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) else if (m_cmdLine->bookmarks() == CmdLineParser::Activate) showBookmarks(); + if (!m_cmdLine->currentFilter().isEmpty()) + m_helpEngine->setCurrentFilter(m_cmdLine->currentFilter()); + if (usesDefaultCollection()) QTimer::singleShot(0, this, SLOT(lookForNewQtDocumentation())); else -- cgit v0.12 From aa234610048a741cddc991be25b84d235f40e345 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 Apr 2009 14:11:36 +0200 Subject: use qdoc3 debug version only when it is available By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh --- doc/doc.pri | 2 +- tools/qdoc3/qdoc3.pro | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/doc.pri b/doc/doc.pri index 46df3cb..a4c77fe 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -4,7 +4,7 @@ win32 { QT_WINCONFIG = release/ - CONFIG(debug, debug|release) { + !CONFIG(release, debug|release) { QT_WINCONFIG = debug/ } } diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 3268585..2bba8fb 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -99,10 +99,3 @@ SOURCES += apigenerator.cpp \ webxmlgenerator.cpp \ yyindent.cpp - -win32 { - QT_WINCONFIG = release - CONFIG(debug, debug|release) { - QT_WINCONFIG = debug - } -} -- cgit v0.12 From b51dd5a7b328291c5dbda540ce228e7d867662cb Mon Sep 17 00:00:00 2001 From: jasplin Date: Thu, 23 Apr 2009 14:26:19 +0200 Subject: Revert "Fixed key sequence eating behavior for QShortcut and QAction." This reverts commit 031adeaf42ddaef8d01338f6c59ba97170be5d53. The patch had some unforeseen side-effects for Creator. It may also affect other existing applications in a similar way. For now, this behavior (eating key sequences for disabled shortcuts) should be achieved using a local workaround in creator. Reviewed-by: mariusSO Task-number: 251246 --- src/gui/kernel/qaction.cpp | 47 +++++++++------------------------- src/gui/kernel/qaction_p.h | 1 - src/gui/kernel/qshortcut.cpp | 20 +++++++-------- src/gui/kernel/qshortcutmap.cpp | 9 ++++--- tests/auto/qaction/tst_qaction.cpp | 33 ------------------------ tests/auto/qshortcut/tst_qshortcut.cpp | 7 ++--- 6 files changed, 31 insertions(+), 86 deletions(-) diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 4edc1ca..abb17d7 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -136,27 +136,25 @@ void QActionPrivate::redoGrab(QShortcutMap &map) void QActionPrivate::redoGrabAlternate(QShortcutMap &map) { Q_Q(QAction); - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) + foreach (int id, alternateShortcutIds) + if (id) map.removeShortcut(id, q); alternateShortcutIds.clear(); if (alternateShortcuts.isEmpty()) return; - for (int i = 0; i < alternateShortcuts.size(); ++i) { - const QKeySequence &alternate = alternateShortcuts.at(i); + foreach (const QKeySequence& alternate, alternateShortcuts) { if (!alternate.isEmpty()) alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext)); else alternateShortcutIds.append(0); } - if (!enabled) { - for (int i = 0; i < alternateShortcutIds.size(); ++i) - map.setShortcutEnabled(false, alternateShortcutIds.at(i), q); + foreach (int id, alternateShortcutIds) + map.setShortcutEnabled(false, id, q); } if (!autorepeat) { - for (int i = 0; i < alternateShortcutIds.size(); ++i) - map.setShortcutAutoRepeat(false, alternateShortcutIds.at(i), q); + foreach (int id, alternateShortcutIds) + map.setShortcutAutoRepeat(false, id, q); } } @@ -165,26 +163,10 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) Q_Q(QAction); if (shortcutId) map.setShortcutEnabled(enable, shortcutId, q); - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) + foreach (int id, alternateShortcutIds) + if (id) map.setShortcutEnabled(enable, id, q); } - -void QActionPrivate::removeAll(QShortcutMap &map) -{ - Q_Q(QAction); - if (shortcutId) { - map.removeShortcut(shortcutId, q); - shortcutId = 0; - } - - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) - map.removeShortcut(id, q); - - alternateShortcutIds.clear(); -} - #endif // QT_NO_SHORTCUT @@ -633,8 +615,8 @@ QAction::~QAction() #ifndef QT_NO_SHORTCUT if (d->shortcutId && qApp) { qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this); - for (int i = 0; i < d->alternateShortcutIds.size(); ++i) - qApp->d_func()->shortcutMap.removeShortcut(d->alternateShortcutIds.at(i), this); + foreach (int id, d->alternateShortcutIds) + qApp->d_func()->shortcutMap.removeShortcut(id, this); } #endif } @@ -1067,12 +1049,7 @@ void QAction::setVisible(bool b) d->visible = b; d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ; #ifndef QT_NO_SHORTCUT - if (b) { - d->redoGrab(qApp->d_func()->shortcutMap); - d->redoGrabAlternate(qApp->d_func()->shortcutMap); - } else { - d->removeAll(qApp->d_func()->shortcutMap); - } + d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap); #endif d->sendDataChanged(); } diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index a5b3731..0617ef5 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -111,7 +111,6 @@ public: void redoGrab(QShortcutMap &map); void redoGrabAlternate(QShortcutMap &map); void setShortcutEnabled(bool enable, QShortcutMap &map); - void removeAll(QShortcutMap &map); static QShortcutMap *globalMap; #endif // QT_NO_SHORTCUT diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index f3c93c6..50b6e59 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -385,21 +385,19 @@ bool QShortcut::event(QEvent *e) { Q_D(QShortcut); bool handled = false; - if (e->type() == QEvent::Shortcut) { + if (d->sc_enabled && e->type() == QEvent::Shortcut) { QShortcutEvent *se = static_cast(e); if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){ - if (d->sc_enabled) { #ifndef QT_NO_WHATSTHIS - if (QWhatsThis::inWhatsThisMode()) { - QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); - handled = true; - } else + if (QWhatsThis::inWhatsThisMode()) { + QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); + handled = true; + } else #endif - if (se->isAmbiguous()) - emit activatedAmbiguously(); - else - emit activated(); - } + if (se->isAmbiguous()) + emit activatedAmbiguously(); + else + emit activated(); handled = true; } } diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 415d71e..1babeb6 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -368,8 +368,9 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) default: break; } - - return true; + // If nextState is QKeySequence::ExactMatch && identicals.count == 0 + // we've only found disabled shortcuts + return identicalMatches > 0 || result == QKeySequence::PartialMatch; } /*! \internal @@ -491,7 +492,9 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e) // We don't need partials, if we have identicals if (d->identicals.size()) break; - partialFound = true; + // We only care about enabled partials, so we don't consume + // key events when all partials are disabled! + partialFound |= (*it).enabled; } } ++it; diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp index 8e4ae86..34f2dfd 100644 --- a/tests/auto/qaction/tst_qaction.cpp +++ b/tests/auto/qaction/tst_qaction.cpp @@ -46,7 +46,6 @@ #include #include #include -#include //TESTED_CLASS= //TESTED_FILES= @@ -75,7 +74,6 @@ private slots: void setStandardKeys(); void alternateShortcuts(); void enabledVisibleInteraction(); - void invisibleActionWithComplexShortcut(); void task200823_tooltip(); private: @@ -324,36 +322,5 @@ void tst_QAction::task200823_tooltip() QCOMPARE(action->toolTip(), ref); } -void tst_QAction::invisibleActionWithComplexShortcut() -{ - QAction action(0); - action.setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E, Qt::Key_1)); - - QLineEdit edit; - edit.addAction(&action); - edit.show(); - QTest::qWait(100); - - QSignalSpy spy(&action, SIGNAL(triggered())); - - action.setVisible(true); - QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier); - QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier); - QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier); - QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier); - QCOMPARE(spy.count(), 1); - QCOMPARE(edit.text(), QLatin1String("")); - - edit.clear(); - spy.clear(); - action.setVisible(false); - QTest::keyPress(&edit, Qt::Key_E, Qt::ControlModifier); - QTest::keyRelease(&edit, Qt::Key_E, Qt::ControlModifier); - QTest::keyPress(&edit, Qt::Key_1, Qt::NoModifier); - QTest::keyRelease(&edit, Qt::Key_1, Qt::NoModifier); - QCOMPARE(spy.count(), 0); - QCOMPARE(edit.text(), QLatin1String("1")); -} - QTEST_MAIN(tst_QAction) #include "tst_qaction.moc" diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/qshortcut/tst_qshortcut.cpp index cd80204..69ebf74 100644 --- a/tests/auto/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/qshortcut/tst_qshortcut.cpp @@ -987,16 +987,17 @@ void tst_QShortcut::keypressConsumption() cut1->setEnabled(false); cut2->setEnabled(false); - edit->clear(); + // Make sure keypresses is passed on, since all multiple keysequences + // with Ctrl+I are disabled sendKeyEvents(edit, Qt::CTRL + Qt::Key_I, 0); // Send key to edit QCOMPARE( currentResult, NoResult ); QCOMPARE( ambigResult, NoResult ); - QVERIFY(edit->toPlainText().isEmpty()); + QVERIFY(edit->toPlainText().endsWith("")); sendKeyEvents(edit, Qt::Key_A, 'a'); // Send key to edit QCOMPARE( currentResult, NoResult ); QCOMPARE( ambigResult, NoResult ); - QVERIFY(edit->toPlainText().isEmpty()); + QVERIFY(edit->toPlainText().endsWith("a")); clearAllShortcuts(); } -- cgit v0.12 From a9157844903870521d94a5a576efd143f04f2aa3 Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 15:08:23 +0200 Subject: update the filter combobox if we set a passed filter --- tools/assistant/tools/assistant/mainwindow.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index cd6cdf1..c1e9027 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -228,8 +228,17 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) else if (m_cmdLine->bookmarks() == CmdLineParser::Activate) showBookmarks(); - if (!m_cmdLine->currentFilter().isEmpty()) - m_helpEngine->setCurrentFilter(m_cmdLine->currentFilter()); + if (!m_cmdLine->currentFilter().isEmpty()) { + const QString &curFilter = m_cmdLine->currentFilter(); + m_helpEngine->setCurrentFilter(curFilter); + int idx = m_filterCombo->findText(curFilter); + if (idx >= 0) { + bool blocked = m_filterCombo->signalsBlocked(); + m_filterCombo->blockSignals(true); + m_filterCombo->setCurrentIndex(idx); + m_filterCombo->blockSignals(blocked); + } + } if (usesDefaultCollection()) QTimer::singleShot(0, this, SLOT(lookForNewQtDocumentation())); -- cgit v0.12 From 11eb20de2bbc2bb0809a0238d3124613ffac6ed4 Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 15:11:16 +0200 Subject: make sure we wait until the page has fully loaded before duplicating --- tools/assistant/tools/assistant/centralwidget.cpp | 4 ++++ tools/assistant/tools/assistant/helpviewer.cpp | 12 +++++++++++- tools/assistant/tools/assistant/helpviewer.h | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index 1b0e671..633747a 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -277,7 +277,11 @@ CentralWidget *CentralWidget::instance() void CentralWidget::newTab() { HelpViewer* viewer = currentHelpViewer(); +#if !defined(QT_NO_WEBKIT) + if (viewer && viewer->hasLoadFinished()) +#else if (viewer) +#endif setSourceInNewTab(viewer->source()); } diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index f7225fa..5ce6e14 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -269,7 +269,10 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *, } HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent) - : QWebView(parent), helpEngine(engine), parentWidget(parent) + : QWebView(parent) + , helpEngine(engine) + , parentWidget(parent) + , loadFinished(false) { setAcceptDrops(false); @@ -295,10 +298,12 @@ HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent) connect(page(), SIGNAL(linkHovered(QString, QString, QString)), this, SIGNAL(highlighted(QString))); connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl))); + connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool))); } void HelpViewer::setSource(const QUrl &url) { + loadFinished = false; if (url.toString() == QLatin1String("help")) { load(QUrl(QLatin1String("qthelp://com.trolltech.com." "assistantinternal_1.0.0/assistant/assistant.html"))); @@ -385,6 +390,11 @@ void HelpViewer::mousePressEvent(QMouseEvent *event) QWebView::mousePressEvent(event); } +void HelpViewer::setLoadFinished(bool ok) +{ + loadFinished = ok; +} + #else // !defined(QT_NO_WEBKIT) HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent) diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h index eea7340..c66b69c 100644 --- a/tools/assistant/tools/assistant/helpviewer.h +++ b/tools/assistant/tools/assistant/helpviewer.h @@ -92,6 +92,8 @@ public: { return pageAction(QWebPage::Forward)->isEnabled(); } inline bool isBackwardAvailable() const { return pageAction(QWebPage::Back)->isEnabled(); } + inline bool hasLoadFinished() const + { return loadFinished; } public Q_SLOTS: void home(); @@ -111,10 +113,12 @@ protected: private Q_SLOTS: void actionChanged(); + void setLoadFinished(bool ok); private: QHelpEngine *helpEngine; CentralWidget* parentWidget; + bool loadFinished; }; #else -- cgit v0.12 From a5c7f0c0ea7dc47cf7cbd740af3dc6b241d68ffb Mon Sep 17 00:00:00 2001 From: jasplin Date: Thu, 23 Apr 2009 15:08:08 +0200 Subject: Revert "Removed dead code." This reverts commit 99d243860548d6be8a68dfd027c51530351d12cb. Needed because of commit b51dd5a7b328291c5dbda540ce228e7d867662cb. --- src/gui/kernel/qshortcutmap.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 1babeb6..ed9654b 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -359,6 +359,8 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) else e->ignore(); + int identicalMatches = d->identicals.count(); + switch(result) { case QKeySequence::NoMatch: return stateWasAccepted; -- cgit v0.12 From 6d0bdd9a3130985451c61d8caa53148c10263059 Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 15:14:32 +0200 Subject: fixes open an empty page on invalid keyword --- tools/assistant/tools/assistant/indexwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp index 0beb5ee..a2c0950 100644 --- a/tools/assistant/tools/assistant/indexwindow.cpp +++ b/tools/assistant/tools/assistant/indexwindow.cpp @@ -197,6 +197,8 @@ void IndexWindow::open(QHelpIndexWidget* indexWidget, const QModelIndex &index) url = tc.link(); } else if (links.count() == 1) { url = links.constBegin().value(); + } else { + return; } if (url.path().endsWith(QLatin1String(".pdf"), Qt::CaseInsensitive)) -- cgit v0.12 From 7fec4bb21bc78760bd1603efb1b62453ac743e01 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 23 Apr 2009 15:03:43 +0200 Subject: fix pro file --- tests/auto/qlocalsocket/test/test.pro | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro index 8ce7c50..7befdf9 100644 --- a/tests/auto/qlocalsocket/test/test.pro +++ b/tests/auto/qlocalsocket/test/test.pro @@ -1,7 +1,5 @@ load(qttest_p4) -include(../src/src.pri) - DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG !wince*: { @@ -14,14 +12,16 @@ DEFINES += QLOCALSOCKET_DEBUG QT = core network SOURCES += ../tst_qlocalsocket.cpp -TARGET = ../tst_qlocalsocket -win32 { +TARGET = tst_qlocalsocket +CONFIG(debug_and_release) { CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlocalsocket -} else { - TARGET = ../../release/tst_qlocalsocket + DESTDIR = ../debug + } else { + DESTDIR = ../release } +} else { + DESTDIR = .. } wince* { -- cgit v0.12 From eb48c652475a11d32e8ce5fd7d42cea827656f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 23 Apr 2009 11:44:00 +0200 Subject: Fixes for QByteArrayMatcher Copy constructor and assignment operator lose data: pointer to content and the length of content also need to be copied over. QByteArrayMatcher::pattern() would return a null byte array if instance was initialized with c-string. Changed default constructor to explicitly initialize pattern length to zero. The bug in the assignment operator is a regression against 4.4.3. Task-number: 251958 Reviewed-by: MariusSO Reviewed-by: paul --- src/corelib/tools/qbytearraymatcher.cpp | 3 +- src/corelib/tools/qbytearraymatcher.h | 7 +- tests/auto/qbytearraymatcher/qbytearraymatcher.pro | 4 + .../qbytearraymatcher/tst_qbytearraymatcher.cpp | 124 +++++++++++++++++++++ 4 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 tests/auto/qbytearraymatcher/qbytearraymatcher.pro create mode 100644 tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp index cd4cf90..211d190 100644 --- a/src/corelib/tools/qbytearraymatcher.cpp +++ b/src/corelib/tools/qbytearraymatcher.cpp @@ -120,6 +120,7 @@ QByteArrayMatcher::QByteArrayMatcher() : d(0) { p.p = 0; + p.l = 0; qMemSet(p.q_skiptable, 0, sizeof(p.q_skiptable)); } @@ -170,7 +171,7 @@ QByteArrayMatcher::~QByteArrayMatcher() QByteArrayMatcher &QByteArrayMatcher::operator=(const QByteArrayMatcher &other) { q_pattern = other.q_pattern; - qMemCopy(p.q_skiptable, other.p.q_skiptable, sizeof(p.q_skiptable)); + qMemCopy(&p, &other.p, sizeof(p)); return *this; } diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index d7f2366..633e92c 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -67,7 +67,12 @@ public: int indexIn(const QByteArray &ba, int from = 0) const; int indexIn(const char *str, int len, int from = 0) const; - inline QByteArray pattern() const { return q_pattern; } + inline QByteArray pattern() const + { + if (q_pattern.isNull()) + return QByteArray((const char*)p.p, p.l); + return q_pattern; + } private: QByteArrayMatcherPrivate *d; diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro new file mode 100644 index 0000000..1618c3e --- /dev/null +++ b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro @@ -0,0 +1,4 @@ +load(qttest_p4) +SOURCES += tst_qbytearraymatcher.cpp + +QT = core diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp new file mode 100644 index 0000000..c3f2fd9 --- /dev/null +++ b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the test suite 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include + +#include + +class tst_QByteArrayMatcher : public QObject +{ + Q_OBJECT + +private slots: + void interface(); + void task251958(); +}; + +static QByteArrayMatcher matcher1; + +void tst_QByteArrayMatcher::interface() +{ + const char needle[] = "abc123"; + QByteArray haystack(500, 'a'); + haystack.insert(6, "123"); + haystack.insert(31, "abc"); + haystack.insert(42, "abc123"); + haystack.insert(84, "abc123"); + + matcher1 = QByteArrayMatcher(QByteArray(needle)); + QByteArrayMatcher matcher2; + matcher2.setPattern(QByteArray(needle)); + + QByteArrayMatcher matcher3 = QByteArrayMatcher(QByteArray(needle)); + QByteArrayMatcher matcher4(needle, sizeof(needle - 1)); + QByteArrayMatcher matcher5(matcher2); + QByteArrayMatcher matcher6; + matcher6 = matcher3; + + QCOMPARE(matcher1.indexIn(haystack), 42); + QCOMPARE(matcher2.indexIn(haystack), 42); + QCOMPARE(matcher3.indexIn(haystack), 42); + QCOMPARE(matcher4.indexIn(haystack), 42); + QCOMPARE(matcher5.indexIn(haystack), 42); + QCOMPARE(matcher6.indexIn(haystack), 42); + + QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length()), 42); + + QCOMPARE(matcher1.indexIn(haystack, 43), 84); + QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 43), 84); + QCOMPARE(matcher1.indexIn(haystack, 85), -1); + QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 85), -1); + + QByteArrayMatcher matcher7(QByteArray("123")); + QCOMPARE(matcher7.indexIn(haystack), 6); + + matcher7 = QByteArrayMatcher(QByteArray("abc")); + QCOMPARE(matcher7.indexIn(haystack), 31); + + matcher7.setPattern(matcher4.pattern()); + QCOMPARE(matcher7.indexIn(haystack), 42); +} + + +static QByteArrayMatcher matcher; + +void tst_QByteArrayMatcher::task251958() +{ + const char p_data[] = { 0x0, 0x0, 0x1 }; + QByteArray pattern(p_data, sizeof(p_data)); + + QByteArray haystack(8, '\0'); + haystack[7] = 0x1; + + matcher = QByteArrayMatcher(pattern); + QCOMPARE(matcher.indexIn(haystack, 0), 5); + QCOMPARE(matcher.indexIn(haystack, 1), 5); + QCOMPARE(matcher.indexIn(haystack, 2), 5); + + matcher.setPattern(pattern); + QCOMPARE(matcher.indexIn(haystack, 0), 5); + QCOMPARE(matcher.indexIn(haystack, 1), 5); + QCOMPARE(matcher.indexIn(haystack, 2), 5); +} + +QTEST_APPLESS_MAIN(tst_QByteArrayMatcher) +#include "tst_qbytearraymatcher.moc" -- cgit v0.12 From 2e8ece735d6a31f4657192e77b9dc53fb2a03e9c Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Thu, 23 Apr 2009 14:13:35 +0200 Subject: Added Google Chat client as a new WebKit example Reviewed-by: Simon Hausmann --- demos/qtdemo/xml/examples.xml | 1 + doc/src/examples.qdoc | 1 + doc/src/examples/googlechat.qdoc | 51 +++++++ doc/src/images/googlechat-example.png | Bin 0 -> 52624 bytes examples/webkit/googlechat/form.ui | 214 ++++++++++++++++++++++++++++++ examples/webkit/googlechat/googlechat.cpp | 163 +++++++++++++++++++++++ examples/webkit/googlechat/googlechat.h | 71 ++++++++++ examples/webkit/googlechat/googlechat.pro | 11 ++ examples/webkit/googlechat/main.cpp | 51 +++++++ examples/webkit/webkit.pro | 3 +- 10 files changed, 565 insertions(+), 1 deletion(-) create mode 100644 doc/src/examples/googlechat.qdoc create mode 100644 doc/src/images/googlechat-example.png create mode 100644 examples/webkit/googlechat/form.ui create mode 100644 examples/webkit/googlechat/googlechat.cpp create mode 100644 examples/webkit/googlechat/googlechat.h create mode 100644 examples/webkit/googlechat/googlechat.pro create mode 100644 examples/webkit/googlechat/main.cpp diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 07c2691..667f9f2 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -217,6 +217,7 @@ + diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 2b7aea3..efe9b2f 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -348,6 +348,7 @@ \list \o \l{webkit/previewer}{Previewer}\raisedaster \o \l{webkit/formextractor}{Form Extractor} + \o \l{webkit/googlechat}{Google Chat} \o \l{webkit/fancybrowser}{Fancy Browser} \endlist diff --git a/doc/src/examples/googlechat.qdoc b/doc/src/examples/googlechat.qdoc new file mode 100644 index 0000000..f2d61cf --- /dev/null +++ b/doc/src/examples/googlechat.qdoc @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the documentation 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example webkit/googlechat + \title Google Chat Example + + The Google Chat example shows how to use implement a simple Google Chat + client with QtWebKit. + + \image googlechat-example.png + +*/ diff --git a/doc/src/images/googlechat-example.png b/doc/src/images/googlechat-example.png new file mode 100644 index 0000000..0338445 Binary files /dev/null and b/doc/src/images/googlechat-example.png differ diff --git a/examples/webkit/googlechat/form.ui b/examples/webkit/googlechat/form.ui new file mode 100644 index 0000000..3b9fb82 --- /dev/null +++ b/examples/webkit/googlechat/form.ui @@ -0,0 +1,214 @@ + + + Form + + + + 0 + 0 + 286 + 413 + + + + Google Talk Client + + + + 0 + + + 0 + + + + + 1 + + + + + + + Qt::Vertical + + + + 20 + 170 + + + + + + + + TextLabel + + + Qt::AlignCenter + + + + + + + 24 + + + + + + + Qt::Vertical + + + + 20 + 169 + + + + + + + + + + + + Qt::Vertical + + + + 20 + 119 + + + + + + + + Google username: + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 17 + + + + + + + + Password: + + + + + + + QLineEdit::Password + + + + + + + Qt::Vertical + + + + 20 + 118 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Login + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + + + 0 + + + + + + about:blank + + + + + + + + + + + + + QWebView + QWidget +
QtWebKit/QWebView
+
+
+ + +
diff --git a/examples/webkit/googlechat/googlechat.cpp b/examples/webkit/googlechat/googlechat.cpp new file mode 100644 index 0000000..9ac2cd2 --- /dev/null +++ b/examples/webkit/googlechat/googlechat.cpp @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include "googlechat.h" + +#define GOOGLECHAT_URL "http://talkgadget.google.com/talkgadget/m" + +GoogleChat::GoogleChat(): QWidget() { + form.setupUi(this); + setFixedSize(320, 480); + + form.userNameEdit->setFocus(); + connect(form.userNameEdit, SIGNAL(textChanged(QString)), SLOT(adjustLoginButton())); + connect(form.userNameEdit, SIGNAL(returnPressed()), SLOT(inputPassword())); + + connect(form.passwordEdit, SIGNAL(textChanged(QString)), SLOT(adjustLoginButton())); + connect(form.passwordEdit, SIGNAL(returnPressed()), SLOT(doLogin())); + + form.loginButton->setEnabled(false); + connect(form.loginButton, SIGNAL(clicked()), SLOT(doLogin())); + + connect(form.webView, SIGNAL(loadFinished(bool)), SLOT(initialPage(bool))); + connect(form.webView, SIGNAL(loadProgress(int)), + form.progressBar, SLOT(setValue(int))); + form.webView->setUrl((QUrl(GOOGLECHAT_URL))); + form.webView->setContextMenuPolicy(Qt::PreventContextMenu); + + showStatus("Wait..."); +} + +void GoogleChat::showStatus(const QString &msg) { + form.statusLabel->setText(msg); + form.stackedWidget->setCurrentIndex(0); +} + +void GoogleChat::showError(const QString &msg) { + form.progressBar->hide(); + showStatus(QString("Error: %1").arg(msg)); +} + +QString GoogleChat::evalJS(const QString &js) { + QWebFrame *frame = form.webView->page()->mainFrame(); + return frame->evaluateJavaScript(js).toString(); +} + +void GoogleChat::adjustLoginButton() { + userName = form.userNameEdit->text(); + password = form.passwordEdit->text(); + bool ok = !userName.isEmpty() && !password.isEmpty(); + form.loginButton->setEnabled(ok); +} + +void GoogleChat::inputPassword() { + if (!form.userNameEdit->text().isEmpty()) + form.passwordEdit->setFocus(); +} + +void GoogleChat::doLogin() { + userName = form.userNameEdit->text(); + password = form.passwordEdit->text(); + bool ok = !userName.isEmpty() && !password.isEmpty(); + if (!ok) + return; + + form.progressBar->setValue(0); + form.progressBar->show(); + connect(form.webView, SIGNAL(loadFinished(bool)), SLOT(loginPage(bool))); + connect(form.webView, SIGNAL(loadProgress(int)), + form.progressBar, SLOT(setValue(int))); + showStatus("Logging in..."); + + QString userEmail = userName + "@gmail.com"; + evalJS(QString("document.getElementById('Email').value = \"%1\";").arg(userEmail)); + evalJS(QString("document.getElementById('Passwd').value = \"%1\";").arg(password)); + evalJS("document.getElementById('gaia_loginform').submit();"); +} + +void GoogleChat::initialPage(bool ok) { + if (ok) { + QString s1 = evalJS("document.getElementById('Email').name"); + QString s2 = evalJS("document.getElementById('Passwd').name"); + QString s3 = evalJS("document.getElementById('gaia_loginform').id"); + if (s1 == "Email" && s2 == "Passwd" && s3 == "gaia_loginform") { + form.stackedWidget->setCurrentIndex(1); + form.webView->disconnect(); + return; + } + } + + showError("SERVICE unavailable."); +} + +void GoogleChat::hideElements() +{ + evalJS("var e = document.getElementsByClassName('footer-footer')[0]; e.parentElement.removeChild(e)"); + evalJS("var e = document.getElementsByClassName('title-bar-bg title-bar')[0]; e.parentElement.removeChild(e)"); + QTimer::singleShot(2000, this, SLOT(hideElements())); +} + +void GoogleChat::loginPage(bool ok) { + QString location = form.webView->url().toString(); + if (!ok) { + if (location.indexOf("CheckCookie")) + return; + showError("Service unavailable"); + } else { + // check for any error message + QString c = evalJS("document.getElementsByClassName('errormsg').length"); + if (c == "0") { + form.stackedWidget->setCurrentIndex(2); + QTimer::singleShot(500, this, SLOT(hideElements())); + return; + } + + QString err = "Unknown login failure."; + if (c == "1") { + err = evalJS("document.getElementsByClassName('errormsg')[0].textContent"); + err = err.simplified(); + } + showError(err); + } +} diff --git a/examples/webkit/googlechat/googlechat.h b/examples/webkit/googlechat/googlechat.h new file mode 100644 index 0000000..c92632c --- /dev/null +++ b/examples/webkit/googlechat/googlechat.h @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "ui_form.h" + +class GoogleChat: public QWidget +{ + Q_OBJECT + +public: + GoogleChat(); + +protected: + void showStatus(const QString &msg); + void showError(const QString &msg); + QString evalJS(const QString &js); + +private slots: + + void adjustLoginButton(); + void inputPassword(); + void doLogin(); + void initialPage(bool ok); + void loginPage(bool ok); + void hideElements(); + +private: + Ui::Form form; + QString userName; + QString password; +}; diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro new file mode 100644 index 0000000..14b7085 --- /dev/null +++ b/examples/webkit/googlechat/googlechat.pro @@ -0,0 +1,11 @@ +QT += webkit +HEADERS = googlechat.h +SOURCES = main.cpp \ + googlechat.cpp +FORMS = form.ui + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat +sources.files = $$SOURCES $$HEADERS $$FORMS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat +INSTALLS += target sources diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp new file mode 100644 index 0000000..26feeea --- /dev/null +++ b/examples/webkit/googlechat/main.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include "googlechat.h" + +int main(int argc, char * argv[]) +{ + QApplication app(argc, argv); + GoogleChat *chat = new GoogleChat; + chat->show(); + return app.exec(); +} diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro index a49830a..225816a 100644 --- a/examples/webkit/webkit.pro +++ b/examples/webkit/webkit.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs SUBDIRS += formextractor \ previewer \ - fancybrowser + fancybrowser \ + googlechat # install target.path = $$[QT_INSTALL_EXAMPLES]/webkit -- cgit v0.12 From 63414acd04910b6b016786f1c340440562eebca1 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 23 Apr 2009 15:44:28 +0200 Subject: Make BGR mode configurable through the GUI --- tools/qvfb/qvfb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index 0fb3577..8de638f 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -635,6 +635,7 @@ void QVFb::configure() config->touchScreen->setChecked(view->touchScreenEmulation()); config->lcdScreen->setChecked(view->lcdScreenEmulation()); chooseDepth(view->displayDepth(), view->displayFormat()); + config->rgbSwapped->setChecked(view->rgbSwapped()); connect(config->skin, SIGNAL(activated(int)), this, SLOT(skinConfigChosen(int))); if ( view->gammaRed() == view->gammaGreen() && view->gammaGreen() == view->gammaBlue() ) { config->gammaslider->setValue(int(view->gammaRed()*400)); @@ -710,6 +711,7 @@ void QVFb::configure() } view->setViewFormat(displayFormat); view->setTouchscreenEmulation( config->touchScreen->isChecked() ); + view->setRgbSwapped(config->rgbSwapped->isChecked()); bool lcdEmulation = config->lcdScreen->isChecked(); view->setLcdScreenEmulation( lcdEmulation ); if ( lcdEmulation ) -- cgit v0.12 From 08cc1ca928c197a0c94ff791da34e0a79eaed61b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 23 Apr 2009 15:29:50 +0200 Subject: clean up server socket on startup --- tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index f741b96..e62b657 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -112,6 +112,8 @@ tst_QLocalSocket::tst_QLocalSocket() #endif )) qWarning() << "lackey executable doesn't exists!"; + + QLocalServer::removeServer("tst_localsocket"); } tst_QLocalSocket::~tst_QLocalSocket() -- cgit v0.12 From 310496564dabe5f3038c64feff6f444074ee65b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 23 Apr 2009 15:30:16 +0200 Subject: correctly handle remote disconnects about the only error case for a PeekNamedPipe() which does not actually want to read anything is some kind of disconnect. so ignore the error code and just handle the error as a close. Task-number: 247144 Reviewed-by: thiago --- src/network/socket/qlocalsocket_win.cpp | 2 +- tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e759d0b..39c9284 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -298,7 +298,7 @@ qint64 QLocalSocketPrivate::bytesAvailable() if (PeekNamedPipe(handle, NULL, 0, NULL, &bytes, NULL)) { return bytes; } else { - if (ERROR_BROKEN_PIPE == GetLastError() && !pipeClosed) { + if (!pipeClosed) { pipeClosed = true; QTimer::singleShot(0, q, SLOT(_q_pipeClosed())); } diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index e62b657..deabda6 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -95,6 +95,7 @@ private slots: void longPath(); void waitForDisconnect(); + void waitForDisconnectByServer(); void removeServer(); @@ -785,6 +786,25 @@ void tst_QLocalSocket::waitForDisconnect() QVERIFY(timer.elapsed() < 2000); } +void tst_QLocalSocket::waitForDisconnectByServer() +{ + QString name = "tst_localsocket"; + LocalServer server; + QVERIFY(server.listen(name)); + LocalSocket socket; + QSignalSpy spy(&socket, SIGNAL(disconnected())); + QVERIFY(spy.isValid()); + socket.connectToServer(name); + QVERIFY(socket.waitForConnected(3000)); + QVERIFY(server.waitForNewConnection(3000)); + QLocalSocket *serverSocket = server.nextPendingConnection(); + QVERIFY(serverSocket); + serverSocket->close(); + QVERIFY(serverSocket->state() == QLocalSocket::UnconnectedState); + QVERIFY(socket.waitForDisconnected(3000)); + QCOMPARE(spy.count(), 1); +} + void tst_QLocalSocket::removeServer() { // this is a hostile takeover, but recovering from a crash results in the same -- cgit v0.12 From 290923f7fab2f2c14f5b92252f7bbfb6bbb695ba Mon Sep 17 00:00:00 2001 From: kh Date: Thu, 23 Apr 2009 16:56:58 +0200 Subject: cleanup --- tools/assistant/tools/assistant/mainwindow.cpp | 25 +--------- tools/assistant/tools/assistant/mainwindow.h | 3 -- tools/assistant/tools/assistant/searchwidget.cpp | 62 ++++++++---------------- 3 files changed, 22 insertions(+), 68 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index c1e9027..2e39186 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -88,7 +88,6 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) : QMainWindow(parent) , m_toolBarMenu(0) , m_cmdLine(cmdLine) - , m_searchWidget(0) , m_progressWidget(0) , m_qtDocInstaller(0) , m_connectedInitSignals(false) @@ -125,20 +124,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) connect(searchEngine, SIGNAL(indexingStarted()), this, SLOT(indexingStarted())); connect(searchEngine, SIGNAL(indexingFinished()), this, SLOT(indexingFinished())); -#ifdef QT_CLUCENE_SUPPORT m_centralWidget->createSearchWidget(searchEngine); -#else - QDockWidget *dock = new QDockWidget(tr("Search"), this); - dock->setObjectName(QLatin1String("SearchWindow")); - m_searchWidget = new SearchWidget(searchEngine, this); - dock->setWidget(m_searchWidget); - addDockWidget(Qt::LeftDockWidgetArea, dock); - - connect(m_searchWidget, SIGNAL(requestShowLink(QUrl)), m_centralWidget, - SLOT(setSource(QUrl))); - connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(QUrl)), - m_centralWidget, SLOT(setSourceInNewTab(QUrl))); -#endif QString defWindowTitle = tr("Qt Assistant"); setWindowTitle(defWindowTitle); @@ -882,19 +868,12 @@ void MainWindow::activateCurrentCentralWidgetTab() void MainWindow::showSearch() { - if (m_searchWidget) - activateDockWidget(m_searchWidget); - else - m_centralWidget->activateSearch(); + m_centralWidget->activateSearch(); } void MainWindow::hideSearch() { - if (m_searchWidget) { - m_searchWidget->parentWidget()->parentWidget()->hide(); - } else { - m_centralWidget->removeSearchWidget(); - } + m_centralWidget->removeSearchWidget(); } void MainWindow::updateApplicationFont() diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h index c716b1c..1bd8005 100644 --- a/tools/assistant/tools/assistant/mainwindow.h +++ b/tools/assistant/tools/assistant/mainwindow.h @@ -62,8 +62,6 @@ class BookmarkWidget; class CmdLineParser; class QtDocInstaller; -class SearchWidget; - class MainWindow : public QMainWindow { Q_OBJECT @@ -159,7 +157,6 @@ private: QMenu *m_toolBarMenu; CmdLineParser *m_cmdLine; - SearchWidget *m_searchWidget; QWidget *m_progressWidget; QtDocInstaller *m_qtDocInstaller; diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp index 000c73d..677e18e 100644 --- a/tools/assistant/tools/assistant/searchwidget.cpp +++ b/tools/assistant/tools/assistant/searchwidget.cpp @@ -70,16 +70,18 @@ SearchWidget::SearchWidget(QHelpSearchEngine *engine, QWidget *parent) QHelpSearchQueryWidget *queryWidget = searchEngine->queryWidget(); vLayout->addWidget(queryWidget); - vLayout->addWidget(resultWidget); - + vLayout->addWidget(resultWidget); + setFocusProxy(queryWidget); connect(queryWidget, SIGNAL(search()), this, SLOT(search())); - connect(resultWidget, SIGNAL(requestShowLink(const QUrl&)), - this, SIGNAL(requestShowLink(const QUrl&))); + connect(resultWidget, SIGNAL(requestShowLink(QUrl)), this, + SIGNAL(requestShowLink(QUrl))); - connect(searchEngine, SIGNAL(searchingStarted()), this, SLOT(searchingStarted())); - connect(searchEngine, SIGNAL(searchingFinished(int)), this, SLOT(searchingFinished(int))); + connect(searchEngine, SIGNAL(searchingStarted()), this, + SLOT(searchingStarted())); + connect(searchEngine, SIGNAL(searchingFinished(int)), this, + SLOT(searchingFinished(int))); QTextBrowser* browser = qFindChild(resultWidget); browser->viewport()->installEventFilter(this); @@ -92,10 +94,6 @@ SearchWidget::~SearchWidget() void SearchWidget::zoomIn() { -#ifndef QT_CLUCENE_SUPPORT - return; -#endif - QTextBrowser* browser = qFindChild(resultWidget); if (browser && zoomCount != 10) { zoomCount++; @@ -105,10 +103,6 @@ void SearchWidget::zoomIn() void SearchWidget::zoomOut() { -#ifndef QT_CLUCENE_SUPPORT - return; -#endif - QTextBrowser* browser = qFindChild(resultWidget); if (browser && zoomCount != -5) { zoomCount--; @@ -118,10 +112,6 @@ void SearchWidget::zoomOut() void SearchWidget::resetZoom() { -#ifndef QT_CLUCENE_SUPPORT - return; -#endif - if (zoomCount == 0) return; @@ -152,7 +142,8 @@ void SearchWidget::searchingFinished(int hits) bool SearchWidget::eventFilter(QObject* o, QEvent *e) { QTextBrowser* browser = qFindChild(resultWidget); - if (browser && o == browser->viewport() && e->type() == QEvent::MouseButtonRelease){ + if (browser && o == browser->viewport() + && e->type() == QEvent::MouseButtonRelease){ QMouseEvent *me = static_cast(e); QUrl link = resultWidget->linkAt(me->pos()); if (!link.isEmpty() || link.isValid()) { @@ -179,7 +170,6 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) QMenu menu; QPoint point = contextMenuEvent->globalPos(); -#ifdef QT_CLUCENE_SUPPORT QTextBrowser* browser = qFindChild(resultWidget); if (!browser) return; @@ -190,22 +180,25 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) QUrl link = browser->anchorAt(point); - QAction *copyAction = menu.addAction(tr("&Copy") + - QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL | Qt::Key_C)))); + QKeySequence keySeq(QKeySequence::Copy); + QAction *copyAction = menu.addAction(tr("&Copy") + QLatin1String("\t") + + keySeq.toString(QKeySequence::NativeText)); copyAction->setEnabled(QTextCursor(browser->textCursor()).hasSelection()); QAction *copyAnchorAction = menu.addAction(tr("Copy &Link Location")); copyAnchorAction->setEnabled(!link.isEmpty() && link.isValid()); - QAction *newTabAction = menu.addAction(tr("Open Link in New Tab") + - QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL))) + + keySeq = QKeySequence(Qt::CTRL); + QAction *newTabAction = menu.addAction(tr("Open Link in New Tab") + + QLatin1String("\t") + keySeq.toString(QKeySequence::NativeText) + QLatin1String("LMB")); newTabAction->setEnabled(!link.isEmpty() && link.isValid()); menu.addSeparator(); - QAction *selectAllAction = menu.addAction(tr("Select All") + - QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL | Qt::Key_A)))); + keySeq = QKeySequence::SelectAll; + QAction *selectAllAction = menu.addAction(tr("Select All") + + QLatin1String("\t") + keySeq.toString(QKeySequence::NativeText)); QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos())); if (usedAction == copyAction) { @@ -222,25 +215,10 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) } else if (usedAction == newTabAction) { emit requestShowLinkInNewTab(link); - } + } else if (usedAction == selectAllAction) { browser->selectAll(); } -#else - point = resultWidget->mapFromGlobal(point); - QUrl link = resultWidget->linkAt(point); - if (link.isEmpty() || !link.isValid()) - return; - - QAction *curTab = menu.addAction(tr("Open Link")); - QAction *newTab = menu.addAction(tr("Open Link in New Tab")); - - QAction *action = menu.exec(mapToGlobal(contextMenuEvent->pos())); - if (curTab == action) - emit requestShowLink(link); - else if (newTab == action) - emit requestShowLinkInNewTab(link); -#endif } QT_END_NAMESPACE -- cgit v0.12 From 5a46b82feea371868a9c793f6df14d92654c2423 Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Thu, 23 Apr 2009 15:44:49 +0200 Subject: Add Google Suggest as a new network example Reviewed-by: Simon Hausmann --- demos/qtdemo/xml/examples.xml | 1 + doc/src/examples.qdoc | 1 + doc/src/examples/googlesuggest.qdoc | 51 ++++++ doc/src/images/googlesuggest-example.png | Bin 0 -> 18809 bytes examples/network/googlesuggest/googlesuggest.cpp | 223 +++++++++++++++++++++++ examples/network/googlesuggest/googlesuggest.h | 80 ++++++++ examples/network/googlesuggest/googlesuggest.pro | 9 + examples/network/googlesuggest/main.cpp | 52 ++++++ examples/network/googlesuggest/searchbox.cpp | 69 +++++++ examples/network/googlesuggest/searchbox.h | 64 +++++++ examples/network/network.pro | 1 + 11 files changed, 551 insertions(+) create mode 100644 doc/src/examples/googlesuggest.qdoc create mode 100644 doc/src/images/googlesuggest-example.png create mode 100644 examples/network/googlesuggest/googlesuggest.cpp create mode 100644 examples/network/googlesuggest/googlesuggest.h create mode 100644 examples/network/googlesuggest/googlesuggest.pro create mode 100644 examples/network/googlesuggest/main.cpp create mode 100644 examples/network/googlesuggest/searchbox.cpp create mode 100644 examples/network/googlesuggest/searchbox.h diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 667f9f2..96a3e80 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -118,6 +118,7 @@ +
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index efe9b2f..29c6c0b 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -209,6 +209,7 @@ \o \l{network/loopback}{Loopback} \o \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster \o \l{network/torrent}{Torrent} + \o \l{network/googlesuggest}{Google Suggest} \endlist \section1 OpenGL diff --git a/doc/src/examples/googlesuggest.qdoc b/doc/src/examples/googlesuggest.qdoc new file mode 100644 index 0000000..a9b09f9 --- /dev/null +++ b/doc/src/examples/googlesuggest.qdoc @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the documentation 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example network/googlesuggest + \title Google Suggest Example + + The Google Suggest example shows how to use the network access manager + to get the list of suggested search terms from Google. + + \image googlesuggest-example.png + +*/ diff --git a/doc/src/images/googlesuggest-example.png b/doc/src/images/googlesuggest-example.png new file mode 100644 index 0000000..4ef072a Binary files /dev/null and b/doc/src/images/googlesuggest-example.png differ diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp new file mode 100644 index 0000000..285a018 --- /dev/null +++ b/examples/network/googlesuggest/googlesuggest.cpp @@ -0,0 +1,223 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#include "googlesuggest.h" + +#define GSUGGEST_URL "http://google.com/complete/search?output=toolbar&q=%1" + +GSuggestCompletion::GSuggestCompletion(QLineEdit *parent): QObject(parent), editor(parent) +{ + popup = new QTreeWidget; + popup->setColumnCount(2); + popup->setUniformRowHeights(true); + popup->setRootIsDecorated(false); + popup->setEditTriggers(QTreeWidget::NoEditTriggers); + popup->setSelectionBehavior(QTreeWidget::SelectRows); + popup->setFrameStyle(QFrame::Box | QFrame::Plain); + popup->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + + popup->header()->hide(); + popup->installEventFilter(this); + popup->setMouseTracking(true); + + connect(popup, SIGNAL(itemClicked(QTreeWidgetItem*, int)), + SLOT(doneCompletion())); + + popup->setWindowFlags(Qt::Popup); + popup->setFocusPolicy(Qt::NoFocus); + popup->setFocusProxy(parent); + + timer = new QTimer(this); + timer->setSingleShot(true); + timer->setInterval(500); + connect(timer, SIGNAL(timeout()), SLOT(autoSuggest())); + connect(editor, SIGNAL(textEdited(QString)), timer, SLOT(start())); + + connect(&networkManager, SIGNAL(finished(QNetworkReply*)), + this, SLOT(handleNetworkData(QNetworkReply*))); + +} + +GSuggestCompletion::~GSuggestCompletion() +{ + delete popup; +} + +bool GSuggestCompletion::eventFilter(QObject *obj, QEvent *ev) +{ + if (obj != popup) + return false; + + if (ev->type() == QEvent::MouseButtonPress) { + popup->hide(); + editor->setFocus(); + return true; + } + + if (ev->type() == QEvent::KeyPress) { + + bool consumed = false; + int key = static_cast(ev)->key(); + switch (key) { + case Qt::Key_Enter: + case Qt::Key_Return: + doneCompletion(); + consumed = true; + + case Qt::Key_Escape: + editor->setFocus(); + popup->hide(); + consumed = true; + + case Qt::Key_Up: + case Qt::Key_Down: + case Qt::Key_Home: + case Qt::Key_End: + case Qt::Key_PageUp: + case Qt::Key_PageDown: + break; + + default: + editor->setFocus(); + editor->event(ev); + popup->hide(); + break; + } + + return consumed; + } + + return false; +} + +void GSuggestCompletion::showCompletion(const QStringList &choices, const QStringList &hits) +{ + + if (choices.isEmpty() || choices.count() != hits.count()) + return; + + const QPalette &pal = editor->palette(); + QColor color = pal.color(QPalette::Disabled, QPalette::WindowText); + + popup->setUpdatesEnabled(false); + popup->clear(); + for (int i = 0; i < choices.count(); ++i) { + QTreeWidgetItem * item; + item = new QTreeWidgetItem(popup); + item->setText(0, choices[i]); + item->setText(1, hits[i]); + item->setTextAlignment(1, Qt::AlignRight); + item->setTextColor(1, color); + } + popup->setCurrentItem(popup->topLevelItem(0)); + popup->resizeColumnToContents(0); + popup->resizeColumnToContents(1); + popup->adjustSize(); + popup->setUpdatesEnabled(true); + + int h = popup->sizeHintForRow(0) * qMin(7, choices.count()) + 3; + popup->resize(popup->width(), h); + + popup->move(editor->mapToGlobal(QPoint(0, editor->height()))); + popup->setFocus(); + popup->show(); +} + +void GSuggestCompletion::doneCompletion() +{ + timer->stop(); + popup->hide(); + editor->setFocus(); + QTreeWidgetItem *item = popup->currentItem(); + if (item) { + editor->setText(item->text(0)); + QKeyEvent *e; + e = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier); + QApplication::postEvent(editor, e); + e = new QKeyEvent(QEvent::KeyRelease, Qt::Key_Enter, Qt::NoModifier); + QApplication::postEvent(editor, e); + } +} + +void GSuggestCompletion::preventSuggest() +{ + timer->stop(); +} + +void GSuggestCompletion::autoSuggest() +{ + QString str = editor->text(); + QString url = QString(GSUGGEST_URL).arg(str); + networkManager.get(QNetworkRequest(QString(url))); +} + +void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply) +{ + QUrl url = networkReply->url(); + if (!networkReply->error()) { + QStringList choices; + QStringList hits; + + QString response(networkReply->readAll()); + QXmlStreamReader xml(response); + while (!xml.atEnd()) { + xml.readNext(); + if (xml.tokenType() == QXmlStreamReader::StartElement) + if (xml.name() == "suggestion") { + QStringRef str = xml.attributes().value("data"); + choices << str.toString(); + } + if (xml.tokenType() == QXmlStreamReader::StartElement) + if (xml.name() == "num_queries") { + QStringRef str = xml.attributes().value("int"); + hits << str.toString(); + } + } + + showCompletion(choices, hits); + } + + networkReply->deleteLater(); +} diff --git a/examples/network/googlesuggest/googlesuggest.h b/examples/network/googlesuggest/googlesuggest.h new file mode 100644 index 0000000..0267709 --- /dev/null +++ b/examples/network/googlesuggest/googlesuggest.h @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef GOOGLESUGGEST_H +#define GOOGLESUGGEST_H + +#include +#include + +QT_BEGIN_NAMESPACE +class QLineEdit; +class QNetworkReply; +class QTimer; +class QTreeWidget; +QT_END_NAMESPACE + +class GSuggestCompletion : public QObject +{ + Q_OBJECT + +public: + GSuggestCompletion(QLineEdit *parent = 0); + ~GSuggestCompletion(); + bool eventFilter(QObject *obj, QEvent *ev); + void showCompletion(const QStringList &choices, const QStringList &hits); + +public slots: + + void doneCompletion(); + void preventSuggest(); + void autoSuggest(); + void handleNetworkData(QNetworkReply *networkReply); + +private: + QLineEdit *editor; + QTreeWidget *popup; + QTimer *timer; + QNetworkAccessManager networkManager; +}; + +#endif // GOOGLESUGGEST_H + diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro new file mode 100644 index 0000000..afd600f --- /dev/null +++ b/examples/network/googlesuggest/googlesuggest.pro @@ -0,0 +1,9 @@ +QT += network +SOURCES = main.cpp searchbox.cpp googlesuggest.cpp +HEADERS = searchbox.h googlesuggest.h + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest +sources.files = $$SOURCES $$HEADERS *.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest +INSTALLS += target sources diff --git a/examples/network/googlesuggest/main.cpp b/examples/network/googlesuggest/main.cpp new file mode 100644 index 0000000..f8d9bc5 --- /dev/null +++ b/examples/network/googlesuggest/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "searchbox.h" + +int main(int argc, char * argv[]) +{ + QApplication app(argc, argv); + SearchBox *searchEdit = new SearchBox; + searchEdit->show(); + return app.exec(); +} diff --git a/examples/network/googlesuggest/searchbox.cpp b/examples/network/googlesuggest/searchbox.cpp new file mode 100644 index 0000000..cd7b122 --- /dev/null +++ b/examples/network/googlesuggest/searchbox.cpp @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include "searchbox.h" +#include "googlesuggest.h" + +#define GSEARCH_URL "http://www.google.com/search?q=%1" + + +SearchBox::SearchBox(QWidget *parent): QLineEdit(parent) +{ + completer = new GSuggestCompletion(this); + + connect(this, SIGNAL(returnPressed()), SLOT(doSearch())); + + setWindowTitle("Search with Google"); + + adjustSize(); + resize(400, height()); + setFocus(); +} + +void SearchBox::doSearch() +{ + completer->preventSuggest(); + QString url = QString(GSEARCH_URL).arg(text()); + QDesktopServices::openUrl(QUrl(url)); +} diff --git a/examples/network/googlesuggest/searchbox.h b/examples/network/googlesuggest/searchbox.h new file mode 100644 index 0000000..75ceffd --- /dev/null +++ b/examples/network/googlesuggest/searchbox.h @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the examples 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef SEARCHBOX_H +#define SEARCHBOX_H + +#include + +class GSuggestCompletion; + +class SearchBox: public QLineEdit +{ + Q_OBJECT + +public: + SearchBox(QWidget *parent = 0); + +protected slots: + void doSearch(); + +private: + GSuggestCompletion *completer; +}; + + +#endif // SEARCHBOX_H diff --git a/examples/network/network.pro b/examples/network/network.pro index 13b3116..8c45745 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -11,6 +11,7 @@ SUBDIRS = blockingfortuneclient \ http \ loopback \ threadedfortuneserver \ + googlesuggest \ torrent contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient -- cgit v0.12 From 5423ba187c62ea861ccfcc013fb15fcc4a5ae28d Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Thu, 23 Apr 2009 17:46:54 +0200 Subject: Fix bugs in QGraphicsItem::childrenBoundingRect() While working on layering in Graphics View I stumbled over this bug. The QGraphicsItem::childrenBoundingRect() function had an accumulating error caused by recursive adding of rectangles that individually were mapped to the local parent using QGraphicsItem::mapRectToParent() / QTransform::mapRect. This caused the brect to be way too large for items with children that are rotated (fex, alternating 45 and -45 degrees). The new version should be just as fast, but with no loss of precision. Reviewed-by: bnilsen --- src/gui/graphicsview/qgraphicsitem.cpp | 41 +++++++++++++++++---- src/gui/graphicsview/qgraphicsitem_p.h | 1 + tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 49 ++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 8a7a080..65d1e0a 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -885,6 +885,38 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, bool de /*! \internal + Returns the bounding rect of this item's children (excluding itself). +*/ +void QGraphicsItemPrivate::childrenBoundingRectHelper(QTransform *x, QRectF *rect) +{ + for (int i = 0; i < children.size(); ++i) { + QGraphicsItem *child = children.at(i); + QGraphicsItemPrivate *childd = child->d_ptr; + bool hasX = childd->hasTransform; + bool hasPos = !childd->pos.isNull(); + if (hasPos || hasX) { + QTransform matrix; + if (hasX) + matrix = child->transform(); + if (hasPos) { + const QPointF &p = childd->pos; + matrix *= QTransform::fromTranslate(p.x(), p.y()); + } + matrix *= *x; + *rect |= matrix.mapRect(child->boundingRect()); + if (!childd->children.isEmpty()) + childd->childrenBoundingRectHelper(&matrix, rect); + } else { + *rect |= x->mapRect(child->boundingRect()); + if (!childd->children.isEmpty()) + childd->childrenBoundingRectHelper(x, rect); + } + } +} + +/*! + \internal + Empty all cached pixmaps from the pixmap cache. */ void QGraphicsItemCache::purge() @@ -3019,13 +3051,8 @@ void QGraphicsItem::setZValue(qreal z) QRectF QGraphicsItem::childrenBoundingRect() const { QRectF childRect; - foreach (QGraphicsItem *child, children()) { - QPointF childPos = child->pos(); - QTransform matrix = child->transform(); - if (!childPos.isNull()) - matrix *= QTransform::fromTranslate(childPos.x(), childPos.y()); - childRect |= matrix.mapRect(child->boundingRect() | child->childrenBoundingRect()); - } + QTransform x; + d_ptr->childrenBoundingRectHelper(&x, &childRect); return childRect; } diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 078c543..940e566 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -178,6 +178,7 @@ public: void addChild(QGraphicsItem *child); void removeChild(QGraphicsItem *child); void setParentItemHelper(QGraphicsItem *parent, bool deleting); + void childrenBoundingRectHelper(QTransform *x, QRectF *rect); virtual void resolveFont(uint inheritedMask) { diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 57e441b..88c64d3 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -172,6 +172,7 @@ private slots: void boundingRects2(); void sceneBoundingRect(); void childrenBoundingRect(); + void childrenBoundingRectTransformed(); void group(); void setGroup(); void nestedGroups(); @@ -2917,9 +2918,57 @@ void tst_QGraphicsItem::childrenBoundingRect() childChild->setParentItem(child); childChild->setPos(500, 500); child->rotate(90); + + + scene.addPolygon(parent->mapToScene(parent->boundingRect() | parent->childrenBoundingRect()))->setPen(QPen(Qt::red));; + + QGraphicsView view(&scene); + view.show(); + + QTest::qWait(5000); + QCOMPARE(parent->childrenBoundingRect(), QRectF(-500, -100, 600, 800)); } +void tst_QGraphicsItem::childrenBoundingRectTransformed() +{ + QGraphicsScene scene; + + QGraphicsRectItem *rect = scene.addRect(QRectF(0, 0, 100, 100)); + QGraphicsRectItem *rect2 = scene.addRect(QRectF(0, 0, 100, 100)); + QGraphicsRectItem *rect3 = scene.addRect(QRectF(0, 0, 100, 100)); + QGraphicsRectItem *rect4 = scene.addRect(QRectF(0, 0, 100, 100)); + QGraphicsRectItem *rect5 = scene.addRect(QRectF(0, 0, 100, 100)); + rect2->setParentItem(rect); + rect3->setParentItem(rect2); + rect4->setParentItem(rect3); + rect5->setParentItem(rect4); + + rect2->setTransform(QTransform().translate(50, 50).rotate(45)); + rect2->setPos(25, 25); + rect3->setTransform(QTransform().translate(50, 50).rotate(45)); + rect3->setPos(25, 25); + rect4->setTransform(QTransform().translate(50, 50).rotate(45)); + rect4->setPos(25, 25); + rect5->setTransform(QTransform().translate(50, 50).rotate(45)); + rect5->setPos(25, 25); + + QRectF subTreeRect = rect->childrenBoundingRect(); + QCOMPARE(subTreeRect.left(), qreal(-206.0660171779821)); + QCOMPARE(subTreeRect.top(), qreal(75.0)); + QCOMPARE(subTreeRect.width(), qreal(351.7766952966369)); + QCOMPARE(subTreeRect.height(), qreal(251.7766952966369)); + + rect->rotate(45); + rect2->rotate(-45); + rect3->rotate(45); + rect4->rotate(-45); + rect5->rotate(45); + + subTreeRect = rect->childrenBoundingRect(); + QCOMPARE(rect->childrenBoundingRect(), QRectF(-100, 75, 275, 250)); +} + void tst_QGraphicsItem::group() { QGraphicsScene scene; -- cgit v0.12 From 3252c7373abb605db80042c5c16b535de0b91401 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Thu, 23 Apr 2009 16:24:54 -0700 Subject: Remove the simpleBrush concept Since we have to update the brush for each paint command anyway keeping the state of the brush and caching the value of simpleBrush makes no sense. Also, most times when filling with a brush QPaintEngineEx::fillRect(const QRect &, const QBrush &) is called in which we never got a brushChanged() anyway. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 48 +++++++++------------- .../gfxdrivers/directfb/qdirectfbpaintengine.h | 1 - 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index d9346fd..92b30a7 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -181,20 +181,17 @@ public: IDirectFBSurface *surface; QPen pen; - QBrush brush; bool antialiased; bool forceRasterPrimitives; bool simplePen; - bool simpleBrush; bool matrixRotShear; bool matrixScale; void setTransform(const QTransform &m); void setPen(const QPen &pen); - void setBrush(const QBrush &brush); void setCompositionMode(QPainter::CompositionMode mode); void setOpacity(quint8 value); void setRenderHints(QPainter::RenderHints hints); @@ -207,6 +204,7 @@ public: inline bool dfbCanHandleClip(const QRect &rect) const; inline bool dfbCanHandleClip(const QRectF &rect) const; inline bool dfbCanHandleClip() const; + inline bool isSimpleBrush(const QBrush &brush) const; void drawLines(const QLine *lines, int count) const; void drawLines(const QLineF *lines, int count) const; @@ -217,6 +215,7 @@ public: void fillRects(const QRectF *rects, int count) const; void drawRects(const QRectF *rects, int count) const; + void drawPixmap(const QRectF &dest, const QPixmap &pixmap, const QRectF &src); void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap); @@ -253,7 +252,7 @@ private: QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p) : surface(0), antialiased(false), forceRasterPrimitives(false), simplePen(false), - simpleBrush(false), matrixRotShear(false), matrixScale(false), lastLockedHeight(-1), + matrixRotShear(false), matrixScale(false), lastLockedHeight(-1), fbWidth(-1), fbHeight(-1), opacity(255), drawFlagsFromCompositionMode(0), blitFlagsFromCompositionMode(0), porterDuffRule(DSPD_SRC_OVER), dirtyClip(true), dfbHandledClip(false), dfbDevice(0), q(p) @@ -287,6 +286,11 @@ bool QDirectFBPaintEnginePrivate::dfbCanHandleClip() const return dfbHandledClip; } +bool QDirectFBPaintEnginePrivate::isSimpleBrush(const QBrush &brush) const +{ + return (brush.style() == Qt::NoBrush) || (brush.style() == Qt::SolidPattern && !antialiased); +} + void QDirectFBPaintEnginePrivate::setClipDirty() { dirtyClip = true; @@ -366,13 +370,6 @@ void QDirectFBPaintEnginePrivate::setPen(const QPen &p) && (pen.widthF() <= 1 && !matrixScale)); } -void QDirectFBPaintEnginePrivate::setBrush(const QBrush &b) -{ - brush = b; - simpleBrush = (brush.style() == Qt::NoBrush) || - (brush.style() == Qt::SolidPattern && !antialiased); -} - void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode mode) { blitFlagsFromCompositionMode = DSBLIT_NOFX; @@ -755,14 +752,6 @@ void QDirectFBPaintEngine::penChanged() QRasterPaintEngine::penChanged(); } -void QDirectFBPaintEngine::brushChanged() -{ - Q_D(QDirectFBPaintEngine); - d->setBrush(state()->brush); - - QRasterPaintEngine::brushChanged(); -} - void QDirectFBPaintEngine::opacityChanged() { Q_D(QDirectFBPaintEngine); @@ -801,7 +790,6 @@ void QDirectFBPaintEngine::setState(QPainterState *s) QRasterPaintEngine::setState(s); d->setClipDirty(); d->setPen(state()->pen); - d->setBrush(state()->brush); d->setOpacity(quint8(state()->opacity * 255)); d->setCompositionMode(state()->compositionMode()); d->setTransform(state()->transform()); @@ -834,8 +822,10 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) { Q_D(QDirectFBPaintEngine); d->updateClip(); - if (!d->dfbCanHandleClip() || d->matrixRotShear || !d->simpleBrush - || !d->simplePen || d->forceRasterPrimitives) { + const QBrush &brush = state()->brush; + if (!d->dfbCanHandleClip() || d->matrixRotShear + || !d->simplePen || d->forceRasterPrimitives + || !d->isSimpleBrush(brush)) { d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); return; @@ -843,8 +833,8 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) d->unlock(); - if (d->brush != Qt::NoBrush) { - d->setDFBColor(d->brush.color()); + if (brush != Qt::NoBrush) { + d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } if (d->pen != Qt::NoPen) { @@ -857,8 +847,10 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) { Q_D(QDirectFBPaintEngine); d->updateClip(); - if (!d->dfbCanHandleClip() || d->matrixRotShear || !d->simpleBrush - || !d->simplePen || d->forceRasterPrimitives) { + const QBrush &brush = state()->brush; + if (!d->dfbCanHandleClip() || d->matrixRotShear + || !d->simplePen || d->forceRasterPrimitives + || !d->isSimpleBrush(brush)) { d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); return; @@ -866,8 +858,8 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) d->unlock(); - if (d->brush != Qt::NoBrush) { - d->setDFBColor(d->brush.color()); + if (brush != Qt::NoBrush) { + d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } if (d->pen != Qt::NoPen) { diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 3c2cefa..e79ec61 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -96,7 +96,6 @@ public: virtual void clipEnabledChanged(); virtual void penChanged(); - virtual void brushChanged(); virtual void opacityChanged(); virtual void compositionModeChanged(); virtual void renderHintsChanged(); -- cgit v0.12 From 7c6ba93ae413309672bb839da2ae1522a170b14d Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Thu, 23 Apr 2009 16:24:54 -0700 Subject: Remove the simpleBrush concept Since we have to update the brush for each paint command anyway keeping the state of the brush and caching the value of simpleBrush makes no sense. Also, most times when filling with a brush QPaintEngineEx::fillRect(const QRect &, const QBrush &) is called in which we never got a brushChanged() anyway. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/directfb.pro | 4 +- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 82 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro index 89a289c..1ee9030 100644 --- a/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/src/plugins/gfxdrivers/directfb/directfb.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers -# These defines might be necessary if your DirectFB driver doesn't +# These defines might be necessary if your DirectFB driver doesn't # support all of the DirectFB API. # #DEFINES += QT_NO_DIRECTFB_WM @@ -14,6 +14,8 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers #DEFINES += QT_NO_DIRECTFB_KEYBOARD #DEFINES += QT_DIRECTFB_TIMING #DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION +#DEFINES += QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +#DEFINES += QT_DIRECTFB_DISABLE_RASTERFALLBACKS target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 92b30a7..ba5d71a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -54,6 +54,70 @@ #include #include +#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +template inline const T *ptr(const T &t) { return &t; } +template <> inline const bool* ptr(const bool &) { return 0; } +template +static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, + bool matrixScale, bool matrixRotShear, bool simplePen, + bool dfbHandledClip, bool forceRasterPrimitives, + const char *nameOne, const T1 &one, + const char *nameTwo, const T2 &two, + const char *nameThree, const T3 &three) +{ + QString out; + QDebug dbg(&out); + dbg << msg << (QByteArray(func) + "()") << "painting on"; + if (dev->devType() == QInternal::Widget) { + dbg << static_cast(dev); + } else { + dbg << dev << "of type" << dev->devType(); + } + + dbg << "matrixScale" << matrixScale + << "matrixRotShear" << matrixRotShear + << "simplePen" << simplePen + << "dfbHandledClip" << dfbHandledClip + << "forceRasterPrimitives" << forceRasterPrimitives; + + const T1 *t1 = ptr(one); + const T2 *t2 = ptr(two); + const T3 *t3 = ptr(three); + + if (t1) { + dbg << nameOne << *t1; + if (t2) { + dbg << nameTwo << *t2; + if (t3) { + dbg << nameThree << *t3; + } + } + } + qWarning("%s", qPrintable(out)); +} +#endif + +#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) rasterFallbackWarn("Disabled raster engine operation", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->matrixScale, d_func()->matrixRotShear, \ + d_func()->simplePen, d_func()->dfbCanHandleClip(), \ + d_func()->forceRasterPrimitives, \ + #one, one, #two, two, #three, three); \ + return; +#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) return; +#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) rasterFallbackWarn("Falling back to raster engine for", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->matrixScale, d_func()->matrixRotShear, \ + d_func()->simplePen, d_func()->dfbCanHandleClip(), \ + d_func()->forceRasterPrimitives, \ + #one, one, #two, two, #three, three); +#else +#define RASTERFALLBACK(one, two, three) +#endif + static inline uint ALPHA_MUL(uint x, uint a) { uint t = x * a; @@ -826,6 +890,7 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) if (!d->dfbCanHandleClip() || d->matrixRotShear || !d->simplePen || d->forceRasterPrimitives || !d->isSimpleBrush(brush)) { + RASTERFALLBACK(rectCount, static_cast(false), static_cast(false)); d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); return; @@ -873,6 +938,7 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) { + RASTERFALLBACK(lineCount, static_cast(false), static_cast(false)); d->lock(); QRasterPaintEngine::drawLines(lines, lineCount); return; @@ -890,6 +956,7 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) { + RASTERFALLBACK(lineCount, static_cast(false), static_cast(false)); d->lock(); QRasterPaintEngine::drawLines(lines, lineCount); return; @@ -915,6 +982,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image, || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN) #endif { + RASTERFALLBACK(r, image.size(), sr); d->lock(); QRasterPaintEngine::drawImage(r, image, sr, flags); return; @@ -938,9 +1006,11 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap, d->updateClip(); if (pixmap.pixmapData()->classId() != QPixmapData::DirectFBClass) { + // not using RASTERFALLBACK since this is the way we do bitmaps? d->lock(); QRasterPaintEngine::drawPixmap(r, pixmap, sr); } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear) { + RASTERFALLBACK(r, pixmap.size(), sr); const QImage *img = static_cast(pixmap.pixmapData())->buffer(); d->lock(); QRasterPaintEngine::drawImage(r, *img, sr); @@ -965,6 +1035,7 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r, d->lock(); QRasterPaintEngine::drawTiledPixmap(r, pixmap, sp); } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear || !sp.isNull()) { + RASTERFALLBACK(r, pixmap.size(), sp); const QImage *img = static_cast(pixmap.pixmapData())->buffer(); d->lock(); QRasterPixmapData *data = new QRasterPixmapData(QPixmapData::PixmapType); @@ -987,6 +1058,7 @@ void QDirectFBPaintEngine::stroke(const QVectorPath &path, const QPen &pen) void QDirectFBPaintEngine::drawPath(const QPainterPath &path) { + RASTERFALLBACK(path.boundingRect(), static_cast(false), static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPath(path); @@ -994,6 +1066,7 @@ void QDirectFBPaintEngine::drawPath(const QPainterPath &path) void QDirectFBPaintEngine::drawPoints(const QPointF *points, int pointCount) { + RASTERFALLBACK(pointCount, static_cast(false), static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPoints(points, pointCount); @@ -1001,6 +1074,7 @@ void QDirectFBPaintEngine::drawPoints(const QPointF *points, int pointCount) void QDirectFBPaintEngine::drawPoints(const QPoint *points, int pointCount) { + RASTERFALLBACK(pointCount, static_cast(false), static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPoints(points, pointCount); @@ -1008,6 +1082,7 @@ void QDirectFBPaintEngine::drawPoints(const QPoint *points, int pointCount) void QDirectFBPaintEngine::drawEllipse(const QRectF &rect) { + RASTERFALLBACK(rect, static_cast(false), static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawEllipse(rect); @@ -1016,6 +1091,7 @@ void QDirectFBPaintEngine::drawEllipse(const QRectF &rect) void QDirectFBPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) { + RASTERFALLBACK(pointCount, mode, static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPolygon(points, pointCount, mode); @@ -1024,6 +1100,7 @@ void QDirectFBPaintEngine::drawPolygon(const QPointF *points, int pointCount, void QDirectFBPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) { + RASTERFALLBACK(pointCount, mode, static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPolygon(points, pointCount, mode); @@ -1032,6 +1109,7 @@ void QDirectFBPaintEngine::drawPolygon(const QPoint *points, int pointCount, void QDirectFBPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) { + RASTERFALLBACK(p, textItem.text(), static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawTextItem(p, textItem); @@ -1039,6 +1117,7 @@ void QDirectFBPaintEngine::drawTextItem(const QPointF &p, void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush) { + RASTERFALLBACK(path, brush, static_cast(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::fill(path, brush); @@ -1072,6 +1151,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) break; } } + RASTERFALLBACK(rect, brush, static_cast(false)); d->lock(); QRasterPaintEngine::fillRect(rect, brush); } @@ -1081,6 +1161,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->dfbCanHandleClip() || d->matrixRotShear || d->forceRasterPrimitives) { + RASTERFALLBACK(rect, color, static_cast(false)); d->lock(); QRasterPaintEngine::fillRect(rect, color); } else { @@ -1097,6 +1178,7 @@ void QDirectFBPaintEngine::drawColorSpans(const QSpan *spans, int count, { Q_D(QDirectFBPaintEngine); if (d->forceRasterPrimitives) { + RASTERFALLBACK(count, color, static_cast(false)); d->lock(); QRasterPaintEngine::drawColorSpans(spans, count, color); } else { -- cgit v0.12 From 3ab7dc5d764d41bf828dd76672ca2918b004bad3 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 15 Apr 2009 11:49:30 +0200 Subject: Remove the Direct3D engine. --- demos/qtdemo/colors.cpp | 24 +- demos/qtdemo/colors.h | 2 - demos/qtdemo/mainwindow.cpp | 8 - dist/changes-4.6.0 | 41 + doc/src/qnamespace.qdoc | 15 +- src/corelib/kernel/qcoreapplication.cpp | 15 +- src/gui/graphicsview/qgraphicsview.cpp | 4 +- src/gui/image/qpixmap.cpp | 14 - src/gui/image/qpixmap.h | 2 - src/gui/image/qpixmap_raster.cpp | 9 - src/gui/image/qpixmap_raster_p.h | 7 - src/gui/kernel/qapplication.cpp | 12 +- src/gui/kernel/qapplication_win.cpp | 3 - src/gui/kernel/qwidget.cpp | 21 - src/gui/kernel/qwidget_p.h | 5 - src/gui/kernel/qwidget_win.cpp | 47 - src/gui/painting/painting.pri | 10 - src/gui/painting/qpaintengine_d3d.cpp | 4576 ------------------------------- src/gui/painting/qpaintengine_d3d.fx | 608 ---- src/gui/painting/qpaintengine_d3d.qrc | 5 - src/gui/painting/qpaintengine_d3d_p.h | 120 - src/gui/painting/qwindowsurface_d3d.cpp | 169 -- src/gui/painting/qwindowsurface_d3d_p.h | 84 - tools/configure/configureapp.cpp | 59 +- 24 files changed, 58 insertions(+), 5802 deletions(-) create mode 100644 dist/changes-4.6.0 delete mode 100644 src/gui/painting/qpaintengine_d3d.cpp delete mode 100644 src/gui/painting/qpaintengine_d3d.fx delete mode 100644 src/gui/painting/qpaintengine_d3d.qrc delete mode 100644 src/gui/painting/qpaintengine_d3d_p.h delete mode 100644 src/gui/painting/qwindowsurface_d3d.cpp delete mode 100644 src/gui/painting/qwindowsurface_d3d_p.h diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index 41bbfb3..bc16296 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -72,10 +72,8 @@ int Colors::contentHeight = 510; // Properties: bool Colors::openGlRendering = false; -bool Colors::direct3dRendering = false; bool Colors::softwareRendering = false; bool Colors::openGlAwailable = true; -bool Colors::direct3dAwailable = true; bool Colors::xRenderPresent = true; bool Colors::noTicker = false; @@ -206,8 +204,6 @@ void Colors::parseArgs(int argc, char *argv[]) QString s(argv[i]); if (s == "-opengl") Colors::openGlRendering = true; - else if (s == "-direct3d") - Colors::direct3dRendering = true; else if (s == "-software") Colors::softwareRendering = true; else if (s == "-no-opengl") // support old style @@ -270,7 +266,7 @@ void Colors::parseArgs(int argc, char *argv[]) Colors::fps = int(parseFloat(s, "-fps")); else if (s.startsWith("-h") || s.startsWith("-help")){ QMessageBox::warning(0, "Arguments", - QString("Usage: qtdemo [-verbose] [-no-adapt] [-opengl] [-direct3d] [-software] [-fullscreen] [-ticker[0|1]] ") + QString("Usage: qtdemo [-verbose] [-no-adapt] [-opengl] [-software] [-fullscreen] [-ticker[0|1]] ") + "[-animations[0|1]] [-no-blending] [-no-sync] [-use-timer-update[0|1]] [-pause[0|1]] " + "[-use-window-mask] [-no-rescale] " + "[-use-pixmaps] [-show-fps] [-show-br] [-8bit[0|1]] [-menu] [-use-loop] [-use-balls] " @@ -330,10 +326,6 @@ void Colors::detectSystemResources() qDebug("- OpenGL not recommended on this system"); } -#if defined(Q_WS_WIN) - Colors::direct3dAwailable = false; // for now. -#endif - #if defined(Q_WS_X11) // check if X render is present: QPixmap tmp(1, 1); @@ -369,20 +361,8 @@ void Colors::postConfigure() } } -#if !defined(Q_WS_WIN) - if (Colors::direct3dRendering){ - Colors::direct3dRendering = false; - qDebug() << "- WARNING: Direct3D specified, but not supported on this platform"; - } -#endif - - if (!Colors::openGlRendering && !Colors::direct3dRendering && !Colors::softwareRendering){ + if (!Colors::openGlRendering && !Colors::softwareRendering){ // The user has not decided rendering system. So we do it instead: -#if defined(Q_WS_WIN) - if (Colors::direct3dAwailable) - Colors::direct3dRendering = true; - else -#endif if (Colors::openGlAwailable) Colors::openGlRendering = true; else diff --git a/demos/qtdemo/colors.h b/demos/qtdemo/colors.h index 58865c6..b725885 100644 --- a/demos/qtdemo/colors.h +++ b/demos/qtdemo/colors.h @@ -82,9 +82,7 @@ public: // properties: static bool openGlRendering; - static bool direct3dRendering; static bool softwareRendering; - static bool openGlAwailable; static bool direct3dAwailable; static bool xRenderPresent; static bool noAdapt; diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index 8723823..151fa5c 100644 --- a/demos/qtdemo/mainwindow.cpp +++ b/demos/qtdemo/mainwindow.cpp @@ -100,12 +100,6 @@ void MainWindow::setRenderingSystem() { QWidget *viewport = 0; - if (Colors::direct3dRendering){ - viewport->setAttribute(Qt::WA_MSWindowsUseDirect3D); - setCacheMode(QGraphicsView::CacheNone); - if (Colors::verbose) - qDebug() << "- using Direct3D"; - } #ifndef QT_NO_OPENGL else if (Colors::openGlRendering){ QGLWidget *glw = new QGLWidget(QGLFormat(QGL::SampleBuffers)); @@ -389,8 +383,6 @@ void MainWindow::keyPressEvent(QKeyEvent *event) s += "Rendering system: "; if (Colors::openGlRendering) s += "OpenGL"; - else if (Colors::direct3dRendering) - s += "Direct3D"; else s += "software"; diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 new file mode 100644 index 0000000..db4ab5f --- /dev/null +++ b/dist/changes-4.6.0 @@ -0,0 +1,41 @@ +Qt 4.6 introduces many new features and improvements as well as bugfixes +over the 4.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.trolltech.com/4.6 + +The Qt version 4.6 series is binary compatible with the 4.5.x series. +Applications compiled for 4.5 will continue to run with 4.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Task Tracker: + + http://www.qtsoftware.com/developer/task-tracker + +Each of these identifiers can be entered in the task tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + + + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + + - The experimental Direct3D paint engine has been removed. The + reasons for this is that Qt Software focuses on OpenGL for desktop + hardware accelerated rendering. \ No newline at end of file diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index d9f001e..097333b 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -129,13 +129,8 @@ Therefore, if it is important to minimize resource consumption, do not set this attribute. - \value AA_MSWindowsUseDirect3DByDefault Is a Windows specific - attribute, that will make the Direct3D paint engine the - default Qt widget paint engine. Note that you can toggle - usage of the Direct3D engine on individual QWidgets by - setting/clearing the \c WA_MSWindowsUseDirect3D attribute - on a specific widget. \bold {This functionality is - experimental}. + \value AA_MSWindowsUseDirect3DByDefault This value is obsolete and + has no effect. \value AA_DontShowIconsInMenus Actions with the Icon property won't be shown in any menus unless specifically set by the @@ -948,10 +943,8 @@ position. This is set/cleared by QWidget::move() and by QWidget::setGeometry(). - \value WA_MSWindowsUseDirect3D Makes drawing to a widget - with this attribute set use the Direct3D paint engine, if the - Direct3D paint engine is available. \bold {This functionality - is experimental.} + \value WA_MSWindowsUseDirect3D This value is obsolete and has no + effect. \value WA_NoBackground This value is obsolete. Use WA_OpaquePaintEvent instead. diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index a23b2dd..e4bd664 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -377,12 +377,12 @@ QString qAppName() QLibrary) can be retrieved with libraryPaths() and manipulated by setLibraryPaths(), addLibraryPath(), and removeLibraryPath(). - On Unix/Linux Qt is configured to use the system local settings by - default. This can cause a conflict when using POSIX functions, for - instance, when converting between data types such as floats and - strings, since the notation may differ between locales. To get - around this problem call the POSIX function setlocale(LC_NUMERIC,"C") - right after initializing QApplication or QCoreApplication to reset + On Unix/Linux Qt is configured to use the system local settings by + default. This can cause a conflict when using POSIX functions, for + instance, when converting between data types such as floats and + strings, since the notation may differ between locales. To get + around this problem call the POSIX function setlocale(LC_NUMERIC,"C") + right after initializing QApplication or QCoreApplication to reset the locale that is used for number formatting to "C"-locale. \sa QApplication, QAbstractEventDispatcher, QEventLoop, @@ -1908,8 +1908,7 @@ QStringList QCoreApplication::arguments() l1arg == "-qdebug" || l1arg == "-reverse" || l1arg == "-stylesheet" || - l1arg == "-widgetcount" || - l1arg == "-direct3d") + l1arg == "-widgetcount") ; else if (l1arg.startsWith("-style=")) ; diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index a9d585c..7720a10 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2809,9 +2809,7 @@ void QGraphicsView::setupViewport(QWidget *widget) const bool isGLWidget = widget->inherits("QGLWidget"); - d->accelerateScrolling = !(isGLWidget - || widget->testAttribute(Qt::WA_MSWindowsUseDirect3D) - || qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)); + d->accelerateScrolling = !(isGLWidget); widget->setFocusPolicy(Qt::StrongFocus); diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 3b82da8..f495b31 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1359,14 +1359,6 @@ bool QPixmap::isDetached() const void QPixmap::deref() { if (data && !data->ref.deref()) { // Destroy image if last ref -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - if (data->classId() == QPixmapData::RasterClass) { - QRasterPixmapData *rData = static_cast(data); - if (rData->texture) - rData->texture->Release(); - rData->texture = 0; - } -#endif if (data->is_cached && qt_pixmap_cleanup_hook_64) qt_pixmap_cleanup_hook_64(cacheKey()); delete data; @@ -1938,12 +1930,6 @@ void QPixmap::detach() if (id == QPixmapData::RasterClass) { QRasterPixmapData *rasterData = static_cast(data); rasterData->image.detach(); -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - if (rasterData->texture) { - rasterData->texture->Release(); - rasterData->texture = 0; - } -#endif } if (data->is_cached && qt_pixmap_cleanup_hook_64 && data->ref == 1) diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index cd3b465..a5609e4 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -254,8 +254,6 @@ private: friend class QWidgetPrivate; friend class QRasterPaintEngine; friend class QRasterBuffer; - friend class QDirect3DPaintEngine; - friend class QDirect3DPaintEnginePrivate; friend class QDetachedPixmap; #if !defined(QT_NO_DATASTREAM) friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &); diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 145b02a..b5556cd 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -50,12 +50,6 @@ #include #include -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) -#include -#include -extern QDirect3DPaintEngine *qt_d3dEngine(); -#endif - QT_BEGIN_NAMESPACE const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, @@ -63,9 +57,6 @@ const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, QRasterPixmapData::QRasterPixmapData(PixelType type) : QPixmapData(type, RasterClass) -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - , texture(0) -#endif { } diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 48d5cf8..9d3bf72 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -58,9 +58,6 @@ #ifdef Q_WS_WIN # include "qt_windows.h" -# ifndef QT_NO_DIRECT3D -# include -# endif #endif QT_BEGIN_NAMESPACE @@ -88,10 +85,6 @@ protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; private: -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - friend class QDirect3DPaintEnginePrivate; - IDirect3DTexture9 *texture; -#endif friend class QPixmap; friend class QBitmap; friend class QDetachedPixmap; diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 9ce5f80..303f3eb 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -107,9 +107,6 @@ static void initResources() Q_INIT_RESOURCE(qstyle); #endif -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - Q_INIT_RESOURCE(qpaintengine_d3d); -#endif Q_INIT_RESOURCE(qmessagebox); #if !defined(QT_NO_PRINTDIALOG) Q_INIT_RESOURCE(qprintdialog); @@ -620,13 +617,6 @@ void QApplicationPrivate::process_cmdline() and QPixmaps. Available options are \c{raster} and \c{opengl}. \endlist - The Windows version of Qt supports an additional command line option, if - Direct3D support has been compiled into Qt: - \list - \o -direct3d will make the Direct3D paint engine the default widget - paint engine in Qt. \bold {This functionality is experimental.} - \endlist - The X11 version of Qt supports some traditional X11 command line options: \list \o -display \e display, sets the X display (default is $DISPLAY). @@ -3499,7 +3489,7 @@ void QApplication::changeOverrideCursor(const QCursor &cursor) It is necessary to call this function to start event handling. The main event loop receives events from the window system and dispatches these to the application widgets. - + Generally, no user interaction can take place before calling exec(). As a special case, modal widgets like QMessageBox can be used before calling exec(), because modal widgets call exec() to start a local event loop. diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 2f2fc2c..c1cb7e2 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -745,9 +745,6 @@ void qt_init(QApplicationPrivate *priv, int) appNoGrab = !appNoGrab; else #endif // QT_DEBUG - if (qstrcmp(argv[i], "-direct3d") == 0) - QApplication::setAttribute(Qt::AA_MSWindowsUseDirect3DByDefault); - else argv[j++] = argv[i]; } if(j < priv->argc) { diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 9f5f18d..b38c4bd 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -9792,27 +9792,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) QEvent e(QEvent::MouseTrackingChange); QApplication::sendEvent(this, &e); break; } -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - case Qt::WA_MSWindowsUseDirect3D: - if (!qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)) { - if (on) { - if (!d->extra) - d->createExtra(); - d->extra->had_auto_fill_bg = d->extra->autoFillBackground; - d->extra->had_no_system_bg = testAttribute(Qt::WA_NoSystemBackground); - d->extra->had_paint_on_screen = testAttribute(Qt::WA_PaintOnScreen); - // enforce the opaque widget state D3D needs - d->extra->autoFillBackground = true; - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - } else if (d->extra) { - d->extra->autoFillBackground = d->extra->had_auto_fill_bg; - setAttribute(Qt::WA_PaintOnScreen, d->extra->had_paint_on_screen); - setAttribute(Qt::WA_NoSystemBackground, d->extra->had_no_system_bg); - } - } - break; -#endif case Qt::WA_NativeWindow: { QInputContext *ic = 0; if (on && !internalWinId() && testAttribute(Qt::WA_InputMethodEnabled) && hasFocus()) { diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 423e833..c403ccc 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -177,11 +177,6 @@ struct QWExtra { //bit flags at the end to improve packing #if defined(Q_WS_WIN) uint shown_mode : 8; // widget show mode -#ifndef QT_NO_DIRECT3D - uint had_paint_on_screen : 1; - uint had_no_system_bg : 1; - uint had_auto_fill_bg : 1; -#endif #endif #if defined(Q_WS_X11) uint compress_events : 1; diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index ffbb341..7374994 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -56,12 +56,6 @@ #include "private/qbackingstore_p.h" #include "private/qwindowsurface_raster_p.h" -#ifndef QT_NO_DIRECT3D -#include "private/qpaintengine_d3d_p.h" -#include "private/qwindowsurface_d3d_p.h" -#endif - - #include #include @@ -1716,11 +1710,6 @@ void QWidgetPrivate::createSysExtra() #ifndef QT_NO_DRAGANDDROP extra->dropTarget = 0; #endif -#ifndef QT_NO_DIRECT3D - extra->had_auto_fill_bg = 0; - extra->had_paint_on_screen = 0; - extra->had_no_system_bg = 0; -#endif } void QWidgetPrivate::deleteSysExtra() @@ -1931,22 +1920,6 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level) // }; // Q_GLOBAL_STATIC(QGlobalRasterPaintEngine, globalRasterPaintEngine) -#ifndef QT_NO_DIRECT3D -static void cleanup_d3d_engine(); -Q_GLOBAL_STATIC_WITH_INITIALIZER(QDirect3DPaintEngine, _qt_d3dEngine, - { - qAddPostRoutine(cleanup_d3d_engine); - }) -static void cleanup_d3d_engine() -{ - _qt_d3dEngine()->cleanup(); -} -QDirect3DPaintEngine* qt_d3dEngine() -{ - return _qt_d3dEngine(); -} -#endif - #ifndef QT_NO_DIRECTDRAW static uchar *qt_primary_surface_bits; @@ -2059,19 +2032,6 @@ void qt_win_initialize_directdraw() { } QPaintEngine *QWidget::paintEngine() const { -#ifndef QT_NO_DIRECT3D - if ((qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault) - || testAttribute(Qt::WA_MSWindowsUseDirect3D)) - && qt_d3dEngine()->hasDirect3DSupport()) - { - QDirect3DPaintEngine *engine = qt_d3dEngine(); - if (qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)) - engine->setFlushOnEnd(false); - else - engine->setFlushOnEnd(true); - return engine; - } -#endif #ifndef QT_NO_DIRECTDRAW QOnScreenRasterPaintEngine *pe = onScreenPaintEngine(); pe->widget = this; @@ -2100,13 +2060,6 @@ QPaintEngine *QWidget::paintEngine() const QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys() { Q_Q(QWidget); -#ifndef QT_NO_DIRECT3D - extern QDirect3DPaintEngine *qt_d3dEngine(); - if (qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault) && (q->windowOpacity() == 1.0f) - && qt_d3dEngine()->hasDirect3DSupport()) { - return new QD3DWindowSurface(q); - } -#endif return new QRasterWindowSurface(q); } diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 528559c..34d1779 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -103,12 +103,6 @@ win32 { painting/qprinterinfo_win.cpp \ painting/qregion_win.cpp !win32-borland:!wince*:LIBS += -lmsimg32 - contains(QT_CONFIG, direct3d) { - HEADERS += painting/qpaintengine_d3d_p.h - SOURCES += painting/qpaintengine_d3d.cpp - RESOURCES += painting/qpaintengine_d3d.qrc - LIBS += -ldxguid - } } embedded { @@ -362,8 +356,4 @@ embedded { SOURCES += painting/qwindowsurface_qws.cpp } -win32:contains(QT_CONFIG, direct3d) { - HEADERS += painting/qwindowsurface_d3d_p.h - SOURCES += painting/qwindowsurface_d3d.cpp -} diff --git a/src/gui/painting/qpaintengine_d3d.cpp b/src/gui/painting/qpaintengine_d3d.cpp deleted file mode 100644 index 9a7638b..0000000 --- a/src/gui/painting/qpaintengine_d3d.cpp +++ /dev/null @@ -1,4576 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "qpaintengine_d3d_p.h" - -#include "private/qdrawhelper_p.h" -#include "private/qfont_p.h" -#include "private/qfontengine_p.h" -#include "private/qpaintengine_p.h" -#include "private/qtessellator_p.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -#ifndef M_PI - #define M_PI 3.14159265358979323846 -#endif - -#define QD3D_MASK_MARGIN 1 -#define QD3D_BATCH_SIZE 256 - -// for the ClearType detection stuff.. -#ifndef SPI_GETFONTSMOOTHINGTYPE -#define SPI_GETFONTSMOOTHINGTYPE 0x200A -#endif - -#ifndef FE_FONTSMOOTHINGCLEARTYPE -#define FE_FONTSMOOTHINGCLEARTYPE 0x0002 -#endif - -//#include -#define PM_INIT -#define PM_MEASURE(A) -#define PM_DISPLAY - -//debugging -//#define QT_DEBUG_VERTEXBUFFER_ACCESS -//#define QT_DEBUG_D3D -//#define QT_DEBUG_D3D_CALLS - -#define QD3D_SET_MARK(output) \ - D3DPERF_SetMarker(0, QString(output).utf16()); - -#define QT_VERTEX_RESET_LIMIT 24576 -#define QT_VERTEX_BUF_SIZE 32768 -#define QD3DFVF_CSVERTEX (D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX2 | D3DFVF_TEXCOORDSIZE4(0) | D3DFVF_TEXCOORDSIZE4(1)) - -// this is a different usage of the effect framework than intended, -// but it's convenient for us to use (See effect file) -#define PASS_STENCIL_ODDEVEN 0 -#define PASS_STENCIL_WINDING 1 -#define PASS_STENCIL_DRAW 2 -#define PASS_STENCIL_DRAW_DIRECT 3 -#define PASS_STENCIL_CLIP 4 -#define PASS_STENCIL_NOSTENCILCHECK 5 -#define PASS_STENCIL_NOSTENCILCHECK_DIRECT 6 -#define PASS_TEXT 7 -#define PASS_CLEARTYPE_TEXT 8 -#define PASS_ALIASED_LINES 9 -#define PASS_ALIASED_LINES_DIRECT 10 - -#define PASS_AA_CREATEMASK 0 -#define PASS_AA_DRAW 1 -#define PASS_AA_DRAW_DIRECT 2 - -#define D3D_STAGE_COUNT 2 -#define D3D_RENDER_STATES 210 -#define D3D_TEXTURE_STATES 33 -#define D3D_SAMPLE_STATES 14 - - -typedef HRESULT (APIENTRY *PFND3DXCREATEBUFFER)(DWORD, LPD3DXBUFFER *); -typedef HRESULT (APIENTRY *PFND3DXCREATEEFFECT)(LPDIRECT3DDEVICE9, LPCVOID, UINT, CONST D3DXMACRO *, - LPD3DXINCLUDE, DWORD, LPD3DXEFFECTPOOL, - LPD3DXEFFECT *, LPD3DXBUFFER *); -typedef D3DXMATRIX *(APIENTRY *PFND3DXMATRIXORTHOOFFCENTERLH)(D3DMATRIX *, FLOAT, FLOAT, - FLOAT, FLOAT, FLOAT, FLOAT); -typedef IDirect3D9 *(APIENTRY *PFNDIRECT3DCREATE9)(uint); - -static PFNDIRECT3DCREATE9 pDirect3DCreate9 = 0; -static PFND3DXCREATEBUFFER pD3DXCreateBuffer = 0; -static PFND3DXCREATEEFFECT pD3DXCreateEffect = 0; -static PFND3DXMATRIXORTHOOFFCENTERLH pD3DXMatrixOrthoOffCenterLH = 0; - - -class QD3DSurfaceManager : public QObject { - Q_OBJECT - -public: - enum QD3DSurfaceManagerStatus { - NoStatus = 0, - NeedsResetting = 0x01, - MaxSizeChanged = 0x02 - }; - - QD3DSurfaceManager(); - ~QD3DSurfaceManager(); - - void init(LPDIRECT3D9 object); - - void setPaintDevice(QPaintDevice *pd); - - int status() const; - void reset(); - - LPDIRECT3DSURFACE9 renderTarget(); - - LPDIRECT3DSURFACE9 surface(QPaintDevice *pd); - LPDIRECT3DSWAPCHAIN9 swapChain(QPaintDevice *pd); - void releasePaintDevice(QPaintDevice *pd); - - LPDIRECT3DDEVICE9 device(); - void cleanup(); - - QSize maxSize() const; - -private: - struct D3DSwapChain { - QSize size; - LPDIRECT3DSWAPCHAIN9 swapchain; - LPDIRECT3DSURFACE9 surface; - }; - - void updateMaxSize(); - void initPresentParameters(D3DPRESENT_PARAMETERS *params); - D3DSwapChain *createSwapChain(QWidget *w); - - QSize m_max_size; - int m_status; - QMap m_swapchains; - - LPDIRECT3DDEVICE9 m_device; - QPaintDevice *m_pd; - HWND m_dummy; - D3DSwapChain *m_current; - -private Q_SLOTS: - void cleanupPaintDevice(QObject *); -}; - -struct vertex { - D3DVECTOR pos; - DWORD color; - FLOAT s0, t0, r0, q0; - FLOAT s1, t1, r1, q1; -}; - -struct QD3DMaskPosition { - int x, y, channel; -}; - - -struct QD3DBatchItem { - enum QD3DBatchInfo { - BI_WINDING = 0x0001, - BI_AA = 0x0002, - BI_BRECT = 0x0004, - BI_MASKFULL = 0x0008, - BI_TEXT = 0x0010, - BI_MASK = 0x0020, - BI_CLIP = 0x0040, - BI_SCISSOR = 0x0080, - - BI_PIXMAP = 0x0100, - BI_IMAGE = 0x0200, - BI_COMPLEXBRUSH = 0x0400, - - BI_CLEARCLIP = 0x0800, // clip nothing (filling the clip mask with 0) - BI_TRANSFORM = 0x1000, - BI_MASKSCISSOR = 0x2000, - BI_FASTLINE = 0x4000, - BI_COSMETICPEN = 0x8000 - }; - - int m_info; - - int m_count; - int m_offset; - - QD3DMaskPosition m_maskpos; - qreal m_xoffset; - qreal m_yoffset; - qreal m_opacity; - - QPixmap m_pixmap; - QRectF m_brect; - QBrush m_brush; - - IDirect3DTexture9 *m_texture; - - qreal m_width; - qreal m_distance; - - QTransform m_matrix; - QPainter::CompositionMode m_cmode; - - QVector m_pointstops; -}; - -struct QD3DBatch { - int m_item_index; - QD3DBatchItem items[QD3D_BATCH_SIZE]; -}; - -class QD3DStateManager; -class QD3DFontCache; -class QD3DDrawHelper; -class QD3DGradientCache; - -class QDirect3DPaintEnginePrivate : public QPaintEnginePrivate -{ - Q_DECLARE_PUBLIC(QDirect3DPaintEngine) - -public: - enum RenderTechnique { - RT_NoTechnique, - RT_Antialiased, - RT_Aliased, - }; - - QDirect3DPaintEnginePrivate() - : m_d3d_object(0) - , m_d3d_device(0) - , m_txop(QTransform::TxNone) - , m_effect(0) - , m_flush_on_end(0) - { init(); } - - ~QDirect3DPaintEnginePrivate(); - - bool init(); - void initDevice(); - - inline QD3DBatchItem *nextBatchItem(); - - QPolygonF brushCoordinates(const QRectF &r, bool stroke, qreal *fp) const; - void fillAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform); - void fillAntialiasedPath(const QPainterPath &path, const QRectF &brect, - const QTransform &txform, bool stroke); - void fillPath(const QPainterPath &path, QRectF brect); - - void strokePath(const QPainterPath &path, QRectF brect, bool simple = false); - QPainterPath strokePathFastPen(const QPainterPath &path); - void strokeAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform); - - void flushBatch(); - int flushAntialiased(int offset); - void flushAliased(QD3DBatchItem *item, int offset); - void flushText(QD3DBatchItem *item, int offset); - void flushLines(QD3DBatchItem *item, int offset); - - void updateTransform(const QTransform &matrix); - void updatePen(const QPen &pen); - void updateBrush(const QBrush &pen); - void updateClipRegion(const QRegion &clipregion, Qt::ClipOperation op = Qt::ReplaceClip); - void updateClipPath(const QPainterPath &clipregion, Qt::ClipOperation op = Qt::ReplaceClip); - void updateFont(const QFont &font); - - void setRenderTechnique(RenderTechnique technique); - - QPointF transformPoint(const QPointF &p, qreal *w) const; - - bool prepareBatch(QD3DBatchItem *item, int offset); - void prepareItem(QD3DBatchItem *item); - void cleanupItem(QD3DBatchItem *item); - void setCompositionMode(QPainter::CompositionMode mode); - - void verifyTexture(const QPixmap &pixmap); - - bool isFastRect(const QRectF &rect); - - void releaseDC(); - - void cleanup(); - bool testCaps(); - - QPixmap getPattern(Qt::BrushStyle style) const; - - // clipping - QPainterPath m_sysclip_path; - QPainterPath m_clip_path; - QRegion m_sysclip_region; - QRegion m_clip_region; - - qreal m_opacity; - D3DCOLOR m_opacity_color; - - int m_current_state; - - ID3DXEffect* m_effect; - - RenderTechnique m_current_technique; - - QTransform m_matrix; - qreal m_inv_scale; - - QPen m_pen; - Qt::BrushStyle m_pen_brush_style; - QTransform m_inv_pen_matrix; - D3DCOLOR m_pen_color; - qreal m_pen_width; - - QBrush m_brush; - Qt::BrushStyle m_brush_style; - QTransform m_inv_brush_matrix; - D3DCOLOR m_brush_color; - QTransform m_brush_origin; - - uint m_clipping_enabled : 1; - uint m_has_complex_clipping : 1; - uint m_cleartype_text: 1; - uint m_has_pen : 1; - uint m_has_cosmetic_pen : 1; - uint m_has_brush : 1; - uint m_has_fast_pen : 1; - uint m_has_aa_fast_pen : 1; - uint m_flush_on_end : 1; - uint m_supports_d3d : 1; - - QTransform::TransformationType m_txop; - - QPainter::CompositionMode m_cmode; - - QD3DSurfaceManager m_surface_manager; - QSize m_surface_size; - - LPDIRECT3D9 m_d3d_object; - LPDIRECT3DDEVICE9 m_d3d_device; - IDirect3DSurface9 *m_current_surface; - bool m_in_scene; - - QD3DGradientCache *m_gradient_cache; - QD3DDrawHelper *m_draw_helper; - QD3DBatch m_batch; - QD3DStateManager *m_statemanager; - - HDC m_dc; - IDirect3DSurface9 *m_dcsurface; - - QMap m_patterns; -}; - - -class QD3DStateManager : public ID3DXEffectStateManager { -public: - QD3DStateManager(LPDIRECT3DDEVICE9 pDevice, ID3DXEffect *effect); - void reset(); - - inline void startStateBlock(); - inline void endStateBlock(); - - inline void setCosmeticPen(bool enabled); - inline void setBrushMode(int mode); - inline void setTexture(LPDIRECT3DBASETEXTURE9 pTexture); - inline void setTexture(LPDIRECT3DBASETEXTURE9 pTexture, QGradient::Spread spread); - inline void setTransformation(const QTransform *matrix = 0); - inline void setProjection(const D3DXMATRIX *pMatrix); - inline void setMaskChannel(int channel); - inline void setMaskOffset(qreal x, qreal y); - inline void setFocalDistance(const qreal &fd); - - inline void beginPass(int pass); - inline void endPass(); - - STDMETHOD(QueryInterface)(REFIID iid, LPVOID *ppv); - STDMETHOD_(ULONG, AddRef)(); - STDMETHOD_(ULONG, Release)(); - - STDMETHOD(SetTransform)(D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix); - STDMETHOD(SetMaterial)(CONST D3DMATERIAL9 *pMaterial); - STDMETHOD(SetLight)(DWORD Index, CONST D3DLIGHT9 *pLight); - STDMETHOD(LightEnable)(DWORD Index, BOOL Enable); - STDMETHOD(SetRenderState)(D3DRENDERSTATETYPE State, DWORD Value); - STDMETHOD(SetTexture)(DWORD Stage, LPDIRECT3DBASETEXTURE9 pTexture); - STDMETHOD(SetTextureStageState)(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value); - STDMETHOD(SetSamplerState)(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value); - STDMETHOD(SetNPatchMode)(FLOAT NumSegments); - STDMETHOD(SetFVF)(DWORD FVF); - STDMETHOD(SetVertexShader)(LPDIRECT3DVERTEXSHADER9 pShader); - STDMETHOD(SetVertexShaderConstantF)(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount); - STDMETHOD(SetVertexShaderConstantI)(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount); - STDMETHOD(SetVertexShaderConstantB)(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShader)(LPDIRECT3DPIXELSHADER9 pShader); - STDMETHOD(SetPixelShaderConstantF)(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShaderConstantI)(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShaderConstantB)(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount); -private: - LPDIRECT3DVERTEXSHADER9 m_vertexshader; - LPDIRECT3DPIXELSHADER9 m_pixelshader; - - LPDIRECT3DBASETEXTURE9 m_textures[D3D_STAGE_COUNT]; - DWORD m_texturestates[D3D_STAGE_COUNT][D3D_TEXTURE_STATES]; - DWORD m_samplerstates[D3D_STAGE_COUNT][D3D_SAMPLE_STATES]; - DWORD m_renderstate[D3D_RENDER_STATES]; - - qreal m_radgradfd; - - bool m_cosmetic_pen; - int m_pass; - int m_maskchannel; - int m_brushmode; - LPDIRECT3DBASETEXTURE9 m_texture; - D3DXMATRIX m_projection; - - D3DXMATRIX m_d3dIdentityMatrix; - bool m_isIdentity; - QTransform m_transformation; - - LPDIRECT3DDEVICE9 m_pDevice; - ID3DXEffect *m_effect; - - LONG m_refs; - bool m_changed; - qreal m_xoffset, m_yoffset; - static int m_mask_channels[4][4]; -}; - -// -// font cache stuff -// - -struct QD3DGlyphCoord { - // stores the offset and size of a glyph texture - qreal x; - qreal y; - qreal width; - qreal height; - qreal log_width; - qreal log_height; - QFixed x_offset; - QFixed y_offset; -}; - -struct QD3DFontTexture { - int x_offset; // current glyph offset within the texture - int y_offset; - int width; - int height; - IDirect3DTexture9 *texture; -}; - -typedef QHash QD3DGlyphHash; -typedef QHash QD3DFontGlyphHash; -typedef QHash QD3DFontTexHash; - -class QD3DGlyphCache : public QObject -{ - Q_OBJECT -public: - QD3DGlyphCache() - : QObject(0) - , current_cache(0) {} - ~QD3DGlyphCache(); - QD3DGlyphCoord *lookup(QFontEngine *, glyph_t); - void cacheGlyphs(QDirect3DPaintEngine *, const QTextItemInt &, const QVarLengthArray &, - bool); - void cleanCache(); - inline QD3DFontTexture *fontTexture(QFontEngine *engine) { - return font_textures.constFind(reinterpret_cast(engine)).value(); - } - -public slots: - void fontEngineDestroyed(QObject *); - -private: - QImage clearTypeGlyph(QFontEngine *, glyph_t glyph); - QD3DGlyphHash *current_cache; - QD3DFontTexHash font_textures; - QD3DFontGlyphHash font_cache; -}; - -QD3DGlyphCache::~QD3DGlyphCache() -{ -} - -QD3DGlyphCoord *QD3DGlyphCache::lookup(QFontEngine *, glyph_t g) -{ - Q_ASSERT(current_cache != 0); - QD3DGlyphHash::const_iterator it = current_cache->constFind(g); - if (it == current_cache->constEnd()) - return 0; - return it.value(); -} - -void QD3DGlyphCache::cleanCache() -{ - QList keys = font_textures.keys(); - for (int i=0; itexture->Release(); - - qDeleteAll(font_textures); - qDeleteAll(font_cache); - font_textures.clear(); - font_cache.clear(); - current_cache = 0; -} - -void QD3DGlyphCache::fontEngineDestroyed(QObject *object) -{ -// qDebug() << "=> font engine destroyed: " << object; - QFontEngine *engine = static_cast(object); - - QD3DFontGlyphHash::iterator cache_it = font_cache.find(engine); - if (cache_it != font_cache.end()) { - QD3DGlyphHash *cache = font_cache.take(engine); - delete cache; - } - - quint64 font_key = reinterpret_cast(engine); - QD3DFontTexture *tex = font_textures.take(font_key); - if (tex) { - tex->texture->Release(); - delete tex; - } -} - -QImage QD3DGlyphCache::clearTypeGlyph(QFontEngine *engine, glyph_t glyph) -{ - glyph_metrics_t gm = engine->boundingBox(glyph); - int glyph_x = qFloor(gm.x.toReal()); - int glyph_y = qFloor(gm.y.toReal()); - int glyph_width = qCeil((gm.x + gm.width).toReal()) - glyph_x + 2; - int glyph_height = qCeil((gm.y + gm.height).toReal()) - glyph_y + 2; - - if (glyph_width + glyph_x <= 0 || glyph_height <= 0) - return QImage(); - QImage im(glyph_width + glyph_x, glyph_height, QImage::Format_ARGB32_Premultiplied); - im.fill(0xff000000); // solid black - QPainter p(&im); - - p.setPen(Qt::white); - p.setBrush(Qt::NoBrush); - - QTextItemInt ti; - ti.ascent = engine->ascent(); - ti.descent = engine->descent(); - ti.width = glyph_width; - ti.fontEngine = engine; - - QGlyphLayoutArray<1> glyphLayout; - ti.glyphs = glyphLayout; - ti.glyphs.glyphs[0] = glyph; - ti.glyphs.advances_x[0] = glyph_width; - p.drawTextItem(QPointF(-glyph_x, -glyph_y), ti); - p.end(); - return im; -} - -#if 0 -static void dump_font_texture(QD3DFontTexture *tex) -{ - QColor color(Qt::red); - D3DLOCKED_RECT rect; - if (FAILED(tex->texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "debug: unable to lock texture rect."; - return; - } - -// cleartype version -// uint *tex_data = (uint *) rect.pBits; -// QImage im(tex->width, tex->height, QImage::Format_ARGB32); -// for (int y=0; yheight; ++y) { -// for (int x=0; xwidth; ++x) { -// im.setPixel(x, y, ((*(tex_data+x+y*tex->width)))); -// } -// } - uchar *tex_data = (uchar *) rect.pBits; - QImage im(rect.Pitch, tex->height, QImage::Format_ARGB32); - for (int y=0; yheight; ++y) { - for (int x=0; xtexture->UnlockRect(0); - static int i= 0; - im.save(QString("tx%1.png").arg(i++)); -} -#endif - -void QD3DGlyphCache::cacheGlyphs(QDirect3DPaintEngine *engine, const QTextItemInt &ti, - const QVarLengthArray &glyphs, bool clearType) -{ - IDirect3DDevice9 *device = engine->d_func()->m_d3d_device; - QD3DFontGlyphHash::const_iterator cache_it = font_cache.constFind(ti.fontEngine); - QD3DGlyphHash *cache = 0; - if (cache_it == font_cache.constEnd()) { - cache = new QD3DGlyphHash; - font_cache.insert(ti.fontEngine, cache); - connect(ti.fontEngine, SIGNAL(destroyed(QObject *)), SLOT(fontEngineDestroyed(QObject *))); - } else { - cache = cache_it.value(); - } - - current_cache = cache; - - D3DFORMAT tex_format = clearType ? D3DFMT_A8R8G8B8 : D3DFMT_A8; - quint64 font_key = reinterpret_cast(ti.fontEngine); - QD3DFontTexHash::const_iterator it = font_textures.constFind(font_key); - QD3DFontTexture *font_tex = 0; - if (it == font_textures.constEnd()) { - // alloc a new texture, put it into the cache - int tex_height = qCeil(ti.ascent.toReal() + ti.descent.toReal()) + 5; - int tex_width = tex_height * 30; // ### - IDirect3DTexture9 *tex; - if (FAILED(device->CreateTexture(tex_width, tex_height, 1, 0, - tex_format, D3DPOOL_MANAGED, &tex, NULL))) - { - qWarning("QD3DGlyphCache::cacheGlyphs(): can't allocate font texture (%dx%d).", - tex_width, tex_height); - return; - } else { -// qDebug() << "=> new font texture: " << QSize(tex_width,tex_height); - font_tex = new QD3DFontTexture; - font_tex->texture = tex; - font_tex->x_offset = 0; - font_tex->y_offset = 0; - font_tex->width = tex_width; - font_tex->height = tex_height; - font_textures.insert(font_key, font_tex); - } - } else { - font_tex = it.value(); - // make it current render target.. - } - - // cache each glyph - for (int i=0; iconstFind(glyphs[i]); - if (it == cache->constEnd()) { - glyph_metrics_t metrics = ti.fontEngine->boundingBox(glyphs[i]); - int glyph_width = qCeil(metrics.width.toReal()) + 5; - int glyph_height = qCeil(ti.ascent.toReal() + ti.descent.toReal()) + 5; - if (font_tex->x_offset + glyph_width > font_tex->width) { - // no room on the current line, start new glyph strip - int strip_height = glyph_height; - font_tex->x_offset = 0; - font_tex->y_offset += strip_height; - if (font_tex->y_offset >= font_tex->height) { - // if no room in the current texture - realloc a larger texture - int old_tex_height = font_tex->height; - font_tex->height += strip_height; - - IDirect3DTexture9 *new_tex; - if (FAILED(device->CreateTexture(font_tex->width, font_tex->height, 1, 0, - tex_format, D3DPOOL_MANAGED, &new_tex, NULL))) - { - qWarning("QD3DGlyphCache(): can't re-allocate font texture."); - return; - } else { -// qDebug() << " -> new glyph strip added:" << QSize(font_tex->width,font_tex->height); - - D3DLOCKED_RECT new_rect, old_rect; - if (FAILED(font_tex->texture->LockRect(0, &old_rect, 0, D3DLOCK_READONLY))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - if (FAILED(new_tex->LockRect(0, &new_rect, 0, 0))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - memcpy(new_rect.pBits, old_rect.pBits, new_rect.Pitch * old_tex_height); - font_tex->texture->UnlockRect(0); - new_tex->UnlockRect(0); - engine->d_func()->flushBatch(); - font_tex->texture->Release(); - font_tex->texture = new_tex; - } - - // update the texture coords and the y offset for the existing glyphs in - // the cache, because of the texture size change - QD3DGlyphHash::iterator it = cache->begin(); - while (it != cache->end()) { - it.value()->height = (it.value()->height * old_tex_height) / font_tex->height; - it.value()->y = (it.value()->y * old_tex_height) / font_tex->height; - ++it; - } - } - } - QD3DGlyphCoord *d3d_glyph = new QD3DGlyphCoord; - d3d_glyph->x = qreal(font_tex->x_offset) / font_tex->width; - d3d_glyph->y = qreal(font_tex->y_offset) / font_tex->height; - d3d_glyph->width = qreal(glyph_width) / font_tex->width; - d3d_glyph->height = qreal(glyph_height) / font_tex->height; - d3d_glyph->log_width = d3d_glyph->width * font_tex->width; - d3d_glyph->log_height = d3d_glyph->height * font_tex->height; - d3d_glyph->x_offset = -metrics.x; - d3d_glyph->y_offset = metrics.y; - - QImage glyph_im; - if (clearType) - glyph_im = clearTypeGlyph(ti.fontEngine, glyphs[i]); - else - glyph_im = ti.fontEngine->alphaMapForGlyph(glyphs[i]).convertToFormat(QImage::Format_Indexed8); - - // write glyph to texture - D3DLOCKED_RECT rect; - RECT glyph_rect = { font_tex->x_offset, font_tex->y_offset, - font_tex->x_offset + glyph_im.width(), - font_tex->y_offset + glyph_im.height() }; - -// qDebug() << " > new glyph char added:" << QSize(glyph_im.width(), glyph_im.height()); - if (FAILED(font_tex->texture->LockRect(0, &rect, &glyph_rect, 0))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - - // ### unify these loops - if (clearType) { - int ppl = rect.Pitch / 4; - uint *tex_data = (uint *) rect.pBits; - for (int y=0; ytexture->UnlockRect(0); - - // debug -// dump_font_texture(font_tex); - - if (font_tex->x_offset + glyph_width > font_tex->width) { - font_tex->x_offset = 0; - font_tex->y_offset += glyph_height; - } else { - font_tex->x_offset += glyph_width; - } - - cache->insert(glyphs[i], d3d_glyph); - } - } -} - -Q_GLOBAL_STATIC(QD3DGlyphCache, qd3d_glyph_cache) - -// -// end font caching stuff -// - - -// -// D3D image cache stuff -// - -// ### keep the GL stuff in mind.. -typedef void (*_qt_image_cleanup_hook_64)(qint64); -extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; - -static void qd3d_image_cleanup(qint64 key); - -class QD3DImage -{ -public: - QD3DImage(IDirect3DDevice9 *device, const QImage &image); - ~QD3DImage(); - - IDirect3DTexture9 *texture; -}; - -static QList qd3d_release_list; - -QD3DImage::QD3DImage(IDirect3DDevice9 *device, const QImage &image) -{ - texture = 0; - Q_ASSERT(device); - QImage im = image.convertToFormat(QImage::Format_ARGB32); - if (FAILED(device->CreateTexture(im.width(), im.height(), 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, 0))) { - qWarning("QD3DImage(): unable to create Direct3D texture."); - return; - } -// qDebug(" -> created image texture: %p - 0x%08x%08x",texture,uint (image.cacheKey() >> 32),uint (image.cacheKey() & 0xffffffff)); - D3DLOCKED_RECT rect; - if (FAILED(texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QD3DImage: unable to lock texture rect."; - return; - } - DWORD *dst = (DWORD *) rect.pBits; - DWORD *src = (DWORD *) im.scanLine(0); - - Q_ASSERT((rect.Pitch/4) == (im.bytesPerLine()/4)); - memcpy(dst, src, rect.Pitch*im.height()); - texture->UnlockRect(0); -} - -QD3DImage::~QD3DImage() -{ - if (texture) - qd3d_release_list.append(texture); -} - -static int qd3d_cache_limit = 64*1024; // cache ~64 MB worth of textures -typedef QCache QD3DImageCache; - -class QD3DImageManager -{ -public: - QD3DImageManager() { - // ### GL does the same! - qt_image_cleanup_hook_64 = qd3d_image_cleanup; - cache.setMaxCost(qd3d_cache_limit); - } - ~QD3DImageManager() { -// qDebug() << "unhooking d3d image cache"; - qt_image_cleanup_hook_64 = 0; - cache.clear(); - } - - IDirect3DTexture9 *lookup(IDirect3DDevice9 *device, const QImage &image); - void remove(quint64 key); - -private: - QD3DImageCache cache; -}; - -IDirect3DTexture9 *QD3DImageManager::lookup(IDirect3DDevice9 *device, const QImage &image) -{ - QD3DImage *tex_image = 0; - - tex_image = cache.object(image.cacheKey()); - if (!tex_image) { - // to avoid cache thrashing we remove images from the cache - // that have the same serial no as the cached image, since - // that image is most likely destoyed already, and we got a - // stale cache entry - uint serial = (uint) (image.cacheKey() >> 32); - QList keys = cache.keys(); - for (int i=0; i> 32) == serial) { - cache.remove(keys.at(i)); - break; - } - } -// qDebug(" => cached: %d, adding cache image: 0x%08x%08x",cache.size(), uint (image.cacheKey() >> 32),uint (image.cacheKey() & 0xffffffff)); - // add cache entry - int cost = image.width()*image.height()*4/1024; - if (cache.totalCost() + cost > cache.maxCost()) { - // no room for new entries? kick out half the cached images - int old_max_cost = cache.maxCost(); - cache.setMaxCost(old_max_cost/2); - cache.setMaxCost(old_max_cost); - } - tex_image = new QD3DImage(device, image); - cache.insert(image.cacheKey(), tex_image, cost); -// qDebug() << "==> total cache cost: " << cache.totalCost() << cost; - } - - return tex_image->texture; -} - -void QD3DImageManager::remove(quint64 key) -{ -// QList keys = cache.keys(); -// if (keys.contains(key)) -// qDebug() << "entery removed from cache"; - cache.remove(key); -} - -Q_GLOBAL_STATIC(QD3DImageManager, qd3d_image_cache) - -static void qd3d_image_cleanup(qint64 key) -{ -// qDebug() << "qd3d_image_cleanup:"; -// qDebug(" => key: 0x%08x%08x", (uint) (key >> 32), (uint)(key & 0xffffffff)); - qd3d_image_cache()->remove(key); -} - -// -// end D3D image cache stuff -// - -class QD3DDrawHelper : public QTessellator -{ -public: - QD3DDrawHelper(QDirect3DPaintEnginePrivate *pe); - ~QD3DDrawHelper(); - - bool needsFlushing() const; - QD3DMaskPosition allocateMaskPosition(const QRectF &brect, bool *breakbatch); - - void setClipPath(const QPainterPath &path, QD3DBatchItem **item); - - void queueAntialiasedMask(const QPolygonF &poly, QD3DBatchItem **item, const QRectF &brect); - QRectF queueAliasedMask(const QPainterPath &path, QD3DBatchItem **item, D3DCOLOR color); - - void queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color, const QPolygonF &trect); - void queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color); - - void queueTextGlyph(const QRectF &rect, const qreal *tex_coords, QD3DBatchItem *item, - D3DCOLOR color); - - void queueAntialiasedLines(const QPainterPath &path, QD3DBatchItem **item, const QRectF &brect); - void queueAliasedLines(const QLineF *lines, int lineCount, QD3DBatchItem **item); - - int drawAntialiasedMask(int offset, int maxoffset); - void drawAliasedMask(int offset); - void drawAntialiasedBoundingRect(QD3DBatchItem *item); - void drawAliasedBoundingRect(QD3DBatchItem *item); - void drawTextItem(QD3DBatchItem *item); - void drawAliasedLines(QD3DBatchItem *item); - - void setMaskSize(QSize size); - - void beforeReset(); - void afterReset(); - - IDirect3DSurface9 *freeMaskSurface(); - - inline void lockVertexBuffer(); - inline void unlockVertexBuffer(); - - inline int index() { return m_index; } - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - enum VertexBufferAccess { - CLEAR = 0x00, - READ = 0x01, - WRITE = 0x02 - }; - int accesscontrol[QT_VERTEX_BUF_SIZE]; -#endif - -private: - void addTrap(const Trapezoid &trap); - void tessellate(const QPolygonF &poly); - inline void lineToStencil(qreal x, qreal y); - inline void curveToStencil(const QPointF &cp1, const QPointF &cp2, const QPointF &ep); - QRectF pathToVertexArrays(const QPainterPath &path); - void resetMask(); - - QDirect3DPaintEnginePrivate *m_pe; - - qreal m_xoffset, m_yoffset; - int m_startindex; - int m_index; - int m_height, m_width; - LPDIRECT3DVERTEXBUFFER9 m_d3dvbuff; - vertex *m_vbuff; - QD3DBatchItem *m_item; - QRectF m_boundingRect; - - qreal max_x; - qreal max_y; - qreal min_x; - qreal min_y; - qreal firstx; - qreal firsty; - - QPointF tess_lastpoint; - int tess_index; - - bool m_locked; - IDirect3DTexture9 *m_mask; - IDirect3DSurface9 *m_maskSurface; - IDirect3DSurface9 *m_depthStencilSurface; - - D3DCOLOR m_color; - bool m_clearmask; - bool m_isLine; - bool m_firstPoint; - - QD3DMaskPosition m_mask_position; - int m_mask_offsetX2; - int m_mask_offsetY2; -}; - -QD3DStateManager::QD3DStateManager(LPDIRECT3DDEVICE9 pDevice, ID3DXEffect *effect) - : m_pDevice(pDevice), m_effect(effect), m_refs(0) -{ - if (FAILED(D3DXMatrixIdentity(&m_d3dIdentityMatrix))) { - qWarning("QDirect3DPaintEngine: D3DXMatrixIdentity failed"); - } - reset(); -} - -void QD3DStateManager::reset() -{ - m_radgradfd = -1; - - m_cosmetic_pen = false; - m_pass = -1; - m_maskchannel = -1; - m_brushmode = -1; - m_texture = 0; - m_xoffset = INT_MAX; - m_yoffset = INT_MAX; - - m_vertexshader = 0; - m_pixelshader = 0; - - m_isIdentity = true; - m_transformation = QTransform(); - m_effect->SetMatrix("g_mTransformation", &m_d3dIdentityMatrix); - - ZeroMemory(&m_projection, sizeof(D3DMATRIX)); - ZeroMemory(m_textures, sizeof(LPDIRECT3DBASETEXTURE9) * D3D_STAGE_COUNT); - FillMemory(m_samplerstates, sizeof(DWORD) * D3D_SAMPLE_STATES * D3D_STAGE_COUNT, 0xFFFFFFFE); - FillMemory(m_texturestates, sizeof(DWORD) * D3D_TEXTURE_STATES * D3D_STAGE_COUNT, 0xFFFFFFFE); - FillMemory(m_renderstate, sizeof(DWORD) * D3D_RENDER_STATES, 0xFFFFFFFE); -} - -inline void QD3DStateManager::beginPass(int pass) -{ - if (pass != m_pass) { - if (m_pass != -1) - m_effect->EndPass(); - m_effect->BeginPass(pass); - m_pass = pass; - } -} - -inline void QD3DStateManager::endPass() -{ - if (m_pass != -1) { - m_pass = -1; - m_effect->EndPass(); - } -} - -inline void QD3DStateManager::startStateBlock() { - m_changed = false; -} - -inline void QD3DStateManager::setCosmeticPen(bool enabled) -{ - if (enabled != m_cosmetic_pen) { - m_effect->SetBool("g_mCosmeticPen", enabled); - m_cosmetic_pen = enabled; - m_changed = true; - } -} - -inline void QD3DStateManager::setBrushMode(int mode) -{ - if (mode != m_brushmode) { - m_effect->SetInt("g_mBrushMode", mode); - m_brushmode = mode; - m_changed = true; - } -} - -inline void QD3DStateManager::setTexture(LPDIRECT3DBASETEXTURE9 pTexture) -{ - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER); - - if (pTexture != m_texture) { - m_texture = pTexture; - m_effect->SetTexture("g_mTexture", pTexture); - m_changed = true; - } -} - -inline void QD3DStateManager::setTexture(LPDIRECT3DBASETEXTURE9 pTexture, QGradient::Spread spread) -{ - switch(spread) { - case QGradient::RepeatSpread: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP); - break; - case QGradient::ReflectSpread: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_MIRROR); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_MIRROR); - break; - default: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); - break; - }; - - if (pTexture != m_texture) { - m_texture = pTexture; - m_effect->SetTexture("g_mTexture", pTexture); - m_changed = true; - } -} - -inline void QD3DStateManager::setTransformation(const QTransform *matrix) -{ - if (matrix) { - if (*matrix != m_transformation) { - D3DXMATRIX dxmatrix(matrix->m11(), matrix->m12(), 0, matrix->m13(), - matrix->m21(), matrix->m22(), 0, matrix->m23(), - 0, 0, 1, 0, - matrix->dx(), matrix->dy(), 0, 1); - m_effect->SetMatrix("g_mTransformation", &dxmatrix); - m_transformation = *matrix; - m_changed = true; - m_isIdentity = false; - } - } else if (!m_isIdentity) { - m_effect->SetMatrix("g_mTransformation", &m_d3dIdentityMatrix); - m_transformation = QTransform(); - m_changed = true; - m_isIdentity = true; - } -} - -inline void QD3DStateManager::setProjection(const D3DXMATRIX *pMatrix) -{ - if (*pMatrix != m_projection) { - m_effect->SetMatrix("g_mViewProjection", pMatrix); - m_projection = *pMatrix; - m_changed = true; - } -} - -inline void QD3DStateManager::setFocalDistance(const qreal &fd) -{ - if (fd != m_radgradfd) { - m_effect->SetFloat("g_mFocalDist", fd); - m_changed = true; - m_radgradfd = fd; - } -} - -inline void QD3DStateManager::setMaskOffset(qreal x, qreal y) -{ - if (x != m_xoffset || y != m_yoffset) { - float offset[2] = {x, y}; - m_effect->SetFloatArray("g_mMaskOffset", offset, 2); - m_xoffset = x; - m_yoffset = y; - m_changed = true; - } -} - -inline void QD3DStateManager::setMaskChannel(int channel) -{ - if (m_maskchannel != channel) { - m_effect->SetIntArray("g_mChannel", m_mask_channels[channel], 4); - m_maskchannel = channel; - m_changed = true; - } -} - -inline void QD3DStateManager::endStateBlock() -{ - if (m_changed) { - m_effect->CommitChanges(); - m_changed = false; - } -} - -STDMETHODIMP QD3DStateManager::QueryInterface(REFIID iid, LPVOID *ppv) -{ - if(iid == IID_IUnknown || iid == IID_ID3DXEffectStateManager) - { - *ppv = this; - ++m_refs; - return NOERROR; - } - *ppv = NULL; - return ResultFromScode(E_NOINTERFACE); -} - -STDMETHODIMP_(ULONG) QD3DStateManager::AddRef(void) -{ - return (ULONG)InterlockedIncrement( &m_refs ); -} - - -STDMETHODIMP_(ULONG) QD3DStateManager::Release(void) -{ - if( 0L == InterlockedDecrement( &m_refs ) ) { - delete this; - return 0L; - } - - return m_refs; -} -STDMETHODIMP QD3DStateManager::SetTransform(D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) -{ - return m_pDevice->SetTransform(State, pMatrix); -} - -STDMETHODIMP QD3DStateManager::SetMaterial(CONST D3DMATERIAL9 *pMaterial) -{ - return m_pDevice->SetMaterial(pMaterial); -} - -STDMETHODIMP QD3DStateManager::SetLight(DWORD Index, CONST D3DLIGHT9 *pLight) -{ - return m_pDevice->SetLight(Index, pLight); -} - -STDMETHODIMP QD3DStateManager::LightEnable(DWORD Index, BOOL Enable) -{ - return m_pDevice->LightEnable(Index, Enable); -} - -STDMETHODIMP QD3DStateManager::SetRenderState(D3DRENDERSTATETYPE State, DWORD Value) -{ - if (State < D3D_RENDER_STATES) { - if (m_renderstate[State] == Value) - return S_OK; - m_renderstate[State] = Value; - } - return m_pDevice->SetRenderState(State, Value); -} - -STDMETHODIMP QD3DStateManager::SetTexture(DWORD Stage, LPDIRECT3DBASETEXTURE9 pTexture) -{ - if (Stage < D3D_STAGE_COUNT) { - if (m_textures[Stage] == pTexture) - return S_OK; - m_textures[Stage] = pTexture; - } - return m_pDevice->SetTexture(Stage, pTexture); -} - -STDMETHODIMP QD3DStateManager::SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) -{ - if (Stage < D3D_STAGE_COUNT && Type < D3D_TEXTURE_STATES) { - if (m_texturestates[Stage][Type] == Value) - return S_OK; - m_texturestates[Stage][Type] = Value; - } - return m_pDevice->SetTextureStageState(Stage, Type, Value); -} - -STDMETHODIMP QD3DStateManager::SetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) -{ - if (Sampler < D3D_STAGE_COUNT && Type < D3D_SAMPLE_STATES) { - if (m_samplerstates[Sampler][Type] == Value) - return S_OK; - m_samplerstates[Sampler][Type] = Value; - } - return m_pDevice->SetSamplerState(Sampler, Type, Value); -} - -STDMETHODIMP QD3DStateManager::SetNPatchMode(FLOAT NumSegments) -{ - return m_pDevice->SetNPatchMode(NumSegments); -} - -STDMETHODIMP QD3DStateManager::SetFVF(DWORD FVF) -{ - return m_pDevice->SetFVF(FVF); -} - -STDMETHODIMP QD3DStateManager::SetVertexShader(LPDIRECT3DVERTEXSHADER9 pShader) -{ - if (m_vertexshader == pShader) - return S_OK; - m_vertexshader = pShader; - return m_pDevice->SetVertexShader(pShader); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantF(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantF(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantI(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantI(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantB(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantB(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShader(LPDIRECT3DPIXELSHADER9 pShader) -{ - if (m_pixelshader == pShader) - return S_OK; - m_pixelshader = pShader; - return m_pDevice->SetPixelShader(pShader); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantF(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantF(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantI(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantI(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantB(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantB(RegisterIndex, pConstantData, RegisterCount); -} - -#define QD3D_GRADIENT_CACHE_SIZE 60 -#define QD3D_GRADIENT_PALETTE_SIZE 1024 - -class QD3DGradientCache -{ - struct CacheInfo - { - inline CacheInfo(QGradientStops s, qreal op) : - stops(s), opacity(op) {} - - IDirect3DTexture9 *texture; - QGradientStops stops; - qreal opacity; - }; - - typedef QMultiHash QD3DGradientColorTableHash; - -public: - QD3DGradientCache(LPDIRECT3DDEVICE9 device); - ~QD3DGradientCache(); - - inline IDirect3DTexture9 *getBuffer(const QGradientStops &stops, qreal opacity); - -protected: - inline void generateGradientColorTable(const QGradientStops& s, - uint *colorTable, - int size, qreal opacity) const; - IDirect3DTexture9 *addCacheElement(quint64 hash_val, const QGradientStops &stops, qreal opacity); - void cleanCache(); - - QD3DGradientColorTableHash cache; - LPDIRECT3DDEVICE9 m_device; -}; - -QD3DGradientCache::QD3DGradientCache(LPDIRECT3DDEVICE9 device) - : m_device(device) -{ - -} - -QD3DGradientCache::~QD3DGradientCache() -{ - cleanCache(); -} - -inline IDirect3DTexture9 *QD3DGradientCache::getBuffer(const QGradientStops &stops, qreal opacity) -{ - quint64 hash_val = 0; - - for (int i = 0; i < stops.size() && i <= 2; i++) - hash_val += stops[i].second.rgba(); - - QD3DGradientColorTableHash::const_iterator it = cache.constFind(hash_val); - - if (it == cache.constEnd()) - return addCacheElement(hash_val, stops, opacity); - else { - do { - const CacheInfo &cache_info = it.value(); - if (cache_info.stops == stops && cache_info.opacity == opacity) { - return cache_info.texture; - } - ++it; - } while (it != cache.constEnd() && it.key() == hash_val); - // an exact match for these stops and opacity was not found, create new cache - return addCacheElement(hash_val, stops, opacity); - } -} - -void QD3DGradientCache::generateGradientColorTable(const QGradientStops& s, uint *colorTable, int size, qreal opacity) const -{ - int pos = 0; - qreal fpos = 0.0; - qreal incr = 1.0 / qreal(size); - QVector colors(s.size()); - - for (int i = 0; i < s.size(); ++i) - colors[i] = s[i].second.rgba(); - - uint alpha = qRound(opacity * 255); - while (fpos < s.first().first) { - colorTable[pos] = ARGB_COMBINE_ALPHA(colors[0], alpha); - pos++; - fpos += incr; - } - - for (int i = 0; i < s.size() - 1; ++i) { - qreal delta = 1/(s[i+1].first - s[i].first); - while (fpos < s[i+1].first && pos < size) { - int dist = int(256 * ((fpos - s[i].first) * delta)); - int idist = 256 - dist; - uint current_color = ARGB_COMBINE_ALPHA(colors[i], alpha); - uint next_color = ARGB_COMBINE_ALPHA(colors[i+1], alpha); -#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - colorTable[pos] = INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist); -#else - uint c = INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist); - colorTable[pos] = ( (c << 24) & 0xff000000) - | ((c >> 24) & 0x000000ff) - | ((c << 8) & 0x00ff0000) - | ((c >> 8) & 0x0000ff00); -#endif // Q_BYTE_ORDER - ++pos; - fpos += incr; - } - } - for (;pos < size; ++pos) - colorTable[pos] = colors[s.size() - 1]; -} - -IDirect3DTexture9 *QD3DGradientCache::addCacheElement(quint64 hash_val, const QGradientStops &stops, qreal opacity) -{ - if (cache.size() == QD3D_GRADIENT_CACHE_SIZE) { - int elem_to_remove = qrand() % QD3D_GRADIENT_CACHE_SIZE; - uint key = cache.keys()[elem_to_remove]; - - // need to call release on each removed cache entry: - QD3DGradientColorTableHash::const_iterator it = cache.constFind(key); - do { - it.value().texture->Release(); - } while (++it != cache.constEnd() && it.key() == key); - - cache.remove(key); // may remove more than 1, but OK - } - - CacheInfo cache_entry(stops, opacity); - uint buffer[QD3D_GRADIENT_PALETTE_SIZE]; - generateGradientColorTable(stops, buffer, QD3D_GRADIENT_PALETTE_SIZE, opacity); - - if (FAILED(m_device->CreateTexture(QD3D_GRADIENT_PALETTE_SIZE, 1, 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &cache_entry.texture, 0))) { - qWarning("QD3DGradientCache::addCacheElement(): unable to create Direct3D texture."); - return 0; - } - - D3DLOCKED_RECT rect; - if (FAILED(cache_entry.texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QD3DGradientCache::addCacheElement(): unable to lock texture rect."; - return 0; - } - memcpy(rect.pBits, buffer, rect.Pitch); - cache_entry.texture->UnlockRect(0); - - return cache.insert(hash_val, cache_entry).value().texture; -} - -void QD3DGradientCache::cleanCache() -{ - QD3DGradientColorTableHash::const_iterator it = cache.constBegin(); - for (; it != cache.constEnd(); ++it) { - const CacheInfo &cache_info = it.value(); - cache_info.texture->Release(); - } - cache.clear(); -} - -QD3DSurfaceManager::QD3DSurfaceManager() : - m_status(NoStatus), m_dummy(0), m_device(0), m_pd(0), m_current(0) -{ - -} - -QD3DSurfaceManager::~QD3DSurfaceManager() -{ -} - -void QD3DSurfaceManager::setPaintDevice(QPaintDevice *pd) -{ - m_status = NoStatus; - m_pd = pd; - m_current = 0; - - if (m_device->TestCooperativeLevel() != D3D_OK) { - m_status = NeedsResetting; - return; - } - - m_current = m_swapchains.value(pd, 0); - QWidget *w = static_cast(pd); - - if (m_current) { - if (m_current->size != w->size()) { - m_swapchains.remove(pd); - m_current->surface->Release(); - m_current->swapchain->Release(); - delete m_current; - m_current = 0; - } - } - - if (!m_current) { - m_current = createSwapChain(w); - updateMaxSize(); - } -} - -int QD3DSurfaceManager::status() const -{ - return m_status; -} - -void QD3DSurfaceManager::reset() -{ - QList pds = m_swapchains.keys(); - - QMap::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - i.value()->surface->Release(); - i.value()->swapchain->Release(); - ++i; - } - qDeleteAll(m_swapchains.values()); - m_swapchains.clear(); - - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = m_dummy; - - HRESULT res = m_device->Reset(¶ms); - if (FAILED(res)) { - switch (res) { - case D3DERR_DEVICELOST: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_DEVICELOST)"); - break; - case D3DERR_DRIVERINTERNALERROR: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_DRIVERINTERNALERROR)"); - break; - case D3DERR_OUTOFVIDEOMEMORY: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_OUTOFVIDEOMEMORY)"); - break; - default: - qWarning("QDirect3DPaintEngine: Reset failed"); - }; - } - - for (int i=0; i(pds.at(i)); - createSwapChain(w); - } - - // reset the mask as well - m_status = MaxSizeChanged; - - setPaintDevice(m_pd); - updateMaxSize(); -} - -LPDIRECT3DSURFACE9 QD3DSurfaceManager::renderTarget() -{ - return m_current ? m_current->surface : 0; -} - -LPDIRECT3DSURFACE9 QD3DSurfaceManager::surface(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.value(pd, 0); - return swapchain ? swapchain->surface : 0; -} - -LPDIRECT3DSWAPCHAIN9 QD3DSurfaceManager::swapChain(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.value(pd, 0); - return swapchain ? swapchain->swapchain : 0; -} - -void QD3DSurfaceManager::releasePaintDevice(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.take(pd); - - if (swapchain) { - swapchain->surface->Release(); - swapchain->swapchain->Release(); - delete swapchain; - if (swapchain == m_current) - m_current = 0; - } -} - -LPDIRECT3DDEVICE9 QD3DSurfaceManager::device() -{ - return m_device; -} - -void QD3DSurfaceManager::cleanup() -{ - QPixmapCache::clear(); - qd3d_glyph_cache()->cleanCache(); - - // release doomed textures - for (int k=0; kRelease(); - qd3d_release_list.clear(); - - QMap::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - i.value()->surface->Release(); - i.value()->swapchain->Release(); - ++i; - } - qDeleteAll(m_swapchains.values()); - - if (m_device) - m_device->Release(); - - DestroyWindow(m_dummy); - QString cname(QLatin1String("qt_d3d_dummy")); - QT_WA({ - UnregisterClass((TCHAR*)cname.utf16(), (HINSTANCE)qWinAppInst()); - } , { - UnregisterClassA(cname.toLatin1(), (HINSTANCE)qWinAppInst()); - }); -} - -QSize QD3DSurfaceManager::maxSize() const -{ - return m_max_size; -} - -extern "C" { - LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -}; - -void QD3DSurfaceManager::init(LPDIRECT3D9 object) -{ - QString cname(QLatin1String("qt_d3d_dummy")); - uint style = CS_DBLCLKS | CS_SAVEBITS; - ATOM atom; - QT_WA({ - WNDCLASS wc; - wc.style = style; - wc.lpfnWndProc = (WNDPROC)QtWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = (HINSTANCE)qWinAppInst(); - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = 0; - wc.lpszClassName = (TCHAR*)cname.utf16(); - atom = RegisterClass(&wc); - } , { - WNDCLASSA wc; - wc.style = style; - wc.lpfnWndProc = (WNDPROC)QtWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = (HINSTANCE)qWinAppInst(); - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = 0; - QByteArray tempArray = cname.toLatin1(); - wc.lpszClassName = tempArray; - atom = RegisterClassA(&wc); - }); - - QT_WA({ - const TCHAR *className = (TCHAR*)cname.utf16(); - m_dummy = CreateWindow(className, className, 0, - 0, 0, 1, 1, - 0, 0, qWinAppInst(), 0); - } , { - m_dummy = CreateWindowA(cname.toLatin1(), cname.toLatin1(), 0, - 0, 0, 1, 1, - 0, 0, qWinAppInst(), 0); - }); - - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = m_dummy; - - HRESULT res = object->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, 0, - D3DCREATE_PUREDEVICE|D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_NOWINDOWCHANGES|D3DCREATE_FPU_PRESERVE, - ¶ms, &m_device); - - if (FAILED(res) || m_device == 0) - qWarning("QDirect3DPaintEngine: failed to create Direct3D device (error=0x%x).", res); -} - -void QD3DSurfaceManager::updateMaxSize() -{ - int w = 0, h = 0; - QMap::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - - int nw = i.key()->width(); - if (nw > w) - w = nw; - - int nh = i.key()->height(); - if (nh > h) - h = nh; - - ++i; - } - - QSize newsize = QSize(w, h); - if (newsize != m_max_size) { - m_status |= MaxSizeChanged; - m_max_size = newsize; - } -} - -void QD3DSurfaceManager::initPresentParameters(D3DPRESENT_PARAMETERS *params) -{ - ZeroMemory(params, sizeof(D3DPRESENT_PARAMETERS)); - params->Windowed = true; - params->SwapEffect = D3DSWAPEFFECT_COPY; - params->BackBufferFormat = D3DFMT_UNKNOWN; - params->PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; - params->Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; -} - -QD3DSurfaceManager::D3DSwapChain *QD3DSurfaceManager::createSwapChain(QWidget *w) -{ - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = w->winId(); - D3DSwapChain *swapchain = new D3DSwapChain(); - swapchain->size = w->size(); - if (FAILED(m_device->CreateAdditionalSwapChain(¶ms, &swapchain->swapchain))) - qWarning("QDirect3DPaintEngine: CreateAdditionalSwapChain failed"); - if (FAILED(swapchain->swapchain->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &swapchain->surface))) - qWarning("QDirect3DPaintEngine: GetBackBuffer failed"); - m_swapchains.insert(w, swapchain); - connect(w, SIGNAL(destroyed(QObject *)), SLOT(cleanupPaintDevice(QObject *))); - - // init with background color - QColor bg = w->palette().color(QPalette::Background); - m_device->ColorFill(swapchain->surface, 0, D3DCOLOR_ARGB(bg.alpha(), bg.red(),bg.green(),bg.blue())); - - return swapchain; -} - -void QD3DSurfaceManager::cleanupPaintDevice(QObject *object) -{ - QWidget *w = static_cast(object); - releasePaintDevice(w); -} - -int QD3DStateManager::m_mask_channels[4][4] = - {{1,0,0,0},{0,1,0,0},{0,0,1,0},{0,0,0,1}}; - -QD3DDrawHelper::QD3DDrawHelper(QDirect3DPaintEnginePrivate *pe) - : m_pe(pe), m_d3dvbuff(0), m_maskSurface(0), m_depthStencilSurface(0), - m_locked(false), m_mask(0), m_startindex(0), m_index(0), m_vbuff(0), m_clearmask(true), - m_isLine(false), m_firstPoint(true) -{ - resetMask(); -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - memset(accesscontrol, 0, QT_VERTEX_BUF_SIZE * sizeof(VertexBufferAccess)); -#endif - - // create vertex buffer - afterReset(); -} - -QD3DDrawHelper::~QD3DDrawHelper() -{ - if (m_maskSurface) - m_maskSurface->Release(); - - if (m_mask) - m_mask->Release(); - - if (m_depthStencilSurface) - m_depthStencilSurface->Release(); - - if (m_d3dvbuff) - m_d3dvbuff->Release(); -} - -inline void QD3DDrawHelper::lockVertexBuffer() -{ - if (!m_locked) { - DWORD lockflags = D3DLOCK_NOOVERWRITE; - if (m_startindex >= QT_VERTEX_RESET_LIMIT) { - m_startindex = 0; - m_index = 0; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=0; iLock(0, 0, (void**)&m_vbuff, lockflags))) { - qWarning() << "QDirect3DPaintEngine: unable to lock vertex buffer."; - } - m_locked = true; - } -} - -inline void QD3DDrawHelper::unlockVertexBuffer() -{ - if (m_locked) { - if (FAILED(m_d3dvbuff->Unlock())) { - qWarning() << "QDirect3DPaintEngine: unable to unlock vertex buffer."; - } - m_locked = false; - } -} - -void QD3DDrawHelper::setClipPath(const QPainterPath &path, QD3DBatchItem **item) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_maskpos.x = m_item->m_maskpos.y = 0; - m_item->m_maskpos.channel = 3; - m_item->m_info |= QD3DBatchItem::BI_CLIP; - - bool winding = (path.fillRule() == Qt::WindingFill); - if (winding) - m_item->m_info |= QD3DBatchItem::BI_WINDING; - - if (!path.isEmpty()) { - m_item->m_info |= QD3DBatchItem::BI_MASK; - m_item->m_info &= ~QD3DBatchItem::BI_AA; - m_color = 0; - QRectF brect = pathToVertexArrays(path); - queueRect(brect, m_item, 0); - } - - *item = m_item; -} - - - -void QD3DDrawHelper::queueAntialiasedMask(const QPolygonF &poly, QD3DBatchItem **item, const QRectF &brect) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - setWinding(m_item->m_info & QD3DBatchItem::BI_WINDING); - - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - - int x = brect.left(); - int y = brect.top(); - - m_item->m_xoffset = (xoffset - x) + 1; - m_item->m_yoffset = (yoffset - y) + 1; - - m_boundingRect = brect; - tessellate(poly); - - *item = m_item; -} - -QRectF QD3DDrawHelper::queueAliasedMask(const QPainterPath &path, QD3DBatchItem **item, D3DCOLOR color) -{ - lockVertexBuffer(); - - m_color = color; - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - - bool winding = (path.fillRule() == Qt::WindingFill); - if (winding) - m_item->m_info |= QD3DBatchItem::BI_WINDING; - - QRectF result = pathToVertexArrays(path); - *item = m_item; - return result; -} - -// used for drawing aliased transformed rects directly -// don't use for antialiased or masked drawing -void QD3DDrawHelper::queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color, const QPolygonF &trect) -{ - lockVertexBuffer(); - - qreal zval = (item->m_info & QD3DBatchItem::BI_CLIP) ? 0.0f : 0.5f; - item->m_info |= QD3DBatchItem::BI_BRECT; - - // if the item does not have a mask, the offset is different - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = (item->m_info & QD3DBatchItem::BI_AA) ? 0 : -2; - } - - qreal x1 = rect.left(); - qreal y1 = rect.top(); - qreal x2 = rect.right(); - qreal y2 = rect.bottom(); - - QPointF tc = trect.at(0); - vertex v1 = { {x1, y1, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f }; - - tc = trect.at(1); - vertex v2 = { {x2, y1, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - - tc = trect.at(2); - vertex v3 = { {x2, y2, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f};; - - tc = trect.at(3); - vertex v4 = { {x1, y2, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 4); ++i) { - if ((m_index + 4) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - - m_startindex = m_index; -} - - -QD3DMaskPosition QD3DDrawHelper::allocateMaskPosition(const QRectF &brect, bool *breakbatch) -{ - int w = brect.width(); - int h = brect.height(); - - w += 3; - h += 3; - - if (w > m_width) - w = m_width; - if (h > m_height) - h = m_height; - - *breakbatch = false; - - if ((m_height - m_mask_offsetY2) >= h && (m_width - m_mask_position.x) >= w) { - m_mask_position.y = m_mask_offsetY2; - } else if ((m_width - m_mask_offsetX2) >= w) { - m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_position.x = m_mask_offsetX2; - } else if (m_mask_position.channel < 3) { - ++m_mask_position.channel; - m_mask_position.x = m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_offsetX2 = m_mask_offsetY2 = QD3D_MASK_MARGIN; - } else { - resetMask(); - *breakbatch = true; - } - - int newoffset = m_mask_position.x + w; - if (m_mask_offsetX2 < newoffset) - m_mask_offsetX2 = newoffset; - m_mask_offsetY2 = (m_mask_position.y + h); - - return m_mask_position; - -} - -void QD3DDrawHelper::queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color) -{ - lockVertexBuffer(); - - QRectF brect; - item->m_info |= QD3DBatchItem::BI_BRECT; - qreal zval = (item->m_info & QD3DBatchItem::BI_CLIP) ? 0.0f : 0.5f; - - if (item->m_info & QD3DBatchItem::BI_AA) { - int xoffset = item->m_maskpos.x; - int yoffset = item->m_maskpos.y; - - int x = rect.left(); - int y = rect.top(); - - brect = QRectF(x, y, rect.width() + 1, rect.height() + 1); - - item->m_xoffset = (xoffset - x) + 1; - item->m_yoffset = (yoffset - y) + 1; - - // if the item does not have a mask, the offset is different - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = 0; - } - } else { - brect = rect; - - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = -2; - } - } - - qreal left = brect.left(); - qreal right = brect.right(); - qreal top = brect.top(); - qreal bottom = brect.bottom(); - - vertex v1 = { {left, bottom, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v2 = { {left, top, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v3 = { {right, top, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v4 = { {right, bottom, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 4); ++i) { - if ((m_index + 4) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - - m_startindex = m_index; -} - -void QD3DDrawHelper::queueAntialiasedLines(const QPainterPath &path, QD3DBatchItem **item, const QRectF &brect) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - setWinding(m_item->m_info & QD3DBatchItem::BI_WINDING); - - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - int x = brect.left(); - int y = brect.top(); - - m_item->m_xoffset = (xoffset - x) + 1; - m_item->m_yoffset = (yoffset - y) + 1; - - m_boundingRect = brect; - - m_xoffset = (x - xoffset) + 0.5f; - m_yoffset = (y - yoffset) + 0.5f; - - QPointF last; - for (int i = 0; i < path.elementCount(); ++i) { - QPainterPath::Element element = path.elementAt(i); - - //Q_ASSERT(!element.isCurveTo()); - - if (element.isLineTo()) - QTessellator::tessellateRect(last, element, m_item->m_width); - - last = element; - } - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; - - *item = m_item; -} - -void QD3DDrawHelper::queueAliasedLines(const QLineF *lines, int lineCount, QD3DBatchItem **item) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_FASTLINE; - - for (int i=0; im_pen_width} , m_pe->m_pen_color, - -1.f, -1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v2 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - 1.f, -1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v3 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - 1.f, 1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v4 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - -1.f, 1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 2; - m_startindex = m_index; - - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - - lockVertexBuffer(); - } - } - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) - 2; - m_startindex = m_index; - - *item = m_item; -} - -void QD3DDrawHelper::queueTextGlyph(const QRectF &rect, const qreal *tex_coords, - QD3DBatchItem *item, D3DCOLOR color) -{ - lockVertexBuffer(); - - qreal x1 = rect.left(); - qreal y1 = rect.top(); - qreal x2 = rect.right(); - qreal y2 = rect.bottom(); - - vertex v1 = { {x1, y1, 0.5f}, color, - tex_coords[0], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v2 = { {x2, y1, 0.5f}, color, - tex_coords[2], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v3 = { {x2, y2, 0.5f}, color, - tex_coords[2], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v4 = { {x1, y1, 0.5f}, color, - tex_coords[0], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v5 = { {x2, y2, 0.5f}, color, - tex_coords[2], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v6 = { {x1, y2, 0.5f}, color, - tex_coords[0], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 6); ++i) { - if ((m_index + 6) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v5; - m_vbuff[m_index++] = v6; - - m_startindex = m_index; - ++item->m_count; -} - -bool QD3DDrawHelper::needsFlushing() const -{ - return (m_pe->m_batch.m_item_index >= QD3D_BATCH_SIZE || m_startindex >= QT_VERTEX_RESET_LIMIT); -} - -void QD3DDrawHelper::setMaskSize(QSize size) -{ - m_width = size.width(); - m_height = size.height(); - - if (m_maskSurface) - m_maskSurface->Release(); - - if (m_mask) - m_mask->Release(); - - if (FAILED(m_pe->m_d3d_device->CreateTexture(m_width, m_height, 1, D3DUSAGE_RENDERTARGET, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &m_mask, NULL))) { - qWarning() << "QDirect3DPaintEngine: CreateTexture() failed."; - } - - if (m_depthStencilSurface) - m_depthStencilSurface->Release(); - - if (FAILED(m_pe->m_d3d_device->CreateDepthStencilSurface(m_width, m_height, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, - TRUE, &m_depthStencilSurface, NULL))) { - qWarning() << "QDirect3DPaintEngine: CreateDepthStencilSurface() failed."; - } - - m_pe->m_d3d_device->SetDepthStencilSurface(m_depthStencilSurface); - m_pe->m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL, 0, 0.0f, 0); - - if (FAILED(m_mask->GetSurfaceLevel(0, &m_maskSurface))) { - qWarning() << "QDirect3DPaintEngine: GetSurfaceLevel() failed."; - } - - m_pe->m_d3d_device->ColorFill(m_maskSurface, 0, D3DCOLOR_ARGB(0,0,0,0)); - D3DXMATRIX projMatrix; - pD3DXMatrixOrthoOffCenterLH(&projMatrix, 0, m_width, m_height, 0, 0, 1); - m_pe->m_effect->SetMatrix("g_mMaskProjection", &projMatrix); - m_pe->m_effect->SetTexture("g_mAAMask", m_mask); -} - -void QD3DDrawHelper::beforeReset() -{ - resetMask(); - m_clearmask = true; - - if (m_maskSurface) { - m_maskSurface->Release(); - m_maskSurface = 0; - } - - if (m_mask) { - m_mask->Release(); - m_mask = 0; - } - - if (m_depthStencilSurface) { - m_depthStencilSurface->Release(); - m_depthStencilSurface = 0; - } - - if (m_d3dvbuff) - m_d3dvbuff->Release(); -} - -void QD3DDrawHelper::afterReset() -{ - if (FAILED(m_pe->m_d3d_device->CreateVertexBuffer(QT_VERTEX_BUF_SIZE*sizeof(vertex), D3DUSAGE_DYNAMIC|D3DUSAGE_WRITEONLY, - QD3DFVF_CSVERTEX, - D3DPOOL_DEFAULT, &m_d3dvbuff, NULL))) { - qWarning() << "QDirect3DPaintEngine: failed to create vertex buffer."; - } - - m_pe->m_d3d_device->SetStreamSource(0, m_d3dvbuff, 0, sizeof(vertex)); - m_pe->m_d3d_device->SetFVF(QD3DFVF_CSVERTEX); - - m_startindex = 0; - m_index = 0; -} - -IDirect3DSurface9 *QD3DDrawHelper::freeMaskSurface() -{ - // we need to make sure the mask is cleared when it's used for something else - resetMask(); - m_clearmask = true; - - return m_maskSurface; -} - -int QD3DDrawHelper::drawAntialiasedMask(int offset, int maxoffset) -{ - int newoffset = offset; - QD3DBatchItem *item = &(m_pe->m_batch.items[offset]); - - // set mask as render target - if (FAILED(m_pe->m_d3d_device->SetRenderTarget(0, m_maskSurface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - - if (m_clearmask) { - m_pe->m_d3d_device->Clear(0, 0, D3DCLEAR_TARGET,D3DCOLOR_ARGB(0,0,0,0), 0, 0); - m_clearmask = false; - } - - // fill the mask - m_pe->m_statemanager->beginPass(PASS_AA_CREATEMASK); - for (; newoffsetm_batch.items[newoffset]); - if (!(item->m_info & QD3DBatchItem::BI_AA) || !(item->m_info & QD3DBatchItem::BI_MASK)) { - break; - } else if (item->m_info & QD3DBatchItem::BI_MASKFULL) { - item->m_info &= ~QD3DBatchItem::BI_MASKFULL; - m_clearmask = true; - break; - } - - m_pe->m_statemanager->startStateBlock(); - if (item->m_info & QD3DBatchItem::BI_MASKSCISSOR) { - RECT rect; - QRectF srect = item->m_brect.adjusted(item->m_xoffset, item->m_yoffset, - item->m_xoffset, item->m_yoffset); - rect.left = qMax(qRound(srect.left()), 0); - rect.top = qMax(qRound(srect.top()), 0); - rect.bottom = qMin(m_height, qRound(srect.bottom())); - rect.right = qMin(m_width, qRound(srect.right())); - m_pe->m_d3d_device->SetScissorRect(&rect); - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); - } - m_pe->m_statemanager->setMaskChannel(item->m_maskpos.channel); - m_pe->m_statemanager->endStateBlock(); - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset; - for (int i=vbstart; i<(vbstart + (item->m_count * 3)); ++i) { - if (accesscontrol[i] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, item->m_count); - - if (item->m_info & QD3DBatchItem::BI_MASKSCISSOR) { - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - } - } - m_pe->m_statemanager->endPass(); - - return newoffset; -} - -void QD3DDrawHelper::drawAliasedMask(int offset) -{ - QD3DBatchItem *item = &(m_pe->m_batch.items[offset]); - if (item->m_info & QD3DBatchItem::BI_MASK) { - m_pe->m_statemanager->beginPass( (item->m_info & QD3DBatchItem::BI_WINDING) ? PASS_STENCIL_WINDING : PASS_STENCIL_ODDEVEN ); - int prev_stop = 0; - for (int i=0; im_pointstops.count(); ++i) { - int stop = item->m_pointstops.at(i); - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = (item->m_offset + prev_stop); - for (int j=vbstart; j<(vbstart+(stop - prev_stop)); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + prev_stop, (stop - prev_stop) - 2); - prev_stop = stop; - } - m_pe->m_statemanager->endPass(); - } -} - -void QD3DDrawHelper::drawTextItem(QD3DBatchItem *item) -{ -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset; - for (int j=vbstart; j<(vbstart + ((item->m_count * 2) * 3)); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, item->m_count*2); -} - -void QD3DDrawHelper::drawAliasedLines(QD3DBatchItem *item) -{ - m_pe->m_statemanager->setCosmeticPen(item->m_info & QD3DBatchItem::BI_COSMETICPEN); - if (item->m_info & QD3DBatchItem::BI_TRANSFORM) { - m_pe->m_statemanager->setTransformation(&item->m_matrix); - } else { - m_pe->m_statemanager->setTransformation(); - } - int pass = (item->m_info & QD3DBatchItem::BI_MASK) - ? PASS_ALIASED_LINES - : PASS_ALIASED_LINES_DIRECT; - m_pe->m_statemanager->beginPass(pass); - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, (item->m_count + 2) / 3); - m_pe->m_statemanager->endPass(); -} - -void QD3DDrawHelper::drawAntialiasedBoundingRect(QD3DBatchItem *item) -{ - if (item->m_info & QD3DBatchItem::BI_SCISSOR) { - RECT rect; - rect.left = qMax(qRound(item->m_brect.left()), 0); - rect.top = qMax(qRound(item->m_brect.top()), 0); - rect.bottom = qMin(m_height, qRound(item->m_brect.bottom())); - rect.right = qMin(m_width, qRound(item->m_brect.right())); - m_pe->m_d3d_device->SetScissorRect(&rect); - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); - } - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset + (item->m_count * 3); - for (int j=vbstart; j<(vbstart + 4); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + (item->m_count * 3), 2); - - if (item->m_info & QD3DBatchItem::BI_SCISSOR) { - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - } -} - -void QD3DDrawHelper::drawAliasedBoundingRect(QD3DBatchItem *item) -{ -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = (item->m_offset + item->m_count + 2); - for (int j=vbstart; j<(vbstart + 4); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + item->m_count + 2, 2); -} - -void QD3DDrawHelper::addTrap(const Trapezoid &trap) -{ - qreal topLeftY = Q27Dot5ToDouble(trap.topLeft->y) - m_yoffset; - qreal topLeftX = Q27Dot5ToDouble(trap.topLeft->x) - m_xoffset; - qreal topRightY = Q27Dot5ToDouble(trap.topRight->y) - m_yoffset; - qreal topRightX = Q27Dot5ToDouble(trap.topRight->x) - m_xoffset; - qreal top = Q27Dot5ToDouble(trap.top) - m_yoffset; - qreal bottom = Q27Dot5ToDouble(trap.bottom) - m_yoffset; - - Q27Dot5 _h = trap.topLeft->y - trap.bottomLeft->y; - Q27Dot5 _w = trap.topLeft->x - trap.bottomLeft->x; - qreal _leftA = (qreal)_w/_h; - qreal _leftB = topLeftX - _leftA * topLeftY; - - _h = trap.topRight->y - trap.bottomRight->y; - _w = trap.topRight->x - trap.bottomRight->x; - qreal _rightA = (qreal)_w/_h; - qreal _rightB = topRightX - _rightA * topRightY; - - qreal invLeftA = qFuzzyIsNull(_leftA) ? 0.0 : 1.0 / _leftA; - qreal invRightA = qFuzzyIsNull(_rightA) ? 0.0 : 1.0 / _rightA; - - vertex v1 = { {1.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v2 = { {0.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v3 = { {0.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - - vertex v4 = { {1.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v5 = { {0.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v6 = { {1.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 6); ++i) { - if ((m_index + 6) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v5; - m_vbuff[m_index++] = v6; - - // check if buffer is full - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; - - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - m_item->m_info &= ~QD3DBatchItem::BI_MASKFULL; - - lockVertexBuffer(); - } -} - -void QD3DDrawHelper::tessellate(const QPolygonF &poly) { - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - - int x = m_boundingRect.left(); - int y = m_boundingRect.top(); - m_xoffset = (x - xoffset) + 0.5f; - m_yoffset = (y - yoffset) + 0.5f; - - QTessellator::tessellate(poly.data(), poly.count()); - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; -} - -inline void QD3DDrawHelper::lineToStencil(qreal x, qreal y) -{ - QPointF lastPt = tess_lastpoint; - tess_lastpoint = QPointF(x, y); - - if (m_isLine && m_firstPoint) - return; - - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (m_index > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - vertex v; - if (m_isLine) { - vertex v1 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - -1.f, -1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v2 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - 1.f, -1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v3 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - 1.f, 1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v4 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - -1.f, 1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - } else { - vertex v1 = { {x, y, 0.5f}, m_color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - m_vbuff[m_index++] = v1; - v = v1; - } - ++tess_index; - - // check if buffer is full - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - int firstindex = m_startindex; - if (!m_item->m_pointstops.isEmpty()) - firstindex = m_item->m_pointstops.last(); - - vertex first = m_vbuff[firstindex]; - - // finish current polygon - m_item->m_pointstops.append(tess_index); - m_item->m_offset = m_startindex; - m_startindex = m_index; - - // copy item - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - - // start new polygon - lockVertexBuffer(); - m_item->m_pointstops.clear(); - if (!m_isLine) { - tess_index = 2; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - m_vbuff[m_index++] = first; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - m_vbuff[m_index++] = v; - } else { - tess_index = 0; - } - } - - if (x > max_x) - max_x = x; - else if (x < min_x) - min_x = x; - if (y > max_y) - max_y = y; - else if (y < min_y) - min_y = y; -} - -inline void QD3DDrawHelper::curveToStencil(const QPointF &cp1, const QPointF &cp2, - const QPointF &ep) -{ - qreal inverseScale = 0.5f; - qreal inverseScaleHalf = inverseScale / 2; - - QBezier beziers[32]; - beziers[0] = QBezier::fromPoints(tess_lastpoint, cp1, cp2, ep); - QBezier *b = beziers; - while (b >= beziers) { - // check if we can pop the top bezier curve from the stack - qreal l = qAbs(b->x4 - b->x1) + qAbs(b->y4 - b->y1); - qreal d; - if (l > inverseScale) { - d = qAbs( (b->x4 - b->x1)*(b->y1 - b->y2) - (b->y4 - b->y1)*(b->x1 - b->x2) ) - + qAbs( (b->x4 - b->x1)*(b->y1 - b->y3) - (b->y4 - b->y1)*(b->x1 - b->x3) ); - d /= l; - } else { - d = qAbs(b->x1 - b->x2) + qAbs(b->y1 - b->y2) + - qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3); - } - if (d < inverseScaleHalf || b == beziers + 31) { - // good enough, we pop it off and add the endpoint - lineToStencil(b->x4, b->y4); - --b; - } else { - // split, second half of the polygon goes lower into the stack - b->split(b+1, b); - ++b; - } - } -} - -QRectF QD3DDrawHelper::pathToVertexArrays(const QPainterPath &path) -{ - m_isLine = (m_item->m_info & QD3DBatchItem::BI_FASTLINE); - const QPainterPath::Element &first = path.elementAt(0); - firstx = first.x; - firsty = first.y; - min_x = max_x = firstx; - min_y = max_y = firsty; - - m_firstPoint = true; - tess_index = 0; - m_item->m_pointstops.clear(); - lineToStencil(firstx, firsty); - m_firstPoint = false; - - for (int i=1; im_pointstops.append(tess_index); - m_firstPoint = true; - lineToStencil(e.x, e.y); - m_firstPoint = false; - break; - case QPainterPath::LineToElement: - lineToStencil(e.x, e.y); - break; - case QPainterPath::CurveToElement: - curveToStencil(e, path.elementAt(i+1), path.elementAt(i+2)); - i+=2; - break; - default: - break; - } - } - - if (!m_isLine) - lineToStencil(firstx, firsty); - - m_item->m_pointstops.append(tess_index); - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) - 2; - m_startindex = m_index; - - QRectF result; - result.setLeft(min_x); - result.setRight(max_x); - result.setTop(min_y); - result.setBottom(max_y); - - if (m_isLine) - result.adjust(0,0,1,1); - - return result; -} - -void QD3DDrawHelper::resetMask() -{ - m_mask_position.x = m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_position.channel = 0; - m_mask_offsetX2 = m_mask_offsetY2 = QD3D_MASK_MARGIN; -} - - -static inline QPainterPath strokeForPath(const QPainterPath &path, const QPen &cpen) { - QPainterPathStroker stroker; - if (cpen.style() == Qt::CustomDashLine) - stroker.setDashPattern(cpen.dashPattern()); - else - stroker.setDashPattern(cpen.style()); - - stroker.setCapStyle(cpen.capStyle()); - stroker.setJoinStyle(cpen.joinStyle()); - stroker.setMiterLimit(cpen.miterLimit()); - stroker.setWidth(cpen.widthF()); - - QPainterPath stroke = stroker.createStroke(path); - stroke.setFillRule(Qt::WindingFill); - return stroke; -} - - -QDirect3DPaintEnginePrivate::~QDirect3DPaintEnginePrivate() -{ - -} - -void QDirect3DPaintEnginePrivate::updateClipPath(const QPainterPath &path, Qt::ClipOperation op) -{ - //#### remove me - QRegion r(path.toFillPolygon().toPolygon(), path.fillRule()); - updateClipRegion(r, op); - -/* if (m_draw_helper->needsFlushing()) - flushBatch(); - - if (op == Qt::IntersectClip && !has_clipping) - op = Qt::ReplaceClip; - - // switch to paths - if (!m_has_complex_clipping) { - m_clip_path = QPainterPath(); - m_clip_path.addRegion(m_clip_region); - m_clip_region = QRegion(); - m_sysclip_path = QPainterPath(); - m_sysclip_path.addRegion(m_sysclip_region); - m_sysclip_region = QRegion(); - m_has_complex_clipping = true; - } - - QPainterPath cpath = m_matrix.map(path); - - QD3DBatchItem *item = &m_batch.items[m_batch.m_item_index++]; - item->m_info = QD3DBatchItem::BI_COMPLEXCLIP; - - switch (op) { - case Qt::UniteClip: - has_clipping = true; - m_clip_path = m_clip_path.united(cpath); - break; - case Qt::ReplaceClip: - has_clipping = true; - m_clip_path = cpath; - break; - case Qt::NoClip: - m_has_complex_clipping = false; - has_clipping = false; - item->m_info |= QD3DBatchItem::BI_CLEARCLIP; - break; - default: // intersect clip - has_clipping = true; - m_clip_path = m_clip_path.intersected(cpath); - break; - } - - if (!m_sysclip_path.isEmpty()) { - item->m_info &= ~QD3DBatchItem::BI_CLEARCLIP; - if (has_clipping) - m_clip_path = m_clip_path.intersected(m_sysclip_path); - else - m_clip_path = m_sysclip_path; - } - - // update the aliased clipping mask - m_draw_helper->setClipPath(m_clip_path, item); - - // update the antialiased clipping mask - if (m_draw_helper->needsFlushing()) - flushBatch(); - - QD3DBatchItem *aaitem = &m_batch.items[m_batch.m_item_index++]; - aaitem->m_info = item->m_info|QD3DBatchItem::BI_AA; - m_draw_helper->setClipPath(m_clip_path, aaitem); */ -} - -extern QPainterPath qt_regionToPath(const QRegion ®ion); - -void QDirect3DPaintEnginePrivate::updateClipRegion(const QRegion &clipregion, Qt::ClipOperation op) -{ - if (m_draw_helper->needsFlushing()) - flushBatch(); - if (m_has_complex_clipping) { - QPainterPath path = qt_regionToPath(clipregion); - updateClipPath(path, op); - return; - } - - if (op == Qt::IntersectClip && m_clip_region.isEmpty()) - op = Qt::ReplaceClip; - - QRegion cregion = m_matrix.map(clipregion); - - QD3DBatchItem *item = nextBatchItem(); - item->m_info &= ~QD3DBatchItem::BI_AA; - - switch (op) { - case Qt::UniteClip: - m_clip_region = m_clip_region.united(cregion); - break; - case Qt::ReplaceClip: - m_clip_region = cregion; - break; - case Qt::NoClip: - m_clip_region = QRegion(); - item->m_info |= QD3DBatchItem::BI_CLEARCLIP; - break; - default: // intersect clip - m_clip_region = m_clip_region.intersected(cregion); - break; - } - - QRegion crgn = m_clip_region; - if (!m_sysclip_region.isEmpty()) { - item->m_info &= ~QD3DBatchItem::BI_CLEARCLIP; - if (!crgn.isEmpty()) - crgn = crgn.intersected(m_sysclip_region); - else - crgn = m_sysclip_region; - } - - QPainterPath path = qt_regionToPath(crgn); - m_draw_helper->setClipPath(path, &item); -} - -void QDirect3DPaintEnginePrivate::updateFont(const QFont &) -{ -} - -void QDirect3DPaintEnginePrivate::setRenderTechnique(RenderTechnique technique) -{ - if (m_current_technique != technique) { - if (m_current_technique != RT_NoTechnique) - m_effect->End(); - - if (technique == RT_Aliased) { - m_effect->SetTechnique("Aliased"); - m_effect->Begin(0,D3DXFX_DONOTSAVESTATE); - } else if (technique == RT_Antialiased) { - m_effect->SetTechnique("Antialiased"); - m_effect->Begin(0,D3DXFX_DONOTSAVESTATE); - } - } - - m_current_technique = technique; -} - -/*QPolygonF QDirect3DPaintEnginePrivate::transformedRect(const QRectF &brect) const -{ - QPolygonF poly(brect); - return m_matrix.map(poly); -} - -QPolygonF QDirect3DPaintEnginePrivate::calcTextureCoords(const QPolygonF &trect) const -{ - QPolygonF result(4); - QRectF brect = trect.boundingRect(); - qreal angle = atan(trect.at(0).x() - -} - -QPolygonF QDirect3DPaintEnginePrivate::offsetTextureCoords(const QRectF &brect, const QPolygonF &trect) const -{ - -}*/ - -inline QD3DBatchItem *QDirect3DPaintEnginePrivate::nextBatchItem() -{ - if (m_draw_helper->needsFlushing()) - flushBatch(); - - QD3DBatchItem *item = &m_batch.items[m_batch.m_item_index++]; - item->m_info = m_current_state; - item->m_cmode = m_cmode; - return item; -} - -qreal calculateAngle(qreal dx, qreal dy) -{ - qreal angle; - - if (qFuzzyIsNull(dx)) { - angle = (dy < 0) ? -M_PI/2 : M_PI/2; - } else { - angle = atanf(dy/dx); - if (dx < 0) - angle += M_PI; - } - - return angle; -} - -QPolygonF QDirect3DPaintEnginePrivate::brushCoordinates(const QRectF &r, bool stroke, qreal *fd) const -{ - QBrush brush; - QTransform matrix; - Qt::BrushStyle style; - - if (stroke) { - brush = m_pen.brush(); - matrix = m_inv_pen_matrix; - style = m_pen_brush_style; - } else { - brush = m_brush; - matrix = m_inv_brush_matrix; - style = m_brush_style; - } - - QPolygonF bpoly; - switch(style) { - case Qt::TexturePattern: { - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - totxcoords.scale(1.0f/brush.texture().width(), - 1.0f/brush.texture().height()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::LinearGradientPattern: { - const QLinearGradient *g = static_cast(brush.gradient()); - QPointF start = g->start(); - QPointF stop = g->finalStop(); - qreal dx = stop.x() - start.x(); - qreal dy = stop.y() - start.y(); - qreal length = sqrt(dx * dx + dy * dy); - qreal angle = calculateAngle(dx, dy); - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - totxcoords.scale(1.0f/length, 1.0f/length); - totxcoords.rotateRadians(-angle); - totxcoords.translate(-start.x(), -start.y()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::ConicalGradientPattern: { - const QConicalGradient *g = static_cast(brush.gradient()); - QPointF center = g->center(); - qreal angle = g->angle(); - QTransform totxcoords; - totxcoords.rotate(angle); - totxcoords.translate(-center.x(), -center.y()); - bpoly = matrix.map(QPolygonF(r)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::RadialGradientPattern: { - const QRadialGradient *g = static_cast(brush.gradient()); - QPointF center = g->center(); - QPointF focalpoint = g->focalPoint(); - qreal dx = focalpoint.x() - center.x(); - qreal dy = focalpoint.y() - center.y(); - qreal radius = g->radius(); - *fd = sqrt(dx * dx + dy * dy) / radius; - qreal angle = calculateAngle(dx, dy); - QTransform totxcoords; - totxcoords.scale(1.0f/radius, 1.0f/radius); - totxcoords.rotateRadians(-angle); - totxcoords.translate(-center.x(), -center.y()); - bpoly = matrix.map(QPolygonF(r)); - bpoly = totxcoords.map(bpoly); - break; } - default: { - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - QPixmap pat = getPattern(style); - totxcoords.scale(1.0f/pat.width(), - 1.0f/pat.height()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); } - }; - - return bpoly; -} - -void QDirect3DPaintEnginePrivate::strokeAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform) -{ - D3DCOLOR solid_color; - QD3DBatchItem *item = nextBatchItem(); - - if (!txform.isIdentity()) - path = txform.map(path); - - QRectF trect; - QPolygonF txcoord; - - solid_color = m_pen_color; - bool has_complex_brush = false; - if (m_pen_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_pen.brush(); - item->m_info |= QD3DBatchItem::BI_COMPLEXBRUSH; - item->m_opacity = m_opacity; - } - - if (m_has_fast_pen) { - item->m_info |= QD3DBatchItem::BI_FASTLINE; - if (m_pen_brush_style == Qt::SolidPattern) { - m_draw_helper->queueAliasedMask(path, &item, solid_color); - item->m_info &= ~QD3DBatchItem::BI_MASK; // bypass stencil buffer - return; - } - } - - QRectF txrect = m_draw_helper->queueAliasedMask(path, &item, 0); - - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, true, &item->m_distance); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = m_matrix; - } else { - trect = txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -void QDirect3DPaintEnginePrivate::fillAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform) -{ - D3DCOLOR solid_color; - QD3DBatchItem *item = nextBatchItem(); - - if (!txform.isIdentity()) - path = txform.map(path); - - QRectF trect; - QPolygonF txcoord; - - solid_color = m_brush_color; - bool has_complex_brush = false; - if (m_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_brush; - item->m_info |= QD3DBatchItem::BI_COMPLEXBRUSH; - item->m_opacity = m_opacity; - } - - QRectF txrect = m_draw_helper->queueAliasedMask(path, &item, 0); - - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, false, &item->m_distance); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = m_matrix; - } else { - trect = txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -void QDirect3DPaintEnginePrivate::fillAntialiasedPath(const QPainterPath &path, const QRectF &brect, - const QTransform &txform, bool stroke) -{ - D3DCOLOR solid_color; - bool winding = (path.fillRule() == Qt::WindingFill); - QPolygonF poly; - QRectF txrect; - QPainterPath tpath; - - if (m_has_aa_fast_pen && stroke) { - tpath = txform.map(path); - txrect = tpath.controlPointRect(); - txrect.adjust(-(m_pen_width/2),-(m_pen_width/2), m_pen_width, m_pen_width); - } else { - poly = path.toFillPolygon(txform); - txrect = poly.boundingRect(); - } - - // brect = approx. bounding rect before transformation - // txrect = exact bounding rect after transformation - // trect = the rectangle to be drawn - // txcoord = the texture coordinates - // adj_txrect = adjusted rect to include aliased outline - - bool use_scissor = false; - if (txrect.left() < 0) { - txrect.adjust(-txrect.left(),0,0,0); - use_scissor = true; - } - if (txrect.top() < 0) { - txrect.adjust(0,-txrect.top(),0,0); - use_scissor = true; - } - - if (!txrect.isValid()) - return; - - QD3DBatchItem *item = nextBatchItem(); - - QRectF adj_txrect = txrect.adjusted(-1,-1,1,1); - QRectF trect; - QPolygonF txcoord; - - bool has_complex_brush = false; - if (stroke) { - solid_color = m_pen_color; - if (m_pen_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_pen.brush(); - } - item->m_width = m_pen_width; - } else { - solid_color = m_brush_color; - if (m_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_brush; - } - } - - qreal focaldist = 0; - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, stroke, &focaldist); - } else { - trect = adj_txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - bool maskfull; - item->m_maskpos = m_draw_helper->allocateMaskPosition(txrect, &maskfull); - if (maskfull) - item->m_info |= QD3DBatchItem::BI_MASKFULL; - item->m_distance = focaldist; - - if (winding) - item->m_info |= QD3DBatchItem::BI_WINDING; - - if (has_complex_brush) { - item->m_info |= QD3DBatchItem::BI_SCISSOR|QD3DBatchItem::BI_COMPLEXBRUSH| - QD3DBatchItem::BI_TRANSFORM; - item->m_brect = adj_txrect; - item->m_matrix = m_matrix; - item->m_opacity = m_opacity; - } - if (use_scissor) { - item->m_info |= QD3DBatchItem::BI_MASKSCISSOR; - item->m_brect = adj_txrect; - } - - if (m_has_aa_fast_pen && stroke) { - m_draw_helper->queueAntialiasedLines(tpath, &item, txrect); - } else { - m_draw_helper->queueAntialiasedMask(poly, &item, txrect); - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -QPainterPath QDirect3DPaintEnginePrivate::strokePathFastPen(const QPainterPath &path) -{ - QPainterPath result; - QBezier beziers[32]; - for (int i=0; i= beziers) { - // check if we can pop the top bezier curve from the stack - qreal l = qAbs(b->x4 - b->x1) + qAbs(b->y4 - b->y1); - qreal d; - if (l > m_inv_scale) { - d = qAbs( (b->x4 - b->x1)*(b->y1 - b->y2) - - (b->y4 - b->y1)*(b->x1 - b->x2) ) - + qAbs( (b->x4 - b->x1)*(b->y1 - b->y3) - - (b->y4 - b->y1)*(b->x1 - b->x3) ); - d /= l; - } else { - d = qAbs(b->x1 - b->x2) + qAbs(b->y1 - b->y2) + - qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3); - } - if (d < inverseScaleHalf || b == beziers + 31) { - // good enough, we pop it off and add the endpoint - result.lineTo(b->x4, b->y4); - --b; - } else { - // split, second half of the polygon goes lower into the stack - b->split(b+1, b); - ++b; - } - } - } // case CurveToElement - default: - break; - } // end of switch - } - return result; -} - -void QDirect3DPaintEnginePrivate::strokePath(const QPainterPath &path, QRectF brect, bool simple) -{ - QTransform txform; - QPainterPath tpath; - - if (m_has_fast_pen || m_has_aa_fast_pen) { - if (!simple) - tpath = strokePathFastPen(path); - else - tpath = path; //already only lines - } else { - tpath = strokeForPath(path, m_pen); - } - - if (tpath.isEmpty()) - return; - - //brect is null if the path is not transformed - if (brect.isNull()) - txform = m_matrix; - - if (!brect.isNull()) { - // brect is set when the path is transformed already, - // this is the case when we have a cosmetic pen. - brect.adjust(-(m_pen_width/2),-(m_pen_width/2), m_pen_width, m_pen_width); - } - - if (brect.isNull()) - brect = tpath.controlPointRect(); - brect.adjust(-m_inv_scale,-m_inv_scale,m_inv_scale,m_inv_scale); //adjust for antialiasing - - if (m_current_state & QD3DBatchItem::BI_AA) { - fillAntialiasedPath(tpath, brect, txform, true); - } else { - strokeAliasedPath(tpath, brect, txform); - } -} - -void QDirect3DPaintEnginePrivate::fillPath(const QPainterPath &path, QRectF brect) -{ - QTransform txform; - - //brect is null if the path is not transformed - if (brect.isNull()) - txform = m_matrix; - - if (brect.isNull()) - brect = path.controlPointRect(); - brect.adjust(-m_inv_scale,-m_inv_scale,m_inv_scale,m_inv_scale); //adjust for antialiasing - - if (m_current_state & QD3DBatchItem::BI_AA) { - fillAntialiasedPath(path, brect, txform, false); - } else { - fillAliasedPath(path, brect, txform); - } -} - - -bool QDirect3DPaintEnginePrivate::init() -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEnginePrivate::init()"; -#endif - - m_draw_helper = 0; - m_gradient_cache = 0; - m_dc = 0; - m_dcsurface = 0; - - m_supports_d3d = false; - m_current_state = 0; - m_in_scene = false; - m_has_fast_pen = false; - m_has_aa_fast_pen = false; - m_has_pen = false; - m_has_brush = false; - m_pen_color = 0; - m_brush_color = 0; - m_current_surface = 0; - m_batch.m_item_index = 0; - m_current_technique = RT_NoTechnique; - - if (!pDirect3DCreate9) { - QLibrary d3d_lib(QLatin1String("d3d9.dll")); - pDirect3DCreate9 = (PFNDIRECT3DCREATE9) d3d_lib.resolve("Direct3DCreate9"); - if (!pDirect3DCreate9) { - qWarning("QDirect3DPaintEngine: failed to resolve symbols from d3d9.dll.\n" - "Make sure you have the DirectX run-time installed."); - return false; - } - } - - if (!pD3DXCreateBuffer || !pD3DXCreateEffect || !pD3DXMatrixOrthoOffCenterLH) { - QLibrary d3dx_lib(QLatin1String("d3dx9_32.dll")); - pD3DXCreateBuffer = (PFND3DXCREATEBUFFER) d3dx_lib.resolve("D3DXCreateBuffer"); - pD3DXCreateEffect = (PFND3DXCREATEEFFECT) d3dx_lib.resolve("D3DXCreateEffect"); - pD3DXMatrixOrthoOffCenterLH = (PFND3DXMATRIXORTHOOFFCENTERLH) - d3dx_lib.resolve("D3DXMatrixOrthoOffCenterLH"); - if (!(pD3DXCreateBuffer && pD3DXCreateEffect && pD3DXMatrixOrthoOffCenterLH)) { - qWarning("QDirect3DPaintEngine: failed to resolve symbols from d3dx9_32.dll.\n" - "Make sure you have the DirectX run-time installed."); - return false; - } - } - - if (!m_d3d_object) { - m_d3d_object = pDirect3DCreate9(D3D_SDK_VERSION); - if (!m_d3d_object) { - qWarning("QDirect3DPaintEngine: failed to create Direct3D object.\n" - "Direct3D support in Qt will be disabled."); - return false; - } - } - - m_supports_d3d = testCaps(); - if (!m_supports_d3d) - return false; - - m_surface_manager.init(m_d3d_object); - m_d3d_device = m_surface_manager.device(); - - if (!m_d3d_device) - return false; - - /* load shaders */ - QFile file(QLatin1String(":/qpaintengine_d3d.fx")); - QByteArray fxFile; - if (file.open(QFile::ReadOnly)) - fxFile = file.readAll(); - - if (fxFile.size() > 0) { - LPD3DXBUFFER compout; - pD3DXCreateBuffer(4096, &compout); - DWORD dwShaderFlags = D3DXFX_NOT_CLONEABLE|D3DXFX_DONOTSAVESTATE|D3DXSHADER_OPTIMIZATION_LEVEL3; - if(FAILED(pD3DXCreateEffect(m_d3d_device, fxFile.constData(), fxFile.size(), - NULL, NULL, dwShaderFlags, NULL, &m_effect, &compout))) { - qWarning("QDirect3DPaintEngine: failed to compile effect file"); - if (compout) - qWarning((char *)compout->GetBufferPointer()); - m_supports_d3d = false; - return false; - } - if (m_effect) { - m_statemanager = new QD3DStateManager(m_d3d_device, m_effect); - m_effect->SetStateManager(m_statemanager); - m_draw_helper = new QD3DDrawHelper(this); - initDevice(); - m_gradient_cache = new QD3DGradientCache(m_d3d_device); - } - } else { - return false; - } - - return true; -} - -QPixmap QDirect3DPaintEnginePrivate::getPattern(Qt::BrushStyle style) const -{ - if (!m_patterns.contains(style)) { - QImage img(16,16,QImage::Format_ARGB32); - img.fill(0); - QPainter p(&img); - p.setBrush(QBrush(Qt::white, style)); - p.setPen(Qt::NoPen); - p.drawRect(0,0,16,16); - p.end(); - QPixmap pattern(QPixmap::fromImage(img)); - QDirect3DPaintEnginePrivate *ct = const_cast(this); - ct->verifyTexture(pattern); - ct->m_patterns.insert(style, pattern); - } - - return m_patterns.value(style); -} - -bool QDirect3DPaintEnginePrivate::testCaps() -{ - D3DCAPS9 caps; - if (FAILED(m_d3d_object->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps))) - return false; - - if ((caps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) - && (caps.DevCaps & D3DDEVCAPS_PUREDEVICE) - && (caps.RasterCaps & D3DPRASTERCAPS_SCISSORTEST) - && (caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED)) - return true; -#if 0 - qDebug() << "Direct3D caps:"; - qDebug() << "D3DPRESENT_INTERVAL_IMMEDIATE:" << ((caps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) != 0); - qDebug() << "D3DDEVCAPS_PUREDEVICE:" << ((caps.DevCaps & D3DDEVCAPS_PUREDEVICE) != 0); - qDebug() << "D3DPRASTERCAPS_SCISSORTEST:" << ((caps.RasterCaps & D3DPRASTERCAPS_SCISSORTEST) != 0); - qDebug() << "D3DSTENCILCAPS_TWOSIDED:" << ((caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) != 0); -#endif - return false; -} - -void QDirect3DPaintEnginePrivate::initDevice() -{ - m_statemanager->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); - m_statemanager->SetRenderState(D3DRS_ZENABLE, D3DZB_FALSE); - m_statemanager->SetRenderState(D3DRS_ZWRITEENABLE, FALSE); - m_statemanager->SetRenderState(D3DRS_LIGHTING, FALSE); - m_statemanager->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); - m_statemanager->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); - m_statemanager->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_DESTALPHA); -} - -void QDirect3DPaintEnginePrivate::updatePen(const QPen &pen) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updatePen"; -#endif - m_pen = pen; - m_has_cosmetic_pen = false; - m_has_pen = (m_pen.style() != Qt::NoPen); - if (m_has_pen) { - m_pen_brush_style = m_pen.brush().style(); - - if (m_pen_brush_style >= Qt::SolidPattern && m_pen_brush_style <= Qt::DiagCrossPattern) { - int a, r, g, b; - m_pen.color().getRgb(&r, &g, &b, &a); - m_pen_color = D3DCOLOR_ARGB((int)(a * m_opacity),r,g,b); - } else { - m_pen_color = m_opacity_color; - } - - m_has_cosmetic_pen = m_pen.isCosmetic(); - - if (m_pen_brush_style != Qt::NoBrush && - m_pen_brush_style != Qt::SolidPattern) { - bool ok; - m_inv_pen_matrix = m_pen.brush().transform().inverted(&ok); - if (!ok) - qWarning() << "QDirect3DPaintEngine: No inverse matix for pen brush matrix."; - } - - m_pen_width = m_pen.widthF(); - if (m_pen_width == 0.0f) - m_pen_width = 1.0f; - } -} - -void QDirect3DPaintEnginePrivate::updateBrush(const QBrush &brush) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateBrush"; -#endif - m_brush = brush; - m_brush_style = m_brush.style(); - m_has_brush = (m_brush_style != Qt::NoBrush); - if (m_has_brush) { - if (m_brush_style >= Qt::SolidPattern && m_brush_style <= Qt::DiagCrossPattern) { - int a, r, g, b; - m_brush.color().getRgb(&r, &g, &b, &a); - m_brush_color = D3DCOLOR_ARGB((int)(a * m_opacity),r,g,b); - } else { - m_brush_color = m_opacity_color; - } - - if (m_brush_style != Qt::SolidPattern) { - bool ok; - m_inv_brush_matrix = (m_brush.transform() * m_brush_origin).inverted(&ok); - if (!ok) - qWarning() << "QDirect3DPaintEngine: No inverse matix for brush matrix."; - - // make sure the texture is loaded as a texture - if (m_brush_style == Qt::TexturePattern) - verifyTexture(m_brush.texture()); - - - } - } -} - -void QDirect3DPaintEnginePrivate::updateTransform(const QTransform &matrix) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateTransform"; -#endif - m_matrix = matrix; - m_inv_scale = qMax(1 / qMax( qMax(qAbs(m_matrix.m11()), qAbs(m_matrix.m22())), - qMax(qAbs(m_matrix.m12()), qAbs(m_matrix.m21())) ), 0.0001); - m_txop = matrix.type(); -} - -int QDirect3DPaintEnginePrivate::flushAntialiased(int offset) -{ - // fills the mask (returns number of items added to the mask) - int newoffset = m_draw_helper->drawAntialiasedMask(offset, m_batch.m_item_index); - - // set the render target to the current output surface - if (FAILED(m_d3d_device->SetRenderTarget(0, m_current_surface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - - // draw the bounding boxes (using the mask generated by drawAntialiasedMask) - for (int i=offset; im_info & QD3DBatchItem::BI_COMPLEXBRUSH) ? PASS_AA_DRAW : PASS_AA_DRAW_DIRECT; - m_statemanager->beginPass(pass); - prepareItem(item); - if (item->m_info & QD3DBatchItem::BI_BRECT) - m_draw_helper->drawAntialiasedBoundingRect(item); - cleanupItem(item); - } - - m_statemanager->endPass(); - - return newoffset; -} - -bool QDirect3DPaintEnginePrivate::prepareBatch(QD3DBatchItem *item, int offset) -{ - if (item->m_info & QD3DBatchItem::BI_CLIP) { - setRenderTechnique(RT_Aliased); - if (item->m_info & QD3DBatchItem::BI_CLEARCLIP) { - m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); - return true; - } - - m_draw_helper->drawAliasedMask(offset); - m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); - if (item->m_info & QD3DBatchItem::BI_BRECT) { - m_statemanager->beginPass(PASS_STENCIL_CLIP); - m_draw_helper->drawAliasedBoundingRect(item); - m_statemanager->endPass(); - } - - return true; - } - - if (item->m_info & QD3DBatchItem::BI_AA) { - setRenderTechnique(RT_Antialiased); - } else { - setRenderTechnique(RT_Aliased); - } - - return false; -} - -void QDirect3DPaintEnginePrivate::prepareItem(QD3DBatchItem *item) { - // pixmap - int brushmode = 0; - m_statemanager->startStateBlock(); - if ((item->m_info & QD3DBatchItem::BI_PIXMAP) || (item->m_info & QD3DBatchItem::BI_IMAGE)) { - QRasterPixmapData *data = static_cast(item->m_pixmap.data); - IDirect3DTexture9 *tex = (item->m_info & QD3DBatchItem::BI_PIXMAP) ? - data->texture : item->m_texture; - m_statemanager->setTexture(tex); - brushmode = 5; - } - - if (item->m_info & QD3DBatchItem::BI_AA) { - m_statemanager->setMaskChannel(item->m_maskpos.channel); - m_statemanager->setMaskOffset(item->m_xoffset, item->m_yoffset); - } - - if (item->m_info & QD3DBatchItem::BI_COMPLEXBRUSH) { - const QBrush brush = item->m_brush; - switch (brush.style()) { - case Qt::TexturePattern: { - QRasterPixmapData *data = static_cast(brush.texture().data); - m_statemanager->setTexture(data->texture, QGradient::RepeatSpread); - brushmode = 1; - break; - } - case Qt::LinearGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - brushmode = 2; - break; - case Qt::ConicalGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - brushmode = 3; - break; - case Qt::RadialGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - m_statemanager->setFocalDistance(item->m_distance); - brushmode = 4; - break; - default: { - QRasterPixmapData *data = static_cast(getPattern(brush.style()).data); - m_statemanager->setTexture(data->texture, QGradient::RepeatSpread); - brushmode = 5; - } - }; - } - - if (item->m_info & QD3DBatchItem::BI_TRANSFORM) { - m_statemanager->setTransformation(&item->m_matrix); - } else { - m_statemanager->setTransformation(); - } - - m_statemanager->setBrushMode(brushmode); - setCompositionMode(item->m_cmode); - m_statemanager->endStateBlock(); -} - - -void QDirect3DPaintEnginePrivate::releaseDC() -{ - if (m_dc) { - m_dcsurface->ReleaseDC(m_dc); - m_dcsurface = 0; - m_dc = 0; - } -} - - -void QDirect3DPaintEnginePrivate::cleanupItem(QD3DBatchItem *item) -{ - if (item->m_info & QD3DBatchItem::BI_PIXMAP) - item->m_pixmap = QPixmap(); - item->m_brush = QBrush(); -} - -void QDirect3DPaintEnginePrivate::verifyTexture(const QPixmap &pm) -{ - QRasterPixmapData *pmData = static_cast(pm.data); - if (!pmData->texture) { - QImage im = pmData->image; - // bitmaps are drawn with the current pen color - if (im.depth() == 1) { - QVector colors(2); - colors[0] = 0; - colors[1] = m_pen.color().rgba(); - im.setColorTable(colors); - } - im = im.convertToFormat(QImage::Format_ARGB32); - if (FAILED(m_d3d_device->CreateTexture(im.width(), im.height(), 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pmData->texture, 0))) - { - qWarning("QDirect3DPaintEngine: unable to create Direct3D texture from pixmap."); - return; - } - D3DLOCKED_RECT rect; - if (FAILED(pmData->texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QDirect3DPaintEngine: unable to lock texture rect."; - return; - } - DWORD *dst = (DWORD *) rect.pBits; - DWORD *src = (DWORD *) im.scanLine(0); - - Q_ASSERT((rect.Pitch/4) == (im.bytesPerLine()/4)); - memcpy(dst, src, rect.Pitch*im.height()); - pmData->texture->UnlockRect(0); - } -} - -bool QDirect3DPaintEnginePrivate::isFastRect(const QRectF &rect) -{ - if (m_matrix.type() < QTransform::TxRotate) { - QRectF r = m_matrix.mapRect(rect); - return r.topLeft().toPoint() == r.topLeft() - && r.bottomRight().toPoint() == r.bottomRight(); - } - - return false; -} - -void QDirect3DPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode mode) -{ - switch(mode) { - case QPainter::CompositionMode_SourceOver: - default: - m_statemanager->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); - m_statemanager->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); - }; -} - -void QDirect3DPaintEnginePrivate::cleanup() -{ - // clean batch - for(int i=0; iRelease(); - - if (m_d3d_object) - m_d3d_object->Release(); - - m_effect = 0; - m_d3d_object = 0; - m_gradient_cache = 0; - m_draw_helper = 0; -} - -void QDirect3DPaintEnginePrivate::flushAliased(QD3DBatchItem *item, int offset) -{ - m_draw_helper->drawAliasedMask(offset); - - if (item->m_info & QD3DBatchItem::BI_BRECT) { - int pass = (item->m_info & QD3DBatchItem::BI_MASK) ? PASS_STENCIL_DRAW_DIRECT : PASS_STENCIL_NOSTENCILCHECK_DIRECT; - if (item->m_info & (QD3DBatchItem::BI_COMPLEXBRUSH|QD3DBatchItem::BI_IMAGE|QD3DBatchItem::BI_PIXMAP) ) - pass = (item->m_info & QD3DBatchItem::BI_MASK) ? PASS_STENCIL_DRAW : PASS_STENCIL_NOSTENCILCHECK; - m_statemanager->beginPass(pass); - prepareItem(item); - m_draw_helper->drawAliasedBoundingRect(item); - cleanupItem(item); - m_statemanager->endPass(); - } -} - -void QDirect3DPaintEnginePrivate::flushText(QD3DBatchItem *item, int) -{ - prepareItem(item); - m_statemanager->setTexture(item->m_texture); - m_statemanager->setBrushMode(1); -// m_statemanager->SetRenderState(D3DRS_BLENDFACTOR, item->m_brush.color().rgba()); - m_statemanager->beginPass(m_cleartype_text ? PASS_CLEARTYPE_TEXT : PASS_TEXT); - m_draw_helper->drawTextItem(item); - m_statemanager->endPass(); - cleanupItem(item); -} - -void QDirect3DPaintEnginePrivate::flushLines(QD3DBatchItem *item, int) -{ - m_draw_helper->drawAliasedLines(item); - - if (item->m_info & QD3DBatchItem::BI_BRECT) { - int pass = (item->m_info & QD3DBatchItem::BI_COMPLEXBRUSH) ? PASS_STENCIL_DRAW : PASS_STENCIL_DRAW_DIRECT; - m_statemanager->beginPass(pass); - prepareItem(item); - m_draw_helper->drawAliasedBoundingRect(item); - cleanupItem(item); - m_statemanager->endPass(); - } -} - -void QDirect3DPaintEnginePrivate::flushBatch() -{ -// static int dbgcounter = 0; -// ++dbgcounter; -// qDebug() << " -> flush" << dbgcounter; - - int offset = 0; - m_draw_helper->unlockVertexBuffer(); - releaseDC(); - - // iterate over all items in the batch - while (offset != m_batch.m_item_index) { - QD3DBatchItem *item = &(m_batch.items[offset]); - - if (prepareBatch(item, offset)) { - ++offset; - continue; - } - - if (item->m_info & QD3DBatchItem::BI_FASTLINE) { - flushLines(item, offset++); - } else if (item->m_info & QD3DBatchItem::BI_AA) { - offset = flushAntialiased(offset); - } else if (item->m_info & QD3DBatchItem::BI_TEXT) { - flushText(item, offset++); - } else { - flushAliased(item, offset++); - } - } - - // reset batch - m_batch.m_item_index = 0; - - // release doomed textures - for (int i=0; iRelease(); - qd3d_release_list.clear(); -} - -QDirect3DPaintEngine::QDirect3DPaintEngine() - : QPaintEngine(*(new QDirect3DPaintEnginePrivate), - PaintEngineFeatures(AllFeatures & ~ObjectBoundingModeGradients)) -{ } - -QDirect3DPaintEngine::~QDirect3DPaintEngine() -{ -} - -bool QDirect3DPaintEngine::begin(QPaintDevice *device) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::begin"; -#endif - Q_D(QDirect3DPaintEngine); - setActive(true); - - QSize old_size = d->m_surface_size; - d->m_surface_size = QRect(0, 0, device->width(), device->height()).size(); - - d->m_current_state = 0; - d->m_inv_scale = 1; - d->m_opacity = 1.0f; - d->m_opacity_color = D3DCOLOR_ARGB(255,255,255,255); - d->m_matrix = QTransform(); - d->m_brush_origin = QTransform(); - d->m_txop = QTransform::TxNone; - d->m_cmode = QPainter::CompositionMode_SourceOver; - - Q_ASSERT(device && device->devType() == QInternal::Widget); - if (d->m_d3d_device == 0) { - qWarning() << "QDirect3DPaintEngine: No Device!"; - return false; - } - - d->m_cleartype_text = false; -// QT_WA({ -// UINT result; -// BOOL ok; -// ok = SystemParametersInfoW(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0); -// if (ok) -// d->m_cleartype_text = (result == FE_FONTSMOOTHINGCLEARTYPE); -// }, { -// UINT result; -// BOOL ok; -// ok = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0); -// if (ok) -// d->m_cleartype_text = (result == FE_FONTSMOOTHINGCLEARTYPE); -// }); - - d->m_surface_manager.setPaintDevice(device); - int status = d->m_surface_manager.status(); - if (status & QD3DSurfaceManager::NeedsResetting) { - d->m_effect->OnLostDevice(); - d->m_draw_helper->beforeReset(); - d->m_statemanager->reset(); - d->m_surface_manager.reset(); - d->m_draw_helper->afterReset(); - d->m_effect->OnResetDevice(); - d->initDevice(); - } - - LPDIRECT3DSURFACE9 newsurface = d->m_surface_manager.renderTarget(); - if (d->m_current_surface != newsurface) { - d->m_current_surface = newsurface; - if (FAILED(d->m_d3d_device->SetRenderTarget(0, newsurface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - } - - status = d->m_surface_manager.status(); - if (status & QD3DSurfaceManager::MaxSizeChanged) { - QSize maxsize = d->m_surface_manager.maxSize(); - d->m_draw_helper->setMaskSize(maxsize); - int masksize[2] = {maxsize.width(), maxsize.height()}; - d->m_effect->SetIntArray("g_mMaskSize", masksize, 2); - } - - if (old_size != d->m_surface_size) { - D3DXMATRIX projMatrix; - pD3DXMatrixOrthoOffCenterLH(&projMatrix, 0, d->m_surface_size.width(), d->m_surface_size.height(), 0, 0.0f, 1.0f); - d->m_statemanager->setProjection(&projMatrix); - } - - if (!d->m_in_scene) { - if (FAILED(d->m_d3d_device->BeginScene())) { - qWarning() << "QDirect3DPaintEngine: BeginScene() failed."; - return false; - } - QWidget *widget = static_cast(device); - if (widget->autoFillBackground() == true) { - QColor color = widget->palette().brush(widget->backgroundRole()).color(); - RECT rect = {0, 0, widget->width(), widget->height()}; - d->m_d3d_device->ColorFill(d->m_current_surface, &rect, - D3DCOLOR_ARGB(color.alpha(), color.red(), color.green(), color.blue())); - } - d->m_in_scene = true; - } - - // set system clip - d->m_clipping_enabled = false; - d->m_has_complex_clipping = false; - - d->m_sysclip_region = systemClip(); - QVector rects = d->m_sysclip_region.rects(); - if (rects.count() == 1 && rects.at(0).size() == d->m_surface_size) - d->m_sysclip_region = QRegion(); - - d->updateClipRegion(QRegion(), Qt::NoClip); - - return true; -} - -void QDirect3DPaintEngine::drawEllipse(const QRectF &rect) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawEllipse (float)"; -#endif - QPaintEngine::drawEllipse(rect); -} - -void QDirect3DPaintEngine::drawEllipse(const QRect &rect) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawEllipse"; -#endif - QPaintEngine::drawEllipse(rect); -} - -void QDirect3DPaintEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlags) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawImage"; -#endif - - Q_D(QDirect3DPaintEngine); - int width = image.width(); - int height = image.height(); - - // transform rectangle - QPolygonF txrect(QRectF(sr.left() / width, sr.top() / height, - sr.width() / width, sr.height() / height)); - - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info = QD3DBatchItem::BI_IMAGE | QD3DBatchItem::BI_TRANSFORM; - item->m_texture = qd3d_image_cache()->lookup(d->m_d3d_device, image); - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueRect(r.adjusted(-0.5f,-0.5f,-0.5f,-0.5f), item, d->m_opacity_color, txrect); -} - -void QDirect3DPaintEngine::drawLines(const QLineF *lines, int lineCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawLines (float)"; -#endif - Q_D(QDirect3DPaintEngine); - - if (!d->m_has_pen) - return; - - if (d->m_has_fast_pen && (d->m_pen_brush_style == Qt::SolidPattern)) { - QD3DBatchItem *item = d->nextBatchItem(); - if (d->m_pen.isCosmetic()) - item->m_info |= QD3DBatchItem::BI_COSMETICPEN; - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueAliasedLines(lines, lineCount, &item); - } else { - QRectF brect; - QPainterPath path; - - // creates a path with the lines - path.moveTo(lines[0].x1(), lines[0].y1()); - qreal lastx = lines[0].x2(); - qreal lasty = lines[0].y2(); - path.lineTo(lastx, lasty); - - for (int i=1; im_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect, true); - } -} - -void QDirect3DPaintEngine::drawLines(const QLine *lines, int lineCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawLines"; -#endif - QPaintEngine::drawLines(lines, lineCount); -} - -void QDirect3DPaintEngine::drawPath(const QPainterPath &path) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPath"; -#endif - Q_D(QDirect3DPaintEngine); - - if (path.isEmpty()) - return; - - QRectF brect; - QPainterPath tpath; - - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - tpath = d->m_matrix.map(path); - } else { - tpath = path; - } - - if (d->m_has_brush) - d->fillPath(tpath, brect); - - if (d->m_has_pen) - d->strokePath(tpath, brect); -} - - -QPointF QDirect3DPaintEnginePrivate::transformPoint(const QPointF &p, qreal *w) const -{ - (*w) = 1.0f; - qreal fx = p.x(); - qreal fy = p.y(); - qreal nx = m_matrix.m11()*fx + m_matrix.m21()*fy + m_matrix.m31(); - qreal ny = m_matrix.m12()*fx + m_matrix.m22()*fy + m_matrix.m32(); - if (!m_matrix.isAffine()) { - *w = m_matrix.m13()*fx + m_matrix.m23()*fy + m_matrix.m33(); - //*w = 1/(*w); - nx = nx/(*w); - ny = ny/(*w); - } - return QPointF(nx, ny); -} - -void QDirect3DPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPixmap"; -#endif - Q_D(QDirect3DPaintEngine); - - if (d->m_draw_helper->needsFlushing()) - d->flushBatch(); - - int width = pm.width(); - int height = pm.height(); - - // transform rectangle - QPolygonF txrect(QRectF(sr.left() / width, sr.top() / height, - sr.width() / width, sr.height() / height)); - - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info = QD3DBatchItem::BI_PIXMAP|QD3DBatchItem::BI_TRANSFORM; - - item->m_pixmap = pm; - d->verifyTexture(item->m_pixmap); - - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueRect(r.adjusted(-0.5f,-0.5f,-0.5f,-0.5f), item, d->m_opacity_color, txrect); -} - -void QDirect3DPaintEngine::drawPoints(const QPointF *points, int pointCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPoints (float)"; -#endif - QPaintEngine::drawPoints(points, pointCount); -} - -void QDirect3DPaintEngine::drawPoints(const QPoint *points, int pointCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPoints"; -#endif - QPaintEngine::drawPoints(points, pointCount); -} - -void QDirect3DPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPolygon"; -#endif - Q_D(QDirect3DPaintEngine); - - if (d->m_has_brush && mode != PolylineMode) { - QPainterPath path; - path.setFillRule(mode == WindingMode ? Qt::WindingFill : Qt::OddEvenFill); - path.moveTo(points[0]); - for (int i=1; ifillPath(path, QRectF()); - } - - if (d->m_has_pen) { - QPainterPath path(points[0]); - for (int i = 1; i < pointCount; ++i) - path.lineTo(points[i]); - if (mode != PolylineMode) - path.lineTo(points[0]); - - if (path.isEmpty()) - return; - QRectF brect; - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect); - } -} - -void QDirect3DPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPolygon"; -#endif - QPaintEngine::drawPolygon(points, pointCount, mode); -} - -void QDirect3DPaintEngine::drawRects(const QRectF *rects, int rectCount) -{ - Q_D(QDirect3DPaintEngine); -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawRects (float)"; -#endif - for (int i=0; im_brush_style == Qt::SolidPattern) && - (!(d->m_current_state & QD3DBatchItem::BI_AA) || d->isFastRect(rects[i]))) { - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_info &= ~QD3DBatchItem::BI_AA; - item->m_matrix = d->m_matrix; - const QRectF rect = rects[i]; - d->m_draw_helper->queueRect(rect, item, d->m_brush_color); - - if (d->m_has_pen) { - if (d->m_has_fast_pen && (d->m_pen_brush_style == Qt::SolidPattern)) { - QLineF lines[4]; - qreal x1 = rect.x(); - qreal y1 = rect.y(); - qreal x2 = rect.width() + x1; - qreal y2 = rect.height() + y1; - lines[0] = QLineF(x1, y1, x2, y1); - lines[1] = QLineF(x2, y1, x2, y2); - lines[2] = QLineF(x2, y2, x1, y2); - lines[3] = QLineF(x1, y2, x1, y1); - QD3DBatchItem *item = d->nextBatchItem(); - if (d->m_pen.isCosmetic()) - item->m_info |= QD3DBatchItem::BI_COSMETICPEN; - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueAliasedLines(lines, 4, &item); - } else { - QPainterPath path; - QRectF brect; - - path.addRect(rects[i]); - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect, true); - } - } - } else { - QPainterPath path; - QRectF brect; - - path.addRect(rects[i]); - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - if (d->m_has_brush) - d->fillPath(path, brect); - - if (d->m_has_pen) - d->strokePath(path, brect, true); - } - } -} - -void QDirect3DPaintEngine::drawRects(const QRect *rects, int rectCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawRects"; -#endif - QPaintEngine::drawRects(rects, rectCount); -} - - -void QDirect3DPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) -{ - Q_D(QDirect3DPaintEngine); - -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawTextItem"; -#endif -// if (d->m_matrix.isScaling() || (d->m_pen_brush_style >= Qt::LinearGradientPattern -// && d->m_pen_brush_style <= Qt::ConicalGradientPattern)) { -// QPaintEngine::drawTextItem(p, textItem); -// return; -// } - - const QTextItemInt &ti = static_cast(textItem); - QVarLengthArray positions; - QVarLengthArray glyphs; - QTransform matrix; - matrix.translate(p.x(), p.y()); - ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions); - - qd3d_glyph_cache()->cacheGlyphs(this, ti, glyphs, d->m_cleartype_text); - QD3DFontTexture *font_tex = qd3d_glyph_cache()->fontTexture(ti.fontEngine); - - QD3DBatchItem *item = d->nextBatchItem(); - d->m_draw_helper->lockVertexBuffer(); - - item->m_info = QD3DBatchItem::BI_TEXT - | (d->m_current_state & ~QD3DBatchItem::BI_AA) | QD3DBatchItem::BI_TRANSFORM; - item->m_texture = font_tex->texture; - item->m_offset = d->m_draw_helper->index(); - item->m_matrix = d->m_matrix; - item->m_count = 0; - item->m_brush = d->m_pen.brush(); - - for (int i=0; i< glyphs.size(); ++i) { - QD3DGlyphCoord *g = qd3d_glyph_cache()->lookup(ti.fontEngine, glyphs[i]); - - // we don't cache glyphs with no width/height - if (!g) - continue; - - // texture coords - qreal tex_coords[] = { g->x, g->y, g->x + g->width, g->y + g->height }; - QPointF logical_pos(qRound((positions[i].x - g->x_offset).toReal()) - 0.5f, - qRound((positions[i].y + g->y_offset).toReal()) - 0.5f); - - QRectF glyph_rect(logical_pos, QSizeF(g->log_width, g->log_height)); - d->m_draw_helper->queueTextGlyph(glyph_rect, tex_coords, item, d->m_pen_color); - } -} - -void QDirect3DPaintEngine::drawTiledPixmap(const QRectF &rect, const QPixmap &pixmap, const QPointF &p) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawTiledPixmap"; -#endif - QPaintEngine::drawTiledPixmap(rect, pixmap, p); -} - -bool QDirect3DPaintEngine::end() -{ - Q_D(QDirect3DPaintEngine); - - d->flushBatch(); - - if (d->m_flush_on_end) { - QPaintDevice *pdev = paintDevice(); - LPDIRECT3DSWAPCHAIN9 swapchain = swapChain(pdev); - - - QWidget *w = 0; - if (pdev->devType() == QInternal::Widget) { - w = static_cast(pdev); - } - - if (w && swapchain) { - QRect br = w->rect(); - QRect wbr = br;//.translated(-w->pos()); - - RECT destrect; - destrect.left = wbr.x(); - destrect.top = wbr.y(); - destrect.right = destrect.left + wbr.width(); - destrect.bottom = destrect.top + wbr.height(); - - RECT srcrect; - srcrect.left = br.x();// + w->x(); - srcrect.top = br.y();// + w->y(); - srcrect.right = wbr.width() + srcrect.left; - srcrect.bottom = wbr.height() + srcrect.top; - int devwidth = w->width(); - int devheight = w->height(); - - if (devwidth <= srcrect.right) { - int diff = srcrect.right - devwidth; - srcrect.right -= diff; - destrect.right -= diff; - if (srcrect.right <= srcrect.left) - return false; - } - if (devheight <= srcrect.bottom) { - int diff = srcrect.bottom - devheight; - srcrect.bottom -= diff; - destrect.bottom -= diff; - if (srcrect.bottom <= srcrect.top) - return false; - } - - if (FAILED(swapchain->Present(&srcrect, &destrect, w->winId(), 0, 0))) - qWarning("QDirect3DPaintEngine: failed to present back buffer."); - } - } - - - return true; -} - -void QDirect3DPaintEngine::updateState(const QPaintEngineState &state) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateState"; -#endif - Q_D(QDirect3DPaintEngine); - - bool update_fast_pen = false; - DirtyFlags flags = state.state(); - - if (flags & DirtyOpacity) { - d->m_opacity = state.opacity(); - if (d->m_opacity > 1.0f) - d->m_opacity = 1.0f; - if (d->m_opacity < 0.f) - d->m_opacity = 0.f; - uint c = (d->m_opacity * 255); - d->m_opacity_color = D3DCOLOR_ARGB(c,c,c,c); - flags |= (DirtyPen | DirtyBrush); - } - - if (flags & DirtyCompositionMode) { - d->m_cmode = state.compositionMode(); - } - - if (flags & DirtyTransform) { - d->updateTransform(state.transform()); - update_fast_pen = true; - } - - if (flags & DirtyHints) { - if (state.renderHints() & QPainter::Antialiasing) - d->m_current_state |= QD3DBatchItem::BI_AA; - else - d->m_current_state &= ~QD3DBatchItem::BI_AA; - update_fast_pen = true; - } - - if (flags & DirtyFont) { - d->updateFont(state.font()); - } - - if (state.state() & DirtyClipEnabled) { - if (state.isClipEnabled() && !d->m_clipping_enabled) { - d->m_clipping_enabled = true; - if (d->m_has_complex_clipping) - d->updateClipPath(painter()->clipPath(), Qt::ReplaceClip); - else - d->updateClipRegion(painter()->clipRegion(), Qt::ReplaceClip); - } else if (!state.isClipEnabled() && d->m_clipping_enabled) { - d->m_clipping_enabled = false; - if (d->m_has_complex_clipping) - d->updateClipPath(QPainterPath(), Qt::NoClip); - else - d->updateClipRegion(QRegion(), Qt::NoClip); - } - } - - if (flags & DirtyClipRegion) { - d->updateClipRegion(state.clipRegion(), state.clipOperation()); - } - - if (flags & DirtyClipPath) { - d->updateClipPath(state.clipPath(), state.clipOperation()); - } - - if (flags & DirtyBrushOrigin) { - d->m_brush_origin = QTransform(); - d->m_brush_origin.translate(-state.brushOrigin().x(), - -state.brushOrigin().y()); - flags |= DirtyBrush; - } - - if (flags & DirtyPen) { - d->updatePen(state.pen()); - update_fast_pen = true; - } - - if (flags & DirtyBrush) - d->updateBrush(state.brush()); - - if (update_fast_pen && d->m_has_pen) { - if (d->m_current_state & QD3DBatchItem::BI_AA) { - d->m_has_fast_pen = false; - d->m_has_aa_fast_pen = ((d->m_txop <= QTransform::TxTranslate) || d->m_has_cosmetic_pen) - && (d->m_pen_width <= 1.0f) - && (d->m_pen.style() == Qt::SolidLine); - } else { - d->m_has_aa_fast_pen = false; - d->m_has_fast_pen = ((d->m_txop <= QTransform::TxTranslate) || d->m_has_cosmetic_pen) - && (d->m_pen.style() == Qt::SolidLine) - && (d->m_pen.capStyle() == Qt::SquareCap); - } - } -} - -void QDirect3DPaintEngine::cleanup() -{ - Q_D(QDirect3DPaintEngine); - d->cleanup(); -} - -void QDirect3DPaintEngine::scroll(QPaintDevice *pd, const RECT &srcrect, const RECT &destrect) -{ - Q_D(QDirect3DPaintEngine); - LPDIRECT3DSURFACE9 srcsurf = d->m_surface_manager.surface(pd); - LPDIRECT3DSURFACE9 masksurf = d->m_draw_helper->freeMaskSurface(); - if (FAILED(d->m_d3d_device->StretchRect(srcsurf, &srcrect, masksurf, &srcrect, D3DTEXF_NONE))) - qWarning("QDirect3DPaintEngine: StretchRect failed."); - if (FAILED(d->m_d3d_device->StretchRect(masksurf, &srcrect, srcsurf, &destrect, D3DTEXF_NONE))) - qWarning("QDirect3DPaintEngine: StretchRect failed."); -} - -LPDIRECT3DSWAPCHAIN9 QDirect3DPaintEngine::swapChain(QPaintDevice *pd) -{ - Q_D(QDirect3DPaintEngine); - - if (d->m_in_scene) { - if (d->m_d3d_device == 0) { - qWarning("QDirect3DPaintEngine: No device!"); - return false; - } - - d->setRenderTechnique(QDirect3DPaintEnginePrivate::RT_NoTechnique); - if (FAILED(d->m_d3d_device->EndScene())) - qWarning("QDirect3DPaintEngine: failed to end scene."); - - d->m_in_scene = false; - } - - return d->m_surface_manager.swapChain(pd); -} - -void QDirect3DPaintEngine::releaseSwapChain(QPaintDevice *pd) -{ - Q_D(QDirect3DPaintEngine); - d->m_surface_manager.releasePaintDevice(pd); -} - -HDC QDirect3DPaintEngine::getDC() const -{ - QDirect3DPaintEnginePrivate *d = const_cast(d_func()); - - if (!d->m_dc && d->m_current_surface) { - d->m_dcsurface = d->m_current_surface; - if (FAILED(d->m_current_surface->GetDC(&d->m_dc))) - qWarning() << "QDirect3DPaintEngine::getDC() failed!"; - } - - return d->m_dc; -} - -void QDirect3DPaintEngine::setFlushOnEnd(bool flushOnEnd) -{ - Q_D(QDirect3DPaintEngine); - - d->m_flush_on_end = flushOnEnd; -} - -bool QDirect3DPaintEngine::hasDirect3DSupport() -{ - Q_D(QDirect3DPaintEngine); - return d->m_supports_d3d; -} - -QT_END_NAMESPACE - -#include "qpaintengine_d3d.moc" diff --git a/src/gui/painting/qpaintengine_d3d.fx b/src/gui/painting/qpaintengine_d3d.fx deleted file mode 100644 index 1148b2a..0000000 --- a/src/gui/painting/qpaintengine_d3d.fx +++ /dev/null @@ -1,608 +0,0 @@ -bool g_mCosmeticPen; -int4 g_mChannel; -float2 g_mMaskOffset; -int2 g_mMaskSize; -float4x4 g_mMaskProjection; -float4x4 g_mViewProjection; -float4x4 g_mTransformation; -texture g_mAAMask; -texture g_mTexture; -int g_mBrushMode; -float g_mFocalDist; - -#define M_PI 3.14159265358979323846 - -sampler PixmapSampler = sampler_state -{ - texture = ; - MIPFILTER = NONE; - MINFILTER = LINEAR; - MAGFILTER = LINEAR; -}; - -sampler TextSampler = sampler_state -{ - texture = ; - MIPFILTER = NONE; - MINFILTER = POINT; - MAGFILTER = POINT; -}; - -sampler AAMaskSampler = sampler_state -{ - texture = ; - AddressU = WRAP; - AddressV = WRAP; - AddressW = WRAP; - MIPFILTER = NONE; - MINFILTER = POINT; - MAGFILTER = POINT; -}; - -struct VS_FULL -{ - float4 Position : POSITION; - float4 Diffuse : COLOR0; - float4 TexCoords0 : TEXCOORD0; - float4 TexCoords1 : TEXCOORD1; -}; - -VS_FULL TrapezoidVS( float4 Position : POSITION, - float4 Diffuse : COLOR0, - float4 TexCoords0 : TEXCOORD0, - float4 TexCoords1 : TEXCOORD1) -{ - VS_FULL Output; - - float a = (TexCoords1.x * Position.x) + (TexCoords1.z * (1.0 - Position.x) ); // left or right a - float b = (TexCoords1.y * Position.x) + (TexCoords1.w * (1.0 - Position.x) ); // left or right b - float d = 1.0 - (Position.x * 2); - - Position.x = (a * Position.y + b) + ( sqrt( abs(a * a) ) * d ); - //Position.x += step(abs(a), 0) * d; - Position.x += (0.5 * d); - - Output.Position = mul(Position, g_mMaskProjection); - Output.Diffuse = Diffuse; - Output.TexCoords0 = TexCoords0; - Output.TexCoords1 = TexCoords1; - - return Output; -} - -struct PS_OUTPUT -{ - float4 Color : COLOR0; -}; - -PS_OUTPUT TrapezoidPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - - float top = max(pixelPos.y - 0.5, In.TexCoords0.x); - float bottom = min(pixelPos.y + 0.5, In.TexCoords0.y); - - float area = bottom - top; - - float left = pixelPos.x - 0.5; - float right = pixelPos.x + 0.5; - - // use line equations to compute intersections of left/right edges with top/bottom of truncated pixel - // vecX: x = (left, top), y = (left, bottom), z = (right, top), w = (right, bottom) - float4 vecX = In.TexCoords1.xxzz * float2(top, bottom).xyxy + In.TexCoords1.yyww; - - float2 invA = In.TexCoords0.zw; - - // transform right line to left to be able to use same calculations for both - vecX.zw = 2 * pixelPos.x - vecX.zw; - - float2 topX = float2(vecX.x, vecX.z); - float2 bottomX = float2(vecX.y, vecX.w); - - // transform lines such that top intersection is to the right of bottom intersection - float2 topXTemp = max(topX, bottomX); - float2 bottomXTemp = min(topX, bottomX); - - // make sure line slope reflects mirrored lines - invA = lerp(invA, -invA, step(topX, bottomX)); - - float2 vecLeftRight = float2(left, right); - - // compute the intersections of the lines with the left and right edges of the pixel - // intersectY: x = (left_line, left), y = (left_line, right), z = (right_line, left), w = (right_line, right) - float4 intersectY = top + (vecLeftRight.xyxy - topXTemp.xxyy) * invA.xxyy; - - float2 temp = lerp(area - 0.5 * (right - bottomXTemp) * (bottom - intersectY.yw), // left < bottom < right < top - (0.5 * (topXTemp + bottomXTemp) - left) * area, // left < bottom < top < right - step(topXTemp, right)); - - float2 excluded = 0.5 * (intersectY.xz - top) * (topXTemp - left); // bottom < left < top < right - - excluded = lerp(0.5 * (intersectY.yw + intersectY.xz) - top, // bottom < left < right < top - excluded, step(topXTemp, right)); - - excluded = lerp(temp, // left < bottom < right (see calculation of temp) - excluded, step(bottomXTemp, left)); - - excluded = lerp(float2(area, area), // right < bottom < top - excluded, step(bottomXTemp, right)); - - excluded *= step(left, topXTemp); - - float result = (area - excluded.x - excluded.y) * step(top, bottom); - Out.Color.r = result * g_mChannel[0]; - Out.Color.g = result * g_mChannel[1]; - Out.Color.b = result * g_mChannel[2]; - Out.Color.a = result * g_mChannel[3]; - - return Out; -} - -VS_FULL ViewProjectionVS( float4 Position : POSITION, - float4 Diffuse : COLOR0, - float4 TexCoords0 : TEXCOORD0, - float4 TexCoords1 : TEXCOORD1) -{ - VS_FULL Output; - - Output.Position = mul(Position, g_mTransformation); - Output.Position = mul(Output.Position, g_mViewProjection); - Output.Diffuse = Diffuse; - Output.TexCoords0 = TexCoords0; - Output.TexCoords1 = TexCoords1; - - return Output; -} - -PS_OUTPUT DirectMaskPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - Out.Color = In.Diffuse; - - float2 maskcoords = ( (pixelPos + g_mMaskOffset) - 0.5 ) / g_mMaskSize; - float2 clipcoords = (pixelPos - 0.5) / g_mMaskSize; - - float4 c = tex2D(AAMaskSampler, maskcoords.xy) * Out.Color.a; - Out.Color.a = c.r * g_mChannel[0]; - Out.Color.a += c.g * g_mChannel[1]; - Out.Color.a += c.b * g_mChannel[2]; - Out.Color.a += c.a * g_mChannel[3]; - - return Out; -} - -PS_OUTPUT MaskPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - - if (g_mBrushMode == 1) { - float x = In.TexCoords0.x; - float y = In.TexCoords0.y; - x = x - int(x); - y = y - int(y); - Out.Color = tex2D(PixmapSampler, float2(x, y)); - Out.Color.a = Out.Color.a * In.Diffuse.a; - } else if (g_mBrushMode == 2) { - Out.Color = tex1D(PixmapSampler, In.TexCoords0.x); - } else if (g_mBrushMode == 3) { - float t = atan2(In.TexCoords0.y, -In.TexCoords0.x) / (2 * M_PI); - Out.Color = tex1D(PixmapSampler, t + 0.5); - } else if (g_mBrushMode == 4) { - float2 tc = float2(In.TexCoords0.x, abs(In.TexCoords0.y)); - float a = (tc.x - g_mFocalDist) / tc.y; - float b = g_mFocalDist; - - float A = 1 + (a * a); - float B = 2.0 * a * b; - float C = (b * b) - 1; - - float y = (-B + sqrt(B*B - 4.0*A*C)) / (2.0*A); - Out.Color = tex1D(PixmapSampler, (tc.y / y) ); - } else if (g_mBrushMode == 5) { - Out.Color = tex2D(PixmapSampler, In.TexCoords0.xy); - Out.Color = Out.Color * In.Diffuse; - } else { - Out.Color = In.Diffuse; - } - - float2 maskcoords = ( (pixelPos + g_mMaskOffset) - 0.5 ) / g_mMaskSize; - - float4 c = tex2D(AAMaskSampler, maskcoords.xy) * Out.Color.a; - Out.Color.a = c.r * g_mChannel[0]; - Out.Color.a += c.g * g_mChannel[1]; - Out.Color.a += c.b * g_mChannel[2]; - Out.Color.a += c.a * g_mChannel[3]; - - return Out; -} - -struct VS_NORMAL -{ - float4 Position : POSITION; - float4 Diffuse : COLOR0; - float4 TexCoords : TEXCOORD0; -}; - -VS_NORMAL MaskProjectionVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mMaskProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -float4 DirectSimplePS(float4 Color : COLOR0) : COLOR0 -{ - return Color; -} - -float4 SimplePS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ - if (g_mBrushMode == 1) { - float opacity = Color.a; - float x = TexCoords.x; - float y = TexCoords.y; - x = x - int(x); - y = y - int(y); - Color = tex2D(PixmapSampler, float2(x, y)); - Color.a = Color.a * opacity; - } else if (g_mBrushMode == 2) { - Color = tex1D(PixmapSampler, TexCoords.x); - } else if (g_mBrushMode == 3) { - float t = atan2(TexCoords.y, -TexCoords.x) / (2 * M_PI); - Color = tex1D(PixmapSampler, t + 0.5); - } else if (g_mBrushMode == 4) { - float2 tc = float2(TexCoords.x, abs(TexCoords.y)); - float a = (tc.x - g_mFocalDist) / tc.y; - float b = g_mFocalDist; - - float A = 1 + (a * a); - float B = 2.0 * a * b; - float C = (b * b) - 1; - - float y = (-B + sqrt(B*B - 4.0*A*C)) / (2.0*A); - Color = tex1D(PixmapSampler, (tc.y / y) ); - } else if (g_mBrushMode == 5) { - Color = tex2D(PixmapSampler, TexCoords.xy) * Color; - } - - return Color; -} - -float4 TextPS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ - Color.a *= tex2D(TextSampler, TexCoords.xy).a; - return Color; -} - -float4 ClearTypePS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ -// if (g_mUsePixmap) { -// float4 MaskColor = tex2D(PixmapSampler, TexCoords.xy); -// Color = float4(1.0, 0.0, 0.0, 1.0); -// Color.a = (1 - MaskColor.a) + MaskColor.a * Color.a; -// Color.r = (1.0 - MaskColor.r) + (MaskColor.r * Color.r); -// Color.g = (1.0 - MaskColor.g) + (MaskColor.g * Color.g); -// Color.b = (1.0 - MaskColor.b) + (MaskColor.b * Color.b); -// Color = MaskColor; - return tex2D(PixmapSampler, TexCoords.xy); -} - -VS_NORMAL NoTxAliasedVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mViewProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -VS_NORMAL AliasedVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mTransformation); - Output.Position = mul(Output.Position, g_mViewProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -VS_NORMAL AliasedLinesVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - float4 start = float4(In.Position.x, In.Position.y, 0.5, In.Position.w); - float4 end = float4(In.TexCoords.z, In.TexCoords.w, 0.5, In.Position.w); - if (g_mCosmeticPen) { - start = mul(start, g_mTransformation); - end = mul(end, g_mTransformation); - } - - float2 line_vec = end - start; - float2 vec = normalize(line_vec); - float2 norm = float2(-vec.y, vec.x); - - float pen_width = In.Position.z; - norm = norm * pen_width * 0.5; - vec = vec * pen_width * 0.5; - - Output.Position.w = In.Position.w; - Output.Position.x = start.x + (vec.x * In.TexCoords.x); - Output.Position.x = Output.Position.x + (norm.x * In.TexCoords.y); - Output.Position.x = Output.Position.x + (line_vec.x * step(0, In.TexCoords.x)); - Output.Position.y = start.y + (vec.y * In.TexCoords.x); - Output.Position.y = Output.Position.y + (norm.y * In.TexCoords.y); - Output.Position.y = Output.Position.y + (line_vec.y * step(0, In.TexCoords.x)); - Output.Position.z = 0.5; - - if (!g_mCosmeticPen) { - Output.Position = mul(Output.Position, g_mTransformation); - } - Output.Position = mul(Output.Position, g_mViewProjection); - - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - - -technique Antialiased -{ - pass PASS_AA_CREATEMASK - { - StencilEnable = False; - ZWriteEnable = False; - ColorWriteEnable = 0x0f; - ZEnable = False; - - SrcBlend = One; - DestBlend = One; - - VertexShader = compile vs_3_0 TrapezoidVS(); - PixelShader = compile ps_3_0 TrapezoidPS(); - } - - pass PASS_AA_DRAW - { - StencilEnable = False; - ZFunc = Greater; - ZWriteEnable = False; - ZEnable = True; - ColorWriteEnable = 0x0f; - - VertexShader = compile vs_3_0 ViewProjectionVS(); - PixelShader = compile ps_3_0 MaskPS(); - } - - pass PASS_AA_DRAW_DIRECT - { - StencilEnable = False; - ZFunc = Greater; - ZEnable = True; - ZWriteEnable = False; - ColorWriteEnable = 0x0f; - - VertexShader = compile vs_3_0 ViewProjectionVS(); - PixelShader = compile ps_3_0 DirectMaskPS(); - } -} - -technique Aliased -{ - pass PASS_STENCIL_ODDEVEN - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilPass = Invert; - StencilFunc = Always; - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_WINDING - { - TwoSidedStencilMode = True; - StencilEnable = True; - StencilRef = 0; - StencilMask = 0xFFFFFFFF; - - CCW_StencilPass = Incr; - CCW_StencilFunc = Always; - - StencilPass = Decr; - StencilFunc = Always; - - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_DRAW - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0x0f; - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 SimplePS(); - } - - pass PASS_STENCIL_DRAW_DIRECT - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0x0f; - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_CLIP - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0; - ZEnable = True; - ZWriteEnable = True; - ZFunc = Always; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_NOSTENCILCHECK - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 SimplePS(); - } - - pass PASS_STENCIL_NOSTENCILCHECK_DIRECT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_TEXT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 TextPS(); - } - - pass PASS_CLEARTYPE_TEXT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - -// SrcBlend = SrcAlpha; -// DestBlend = InvSrcAlpha; - -// SrcBlend = DestColor; -// DestBlend = Zero; - SrcBlend = BlendFactor; - DestBlend = InvSrcColor; - -// SrcBlend = Zero; -// DestBlend = SrcColor; - -// SrcBlend = One; -// DestBlend = Zero; - - VertexShader = compile vs_3_0 AliasedVS(); - PixelShader = compile ps_3_0 ClearTypePS(); - } - - pass PASS_ALIASED_LINES - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilPass = Invert; - StencilFunc = Always; - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 AliasedLinesVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_ALIASED_LINES_DIRECT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedLinesVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } -} - diff --git a/src/gui/painting/qpaintengine_d3d.qrc b/src/gui/painting/qpaintengine_d3d.qrc deleted file mode 100644 index c106f2b..0000000 --- a/src/gui/painting/qpaintengine_d3d.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - qpaintengine_d3d.fx - - diff --git a/src/gui/painting/qpaintengine_d3d_p.h b/src/gui/painting/qpaintengine_d3d_p.h deleted file mode 100644 index 8fa5cf6..0000000 --- a/src/gui/painting/qpaintengine_d3d_p.h +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPAINTENGINE_D3D_P_H -#define QPAINTENGINE_D3D_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "QtGui/qpaintengine.h" -#include - -QT_BEGIN_NAMESPACE - -class QDirect3DPaintEnginePrivate; -class QDirect3DPaintEngine : public QPaintEngine -{ - Q_DECLARE_PRIVATE(QDirect3DPaintEngine) -public: - QDirect3DPaintEngine(); - ~QDirect3DPaintEngine(); - bool begin(QPaintDevice *device); - - void drawEllipse(const QRectF &rect); - void drawEllipse(const QRect &rect); - - void drawImage(const QRectF &rectangle, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); - - void drawLines(const QLineF *lines, int lineCount); - void drawLines(const QLine *lines, int lineCount); - - void drawPath(const QPainterPath &path); - - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - - void drawPoints(const QPointF *points, int pointCount); - void drawPoints(const QPoint *points, int pointCount); - - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); - - void drawRects(const QRectF *rects, int rectCount); - void drawRects(const QRect * rects, int rectCount); - - void drawTextItem(const QPointF &p, const QTextItem &textItem); - - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr); - - bool end(); - - Type type() const { return Direct3D; } - void updateState(const QPaintEngineState &state); - - void cleanup(); - - HDC getDC() const; - void setFlushOnEnd(bool flushOnEnd); - bool hasDirect3DSupport(); - -public: - void scroll(QPaintDevice *pd, const RECT &srcrect, const RECT &destrect); - LPDIRECT3DSWAPCHAIN9 swapChain(QPaintDevice *pd); - void releaseSwapChain(QPaintDevice *pd); - -private: - Q_DISABLE_COPY(QDirect3DPaintEngine) - friend class QPixmap; - friend class QD3DGlyphCache; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/gui/painting/qwindowsurface_d3d.cpp b/src/gui/painting/qwindowsurface_d3d.cpp deleted file mode 100644 index 2b7f633..0000000 --- a/src/gui/painting/qwindowsurface_d3d.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define D3D_DEBUG_BACKBUFFER - -#include -#include -#include "qdebug.h" - -#include "qpaintengine_d3d_p.h" -#include "qwindowsurface_d3d_p.h" -#include "private/qwidget_p.h" -#include "private/qbackingstore_p.h" - -#include - -QT_BEGIN_NAMESPACE - -extern QDirect3DPaintEngine *qt_d3dEngine(); - -struct QD3DWindowSurfacePrivate -{ - QSize m_lastSize; - QWidget *m_widget; -}; - -QD3DWindowSurface::QD3DWindowSurface(QWidget *window) - : QWindowSurface(window), d_ptr(new QD3DWindowSurfacePrivate) -{ - Q_ASSERT(window->isTopLevel()); - d_ptr->m_widget = window; -} - - -QD3DWindowSurface::~QD3DWindowSurface() -{ - delete d_ptr; -} - -QPaintDevice *QD3DWindowSurface::paintDevice() -{ - return d_ptr->m_widget; -} - - -void QD3DWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &offset) -{ - QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft(); - - QDirect3DPaintEngine *engine = qt_d3dEngine(); - LPDIRECT3DSWAPCHAIN9 swapchain = engine->swapChain(d_ptr->m_widget); - - if (swapchain) { - QRect br = rgn.boundingRect(); - QRect wbr = br.translated(-wOffset); - - RECT destrect; - destrect.left = wbr.x(); - destrect.top = wbr.y(); - destrect.right = destrect.left + wbr.width(); - destrect.bottom = destrect.top + wbr.height(); - - RECT srcrect; - srcrect.left = br.x() + offset.x(); - srcrect.top = br.y() + offset.y(); - srcrect.right = wbr.width() + srcrect.left; - srcrect.bottom = wbr.height() + srcrect.top; - int devwidth = d_ptr->m_lastSize.width(); - int devheight = d_ptr->m_lastSize.height(); - - if (devwidth <= srcrect.right) { - int diff = srcrect.right - devwidth; - srcrect.right -= diff; - destrect.right -= diff; - if (srcrect.right <= srcrect.left) - return; - } - if (devheight <= srcrect.bottom) { - int diff = srcrect.bottom - devheight; - srcrect.bottom -= diff; - destrect.bottom -= diff; - if (srcrect.bottom <= srcrect.top) - return; - } - - if (FAILED(swapchain->Present(&srcrect, &destrect, widget->winId(), 0, 0))) - qWarning("QDirect3DPaintEngine: failed to present back buffer."); - -#ifdef D3D_DEBUG_BACKBUFFER - qDebug() << widget << srcrect.left << srcrect.top << wbr.width() << wbr.height() << "Dest: " << destrect.left << destrect.top; - IDirect3DSurface9 *surface; - swapchain->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &surface); - QString filename("C:\\test.bmp"); - D3DXSaveSurfaceToFile(filename.utf16(), D3DXIFF_BMP, surface, 0, 0); - surface->Release(); -#endif - } -} - -void QD3DWindowSurface::setGeometry(const QRect &rect) -{ - if (rect.isEmpty()) - qt_d3dEngine()->releaseSwapChain(d_ptr->m_widget); - - d_ptr->m_lastSize = rect.size(); - QWindowSurface::setGeometry(rect); -} - - -bool QD3DWindowSurface::scroll(const QRegion &area, int dx, int dy) -{ - QDirect3DPaintEngine *engine = qt_d3dEngine(); - QRect rect = area.boundingRect(); - - RECT destrect; - destrect.left = rect.x()+dx; - destrect.top = rect.y()+dy; - destrect.right = rect.width() + destrect.left; - destrect.bottom = rect.height() + destrect.top; - - RECT srcrect; - srcrect.left = rect.x(); - srcrect.top = rect.y(); - srcrect.right = rect.width() + srcrect.left; - srcrect.bottom = rect.height() + srcrect.top; - - engine->scroll(d_ptr->m_widget, srcrect, destrect); - return true; -} - -QT_END_NAMESPACE diff --git a/src/gui/painting/qwindowsurface_d3d_p.h b/src/gui/painting/qwindowsurface_d3d_p.h deleted file mode 100644 index 9cdfe29..0000000 --- a/src/gui/painting/qwindowsurface_d3d_p.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QWINDOWSURFACE_D3D_P_H -#define QWINDOWSURFACE_D3D_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of the QLibrary class. This header file may change from -// version to version without notice, or even be removed. -// -// We mean it. -// - -#include -#include "private/qwindowsurface_p.h" - -QT_BEGIN_NAMESPACE - -class QPaintDevice; -class QPoint; -class QRegion; -class QWidget; -struct QD3DWindowSurfacePrivate; - -class QD3DWindowSurface : public QWindowSurface -{ -public: - QD3DWindowSurface(QWidget *widget); - ~QD3DWindowSurface(); - - QPaintDevice *paintDevice(); - void flush(QWidget *widget, const QRegion ®ion, const QPoint &offset); - void setGeometry(const QRect &rect); - bool scroll(const QRegion &area, int dx, int dy); - -private: - QD3DWindowSurfacePrivate *d_ptr; -}; - -QT_END_NAMESPACE - -#endif // QWINDOWSURFACE_D3D_P_H diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index bcbf557..b0e7b53 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -314,7 +314,6 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "QT3SUPPORT" ] = "yes"; dictionary[ "ACCESSIBILITY" ] = "yes"; dictionary[ "OPENGL" ] = "yes"; - dictionary[ "DIRECT3D" ] = "auto"; dictionary[ "IPV6" ] = "yes"; // Always, dynamicly loaded dictionary[ "OPENSSL" ] = "auto"; dictionary[ "DBUS" ] = "auto"; @@ -817,11 +816,7 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-iwmmxt") dictionary[ "IWMMXT" ] = "yes"; - else if (configCmdLine.at(i) == "-no-direct3d") { - dictionary["DIRECT3D"] = "no"; - }else if (configCmdLine.at(i) == "-direct3d") { - dictionary["DIRECT3D"] = "auto"; // have to pass auto detection to enable Direct3D - } else if( configCmdLine.at(i) == "-no-openssl" ) { + else if( configCmdLine.at(i) == "-no-openssl" ) { dictionary[ "OPENSSL"] = "no"; } else if( configCmdLine.at(i) == "-openssl" ) { dictionary[ "OPENSSL" ] = "yes"; @@ -1315,7 +1310,6 @@ void Configure::applySpecSpecifics() dictionary[ "MMX" ] = "no"; dictionary[ "IWMMXT" ] = "no"; dictionary[ "CE_CRT" ] = "yes"; - dictionary[ "DIRECT3D" ] = "no"; dictionary[ "WEBKIT" ] = "no"; dictionary[ "PHONON" ] = "yes"; dictionary[ "DIRECTSHOW" ] = "no"; @@ -1414,7 +1408,7 @@ bool Configure::displayHelp() "[-system-libtiff] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n" "[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n" "[-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n" - "[-no-iwmmxt] [-iwmmxt] [-direct3d] [-openssl] [-openssl-linked]\n" + "[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n" "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform ]\n" "[-qtnamespace ] [-no-phonon] [-phonon]\n" "[-no-phonon-backend] [-phonon-backend]\n" @@ -1578,7 +1572,6 @@ bool Configure::displayHelp() desc("SSE", "yes", "-sse", "Compile with use of SSE instructions"); desc("SSE2", "no", "-no-sse2", "Do not compile with use of SSE2 instructions"); desc("SSE2", "yes", "-sse2", "Compile with use of SSE2 instructions"); - desc("DIRECT3D", "yes", "-direct3d", "Compile in Direct3D support (experimental - see INSTALL for more info)"); desc("OPENSSL", "no", "-no-openssl", "Do not compile in OpenSSL support"); desc("OPENSSL", "yes", "-openssl", "Compile in run-time OpenSSL support"); desc("OPENSSL", "linked","-openssl-linked", "Compile in linked OpenSSL support"); @@ -1824,47 +1817,6 @@ bool Configure::checkAvailability(const QString &part) && dictionary.value("QMAKESPEC") != "win32-msvc.net" // Leave for now, since we can't be sure if they are using 2002 or 2003 with this spec && dictionary.value("QMAKESPEC") != "win32-msvc2002" && dictionary.value("EXCEPTIONS") == "yes"; - } else if (part == "DIRECT3D") { - QString sdk_dir(QString::fromLocal8Bit(getenv("DXSDK_DIR"))); - QDir dir; - bool has_d3d = false; - - if (!sdk_dir.isEmpty() && dir.exists(sdk_dir)) - has_d3d = true; - - if (has_d3d && !QFile::exists(sdk_dir + QLatin1String("\\include\\d3d9.h"))) { - cout << "No Direct3D version 9 SDK found." << endl; - has_d3d = false; - } - - // find the first dxguid.lib in the current LIB paths, if it is NOT - // the D3D SDK one, we're most likely in trouble.. - if (has_d3d) { - has_d3d = false; - QString env_lib(QString::fromLocal8Bit(getenv("LIB"))); - QStringList lib_paths = env_lib.split(';'); - for (int i=0; i\\Utilities\\Bin\\dx_setenv.cmd script." << endl - << "The D3D SDK library path *needs* to appear before the Platform SDK library" << endl - << "path in your LIB environment variable." << endl; - } } else if (part == "PHONON") { available = findFile("vmr9.h") && findFile("dshow.h") && findFile("strmiids.lib") && findFile("dmoguids.lib") && findFile("msdmo.lib") && findFile("d3d9.h"); @@ -1958,8 +1910,6 @@ void Configure::autoDetection() dictionary["SCRIPTTOOLS"] = checkAvailability("SCRIPTTOOLS") ? "yes" : "no"; if (dictionary["XMLPATTERNS"] == "auto") dictionary["XMLPATTERNS"] = checkAvailability("XMLPATTERNS") ? "yes" : "no"; - if (dictionary["DIRECT3D"] == "auto") - dictionary["DIRECT3D"] = checkAvailability("DIRECT3D") ? "yes" : "no"; if (dictionary["PHONON"] == "auto") dictionary["PHONON"] = checkAvailability("PHONON") ? "yes" : "no"; if (dictionary["WEBKIT"] == "auto") @@ -2284,9 +2234,6 @@ void Configure::generateOutputVars() if ( dictionary["DIRECTSHOW"] == "yes" ) qtConfig += "directshow"; - if (dictionary[ "DIRECT3D" ] == "yes") - qtConfig += "direct3d"; - if (dictionary[ "OPENSSL" ] == "yes") qtConfig += "openssl"; else if (dictionary[ "OPENSSL" ] == "linked") @@ -2666,7 +2613,6 @@ void Configure::generateConfigfiles() if(dictionary["ACCESSIBILITY"] == "no") qconfigList += "QT_NO_ACCESSIBILITY"; if(dictionary["EXCEPTIONS"] == "no") qconfigList += "QT_NO_EXCEPTIONS"; if(dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL"; - if(dictionary["DIRECT3D"] == "no") qconfigList += "QT_NO_DIRECT3D"; if(dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL"; if(dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if(dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; @@ -2926,7 +2872,6 @@ void Configure::displayConfig() cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl; cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl; cout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl; - cout << "Direct3D support............" << dictionary[ "DIRECT3D" ] << endl; cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl; -- cgit v0.12 From f78a8f9c839969d3c3d2e9b4287bc62aa43f5f64 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 24 Apr 2009 09:26:04 +0200 Subject: Fix clipping bug in raster paint engine If we have a rect-clip where we actually had spans (used for cleartype) and then reused that clipdata, we would never re-create the spans, which would mean that future drawing would be filtered based on the old clip Reviewed-by: Samuel --- src/gui/painting/qpaintengine_raster.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index e981f8d..ba1e27c 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4405,6 +4405,9 @@ void QClipData::fixup() */ void QClipData::setClipRect(const QRect &rect) { + if (rect == clipRect) + return; + // qDebug() << "setClipRect" << clipSpanHeight << count << allocated << rect; hasRectClip = true; clipRect = rect; @@ -4414,6 +4417,11 @@ void QClipData::setClipRect(const QRect &rect) ymin = qMin(rect.y(), clipSpanHeight); ymax = qMin(rect.y() + rect.height(), clipSpanHeight); + if (m_spans) { + delete m_spans; + m_spans = 0; + } + // qDebug() << xmin << xmax << ymin << ymax; } @@ -4437,6 +4445,12 @@ void QClipData::setClipRegion(const QRegion ®ion) ymin = rect.y(); ymax = rect.y() + rect.height(); } + + if (m_spans) { + delete m_spans; + m_spans = 0; + } + } /*! -- cgit v0.12 From 56ef2860a03e67afcb66c0827f1f258c7ae7c86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Fri, 24 Apr 2009 11:00:05 +0200 Subject: Fix a caching problem in QSvgIconEngine. The QIcon::pixmap() call would always load and validate any svg file that was used for a QIcon, even though there was a cached pixmap for that particular size. Task-number: 248848 Reviewed-by: Kim --- src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 7fdf81f..c7249d3 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -121,7 +121,7 @@ QSize QSvgIconEngine::actualSize(const QSize &size, QIcon::Mode mode, if (!pm.isNull() && pm.size() == size) return size; } - + QSvgRenderer renderer; d->loadDataForModeAndState(&renderer, mode, state); if (renderer.isValid()) { @@ -158,9 +158,13 @@ void QSvgIconEnginePrivate::loadDataForModeAndState(QSvgRenderer *renderer, QIco QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) -{ +{ QPixmap pm; + QString pmckey(d->pmcKey(size, mode, state)); + if (QPixmapCache::find(pmckey, pm)) + return pm; + if (d->addedPixmaps) { pm = d->addedPixmaps->value(d->hashKey(mode, state)); if (!pm.isNull() && pm.size() == size) @@ -176,10 +180,6 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode, if (!actualSize.isNull()) actualSize.scale(size, Qt::KeepAspectRatio); - QString pmckey(d->pmcKey(actualSize, mode, state)); - if (QPixmapCache::find(pmckey, pm)) - return pm; - QImage img(actualSize, QImage::Format_ARGB32_Premultiplied); img.fill(0x00000000); QPainter p(&img); -- cgit v0.12 From 391940bb9e3eef13efad9550d6e35b3db6f83c17 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Fri, 24 Apr 2009 11:13:56 +0200 Subject: Drag and drop examples not working correctly in Cocoa In the updated examples, the drag operation is changed in the drop-event handler, which was not handled correctly in the Cocoa. This is now supported for drag and drop from same application. If the drop was to another application, the drag will return the result from the last drag-move event. Task-number: 252103 Reviewed-by: nrc --- src/gui/kernel/qcocoaview_mac.mm | 76 +++++++++++++++++++++------------ src/gui/kernel/qt_cocoa_helpers_mac.mm | 12 ++++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h | 1 + 3 files changed, 62 insertions(+), 27 deletions(-) diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index e84af90..fae4821 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -292,9 +292,18 @@ extern "C" { QPoint posDrag(localPoint.x, localPoint.y); NSDragOperation nsActions = [sender draggingSourceOperationMask]; Qt::DropActions qtAllowed = qt_mac_mapNSDragOperations(nsActions); + QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) = nsActions; + Qt::KeyboardModifiers modifiers = Qt::NoModifier; + if ([sender draggingSource] != nil) { + // modifier flags might have changed, update it here since we don't send any input events. + QApplicationPrivate::modifier_buttons = qt_cocoaModifiers2QtModifiers([[NSApp currentEvent] modifierFlags]); + modifiers = QApplication::keyboardModifiers(); + } else { + // when the source is from another application the above technique will not work. + modifiers = qt_cocoaDragOperation2QtModifiers(nsActions); + } // send the drag enter event to the widget. - QDragEnterEvent qDEEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragEnterEvent qDEEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); QApplication::sendEvent(qwidget, &qDEEvent); if (!qDEEvent.isAccepted()) { // widget is not interested in this drag, so ignore this drop data. @@ -302,24 +311,23 @@ extern "C" { return NSDragOperationNone; } else { // send a drag move event immediately after a drag enter event (as per documentation). - QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); qDMEvent.setDropAction(qDEEvent.dropAction()); qDMEvent.accept(); // accept by default, since enter event was accepted. QApplication::sendEvent(qwidget, &qDMEvent); if (!qDMEvent.isAccepted() || qDMEvent.dropAction() == Qt::IgnoreAction) { // since we accepted the drag enter event, the widget expects // future drage move events. - // ### check if we need to treat this like the drag enter event. + // ### check if we need to treat this like the drag enter event. nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDEEvent.dropAction()); } else { nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDMEvent.dropAction()); - } + } QT_PREPEND_NAMESPACE(qt_mac_copy_answer_rect)(qDMEvent); - return nsActions; + return nsActions; } } - + - (NSDragOperation)draggingUpdated:(id < NSDraggingInfo >)sender { // drag enter event was rejected, so ignore the move event. @@ -337,11 +345,19 @@ extern "C" { // send drag move event to the widget QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) = nsActions; Qt::DropActions qtAllowed = QT_PREPEND_NAMESPACE(qt_mac_mapNSDragOperations)(nsActions); + Qt::KeyboardModifiers modifiers = Qt::NoModifier; + if ([sender draggingSource] != nil) { + // modifier flags might have changed, update it here since we don't send any input events. + QApplicationPrivate::modifier_buttons = qt_cocoaModifiers2QtModifiers([[NSApp currentEvent] modifierFlags]); + modifiers = QApplication::keyboardModifiers(); + } else { + // when the source is from another application the above technique will not work. + modifiers = qt_cocoaDragOperation2QtModifiers(nsActions); + } QMimeData *mimeData = dropData; if (QDragManager::self()->source()) mimeData = QDragManager::self()->dragPrivate()->data; - QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); qDMEvent.accept(); QApplication::sendEvent(qwidget, &qDMEvent); @@ -370,12 +386,12 @@ extern "C" { - (BOOL)performDragOperation:(id )sender { [self addDropData:sender]; - + NSPoint windowPoint = [sender draggingLocation]; NSPoint globalPoint = [[sender draggingDestinationWindow] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; QPoint posDrop(localPoint.x, localPoint.y); - + NSDragOperation nsActions = [sender draggingSourceOperationMask]; Qt::DropActions qtAllowed = qt_mac_mapNSDragOperations(nsActions); QMimeData *mimeData = dropData; @@ -387,6 +403,8 @@ extern "C" { if (QDragManager::self()->object) QDragManager::self()->dragPrivate()->target = qwidget; QApplication::sendEvent(qwidget, &de); + if (QDragManager::self()->object) + QDragManager::self()->dragPrivate()->executed_action = de.dropAction(); if (!de.isAccepted()) return NO; else @@ -417,10 +435,9 @@ extern "C" { - (void) setFrameSize:(NSSize)newSize { [super setFrameSize:newSize]; - + // A change in size has required the view to be invalidated. - if ([self inLiveResize]) - { + if ([self inLiveResize]) { NSRect rects[4]; NSInteger count; [self getRectsExposedDuringLiveResize:rects count:&count]; @@ -428,9 +445,7 @@ extern "C" { { [self setNeedsDisplayInRect:rects[count]]; } - } - else - { + } else { [self setNeedsDisplay:YES]; } } @@ -565,7 +580,7 @@ extern "C" { if (!qAppInstance()->activeModalWidget() || QApplicationPrivate::tryModalHelper(qwidget, 0)) { QApplication::sendEvent(qwidget, &enterEvent); qt_mouseover = qwidget; - + // Update cursor and dispatch hover events. qt_mac_update_cursor_at_global_pos(flipPoint(globalPoint).toPoint()); if (qwidget->testAttribute(Qt::WA_Hover) && @@ -620,7 +635,7 @@ extern "C" { [viewsToLookAt addObject:qt_mac_nativeview_for(parentWidget)]; parentWidget = parentWidget->parentWidget(); } - + // Now walk through the subviews of each view and determine which subview should // get the event. We look through all the subviews at a given level with // the assumption that the last item to be found the candidate has a higher z-order. @@ -756,7 +771,7 @@ extern "C" { if (currentIManager && [currentIManager wantsToHandleMouseEvents]) { [currentIManager handleMouseEvent:theEvent]; } - + NSPoint windowPoint = [theEvent locationInWindow]; NSPoint globalPoint = [[theEvent window] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; @@ -765,7 +780,7 @@ extern "C" { Qt::MouseButton buttons = cocoaButton2QtButton([theEvent buttonNumber]); bool wheelOK = false; Qt::KeyboardModifiers keyMods = qt_cocoaModifiers2QtModifiers([theEvent modifierFlags]); - + // Mouse wheel deltas seem to tick in at increments of 0.1. Qt widgets // expect the delta to be a multiple of 120. const int ScrollFactor = 10 * 120; @@ -787,7 +802,7 @@ extern "C" { wheelOK = qwe2.isAccepted(); } } - + if (deltaY) { QWheelEvent qwe(qlocal, qglobal, deltaY, buttons, keyMods, Qt::Vertical); qt_sendSpontaneousEvent(qwidget, &qwe); @@ -800,7 +815,7 @@ extern "C" { wheelOK = qwe2.isAccepted(); } } - + if (deltaZ) { // Qt doesn't explicitly support wheels with a Z component. In a misguided attempt to // try to be ahead of the pack, I'm adding this extra value. @@ -889,6 +904,11 @@ extern "C" { Q_UNUSED(anImage); Q_UNUSED(aPoint); qMacDnDParams()->performedAction = operation; + if (QDragManager::self()->object + && QDragManager::self()->dragPrivate()->executed_action != Qt::ActionMask) { + qMacDnDParams()->performedAction = + qt_mac_mapDropAction(QDragManager::self()->dragPrivate()->executed_action); + } } - (QWidget *)qt_qwidget @@ -1202,13 +1222,13 @@ Qt::DropAction QDragManager::drag(QDrag *o) so we just bail early to prevent it */ if(!(GetCurrentEventButtonState() & kEventMouseButtonPrimary)) return Qt::IgnoreAction; - + if(object) { dragPrivate()->source->removeEventFilter(this); cancel(); beingCancelled = false; } - + object = o; dragPrivate()->target = 0; @@ -1220,7 +1240,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacPasteboardMime::MIME_DND); dragPrivate()->data->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray()); dragBoard.setMimeData(dragPrivate()->data); - + // create the image QPoint hotspot; QPixmap pix = dragPrivate()->pixmap; @@ -1266,6 +1286,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) NSSize mouseOffset = {0.0, 0.0}; NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; NSPoint windowPoint = [dndParams->theEvent locationInWindow]; + dragPrivate()->executed_action = Qt::ActionMask; // do the drag [dndParams->view retain]; [dndParams->view dragImage:image @@ -1277,6 +1298,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) slideBack:YES]; [dndParams->view release]; [image release]; + dragPrivate()->executed_action = Qt::IgnoreAction; object = 0; Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams->performedAction)); // do post drag processing, if required. diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 52e76d8..f000292 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -515,6 +515,18 @@ Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags) return qtMods; } +Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations) +{ + Qt::KeyboardModifiers qtMods =Qt::NoModifier; + if (dragOperations & NSDragOperationLink) + qtMods |= Qt::MetaModifier; + if (dragOperations & NSDragOperationGeneric) + qtMods |= Qt::ControlModifier; + if (dragOperations & NSDragOperationCopy) + qtMods |= Qt::AltModifier; + return qtMods; +} + static inline QEvent::Type cocoaEvent2QtEvent(NSUInteger eventType) { // Handle the trivial cases that can be determined from the type. diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index ef55aa4..63a301c 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -141,6 +141,7 @@ inline QApplication *qAppInstance() { return static_cast(QCoreAp struct ::TabletProximityRec; void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); +Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); inline int flipYCoordinate(int y) { return QApplication::desktop()->screenGeometry(0).height() - y; -- cgit v0.12 From a26aec8673cd5c1e3169b0ad4cd9ee748ba56bb4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 24 Apr 2009 09:54:04 +0200 Subject: don't complain about invalid socket on server shutdown Reviewed-by: thiago --- src/network/socket/qlocalserver_unix.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 065a9de..e7d2252 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -148,9 +148,11 @@ void QLocalServerPrivate::closeServer() QT_CLOSE(listenSocket); listenSocket = -1; - if (socketNotifier) + if (socketNotifier) { + socketNotifier->setEnabled(false); // Otherwise, closed socket is checked before deleter runs socketNotifier->deleteLater(); - socketNotifier = 0; + socketNotifier = 0; + } if (!fullServerName.isEmpty()) QFile::remove(fullServerName); -- cgit v0.12 From 495a818a439c9ad62f9af696f6c3fdc5b0065e07 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Fri, 24 Apr 2009 12:05:48 +0200 Subject: Fix an issue with SVG gradient rendering. This patch complete the two others made by Kim : - 6c2dd295b2ca2f9125fe072d035a3784ce748718 - 003223dcfc1fa884b82085db19d4c4056bf6eaa0 It fix the stops if the gradient link to another gradient below. Task-number: KDE Reviewed-by: Kim Reviewed-by: Samuel --- src/svg/qsvgstyle.cpp | 1 + tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 44 ++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index b065395..bd0804c 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -808,6 +808,7 @@ void QSvgGradientStyle::resolveStops() static_cast(prop); st->resolveStops(); m_gradient->setStops(st->qgradient()->stops()); + m_gradientStopsSet = st->gradientStopsSet(); } } m_link = QString(); diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index 4a17031..4da99da 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -534,16 +534,42 @@ void tst_QSvgRenderer::gradientStops() const QCOMPARE(image, refImage); } + const char *svgs[] = { + "" + "" + "" + "" + "" + "" + "" + "" + "", + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "", + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + }; + for (int i = 0 ; i < sizeof(svgs) / sizeof(svgs[0]) ; ++i) { - QByteArray data("" - "" - "" - "" - "" - "" - "" - "" - ""); + QByteArray data = svgs[i]; QSvgRenderer renderer(data); QImage image(256, 8, QImage::Format_ARGB32_Premultiplied); -- cgit v0.12 From 10fa7986020c75da0ce68ec051a1086bd6bf5bf4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Apr 2009 11:52:34 +0200 Subject: Change Qt version number to 4.5.2 Reviewed-By: TrustMe --- src/corelib/global/qglobal.h | 4 ++-- src/plugins/qpluginbase.pri | 2 +- src/qbase.pri | 2 +- tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 +- tools/qdoc3/test/assistant.qdocconf | 2 +- tools/qdoc3/test/designer.qdocconf | 2 +- tools/qdoc3/test/linguist.qdocconf | 2 +- tools/qdoc3/test/qmake.qdocconf | 2 +- tools/qdoc3/test/qt-build-docs.qdocconf | 6 +++--- tools/qdoc3/test/qt.qdocconf | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d0855fe..36d87e2 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -44,11 +44,11 @@ #include -#define QT_VERSION_STR "4.5.1" +#define QT_VERSION_STR "4.5.2" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x040501 +#define QT_VERSION 0x040502 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index 446efab..ae39021 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.5.1 + VERSION=4.5.2 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/qbase.pri b/src/qbase.pri index e9da61d..f7c8a95 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -4,7 +4,7 @@ INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.5.1 + VERSION=4.5.2 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index f71bc08..aca97ed 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -12,5 +12,5 @@ HTML.footer = "


\n" \ "\n" \ "\n" \ "\n" \ - "\n" \ + "\n" \ "
Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)Trademarks
Qt 4.5.1
Qt 4.5.2
" diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index cd5a877..67f1ecb 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -17,7 +17,7 @@ qhp.Assistant.namespace = com.trolltech.assistant.451 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Assistant.filterAttributes = qt 4.5.1 tools assistant +qhp.Assistant.filterAttributes = qt 4.5.2 tools assistant qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant qhp.Assistant.subprojects = manual examples diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index bfafed0..3e916a2 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -17,7 +17,7 @@ qhp.Designer.namespace = com.trolltech.designer.451 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Designer.filterAttributes = qt 4.5.1 tools designer +qhp.Designer.filterAttributes = qt 4.5.2 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index d917100..adb8c20 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -17,7 +17,7 @@ qhp.Linguist.namespace = com.trolltech.linguist.451 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.Linguist.filterAttributes = qt 4.5.1 tools linguist +qhp.Linguist.filterAttributes = qt 4.5.2 tools linguist qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index d236f81..aa7e1ad 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -17,7 +17,7 @@ qhp.qmake.namespace = com.trolltech.qmake.451 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.qmake.filterAttributes = qt 4.5.1 tools qmake +qhp.qmake.filterAttributes = qt 4.5.2 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index e6edb29..14e48a9 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -35,9 +35,9 @@ qhp.Qt.extraFiles = classic.css \ images/dynamiclayouts-example.png \ images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 +qhp.Qt.filterAttributes = qt 4.5.2 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.2 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index aa1088e..f7e774d 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -37,9 +37,9 @@ qhp.Qt.extraFiles = classic.css \ images/dynamiclayouts-example.png \ images/stylesheet-coffee-plastique.png -qhp.Qt.filterAttributes = qt 4.5.1 qtrefdoc -qhp.Qt.customFilters.Qt.name = Qt 4.5.1 -qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1 +qhp.Qt.filterAttributes = qt 4.5.2 qtrefdoc +qhp.Qt.customFilters.Qt.name = Qt 4.5.2 +qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.2 qhp.Qt.subprojects = classes overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes -- cgit v0.12 From e09144d9ae2fbebaa5c6a2eeb7975a3a75ddbf0b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Apr 2009 12:37:49 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( d5ea85e03f22fb6fb87275774a2c53031941017e ) Changes in WebKit since the last update: ++ b/JavaScriptCore/ChangeLog 2009-01-22 Oliver Hunt Reviewed by Geoff Garen. (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" Automatic semicolon insertion was resulting in this being accepted in the initial nodeless parsing, but subsequent reparsing for code generation would fail, leading to a crash. The solution is to ensure that reparsing a function performs parsing in the same state as the initial parse. We do this by modifying the saved source ranges to include rather than exclude the opening and closing braces. * bytecode/CodeBlock.cpp: (JSC::CodeBlock::reparseForExceptionInfoIfNecessary): add an assertion for successful recompile * parser/Lexer.h: (JSC::Lexer::sourceCode): include rather than exclude braces. * parser/Nodes.h: (JSC::FunctionBodyNode::toSourceString): No need to append braces anymore. 2009-01-21 Alexey Proskuryakov Suggested by Oliver Hunt. Reviewed by Oliver Hunt. https://bugs.webkit.org/show_bug.cgi?id=23456 Function argument names leak * parser/Nodes.cpp: (JSC::FunctionBodyNode::~FunctionBodyNode): Destruct parameter names. 2009-01-22 Beth Dakin Reviewed by Sam Weinig. Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ fast/js/numeric-conversion.html is broken, and corresponding The basic problem here is that parseInt(Infinity) should be NaN, but we were returning 0. NaN matches Safari 3.2.1 and Firefox. * runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncParseInt): 2009-01-13 Beth Dakin Reviewed by Darin Adler and Oliver Hunt. REGRESSION: Business widget's front side fails to render correctly when flipping widget The problem here is that parseInt was parsing NaN as 0. This patch corrects that by parsing NaN as NaN. This matches our old behavior and Firefox. * runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncParseInt): ++ b/LayoutTests/ChangeLog 2009-01-22 Oliver Hunt Reviewed by Geoff Garen. (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" Add additional reparsing tests. * fast/js/reparsing-semicolon-insertion-expected.txt: * fast/js/resources/reparsing-semicolon-insertion.js: (commaParenTest): (commaParenThrowTest): 2009-01-22 Beth Dakin Reviewed by Sam Weinig. Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ fast/js/numeric-conversion.html is broken, and corresponding The basic problem here is that parseInt(Infinity) should be NaN, but we were returning 0. NaN matches Safari 3.2.1 and Firefox. * fast/js/numeric-conversion-expected.txt: * fast/js/resources/numeric-conversion.js: 2009-01-13 Beth Dakin Reviewed by Darin Adler and Oliver Hunt. Updated test and results for REGRESSION: Business widget's front side fails to render correctly when flipping widget parseInt(NaN) should be NaN. * fast/js/numeric-conversion-expected.txt: * fast/js/resources/numeric-conversion.js: ++ b/WebCore/ChangeLog 2009-03-13 Adam Bergkvist Reviewed by Alexey Proskuryakov. https://bugs.webkit.org/show_bug.cgi?id=24349 [QT] HTTP status text is never set Set HTTP status text to the reason phrase attribute of QNetworkReply. * platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::sendResponseIfNeeded): 2009-03-02 Dirk Schulze Reviewed by Holger Freyther. Added putImageData to Qt. Discussed with Ariya Hidayat. [Qt] lacks putImageData support in Canvas https://bugs.webkit.org/show_bug.cgi?id=22186 * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::putImageData): 2009-03-01 Larry Ewing Reviewed by Alexey Proskuryakov. https://bugs.webkit.org/show_bug.cgi?id=24080 NPN_GetValue casting to the wrong type and writing outside bounds Make sure to cast the value to the correct type so that only memory owned by the value is written to. * plugins/gtk/PluginViewGtk.cpp (PluginView::getValueStatic): * plugins/qt/PluginViewQt.cpp (PluginView::getValueStatic): * plugins/mac/PluginViewMac.cpp (PluginView::getValueStatic): (PluginView::getValue): 2009-02-27 Adam Treat Reviewed by Eric Seidel. https://bugs.webkit.org/show_bug.cgi?id=24229 If an image has no alpha channel there is no reason to use SourceOver. * platform/graphics/qt/ImageQt.cpp: (WebCore::Image::drawPattern): (WebCore::BitmapImage::draw): 2009-02-27 Zack Rusin Reviewed by Nikolas Zimmermann. Qt: be more reasonable about scrolled lines cMouseWheelPixelsPerLineStep is currently a constant set to 13.3. it doesn't match our metrics meaning that Qt scrolls by ~2 lines by default which is quite irritating. so lets scroll vertically by the Qt set number of lines * Qt default single step scroll * platform/qt/WheelEventQt.cpp: 2009-02-25 Dirk Schulze Reviewed by Oliver Hunt. Ported arcTo to Qt. Qt has no native support for arcTo. This changes calculate the behavior of arcTo and draws it with lineTo and arc. [QT] implement Canvas arcTo https://bugs.webkit.org/show_bug.cgi?id=23873 * platform/graphics/qt/PathQt.cpp: (WebCore::Path::addArcTo): 2009-03-12 Adam Treat Reviewed by Oliver Hunt. https://bugs.webkit.org/show_bug.cgi?id=24498 Fix the Qt port to use the same algorithm for drawing dashed and dotted borders as the other ports. This makes the Qt port pixel-for-pixel perfect compared to border drawing with Apple's canonical mac port and much closer to konqueror and firefox behavior. * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::drawLine): 2009-03-09 Adam Treat Reviewed by George Staikos. https://bugs.webkit.org/show_bug.cgi?id=24463 WebCore::qstring is detaching and copying twice for every single WebCore::TextRun that is processed and drawn. This elevates this method to one of the top-ten most expensive methods in all of QtWebKit according to profiling. This changes the method so that QString only detaches when absolutely necessary. * platform/graphics/qt/FontQt.cpp: (WebCore::qstring): (WebCore::fixSpacing): (WebCore::Font::drawComplexText): (WebCore::Font::floatWidthForComplexText): (WebCore::Font::offsetForPositionForComplexText): (WebCore::Font::selectionRectForComplexText): ++ b/WebKit/qt/ChangeLog 2009-03-02 Benjamin C Meyer Reviewed by George Staikos. https://bugs.webkit.org/show_bug.cgi?id=21230 On X11 match the behavior of Firefox and also copy the url to the clipboard selection when the action Copy Link Location is executed. * Api/qwebpage.cpp: (QWebPage::triggerAction): --- src/3rdparty/webkit/JavaScriptCore/ChangeLog | 57 +++++++++++ .../webkit/JavaScriptCore/bytecode/CodeBlock.cpp | 1 + src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h | 2 +- .../webkit/JavaScriptCore/parser/Nodes.cpp | 2 + src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h | 2 +- .../runtime/JSGlobalObjectFunctions.cpp | 8 +- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 108 +++++++++++++++++++++ .../webkit/WebCore/platform/graphics/qt/FontQt.cpp | 33 ++++--- .../platform/graphics/qt/GraphicsContextQt.cpp | 78 ++++++++++++++- .../WebCore/platform/graphics/qt/ImageBufferQt.cpp | 59 +++++++++-- .../WebCore/platform/graphics/qt/ImageQt.cpp | 5 + .../webkit/WebCore/platform/graphics/qt/PathQt.cpp | 74 +++++++++++++- .../platform/network/qt/QNetworkReplyHandler.cpp | 4 +- .../webkit/WebCore/platform/qt/WheelEventQt.cpp | 13 ++- .../webkit/WebCore/plugins/mac/PluginViewMac.cpp | 6 +- .../webkit/WebCore/plugins/qt/PluginViewQt.cpp | 6 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 9 +- src/3rdparty/webkit/WebKit/qt/ChangeLog | 11 +++ 19 files changed, 438 insertions(+), 42 deletions(-) diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index fe85bb9..3321570 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,60 @@ +2009-01-22 Oliver Hunt + + Reviewed by Geoff Garen. + + (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" + + + Automatic semicolon insertion was resulting in this being accepted in the initial + nodeless parsing, but subsequent reparsing for code generation would fail, leading + to a crash. The solution is to ensure that reparsing a function performs parsing + in the same state as the initial parse. We do this by modifying the saved source + ranges to include rather than exclude the opening and closing braces. + + * bytecode/CodeBlock.cpp: + (JSC::CodeBlock::reparseForExceptionInfoIfNecessary): add an assertion for successful recompile + * parser/Lexer.h: + (JSC::Lexer::sourceCode): include rather than exclude braces. + * parser/Nodes.h: + (JSC::FunctionBodyNode::toSourceString): No need to append braces anymore. + +2009-01-21 Alexey Proskuryakov + + Suggested by Oliver Hunt. Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=23456 + Function argument names leak + + * parser/Nodes.cpp: (JSC::FunctionBodyNode::~FunctionBodyNode): Destruct parameter names. + +2009-01-22 Beth Dakin + + Reviewed by Sam Weinig. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ + fast/js/numeric-conversion.html is broken, and corresponding + + + The basic problem here is that parseInt(Infinity) should be NaN, + but we were returning 0. NaN matches Safari 3.2.1 and Firefox. + + * runtime/JSGlobalObjectFunctions.cpp: + (JSC::globalFuncParseInt): + +2009-01-13 Beth Dakin + + Reviewed by Darin Adler and Oliver Hunt. + + REGRESSION: Business widget's front side + fails to render correctly when flipping widget + + The problem here is that parseInt was parsing NaN as 0. This patch + corrects that by parsing NaN as NaN. This matches our old behavior + and Firefox. + + * runtime/JSGlobalObjectFunctions.cpp: + (JSC::globalFuncParseInt): + 2009-02-13 Adam Treat Reviewed by George Staikos. diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp index 91fb1c0..9207c8a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp @@ -1397,6 +1397,7 @@ void CodeBlock::reparseForExceptionInfoIfNecessary(CallFrame* callFrame) case FunctionCode: { FunctionBodyNode* ownerFunctionBodyNode = static_cast(m_ownerNode); RefPtr newFunctionBody = m_globalData->parser->reparse(m_globalData, ownerFunctionBodyNode); + ASSERT(newFunctionBody); newFunctionBody->finishParsing(ownerFunctionBodyNode->copyParameters(), ownerFunctionBodyNode->parameterCount()); CodeBlock& newCodeBlock = newFunctionBody->bytecodeForExceptionInfoReparse(scopeChain); ASSERT(newCodeBlock.m_exceptionInfo); diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h index cb553af..afcf09f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h @@ -88,7 +88,7 @@ namespace JSC { bool sawError() const { return m_error; } void clear(); - SourceCode sourceCode(int openBrace, int closeBrace, int firstLine) { return SourceCode(m_source->provider(), openBrace + 1, closeBrace, firstLine); } + SourceCode sourceCode(int openBrace, int closeBrace, int firstLine) { return SourceCode(m_source->provider(), openBrace, closeBrace + 1, firstLine); } private: friend class JSGlobalData; diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp index bdc5d2f..201af28 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp @@ -2552,6 +2552,8 @@ FunctionBodyNode::FunctionBodyNode(JSGlobalData* globalData, SourceElements* chi FunctionBodyNode::~FunctionBodyNode() { ASSERT(!m_refCount); + for (size_t i = 0; i < m_parameterCount; ++i) + m_parameters[i].~Identifier(); fastFree(m_parameters); } diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h index f8512f7..20885c3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h @@ -2205,7 +2205,7 @@ namespace JSC { void finishParsing(const SourceCode&, ParameterNode*); void finishParsing(Identifier* parameters, size_t parameterCount); - UString toSourceString() const JSC_FAST_CALL { return UString("{") + source().toString() + UString("}"); } + UString toSourceString() const JSC_FAST_CALL { return source().toString(); } // These objects are ref/deref'd a lot in the scope chain, so this is a faster ref/deref. // If the virtual machine changes so this doesn't happen as much we can change back. diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index f12d2f3..ecdddcf 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -302,9 +302,11 @@ JSValuePtr globalFuncParseInt(ExecState* exec, JSObject*, JSValuePtr, const ArgL if (JSImmediate::isImmediate(value)) return value; double d = value->uncheckedGetNumber(); - if (!isfinite(d)) - return JSImmediate::zeroImmediate(); - return jsNumber(exec, floor(d)); + if (isfinite(d)) + return jsNumber(exec, floor(d)); + if (isnan(d) || isinf(d)) + return jsNaN(&exec->globalData()); + return JSImmediate::zeroImmediate(); } return jsNumber(exec, parseInt(value->toString(exec), radix)); diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index bfaefa2..60c9ba7 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 450331808bfe11b1472c213a8cb311190355c2de + d5ea85e03f22fb6fb87275774a2c53031941017e diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 9be6e72..00bd427 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,111 @@ +2009-03-13 Adam Bergkvist + + Reviewed by Alexey Proskuryakov. + + https://bugs.webkit.org/show_bug.cgi?id=24349 + [QT] HTTP status text is never set + + Set HTTP status text to the reason phrase attribute of QNetworkReply. + + * platform/network/qt/QNetworkReplyHandler.cpp: + (WebCore::QNetworkReplyHandler::sendResponseIfNeeded): + +2009-03-02 Dirk Schulze + + Reviewed by Holger Freyther. + + Added putImageData to Qt. Discussed with Ariya Hidayat. + + [Qt] lacks putImageData support in Canvas + https://bugs.webkit.org/show_bug.cgi?id=22186 + + * platform/graphics/qt/ImageBufferQt.cpp: + (WebCore::ImageBuffer::putImageData): + +2009-03-01 Larry Ewing + + Reviewed by Alexey Proskuryakov. + + https://bugs.webkit.org/show_bug.cgi?id=24080 + NPN_GetValue casting to the wrong type and writing outside bounds + + Make sure to cast the value to the correct type so that only + memory owned by the value is written to. + + * plugins/gtk/PluginViewGtk.cpp (PluginView::getValueStatic): + * plugins/qt/PluginViewQt.cpp (PluginView::getValueStatic): + * plugins/mac/PluginViewMac.cpp (PluginView::getValueStatic): + (PluginView::getValue): + +2009-02-27 Adam Treat + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=24229 + If an image has no alpha channel there is no reason to use SourceOver. + + * platform/graphics/qt/ImageQt.cpp: + (WebCore::Image::drawPattern): + (WebCore::BitmapImage::draw): + +2009-02-27 Zack Rusin + + Reviewed by Nikolas Zimmermann. + + Qt: be more reasonable about scrolled lines + + cMouseWheelPixelsPerLineStep is currently a constant set to 13.3. it doesn't + match our metrics meaning that Qt scrolls by ~2 lines by default which is quite + irritating. so lets scroll vertically by the Qt set number of lines * Qt default + single step scroll + + * platform/qt/WheelEventQt.cpp: + +2009-02-25 Dirk Schulze + + Reviewed by Oliver Hunt. + + Ported arcTo to Qt. Qt has no native support for arcTo. This changes + calculate the behavior of arcTo and draws it with lineTo and arc. + + [QT] implement Canvas arcTo + https://bugs.webkit.org/show_bug.cgi?id=23873 + + * platform/graphics/qt/PathQt.cpp: + (WebCore::Path::addArcTo): + +2009-03-12 Adam Treat + + Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=24498 + Fix the Qt port to use the same algorithm for drawing dashed and dotted + borders as the other ports. This makes the Qt port pixel-for-pixel perfect + compared to border drawing with Apple's canonical mac port and much closer + to konqueror and firefox behavior. + + * platform/graphics/qt/GraphicsContextQt.cpp: + (WebCore::GraphicsContext::drawLine): + +2009-03-09 Adam Treat + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=24463 + WebCore::qstring is detaching and copying twice for every single + WebCore::TextRun that is processed and drawn. This elevates this method + to one of the top-ten most expensive methods in all of QtWebKit according + to profiling. This changes the method so that QString only detaches + when absolutely necessary. + + * platform/graphics/qt/FontQt.cpp: + (WebCore::qstring): + (WebCore::fixSpacing): + (WebCore::Font::drawComplexText): + (WebCore::Font::floatWidthForComplexText): + (WebCore::Font::offsetForPositionForComplexText): + (WebCore::Font::selectionRectForComplexText): + 2009-02-04 Simon Hausmann Unreviewed Qt build fix. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp index deeea99..4e78083 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp @@ -37,20 +37,27 @@ #if QT_VERSION >= 0x040400 namespace WebCore { -static QString qstring(const TextRun& run) +static const QString qstring(const TextRun& run) { - QString string((QChar *)run.characters(), run.length()); - QChar *uc = string.data(); + //We don't detach + return QString::fromRawData((const QChar *)run.characters(), run.length()); +} + +static const QString fixSpacing(const QString &string) +{ + //Only detach if we're actually changing something + QString possiblyDetached = string; for (int i = 0; i < string.length(); ++i) { - if (Font::treatAsSpace(uc[i].unicode())) - uc[i] = 0x20; - else if (Font::treatAsZeroWidthSpace(uc[i].unicode())) - uc[i] = 0x200c; + const QChar c = string.at(i); + if (c.unicode() != 0x20 && Font::treatAsSpace(c.unicode())) { + possiblyDetached[i] = 0x20; //detach + } else if (c.unicode() != 0x200c && Font::treatAsZeroWidthSpace(c.unicode())) { + possiblyDetached[i] = 0x200c; //detach + } } - return string; + return possiblyDetached; } - static QTextLine setupLayout(QTextLayout* layout, const TextRun& style) { int flags = style.rtl() ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight; @@ -75,7 +82,7 @@ void Font::drawComplexText(GraphicsContext* ctx, const TextRun& run, const Float Color color = ctx->fillColor(); p->setPen(QColor(color)); - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); // text shadow IntSize shadowSize; @@ -144,7 +151,7 @@ float Font::floatWidthForComplexText(const TextRun& run) const { if (!run.length()) return 0; - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); int w = int(line.naturalTextWidth()); @@ -157,7 +164,7 @@ float Font::floatWidthForComplexText(const TextRun& run) const int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool includePartialGlyphs) const { - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); return line.xToCursor(position); @@ -165,7 +172,7 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool FloatRect Font::selectionRectForComplexText(const TextRun& run, const IntPoint& pt, int h, int from, int to) const { - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 936c1ea..6c90ea3 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -470,13 +470,21 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2) if (paintingDisabled()) return; + StrokeStyle style = strokeStyle(); + Color color = strokeColor(); + if (style == NoStroke || !color.alpha()) + return; + + float width = strokeThickness(); + FloatPoint p1 = point1; FloatPoint p2 = point2; + bool isVerticalLine = (p1.x() == p2.x()); QPainter *p = m_data->p(); const bool antiAlias = p->testRenderHint(QPainter::Antialiasing); p->setRenderHint(QPainter::Antialiasing, m_data->antiAliasingForRectsAndLines); - adjustLineToPixelBoundaries(p1, p2, strokeThickness(), strokeStyle()); + adjustLineToPixelBoundaries(p1, p2, width, style); IntSize shadowSize; int shadowBlur; @@ -489,8 +497,76 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2) p->restore(); } + int patWidth = 0; + switch (style) { + case NoStroke: + case SolidStroke: + break; + case DottedStroke: + patWidth = (int)width; + break; + case DashedStroke: + patWidth = 3 * (int)width; + break; + } + + if (patWidth) { + p->save(); + + // Do a rect fill of our endpoints. This ensures we always have the + // appearance of being a border. We then draw the actual dotted/dashed line. + if (isVerticalLine) { + p->fillRect(FloatRect(p1.x() - width / 2, p1.y() - width, width, width), color); + p->fillRect(FloatRect(p2.x() - width / 2, p2.y(), width, width), color); + } else { + p->fillRect(FloatRect(p1.x() - width, p1.y() - width / 2, width, width), color); + p->fillRect(FloatRect(p2.x(), p2.y() - width / 2, width, width), color); + } + + // Example: 80 pixels with a width of 30 pixels. + // Remainder is 20. The maximum pixels of line we could paint + // will be 50 pixels. + int distance = (isVerticalLine ? (point2.y() - point1.y()) : (point2.x() - point1.x())) - 2*(int)width; + int remainder = distance % patWidth; + int coverage = distance - remainder; + int numSegments = coverage / patWidth; + + float patternOffset = 0.0f; + // Special case 1px dotted borders for speed. + if (patWidth == 1) + patternOffset = 1.0f; + else { + bool evenNumberOfSegments = numSegments % 2 == 0; + if (remainder) + evenNumberOfSegments = !evenNumberOfSegments; + if (evenNumberOfSegments) { + if (remainder) { + patternOffset += patWidth - remainder; + patternOffset += remainder / 2; + } else + patternOffset = patWidth / 2; + } else { + if (remainder) + patternOffset = (patWidth - remainder)/2; + } + } + + QVector dashes; + dashes << qreal(patWidth) / width << qreal(patWidth) / width; + + QPen pen = p->pen(); + pen.setWidthF(width); + pen.setCapStyle(Qt::FlatCap); + pen.setDashPattern(dashes); + pen.setDashOffset(patternOffset / width); + p->setPen(pen); + } + p->drawLine(p1, p2); + if (patWidth) + p->restore(); + p->setRenderHint(QPainter::Antialiasing, antiAlias); } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp index d1009b5..29a02d4 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2006 Nikolas Zimmermann * Copyright (C) 2008 Holger Hans Peter Freyther + * Copyright (C) 2009 Dirk Schulze * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,7 +32,6 @@ #include "GraphicsContext.h" #include "ImageData.h" #include "MIMETypeRegistry.h" -#include "NotImplemented.h" #include "StillImageQt.h" #include @@ -111,9 +111,7 @@ PassRefPtr ImageBuffer::getImageData(const IntRect& rect) const endy = m_size.height(); int numRows = endy - originy; - QImage image = m_data.m_pixmap.toImage(); - if (image.format() != QImage::Format_ARGB32) - image = image.convertToFormat(QImage::Format_ARGB32); + QImage image = m_data.m_pixmap.toImage().convertToFormat(QImage::Format_ARGB32); ASSERT(!image.isNull()); unsigned destBytesPerRow = 4 * rect.width(); @@ -134,9 +132,58 @@ PassRefPtr ImageBuffer::getImageData(const IntRect& rect) const return result; } -void ImageBuffer::putImageData(ImageData*, const IntRect&, const IntPoint&) +void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint) { - notImplemented(); + ASSERT(sourceRect.width() > 0); + ASSERT(sourceRect.height() > 0); + + int originx = sourceRect.x(); + int destx = destPoint.x() + sourceRect.x(); + ASSERT(destx >= 0); + ASSERT(destx < m_size.width()); + ASSERT(originx >= 0); + ASSERT(originx <= sourceRect.right()); + + int endx = destPoint.x() + sourceRect.right(); + ASSERT(endx <= m_size.width()); + + int numColumns = endx - destx; + + int originy = sourceRect.y(); + int desty = destPoint.y() + sourceRect.y(); + ASSERT(desty >= 0); + ASSERT(desty < m_size.height()); + ASSERT(originy >= 0); + ASSERT(originy <= sourceRect.bottom()); + + int endy = destPoint.y() + sourceRect.bottom(); + ASSERT(endy <= m_size.height()); + int numRows = endy - desty; + + unsigned srcBytesPerRow = 4 * source->width(); + + bool isPainting = m_data.m_painter->isActive(); + if (isPainting) + m_data.m_painter->end(); + + QImage image = m_data.m_pixmap.toImage().convertToFormat(QImage::Format_ARGB32); + ASSERT(!image.isNull()); + + unsigned char* srcRows = source->data()->data() + originy * srcBytesPerRow + originx * 4; + for (int y = 0; y < numRows; ++y) { + quint32* scanLine = reinterpret_cast(image.scanLine(y + desty)); + for (int x = 0; x < numColumns; x++) { + int basex = x * 4; + scanLine[x + destx] = reinterpret_cast(srcRows + basex)[0]; + } + + srcRows += srcBytesPerRow; + } + + m_data.m_pixmap = QPixmap::fromImage(image); + + if (isPainting) + m_data.m_painter->begin(&m_data.m_pixmap); } // We get a mimeType here but QImageWriter does not support mimetypes but diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp index be7d1e0..e266c07 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp @@ -109,6 +109,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const ctxt->save(); ctxt->setCompositeOperation(op); QPainter* p = ctxt->platformContext(); + if (!pixmap.hasAlpha() && p->compositionMode() == QPainter::CompositionMode_SourceOver) + p->setCompositionMode(QPainter::CompositionMode_Source); p->setBrushOrigin(phase); p->fillRect(destRect, b); ctxt->restore(); @@ -146,6 +148,9 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, QPainter* painter(ctxt->platformContext()); + if (!image->hasAlpha() && painter->compositionMode() == QPainter::CompositionMode_SourceOver) + painter->setCompositionMode(QPainter::CompositionMode_Source); + // Test using example site at // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html painter->drawPixmap(dst, *image, src); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp index 90b342e..e68be2b 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp @@ -1,6 +1,7 @@ /* - * Copyright (C) 2006 Zack Rusin - * 2006 Rob Buis + * Copyright (C) 2006 Zack Rusin + * 2006 Rob Buis + * 2009 Dirk Schulze * * All rights reserved. * @@ -139,9 +140,72 @@ void Path::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius) { - //FIXME: busted - qWarning("arcTo is busted"); - m_path->arcTo(p1.x(), p1.y(), p2.x(), p2.y(), radius, 90); + FloatPoint p0(m_path->currentPosition()); + + if ((p1.x() == p0.x() && p1.y() == p0.y()) || (p1.x() == p2.x() && p1.y() == p2.y()) || radius == 0.f) { + m_path->lineTo(p1); + return; + } + + FloatPoint p1p0((p0.x() - p1.x()),(p0.y() - p1.y())); + FloatPoint p1p2((p2.x() - p1.x()),(p2.y() - p1.y())); + float p1p0_length = sqrtf(p1p0.x() * p1p0.x() + p1p0.y() * p1p0.y()); + float p1p2_length = sqrtf(p1p2.x() * p1p2.x() + p1p2.y() * p1p2.y()); + + double cos_phi = (p1p0.x() * p1p2.x() + p1p0.y() * p1p2.y()) / (p1p0_length * p1p2_length); + // all points on a line logic + if (cos_phi == -1) { + m_path->lineTo(p1); + return; + } + if (cos_phi == 1) { + // add infinite far away point + unsigned int max_length = 65535; + double factor_max = max_length / p1p0_length; + FloatPoint ep((p0.x() + factor_max * p1p0.x()), (p0.y() + factor_max * p1p0.y())); + m_path->lineTo(ep); + return; + } + + float tangent = radius / tan(acos(cos_phi) / 2); + float factor_p1p0 = tangent / p1p0_length; + FloatPoint t_p1p0((p1.x() + factor_p1p0 * p1p0.x()), (p1.y() + factor_p1p0 * p1p0.y())); + + FloatPoint orth_p1p0(p1p0.y(), -p1p0.x()); + float orth_p1p0_length = sqrt(orth_p1p0.x() * orth_p1p0.x() + orth_p1p0.y() * orth_p1p0.y()); + float factor_ra = radius / orth_p1p0_length; + + // angle between orth_p1p0 and p1p2 to get the right vector orthographic to p1p0 + double cos_alpha = (orth_p1p0.x() * p1p2.x() + orth_p1p0.y() * p1p2.y()) / (orth_p1p0_length * p1p2_length); + if (cos_alpha < 0.f) + orth_p1p0 = FloatPoint(-orth_p1p0.x(), -orth_p1p0.y()); + + FloatPoint p((t_p1p0.x() + factor_ra * orth_p1p0.x()), (t_p1p0.y() + factor_ra * orth_p1p0.y())); + + // calculate angles for addArc + orth_p1p0 = FloatPoint(-orth_p1p0.x(), -orth_p1p0.y()); + float sa = acos(orth_p1p0.x() / orth_p1p0_length); + if (orth_p1p0.y() < 0.f) + sa = 2 * piDouble - sa; + + // anticlockwise logic + bool anticlockwise = false; + + float factor_p1p2 = tangent / p1p2_length; + FloatPoint t_p1p2((p1.x() + factor_p1p2 * p1p2.x()), (p1.y() + factor_p1p2 * p1p2.y())); + FloatPoint orth_p1p2((t_p1p2.x() - p.x()),(t_p1p2.y() - p.y())); + float orth_p1p2_length = sqrtf(orth_p1p2.x() * orth_p1p2.x() + orth_p1p2.y() * orth_p1p2.y()); + float ea = acos(orth_p1p2.x() / orth_p1p2_length); + if (orth_p1p2.y() < 0) + ea = 2 * piDouble - ea; + if ((sa > ea) && ((sa - ea) < piDouble)) + anticlockwise = true; + if ((sa < ea) && ((ea - sa) > piDouble)) + anticlockwise = true; + + m_path->lineTo(t_p1p0); + + addArc(p, radius, sa, ea, anticlockwise); } void Path::closeSubpath() diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 2de2125..2c730a6 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -269,8 +269,10 @@ void QNetworkReplyHandler::sendResponseIfNeeded() const bool isLocalFileReply = (m_reply->url().scheme() == QLatin1String("file")); int statusCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - if (!isLocalFileReply) + if (!isLocalFileReply) { response.setHTTPStatusCode(statusCode); + response.setHTTPStatusText(m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray().constData()); + } else if (m_reply->error() == QNetworkReply::ContentNotFoundError) response.setHTTPStatusCode(404); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp index cc8acd2..b25ae7a 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp @@ -21,7 +21,9 @@ #include "PlatformWheelEvent.h" #include "PlatformMouseEvent.h" +#include "Scrollbar.h" +#include #include namespace WebCore { @@ -54,9 +56,14 @@ PlatformWheelEvent::PlatformWheelEvent(QWheelEvent* e) m_deltaY = (e->delta() / 120); } - // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event - m_deltaX *= horizontalLineMultiplier(); - m_deltaY *= verticalLineMultiplier(); + m_deltaX *= QApplication::wheelScrollLines(); + // use the same single scroll step as QTextEdit (in + // QTextEditPrivate::init [h,v]bar->setSingleStep ) + // and divide by the default WebKit scroll step to + // get the Qt mouse wheel scroll behavior + static const float cDefaultQtScrollStep = 20.f; + m_deltaY *= QApplication::wheelScrollLines() * + (cDefaultQtScrollStep / cMouseWheelPixelsPerLineStep); } #endif // QT_NO_WHEELEVENT diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index 1d7d570..3229922 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -220,11 +220,11 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) switch (variable) { case NPNVToolkit: - *((uint32 *)value) = 0; + *static_cast(value) = 0; return NPERR_NO_ERROR; case NPNVjavascriptEnabledBool: - *((uint32 *)value) = true; + *static_cast(value) = true; return NPERR_NO_ERROR; default: @@ -275,7 +275,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value) } case NPNVsupportsCoreGraphicsBool: - *((uint32 *)value) = true; + *static_cast(value) = true; return NPERR_NO_ERROR; default: diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp index 5aa8933..c8dd0e5 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp @@ -301,15 +301,15 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) { switch (variable) { case NPNVToolkit: - *((uint32 *)value) = 0; + *static_cast(value) = 0; return NPERR_NO_ERROR; case NPNVSupportsXEmbedBool: - *((uint32 *)value) = true; + *static_cast(value) = true; return NPERR_NO_ERROR; case NPNVjavascriptEnabledBool: - *((uint32 *)value) = true; + *static_cast(value) = true; return NPERR_NO_ERROR; default: diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index e17306d..c55b780 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1450,9 +1450,16 @@ void QWebPage::triggerAction(WebAction action, bool checked) openNewWindow(url, frame); break; } - case CopyLinkToClipboard: + case CopyLinkToClipboard: { +#if defined(Q_WS_X11) + bool oldSelectionMode = Pasteboard::generalPasteboard()->isSelectionMode(); + Pasteboard::generalPasteboard()->setSelectionMode(true); + editor->copyURL(d->hitTestResult.linkUrl(), d->hitTestResult.linkText()); + Pasteboard::generalPasteboard()->setSelectionMode(oldSelectionMode); +#endif editor->copyURL(d->hitTestResult.linkUrl(), d->hitTestResult.linkText()); break; + } case OpenImageInNewWindow: openNewWindow(d->hitTestResult.imageUrl(), frame); break; diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 5a23200..e6c16ec 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,14 @@ +2009-03-02 Benjamin C Meyer + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=21230 + On X11 match the behavior of Firefox and also copy the url to the + clipboard selection when the action Copy Link Location is executed. + + * Api/qwebpage.cpp: + (QWebPage::triggerAction): + 2009-03-07 Adam Treat Reviewed by Cameron Zwarich. -- cgit v0.12 From 294f32f41da900ad3ae70e1546ea0057f8864d95 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Fri, 24 Apr 2009 10:23:13 +0200 Subject: Alias for QUtf16Codec is wrong. Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit. --- src/corelib/codecs/qutfcodec.cpp | 4 +--- tests/auto/qtextcodec/tst_qtextcodec.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index 281bf75..1ac592e 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -413,9 +413,7 @@ QByteArray QUtf16Codec::name() const QList QUtf16Codec::aliases() const { - QList list; - list << "ISO-10646-UCS-2"; - return list; + return QList(); } int QUtf16BECodec::mibEnum() const diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index b1bfb86..536b695 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -68,6 +68,7 @@ private slots: void flagEFBFBF() const; void decode0D() const; void codecForIndex() const; + void aliasForUTF16() const; void utf8Codec_data(); void utf8Codec(); @@ -453,6 +454,11 @@ void tst_QTextCodec::codecForIndex() const { } +void tst_QTextCodec::aliasForUTF16() const +{ + QVERIFY(QTextCodec::codecForName("UTF-16")->aliases().isEmpty()); +} + static QString fromInvalidUtf8Sequence(const QByteArray &ba) { return QString().fill(QChar::ReplacementCharacter, ba.size()); -- cgit v0.12 From fbdf2d74f010c85c85af4ee9ea793039cccf2354 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Fri, 24 Apr 2009 11:39:47 +0200 Subject: Return the correct MIB number for TSCII. When the code was written, IANA hadn't assigned one. Requested/spotted by Nokia i18n team. Task-number: 251790 Reviewed-by: Brad Reviewed-by: Denis AutoTest: In this submit. --- src/corelib/codecs/qtsciicodec.cpp | 3 +-- tests/auto/qtextcodec/tst_qtextcodec.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp index 14d2c9c..0ec0567 100644 --- a/src/corelib/codecs/qtsciicodec.cpp +++ b/src/corelib/codecs/qtsciicodec.cpp @@ -180,8 +180,7 @@ QByteArray QTsciiCodec::name() const */ int QTsciiCodec::mibEnum() const { - /* There is no MIBEnum for TSCII now */ - return -3197; + return 2107; } static const int UnToTsLast = 124; // 125 items -- so the last will be 124 diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 536b695..cf4135b 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -69,6 +69,7 @@ private slots: void decode0D() const; void codecForIndex() const; void aliasForUTF16() const; + void mibForTSCII() const; void utf8Codec_data(); void utf8Codec(); @@ -459,6 +460,11 @@ void tst_QTextCodec::aliasForUTF16() const QVERIFY(QTextCodec::codecForName("UTF-16")->aliases().isEmpty()); } +void tst_QTextCodec::mibForTSCII() const +{ + QCOMPARE(QTextCodec::codecForName("TSCII")->mibEnum(), 2107); +} + static QString fromInvalidUtf8Sequence(const QByteArray &ba) { return QString().fill(QChar::ReplacementCharacter, ba.size()); -- cgit v0.12 From 225b516ea21e841ee52d2f3edb426eb781ab0c8d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Apr 2009 12:41:02 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me --- doc/src/qtwebkit.qdoc | 189 -------------------- doc/src/snippets/code/doc_src_qtwebkit.qdoc | 8 - .../src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp | 35 ---- doc/src/snippets/webkit/simple/main.cpp | 56 ------ doc/src/snippets/webkit/simple/simple.pro | 2 - doc/src/snippets/webkit/webpage/main.cpp | 62 ------- doc/src/snippets/webkit/webpage/webpage.pro | 3 - src/3rdparty/webkit/ChangeLog | 8 + src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 6 +- src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 14 +- src/3rdparty/webkit/WebKit/qt/ChangeLog | 20 +++ src/3rdparty/webkit/WebKit/qt/docs/docs.pri | 15 ++ src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 189 ++++++++++++++++++++ .../webkit/WebKit/qt/docs/qtwebkit.qdocconf | 195 +++++++++++++++++++++ .../webkitsnippets/qtwebkit_build_snippet.qdoc | 8 + .../webkitsnippets/qtwebkit_qwebview_snippet.cpp | 35 ++++ .../WebKit/qt/docs/webkitsnippets/simple/main.cpp | 34 ++++ .../qt/docs/webkitsnippets/simple/simple.pro | 2 + .../WebKit/qt/docs/webkitsnippets/webpage/main.cpp | 81 +++++++++ .../qt/docs/webkitsnippets/webpage/webpage.pro | 3 + tools/qdoc3/test/qt-build-docs.qdocconf | 3 +- tools/qdoc3/test/qt-inc.qdocconf | 3 +- tools/qdoc3/test/qt.qdocconf | 3 +- 24 files changed, 607 insertions(+), 369 deletions(-) delete mode 100644 doc/src/qtwebkit.qdoc delete mode 100644 doc/src/snippets/code/doc_src_qtwebkit.qdoc delete mode 100644 doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp delete mode 100644 doc/src/snippets/webkit/simple/main.cpp delete mode 100644 doc/src/snippets/webkit/simple/simple.pro delete mode 100644 doc/src/snippets/webkit/webpage/main.cpp delete mode 100644 doc/src/snippets/webkit/webpage/webpage.pro create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/docs.pri create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro diff --git a/doc/src/qtwebkit.qdoc b/doc/src/qtwebkit.qdoc deleted file mode 100644 index 0092950..0000000 --- a/doc/src/qtwebkit.qdoc +++ /dev/null @@ -1,189 +0,0 @@ -/*! - \module QtWebKit - \title QtWebKit Module - \contentspage Qt's Modules - \previouspage QtSvg - \nextpage QtXml - \ingroup architecture - \ingroup modules - \brief An introduction to the QtWebKit module. - - \keyword Browser - \keyword Web Browser - - \since 4.4 - - QtWebKit provides a Web browser engine that makes it easy to embed content - from the World Wide Web into your Qt application. At the same time Web - content can be enhanced with native controls. - - QtWebKit provides facilities for rendering of HyperText Markup Language - (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector - Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and - scripted with JavaScript. - - A bridge between the JavaScript execution environment and the Qt object - model makes it possible for custom QObjects to be scripted. Integration - with the Qt networking module enables Web pages to be transparently loaded - from Web servers, the local file system or even the Qt resource system. - - In addition to providing pure rendering features, HTML documents can be - made fully editable to the user through the use of the \c{contenteditable} - attribute on HTML elements. - - QtWebKit is based on the Open Source WebKit engine. More information about - WebKit itself can be found on the \l{WebKit Open Source Project} Web site. - - The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the - \l{Open Source Versions of Qt}. - - \note Building the QtWebKit module with debugging symbols is problematic - on many platforms due to the size of the WebKit engine. We recommend - building the module in release mode only for embedded platforms. - - \note Web site icons, also known as "FavIcons", are currently not supported - on Windows. We plan to address this in a future release. - - \note WebKit has certain minimum requirements that must be met on - Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements} - document for more information. - - Topics: - - \tableofcontents - - \section1 Configuring the Build Process - - Applications that use QtWebKit's classes need to be configured to be built - against the QtWebKit module. The following declaration in a \c qmake - project file ensures that an application is compiled and linked - appropriately: - - \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 0 - - This line is necessary because only the QtCore and QtGui modules are used - in the default build process. - - To include the definitions of the module's classes, use the following - directive: - - \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 1 - - \section1 Architecture - - The easiest way to render content is through the QWebView class. As a - widget it can be embedded into your forms or a graphics view, and it - provides convenience functions for downloading and rendering web sites. - - \snippet snippets/webkit/simple/main.cpp Using QWebView - - QWebView acts as a view onto Web pages, each of which is represented by an - instance of the QWebPage class. QWebPage provides access to the document - structure in a page, describing features such as frames, the navigation - history, and the undo/redo stack for editable content. - - HTML documents can be nested using frames in a frameset. An individual - frame in HTML is represented using the QWebFrame class. It includes the - bridge to the JavaScript window object and can be painted using QPainter. - Each QWebPage has one QWebFrame object as its main frame. - - Individual browser features, defaults and other settings can be configured - through the QWebSettings class. It is possible to provide defaults for all - QWebPage instances through the default settings. Individual attributes - can be overidden by the page specific settings object. - - \section1 Netscape Plugin Support - - Since WebKit supports the Netscape Plugin API, Qt applications can display - Web pages that embed common plugins, as long as the user has the appropriate - binary files for those plugins installed. - - The following locations are searched for plugins: - - \table - \header \o Linux/Unix \o Windows - \row \o{1,3} - \list - \o \c{.mozilla/plugins} in the user's home directory - \o \c{.netscape/plugins} in the user's home directory - \o System locations, such as - \list - \o \c{/usr/lib/browser/plugins} - \o \c{/usr/local/lib/mozilla/plugins} - \o \c{/usr/lib/firefox/plugins} - \o \c{/usr/lib64/browser-plugins} - \o \c{/usr/lib/browser-plugins} - \o \c{/usr/lib/mozilla/plugins} - \o \c{/usr/local/netscape/plugins} - \o \c{/opt/mozilla/plugins} - \o \c{/opt/mozilla/lib/plugins} - \o \c{/opt/netscape/plugins} - \o \c{/opt/netscape/communicator/plugins} - \o \c{/usr/lib/netscape/plugins} - \o \c{/usr/lib/netscape/plugins-libc5} - \o \c{/usr/lib/netscape/plugins-libc6} - \o \c{/usr/lib64/netscape/plugins} - \o \c{/usr/lib64/mozilla/plugins} - \endlist - \o Locations specified by environment variables: - \list - \o \c{$MOZILLA_HOME/plugins} - \o \c{$MOZ_PLUGIN_PATH} - \o \c{$QTWEBKIT_PLUGIN_PATH} - \endlist - \endlist - - \o - \list - \o The user's \c{Application Data\Mozilla\plugins} directory - \o Standard system locations of plugins for Quicktime, Flash, etc. - \endlist - - \row - \raw HTML - Mac OS X - \endraw - \row - \o - \list - \o \c{Library/Internet Plug-Ins} in the user's home directory - \o The system \c{/Library/Internet Plug-Ins} directory - \endlist - \endtable - - \section1 License Information - - This is a snapshot of the Qt port of WebKit. The exact version information - can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt. - - Qt Commercial Edition licensees that wish to distribute applications that - use the QtWebKit module need to be aware of their obligations under the - GNU Lesser General Public License (LGPL). - - Developers using the Open Source Edition can choose to redistribute - the module under the appropriate version of the GNU LGPL; version 2.1 - for applications and libraries licensed under the GNU GPL version 2, - or version 3 for applications and libraries licensed under the GNU - GPL version 2. - - \legalese - WebKit is licensed under the GNU Library General Public License. - Individual contributor names and copyright dates can be found - inline in the code. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - \endlegalese -*/ diff --git a/doc/src/snippets/code/doc_src_qtwebkit.qdoc b/doc/src/snippets/code/doc_src_qtwebkit.qdoc deleted file mode 100644 index d4fc2bd..0000000 --- a/doc/src/snippets/code/doc_src_qtwebkit.qdoc +++ /dev/null @@ -1,8 +0,0 @@ -//! [0] -QT += webkit -//! [0] - - -//! [1] -#include -//! [1] diff --git a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp b/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp deleted file mode 100644 index f04cd29..0000000 --- a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp +++ /dev/null @@ -1,35 +0,0 @@ - -void wrapInFunction() -{ - -//! [0] - view->page()->history(); -//! [0] - - -//! [1] - view->page()->settings(); -//! [1] - - -//! [2] - view->triggerAction(QWebPage::Copy); -//! [2] - - -//! [3] - view->page()->triggerPageAction(QWebPage::Stop); -//! [3] - - -//! [4] - view->page()->triggerPageAction(QWebPage::GoBack); -//! [4] - - -//! [5] - view->page()->triggerPageAction(QWebPage::GoForward); -//! [5] - -} - diff --git a/doc/src/snippets/webkit/simple/main.cpp b/doc/src/snippets/webkit/simple/main.cpp deleted file mode 100644 index a6a4fc2..0000000 --- a/doc/src/snippets/webkit/simple/main.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the documentation 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QWidget *parent = 0; -//! [Using QWebView] - QWebView *view = new QWebView(parent); - view->load(QUrl("http://qtsoftware.com/")); - view->show(); -//! [Using QWebView] - return app.exec(); -} diff --git a/doc/src/snippets/webkit/simple/simple.pro b/doc/src/snippets/webkit/simple/simple.pro deleted file mode 100644 index 61cd3bf..0000000 --- a/doc/src/snippets/webkit/simple/simple.pro +++ /dev/null @@ -1,2 +0,0 @@ -QT += webkit -SOURCES = main.cpp diff --git a/doc/src/snippets/webkit/webpage/main.cpp b/doc/src/snippets/webkit/webpage/main.cpp deleted file mode 100644 index b433ac2..0000000 --- a/doc/src/snippets/webkit/webpage/main.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include -#include -#include - -//! [0] -class Thumbnailer : public QObject -{ - Q_OBJECT - -public: - Thumbnailer(const QUrl &url); - -signals: - void finished(); - -private slots: - void render(); - -private: - QWebPage page; - -}; -//! [0] - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - Thumbnailer thumbnail(QUrl("http://qtsoftware.com")); - - QObject::connect(&thumbnail, SIGNAL(finished()), - &app, SLOT(quit())); - - return app.exec(); -} - -//! [1] -Thumbnailer::Thumbnailer(const QUrl &url) -{ - page.mainFrame()->load(url); - connect(&page, SIGNAL(loadFinished(bool)), - this, SLOT(render())); -} -//! [1] - -//! [2] -void Thumbnailer::render() -{ - page.setViewportSize(page.mainFrame()->contentsSize()); - QImage image(page.viewportSize(), QImage::Format_ARGB32); - QPainter painter(&image); - - page.mainFrame()->render(&painter); - painter.end(); - - QImage thumbnail = image.scaled(400, 400); - thumbnail.save("thumbnail.png"); - - emit finished(); -} -//! [2] -#include "main.moc" diff --git a/doc/src/snippets/webkit/webpage/webpage.pro b/doc/src/snippets/webkit/webpage/webpage.pro deleted file mode 100644 index fcad03b..0000000 --- a/doc/src/snippets/webkit/webpage/webpage.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += console -QT += webkit -SOURCES = main.cpp \ No newline at end of file diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index ec8242d..76cfc80 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,11 @@ +2009-04-24 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Added support for generating API docs in the Qt build using "make docs" + + * WebKit.pro: Include docs.pri for "make docs" target. + 2008-12-19 Marco Barisione Reviewed by Holger Freyther. diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 60c9ba7..250eb90 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - d5ea85e03f22fb6fb87275774a2c53031941017e + 242472777d440a540b4bc944c84eb522388e384e diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index c55b780..4828543 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1198,18 +1198,18 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const Suppose we have a \c Thumbnail class as follows: - \snippet doc/src/snippets/webkit/webpage/main.cpp 0 + \snippet webkitsnippets/webpage/main.cpp 0 The \c Thumbnail's constructor takes in a \a url. We connect our QWebPage object's \l{QWebPage::}{loadFinished()} signal to our private slot, \c render(). - \snippet doc/src/snippets/webkit/webpage/main.cpp 1 + \snippet webkitsnippets/webpage/main.cpp 1 The \c render() function shows how we can paint a thumbnail using a QWebPage object. - \snippet doc/src/snippets/webkit/webpage/main.cpp 2 + \snippet webkitsnippets/webpage/main.cpp 2 We begin by setting the \l{QWebPage::viewportSize()}{viewportSize} and then we instantiate a QImage object, \c image, with the same size as our diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index a843eba..9753f4f 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -86,7 +86,7 @@ public: Qt Widgets, the show() function must be invoked in order to display QWebView. The snippet below illustrates this: - \snippet doc/src/snippets/webkit/simple/main.cpp Using QWebView + \snippet webkitsnippets/simple/main.cpp Using QWebView Alternatively, setUrl() can also be used to load a web site. If you have the HTML content readily available, you can use setHtml() instead. @@ -325,7 +325,7 @@ void QWebView::setContent(const QByteArray &data, const QString &mimeType, const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 0 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 0 */ QWebHistory *QWebView::history() const { @@ -337,7 +337,7 @@ QWebHistory *QWebView::history() const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 1 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 1 \sa QWebSettings::globalSettings() */ @@ -429,7 +429,7 @@ QAction *QWebView::pageAction(QWebPage::WebAction action) const The following example triggers the copy action and therefore copies any selected text to the clipboard. - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 2 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 2 \sa pageAction() */ @@ -606,7 +606,7 @@ void QWebView::print(QPrinter *printer) const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 3 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 3 \sa reload(), pageAction(), loadFinished() */ @@ -622,7 +622,7 @@ void QWebView::stop() It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 4 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 4 \sa forward(), pageAction() */ @@ -638,7 +638,7 @@ void QWebView::back() It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 5 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 5 \sa back(), pageAction() */ diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index e6c16ec..640f652 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,23 @@ +2009-04-24 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Added support for generating API docs in the Qt build using "make docs" + + Added code snippets and overview from the Qt sources references in the API docs. + + * Api/qwebpage.cpp: Adjust paths to snippets. + * Api/qwebview.cpp: Ditto. + * docs/docs.pri: Added. + * docs/qtwebkit.qdoc: Added. + * docs/qtwebkit.qdocconf: Added. + * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. + * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. + * docs/webkitsnippets/simple/main.cpp: Added. + * docs/webkitsnippets/simple/simple.pro: Added. + * docs/webkitsnippets/webpage/main.cpp: Added. + * docs/webkitsnippets/webpage/webpage.pro: Added. + 2009-03-02 Benjamin C Meyer Reviewed by George Staikos. diff --git a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri new file mode 100644 index 0000000..4a8c165 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri @@ -0,0 +1,15 @@ +include(../../../WebKit.pri) + +unix { + QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/tools/qdoc3/qdoc3 +} else { + QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe +} + +unix { +docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf +} else { +docs.commands = \"$$QDOC $$PWD/qtwebkit.qdocconf\" +} + +QMAKE_EXTRA_TARGETS += docs diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc new file mode 100644 index 0000000..06305e0 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -0,0 +1,189 @@ +/*! + \module QtWebKit + \title QtWebKit Module + \contentspage Qt's Modules + \previouspage QtSvg + \nextpage QtXml + \ingroup architecture + \ingroup modules + \brief An introduction to the QtWebKit module. + + \keyword Browser + \keyword Web Browser + + \since 4.4 + + QtWebKit provides a Web browser engine that makes it easy to embed content + from the World Wide Web into your Qt application. At the same time Web + content can be enhanced with native controls. + + QtWebKit provides facilities for rendering of HyperText Markup Language + (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector + Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and + scripted with JavaScript. + + A bridge between the JavaScript execution environment and the Qt object + model makes it possible for custom QObjects to be scripted. Integration + with the Qt networking module enables Web pages to be transparently loaded + from Web servers, the local file system or even the Qt resource system. + + In addition to providing pure rendering features, HTML documents can be + made fully editable to the user through the use of the \c{contenteditable} + attribute on HTML elements. + + QtWebKit is based on the Open Source WebKit engine. More information about + WebKit itself can be found on the \l{WebKit Open Source Project} Web site. + + The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the + \l{Open Source Versions of Qt}. + + \note Building the QtWebKit module with debugging symbols is problematic + on many platforms due to the size of the WebKit engine. We recommend + building the module in release mode only for embedded platforms. + + \note Web site icons, also known as "FavIcons", are currently not supported + on Windows. We plan to address this in a future release. + + \note WebKit has certain minimum requirements that must be met on + Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements} + document for more information. + + Topics: + + \tableofcontents + + \section1 Configuring the Build Process + + Applications that use QtWebKit's classes need to be configured to be built + against the QtWebKit module. The following declaration in a \c qmake + project file ensures that an application is compiled and linked + appropriately: + + \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0 + + This line is necessary because only the QtCore and QtGui modules are used + in the default build process. + + To include the definitions of the module's classes, use the following + directive: + + \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 1 + + \section1 Architecture + + The easiest way to render content is through the QWebView class. As a + widget it can be embedded into your forms or a graphics view, and it + provides convenience functions for downloading and rendering web sites. + + \snippet webkitsnippets/simple/main.cpp Using QWebView + + QWebView acts as a view onto Web pages, each of which is represented by an + instance of the QWebPage class. QWebPage provides access to the document + structure in a page, describing features such as frames, the navigation + history, and the undo/redo stack for editable content. + + HTML documents can be nested using frames in a frameset. An individual + frame in HTML is represented using the QWebFrame class. It includes the + bridge to the JavaScript window object and can be painted using QPainter. + Each QWebPage has one QWebFrame object as its main frame. + + Individual browser features, defaults and other settings can be configured + through the QWebSettings class. It is possible to provide defaults for all + QWebPage instances through the default settings. Individual attributes + can be overidden by the page specific settings object. + + \section1 Netscape Plugin Support + + Since WebKit supports the Netscape Plugin API, Qt applications can display + Web pages that embed common plugins, as long as the user has the appropriate + binary files for those plugins installed. + + The following locations are searched for plugins: + + \table + \header \o Linux/Unix \o Windows + \row \o{1,3} + \list + \o \c{.mozilla/plugins} in the user's home directory + \o \c{.netscape/plugins} in the user's home directory + \o System locations, such as + \list + \o \c{/usr/lib/browser/plugins} + \o \c{/usr/local/lib/mozilla/plugins} + \o \c{/usr/lib/firefox/plugins} + \o \c{/usr/lib64/browser-plugins} + \o \c{/usr/lib/browser-plugins} + \o \c{/usr/lib/mozilla/plugins} + \o \c{/usr/local/netscape/plugins} + \o \c{/opt/mozilla/plugins} + \o \c{/opt/mozilla/lib/plugins} + \o \c{/opt/netscape/plugins} + \o \c{/opt/netscape/communicator/plugins} + \o \c{/usr/lib/netscape/plugins} + \o \c{/usr/lib/netscape/plugins-libc5} + \o \c{/usr/lib/netscape/plugins-libc6} + \o \c{/usr/lib64/netscape/plugins} + \o \c{/usr/lib64/mozilla/plugins} + \endlist + \o Locations specified by environment variables: + \list + \o \c{$MOZILLA_HOME/plugins} + \o \c{$MOZ_PLUGIN_PATH} + \o \c{$QTWEBKIT_PLUGIN_PATH} + \endlist + \endlist + + \o + \list + \o The user's \c{Application Data\Mozilla\plugins} directory + \o Standard system locations of plugins for Quicktime, Flash, etc. + \endlist + + \row + \raw HTML + Mac OS X + \endraw + \row + \o + \list + \o \c{Library/Internet Plug-Ins} in the user's home directory + \o The system \c{/Library/Internet Plug-Ins} directory + \endlist + \endtable + + \section1 License Information + + This is a snapshot of the Qt port of WebKit. The exact version information + can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt. + + Qt Commercial Edition licensees that wish to distribute applications that + use the QtWebKit module need to be aware of their obligations under the + GNU Lesser General Public License (LGPL). + + Developers using the Open Source Edition can choose to redistribute + the module under the appropriate version of the GNU LGPL; version 2.1 + for applications and libraries licensed under the GNU GPL version 2, + or version 3 for applications and libraries licensed under the GNU + GPL version 2. + + \legalese + WebKit is licensed under the GNU Library General Public License. + Individual contributor names and copyright dates can be found + inline in the code. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endlegalese +*/ diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf new file mode 100644 index 0000000..e60e586 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf @@ -0,0 +1,195 @@ +# Run qdoc from the directory that contains this file. + +project = qtwebkit +description = "Qt WebKit API Documentation" + +headerdirs = $SRCDIR/WebKit/qt/Api +sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs +outputdir = $OUTPUT_DIR/doc/html +outputformats = HTML +sources.fileextensions = "*.cpp *.doc *.qdoc *.h" +exampledirs = $SRCDIR/WebKit/qt/docs + +indexes = $QTDIR/doc/html/qt.index + +# macros.qdocconf + +macro.aring.HTML = "å" +macro.Auml.HTML = "Ä" +macro.author = "\\bold{Author:}" +macro.br.HTML = "
" +macro.BR.HTML = "
" +macro.aacute.HTML = "á" +macro.eacute.HTML = "é" +macro.iacute.HTML = "í" +macro.gui = "\\bold" +macro.hr.HTML = "
" +macro.key = "\\bold" +macro.menu = "\\bold" +macro.note = "\\bold{Note:}" +macro.oslash.HTML = "ø" +macro.ouml.HTML = "ö" +macro.QA = "\\e{Qt Assistant}" +macro.QD = "\\e{Qt Designer}" +macro.QL = "\\e{Qt Linguist}" +macro.param = "\\e" +macro.raisedaster.HTML = "*" +macro.reg.HTML = "®" +macro.return = "Returns" +macro.starslash = "\\c{*/}" +macro.uuml.HTML = "ü" +macro.mdash.HTML = "—" + +# compat.qdocconf + +alias.i = e +alias.include = input + +macro.0 = "\\\\0" +macro.b = "\\\\b" +macro.n = "\\\\n" +macro.r = "\\\\r" +macro.i = "\\o" +macro.i11 = "\\o{1,1}" +macro.i12 = "\\o{1,2}" +macro.i13 = "\\o{1,3}" +macro.i14 = "\\o{1,4}" +macro.i15 = "\\o{1,5}" +macro.i16 = "\\o{1,6}" +macro.i17 = "\\o{1,7}" +macro.i18 = "\\o{1,8}" +macro.i19 = "\\o{1,9}" +macro.i21 = "\\o{2,1}" +macro.i31 = "\\o{3,1}" +macro.i41 = "\\o{4,1}" +macro.i51 = "\\o{5,1}" +macro.i61 = "\\o{6,1}" +macro.i71 = "\\o{7,1}" +macro.i81 = "\\o{8,1}" +macro.i91 = "\\o{9,1}" +macro.img = "\\image" +macro.endquote = "\\endquotation" + +spurious = "Missing comma in .*" \ + "Missing pattern .*" + +# Doxygen compatibility commands + +macro.see = "\\sa" +macro.function = "\\fn" + +# qt-cpp-ignore.qdocconf + +Cpp.ignoretokens = QAXFACTORY_EXPORT \ + QDESIGNER_COMPONENTS_LIBRARY \ + QDESIGNER_EXTENSION_LIBRARY \ + QDESIGNER_SDK_LIBRARY \ + QDESIGNER_SHARED_LIBRARY \ + QDESIGNER_UILIB_LIBRARY \ + QM_EXPORT_CANVAS \ + QM_EXPORT_DNS \ + QM_EXPORT_DOM \ + QM_EXPORT_FTP \ + QM_EXPORT_HTTP \ + QM_EXPORT_ICONVIEW \ + QM_EXPORT_NETWORK \ + QM_EXPORT_OPENGL \ + QM_EXPORT_SQL \ + QM_EXPORT_TABLE \ + QM_EXPORT_WORKSPACE \ + QM_EXPORT_XML \ + QT_ASCII_CAST_WARN \ + QT_ASCII_CAST_WARN_CONSTRUCTOR \ + QT_BEGIN_HEADER \ + QT_DESIGNER_STATIC \ + QT_END_HEADER \ + QT_FASTCALL \ + QT_WIDGET_PLUGIN_EXPORT \ + Q_COMPAT_EXPORT \ + Q_CORE_EXPORT \ + Q_EXPLICIT \ + Q_EXPORT \ + Q_EXPORT_CODECS_CN \ + Q_EXPORT_CODECS_JP \ + Q_EXPORT_CODECS_KR \ + Q_EXPORT_PLUGIN \ + Q_GFX_INLINE \ + Q_GUI_EXPORT \ + Q_GUI_EXPORT_INLINE \ + Q_GUI_EXPORT_STYLE_CDE \ + Q_GUI_EXPORT_STYLE_COMPACT \ + Q_GUI_EXPORT_STYLE_MAC \ + Q_GUI_EXPORT_STYLE_MOTIF \ + Q_GUI_EXPORT_STYLE_MOTIFPLUS \ + Q_GUI_EXPORT_STYLE_PLATINUM \ + Q_GUI_EXPORT_STYLE_POCKETPC \ + Q_GUI_EXPORT_STYLE_SGI \ + Q_GUI_EXPORT_STYLE_WINDOWS \ + Q_GUI_EXPORT_STYLE_WINDOWSXP \ + QHELP_EXPORT \ + Q_INLINE_TEMPLATE \ + Q_INTERNAL_WIN_NO_THROW \ + Q_NETWORK_EXPORT \ + Q_OPENGL_EXPORT \ + Q_OUTOFLINE_TEMPLATE \ + Q_SQL_EXPORT \ + Q_SVG_EXPORT \ + Q_SCRIPT_EXPORT \ + Q_TESTLIB_EXPORT \ + Q_TYPENAME \ + Q_XML_EXPORT \ + Q_XMLSTREAM_EXPORT \ + Q_XMLPATTERNS_EXPORT \ + QDBUS_EXPORT \ + QT_BEGIN_NAMESPACE \ + QT_BEGIN_INCLUDE_NAMESPACE \ + QT_END_NAMESPACE \ + QT_END_INCLUDE_NAMESPACE \ + PHONON_EXPORT \ + EXTENSIONSYSTEM_EXPORT +Cpp.ignoredirectives = Q_DECLARE_HANDLE \ + Q_DECLARE_INTERFACE \ + Q_DECLARE_METATYPE \ + Q_DECLARE_OPERATORS_FOR_FLAGS \ + Q_DECLARE_PRIVATE \ + Q_DECLARE_PUBLIC \ + Q_DECLARE_SHARED \ + Q_DECLARE_TR_FUNCTIONS \ + Q_DECLARE_TYPEINFO \ + Q_DISABLE_COPY \ + QT_FORWARD_DECLARE_CLASS \ + Q_DUMMY_COMPARISON_OPERATOR \ + Q_ENUMS \ + Q_FLAGS \ + Q_INTERFACES \ + __attribute__ \ + K_DECLARE_PRIVATE \ + PHONON_OBJECT \ + PHONON_HEIR + + + +HTML.style = "" \ + "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }"\ + "a:link { color: #004faf; text-decoration: none }"\ + "a:visited { color: #672967; text-decoration: none }"\ + "td.postheader { font-family: sans-serif }"\ + "tr.address { font-family: sans-serif }"\ + "body { background: #ffffff; color: black }"\ + "table tr.odd { background: #f0f0f0; color: black; }"\ + "table tr.even { background: #e4e4e4; color: black; }"\ + "table.annotated th { padding: 3px; text-align: left }"\ + "table.annotated td { padding: 3px; } "\ + "table tr pre { padding-top: none; padding-bottom: none; padding-left: none; padding-right: none; border: none; background: none }"\ + "tr.qt-style { background: #a2c511; color: black }"\ + "body pre { padding: 0.2em; border: #e7e7e7 1px solid; background: #f1f1f1; color: black }"\ + "span.preprocessor, span.preprocessor a { color: darkblue; }"\ + "span.comment { color: darkred; font-style: italic }"\ + "span.string,span.char { color: darkgreen; }"\ + ".title { text-align: center }"\ + ".subtitle { font-size: 0.8em }"\ + ".small-subtitle { font-size: 0.65em }" + +HTML.postheader = "" + +HTML.footer = "" diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc new file mode 100644 index 0000000..d4fc2bd --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc @@ -0,0 +1,8 @@ +//! [0] +QT += webkit +//! [0] + + +//! [1] +#include +//! [1] diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp new file mode 100644 index 0000000..f04cd29 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp @@ -0,0 +1,35 @@ + +void wrapInFunction() +{ + +//! [0] + view->page()->history(); +//! [0] + + +//! [1] + view->page()->settings(); +//! [1] + + +//! [2] + view->triggerAction(QWebPage::Copy); +//! [2] + + +//! [3] + view->page()->triggerPageAction(QWebPage::Stop); +//! [3] + + +//! [4] + view->page()->triggerPageAction(QWebPage::GoBack); +//! [4] + + +//! [5] + view->page()->triggerPageAction(QWebPage::GoForward); +//! [5] + +} + diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp new file mode 100644 index 0000000..82f5b6c --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp @@ -0,0 +1,34 @@ +/* + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QWidget *parent = 0; +//! [Using QWebView] + QWebView *view = new QWebView(parent); + view->load(QUrl("http://qtsoftware.com/")); + view->show(); +//! [Using QWebView] + return app.exec(); +} diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro new file mode 100644 index 0000000..61cd3bf --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro @@ -0,0 +1,2 @@ +QT += webkit +SOURCES = main.cpp diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp new file mode 100644 index 0000000..b91bc30 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp @@ -0,0 +1,81 @@ +/* + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include +#include +#include + +//! [0] +class Thumbnailer : public QObject +{ + Q_OBJECT + +public: + Thumbnailer(const QUrl &url); + +signals: + void finished(); + +private slots: + void render(); + +private: + QWebPage page; + +}; +//! [0] + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + Thumbnailer thumbnail(QUrl("http://qtsoftware.com")); + + QObject::connect(&thumbnail, SIGNAL(finished()), + &app, SLOT(quit())); + + return app.exec(); +} + +//! [1] +Thumbnailer::Thumbnailer(const QUrl &url) +{ + page.mainFrame()->load(url); + connect(&page, SIGNAL(loadFinished(bool)), + this, SLOT(render())); +} +//! [1] + +//! [2] +void Thumbnailer::render() +{ + page.setViewportSize(page.mainFrame()->contentsSize()); + QImage image(page.viewportSize(), QImage::Format_ARGB32); + QPainter painter(&image); + + page.mainFrame()->render(&painter); + painter.end(); + + QImage thumbnail = image.scaled(400, 400); + thumbnail.save("thumbnail.png"); + + emit finished(); +} +//! [2] +#include "main.moc" diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro new file mode 100644 index 0000000..fcad03b --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro @@ -0,0 +1,3 @@ +CONFIG += console +QT += webkit +SOURCES = main.cpp \ No newline at end of file diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 14e48a9..a1baf2f 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -105,7 +105,8 @@ exampledirs = $QT_SOURCE_TREE/doc/src \ $QT_SOURCE_TREE/examples \ $QT_SOURCE_TREE/examples/tutorials \ $QT_SOURCE_TREE \ - $QT_SOURCE_TREE/qmake/examples + $QT_SOURCE_TREE/qmake/examples \ + $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QT_SOURCE_TREE/doc/src/images \ $QT_SOURCE_TREE/examples outputdir = $QT_BUILD_TREE/doc/html diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 18d3faf..7255a67 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -20,7 +20,8 @@ headerdirs = $QDOC_CURRENT_DIR exampledirs = $QTDIR/doc/src \ $QTDIR/examples \ $QTDIR \ - $QTDIR/qmake/examples + $QTDIR/qmake/examples \ + $QTDIR/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QTDIR/doc/src/images \ $QTDIR/examples outputdir = $QTDIR/doc/html diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index f7e774d..8859511 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -107,7 +107,8 @@ exampledirs = $QTDIR/doc/src \ $QTDIR/examples \ $QTDIR/examples/tutorials \ $QTDIR \ - $QTDIR/qmake/examples + $QTDIR/qmake/examples \ + $QTDIR/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QTDIR/doc/src/images \ $QTDIR/examples outputdir = $QTDIR/doc/html -- cgit v0.12 From d489dc180c1e71de117e6d015c5645441eb9fb7f Mon Sep 17 00:00:00 2001 From: kh Date: Fri, 24 Apr 2009 12:59:39 +0200 Subject: init combobox member and make sure we won't access it uninitialized --- tools/assistant/tools/assistant/mainwindow.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index 2e39186..6e22413 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -86,6 +86,7 @@ QT_BEGIN_NAMESPACE MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) : QMainWindow(parent) + , m_filterCombo(0) , m_toolBarMenu(0) , m_cmdLine(cmdLine) , m_progressWidget(0) @@ -217,12 +218,14 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) if (!m_cmdLine->currentFilter().isEmpty()) { const QString &curFilter = m_cmdLine->currentFilter(); m_helpEngine->setCurrentFilter(curFilter); - int idx = m_filterCombo->findText(curFilter); - if (idx >= 0) { - bool blocked = m_filterCombo->signalsBlocked(); - m_filterCombo->blockSignals(true); - m_filterCombo->setCurrentIndex(idx); - m_filterCombo->blockSignals(blocked); + if (m_filterCombo) { + int idx = m_filterCombo->findText(curFilter); + if (idx >= 0) { + bool blocked = m_filterCombo->signalsBlocked(); + m_filterCombo->blockSignals(true); + m_filterCombo->setCurrentIndex(idx); + m_filterCombo->blockSignals(blocked); + } } } -- cgit v0.12 From fc0c0621d8c5ffb89e4f9c72fa706b3f10aea97e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Apr 2009 13:11:17 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( a6ebe3865025e2bb4d767a79435af4daf5a9b4db ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog Rubber-stamped by Ariya Hidayat. Fix qdoc warning about link to QAction::isEnabled. * Api/qwebpage.cpp: 2009-04-24 Simon Hausmann --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 +- src/3rdparty/webkit/WebKit/qt/ChangeLog | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 250eb90..26ce489 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 242472777d440a540b4bc944c84eb522388e384e + a6ebe3865025e2bb4d767a79435af4daf5a9b4db diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 4828543..01b68eb 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1095,7 +1095,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const This enum describes the types of action which can be performed on the web page. Actions only have an effect when they are applicable. The availability of - actions can be be determined by checking \l{QAction::}{enabled()} on the + actions can be be determined by checking \l{QAction::}{isEnabled()} on the action returned by \l{QWebPage::}{action()}. One method of enabling the text editing, cursor movement, and text selection actions diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 640f652..c3bd633 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,5 +1,13 @@ 2009-04-24 Simon Hausmann + Rubber-stamped by Ariya Hidayat. + + Fix qdoc warning about link to QAction::isEnabled. + + * Api/qwebpage.cpp: + +2009-04-24 Simon Hausmann + Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" -- cgit v0.12 From 211bea9838bcc2acd7f54b65468fe1be2d81b1e0 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Fri, 24 Apr 2009 14:18:17 +0200 Subject: Re-send network request properly when the socket is in Closing state. This fixes the "QAbstractSocket::connectToHost() called when already connecting/connected to ". The issue was that we were trying to call connect on a socket that was in a Closing state. We have to wait for the disconnected signal before we try to connect again. Reviewed-by: Prasanth --- src/network/access/qhttpnetworkconnection.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 980c0e0..5940fba 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -265,6 +265,11 @@ bool QHttpNetworkConnectionPrivate::ensureConnection(QAbstractSocket *socket) if (socket->state() != QAbstractSocket::ConnectedState) { // connect to the host if not already connected. int index = indexOf(socket); + // resend this request after we receive the disconnected signal + if (socket->state() == QAbstractSocket::ClosingState) { + channels[index].resendCurrent = true; + return false; + } channels[index].state = ConnectingState; channels[index].pendingEncrypt = encrypt; @@ -982,6 +987,9 @@ void QHttpNetworkConnectionPrivate::_q_disconnected() channels[i].state = ReadingState; if (channels[i].reply) receiveReply(socket, channels[i].reply); + } else if (channels[i].state == IdleState && channels[i].resendCurrent) { + // re-sending request because the socket was in ClosingState + QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection); } channels[i].state = IdleState; } -- cgit v0.12 From d6d25c3978360bd8c30b3dcce3bfa4117d37f5d8 Mon Sep 17 00:00:00 2001 From: kh Date: Fri, 24 Apr 2009 16:52:13 +0200 Subject: cleanup, no functional change --- tools/assistant/tools/assistant/centralwidget.cpp | 207 ++++++++++++---------- tools/assistant/tools/assistant/centralwidget.h | 3 + tools/assistant/tools/assistant/helpviewer.h | 2 + 3 files changed, 118 insertions(+), 94 deletions(-) diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index 633747a..aa8887c 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -72,7 +72,8 @@ QT_BEGIN_NAMESPACE namespace { - HelpViewer* helpViewerFromTabPosition(const QTabWidget *widget, const QPoint &point) + HelpViewer* helpViewerFromTabPosition(const QTabWidget *widget, + const QPoint &point) { QTabBar *tabBar = qFindChild(widget); for (int i = 0; i < tabBar->count(); ++i) { @@ -87,38 +88,32 @@ namespace { FindWidget::FindWidget(QWidget *parent) : QWidget(parent) { - QString system = QLatin1String("win"); QHBoxLayout *hboxLayout = new QHBoxLayout(this); -#ifdef Q_OS_MAC - system = QLatin1String("mac"); -#else - hboxLayout->setSpacing(6); + QString resourcePath = QLatin1String(":/trolltech/assistant/images/"); + +#ifndef Q_OS_MAC hboxLayout->setMargin(0); + hboxLayout->setSpacing(6); + resourcePath.append(QLatin1String("win")); +#else + resourcePath.append(QLatin1String("mac")); #endif - toolClose = new QToolButton(this); - toolClose->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/closetab.png").arg(system))); - toolClose->setAutoRaise(true); + toolClose = setupToolButton(QLatin1String(""), + resourcePath + QLatin1String("/closetab.png")); hboxLayout->addWidget(toolClose); editFind = new QLineEdit(this); - editFind->setMinimumSize(QSize(150, 0)); - connect(editFind, SIGNAL(textChanged(const QString&)), - this, SLOT(updateButtons())); hboxLayout->addWidget(editFind); + editFind->setMinimumSize(QSize(150, 0)); + connect(editFind, SIGNAL(textChanged(QString)), this, SLOT(updateButtons())); - toolPrevious = new QToolButton(this); - toolPrevious->setAutoRaise(true); - toolPrevious->setText(tr("Previous")); - toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - toolPrevious->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/previous.png").arg(system))); + toolPrevious = setupToolButton(tr("Previous"), + resourcePath + QLatin1String("/previous.png")); hboxLayout->addWidget(toolPrevious); - toolNext = new QToolButton(this); - toolNext->setAutoRaise(true); - toolNext->setText(tr("Next")); - toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - toolNext->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/next.png").arg(system))); + toolNext = setupToolButton(tr("Next"), + resourcePath + QLatin1String("/next.png")); hboxLayout->addWidget(toolNext); checkCase = new QCheckBox(tr("Case Sensitive"), this); @@ -131,15 +126,17 @@ FindWidget::FindWidget(QWidget *parent) #endif labelWrapped = new QLabel(this); + labelWrapped->setScaledContents(true); + labelWrapped->setTextFormat(Qt::RichText); labelWrapped->setMinimumSize(QSize(0, 20)); labelWrapped->setMaximumSize(QSize(105, 20)); - labelWrapped->setTextFormat(Qt::RichText); - labelWrapped->setScaledContents(true); - labelWrapped->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); - labelWrapped->setText(tr(" Search wrapped")); + labelWrapped->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter); + labelWrapped->setText(tr(" Search wrapped")); hboxLayout->addWidget(labelWrapped); - QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, + QSizePolicy::Minimum); hboxLayout->addItem(spacerItem); setMinimumWidth(minimumSizeHint().width()); labelWrapped->hide(); @@ -162,38 +159,54 @@ void FindWidget::updateButtons() } } +QToolButton* FindWidget::setupToolButton(const QString &text, const QString &icon) +{ + QToolButton* toolButton = new QToolButton(this); + + toolButton->setText(text); + toolButton->setAutoRaise(true); + toolButton->setIcon(QIcon(icon)); + toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + + return toolButton; +} + + +// -- + CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent) : QWidget(parent) + , lastTabPage(0) + , collectionFile(engine->collectionFile()) , findBar(0) , tabWidget(0) + , findWidget(0) , helpEngine(engine) , printer(0) + , usesDefaultCollection(parent->usesDefaultCollection()) , m_searchWidget(0) { - staticCentralWidget = this; - - lastTabPage = 0; globalActionList.clear(); - collectionFile = helpEngine->collectionFile(); - usesDefaultCollection = parent->usesDefaultCollection(); - - QString system = QLatin1String("win"); + staticCentralWidget = this; QVBoxLayout *vboxLayout = new QVBoxLayout(this); + QString resourcePath = QLatin1String(":/trolltech/assistant/images/"); -#ifdef Q_OS_MAC - system = QLatin1String("mac"); -#else +#ifndef Q_OS_MAC vboxLayout->setMargin(0); + resourcePath.append(QLatin1String("win")); +#else + resourcePath.append(QLatin1String("mac")); #endif tabWidget = new QTabWidget(this); - connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentPageChanged(int))); + connect(tabWidget, SIGNAL(currentChanged(int)), this, + SLOT(currentPageChanged(int))); QToolButton *newTabButton = new QToolButton(this); newTabButton->setAutoRaise(true); newTabButton->setToolTip(tr("Add new page")); - newTabButton->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/addtab.png").arg(system))); + newTabButton->setIcon(QIcon(resourcePath + QLatin1String("/addtab.png"))); tabWidget->setCornerWidget(newTabButton, Qt::TopLeftCorner); connect(newTabButton, SIGNAL(clicked()), this, SLOT(newTab())); @@ -202,7 +215,7 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent) closeTabButton->setEnabled(false); closeTabButton->setAutoRaise(true); closeTabButton->setToolTip(tr("Close current page")); - closeTabButton->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/closetab.png").arg(system))); + closeTabButton->setIcon(QIcon(resourcePath + QLatin1String("/closetab.png"))); tabWidget->setCornerWidget(closeTabButton, Qt::TopRightCorner); connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeTab())); @@ -216,19 +229,20 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent) vboxLayout->addWidget(findBar); findBar->hide(); findWidget->editFind->installEventFilter(this); - connect(findWidget->toolClose, SIGNAL(clicked()), findBar, SLOT(hide())); + connect(findWidget->toolClose, SIGNAL(clicked()), findBar, SLOT(hide())); connect(findWidget->toolNext, SIGNAL(clicked()), this, SLOT(findNext())); connect(findWidget->editFind, SIGNAL(returnPressed()), this, SLOT(findNext())); - connect(findWidget->editFind, SIGNAL(textChanged(const QString&)), this, SLOT(findCurrentText(const QString&))); + connect(findWidget->editFind, SIGNAL(textChanged(QString)), this, + SLOT(findCurrentText(QString))); connect(findWidget->toolPrevious, SIGNAL(clicked()), this, SLOT(findPrevious())); QTabBar *tabBar = qFindChild(tabWidget); if (tabBar) { tabBar->installEventFilter(this); tabBar->setContextMenuPolicy(Qt::CustomContextMenu); - connect(tabBar, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(showTabBarContextMenu(const QPoint&))); + connect(tabBar, SIGNAL(customContextMenuRequested(QPoint)), this, + SLOT(showTabBarContextMenu(QPoint))); } QPalette p = qApp->palette(); @@ -247,17 +261,12 @@ CentralWidget::~CentralWidget() QString zoomCount; QString currentPages; - QLatin1Char sep('|'); + QLatin1Char separator('|'); for (int i = 1; i < tabWidget->count(); ++i) { HelpViewer *viewer = qobject_cast(tabWidget->widget(i)); if (viewer && viewer->source().isValid()) { - currentPages.append(viewer->source().toString()).append(sep); -#if !defined(QT_NO_WEBKIT) - zoomCount.append(QString::number(viewer->textSizeMultiplier())). - append(sep); -#else - zoomCount.append(QString::number(viewer->zoom())).append(sep); -#endif + currentPages += viewer->source().toString() + separator; + zoomCount += QString::number(viewer->zoom()) + separator; } } engine.setCustomValue(QLatin1String("LastTabPage"), lastTabPage); @@ -363,8 +372,9 @@ void CentralWidget::setSource(const QUrl &url) lastTabPage = tabWidget->addTab(viewer, QString()); tabWidget->setCurrentIndex(lastTabPage); connectSignals(); - } else + } else { viewer = lastViewer; + } viewer->setSource(url); currentPageChanged(lastTabPage); @@ -375,37 +385,35 @@ void CentralWidget::setSource(const QUrl &url) void CentralWidget::setLastShownPages() { + const QLatin1String key("LastShownPages"); + QString value = helpEngine->customValue(key, QString()).toString(); + const QStringList lastShownPageList = value.split(QLatin1Char('|'), + QString::SkipEmptyParts); + + const int pageCount = lastShownPageList.count(); + if (pageCount == 0 && usesDefaultCollection) + return setSource(QUrl(QLatin1String("help"))); + #if !defined(QT_NO_WEBKIT) - QLatin1String zoom("LastPagesZoomWebView"); + const QLatin1String zoom("LastPagesZoomWebView"); #else - QLatin1String zoom("LastPagesZoomTextBrowser"); + const QLatin1String zoom("LastPagesZoomTextBrowser"); #endif - const QStringList lastShownPageList = - helpEngine->customValue(QLatin1String("LastShownPages")).toString(). - split(QLatin1Char('|'), QString::SkipEmptyParts); - - if (!lastShownPageList.isEmpty()) { - QVectorzoomList = helpEngine->customValue(zoom).toString(). - split(QLatin1Char('|'), QString::SkipEmptyParts).toVector(); - if (zoomList.isEmpty()) - zoomList.fill(QLatin1String("0.0"), lastShownPageList.size()); - else if(zoomList.count() < lastShownPageList.count()) { - zoomList.insert(zoomList.count(), - lastShownPageList.count() - zoomList.count(), QLatin1String("0.0")); - } + value = helpEngine->customValue(zoom, QString()).toString(); + QVector zoomVector = value.split(QLatin1Char('|'), + QString::SkipEmptyParts).toVector(); - QVector::const_iterator zIt = zoomList.constBegin(); - QStringList::const_iterator it = lastShownPageList.constBegin(); - for (; it != lastShownPageList.constEnd(); ++it, ++zIt) - setSourceInNewTab((*it), (*zIt).toFloat()); + const int zoomCount = zoomVector.count(); + zoomVector.insert(zoomCount, pageCount - zoomCount, QLatin1String("0.0")); - tabWidget->setCurrentIndex(helpEngine->customValue( - QLatin1String("LastTabPage"), 1).toInt()); - } else { - if (usesDefaultCollection) - setSource(QUrl(QLatin1String("help"))); - } + QVector::const_iterator zIt = zoomVector.constBegin(); + QStringList::const_iterator it = lastShownPageList.constBegin(); + for (; it != lastShownPageList.constEnd(); ++it, ++zIt) + setSourceInNewTab((*it), (*zIt).toFloat()); + + const QLatin1String lastTab("LastTabPage"); + tabWidget->setCurrentIndex(helpEngine->customValue(lastTab, 1).toInt()); } bool CentralWidget::hasSelection() const @@ -483,7 +491,8 @@ void CentralWidget::printPreview() #ifndef QT_NO_PRINTER initPrinter(); QPrintPreviewDialog preview(printer, this); - connect(&preview, SIGNAL(paintRequested(QPrinter *)), SLOT(printPreview(QPrinter *))); + connect(&preview, SIGNAL(paintRequested(QPrinter*)), + SLOT(printPreview(QPrinter*))); preview.exec(); #endif } @@ -634,13 +643,18 @@ void CentralWidget::connectSignals() { const HelpViewer* viewer = currentHelpViewer(); if (viewer) { - connect(viewer, SIGNAL(copyAvailable(bool)), this, SIGNAL(copyAvailable(bool))); - connect(viewer, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool))); - connect(viewer, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool))); - connect(viewer, SIGNAL(sourceChanged(const QUrl&)), this, SIGNAL(sourceChanged(const QUrl&))); - connect(viewer, SIGNAL(highlighted(const QString&)), this, SIGNAL(highlighted(const QString&))); - - connect(viewer, SIGNAL(sourceChanged(const QUrl&)), this, SLOT(setTabTitle(const QUrl&))); + connect(viewer, SIGNAL(copyAvailable(bool)), this, + SIGNAL(copyAvailable(bool))); + connect(viewer, SIGNAL(forwardAvailable(bool)), this, + SIGNAL(forwardAvailable(bool))); + connect(viewer, SIGNAL(backwardAvailable(bool)), this, + SIGNAL(backwardAvailable(bool))); + connect(viewer, SIGNAL(sourceChanged(QUrl)), this, + SIGNAL(sourceChanged(QUrl))); + connect(viewer, SIGNAL(highlighted(QString)), this, + SIGNAL(highlighted(QString))); + connect(viewer, SIGNAL(sourceChanged(QUrl)), this, + SLOT(setTabTitle(QUrl))); } } @@ -700,8 +714,11 @@ void CentralWidget::currentPageChanged(int index) enabled = tabWidget->count() > 1; } - tabWidget->cornerWidget(Qt::TopRightCorner)->setEnabled(enabled); - tabWidget->cornerWidget(Qt::TopLeftCorner)->setEnabled(m_searchWidget ? enabled : true); + QWidget *widget = tabWidget->cornerWidget(Qt::TopLeftCorner); + widget->setEnabled(m_searchWidget ? enabled : true); + + widget = tabWidget->cornerWidget(Qt::TopRightCorner); + widget->setEnabled(enabled); emit currentViewerChanged(); } @@ -876,8 +893,10 @@ void CentralWidget::find(QString ttf, bool forward, bool backward) QTextDocument::FindFlags options; - if (cursor.hasSelection()) - cursor.setPosition(forward ? cursor.position() : cursor.anchor(), QTextCursor::MoveAnchor); + if (cursor.hasSelection()) { + cursor.setPosition(forward ? cursor.position() : cursor.anchor(), + QTextCursor::MoveAnchor); + } QTextCursor newCursor = cursor; @@ -971,10 +990,10 @@ void CentralWidget::createSearchWidget(QHelpSearchEngine *searchEngine) { if (!m_searchWidget) { m_searchWidget = new SearchWidget(searchEngine, this); - connect(m_searchWidget, SIGNAL(requestShowLink(const QUrl&)), this, - SLOT(setSourceFromSearch(const QUrl&))); - connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(const QUrl&)), this, - SLOT(setSourceFromSearchInNewTab(const QUrl&))); + connect(m_searchWidget, SIGNAL(requestShowLink(QUrl)), this, + SLOT(setSourceFromSearch(QUrl))); + connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(QUrl)), this, + SLOT(setSourceFromSearchInNewTab(QUrl))); } tabWidget->insertTab(0, m_searchWidget, tr("Search")); } diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h index 75bd8be..a34ba65 100644 --- a/tools/assistant/tools/assistant/centralwidget.h +++ b/tools/assistant/tools/assistant/centralwidget.h @@ -83,6 +83,9 @@ private slots: void updateButtons(); private: + QToolButton* setupToolButton(const QString &text, const QString &icon); + +private: QLineEdit *editFind; QCheckBox *checkCase; QLabel *labelWrapped; diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h index c66b69c..37545c7 100644 --- a/tools/assistant/tools/assistant/helpviewer.h +++ b/tools/assistant/tools/assistant/helpviewer.h @@ -94,6 +94,8 @@ public: { return pageAction(QWebPage::Back)->isEnabled(); } inline bool hasLoadFinished() const { return loadFinished; } + inline qreal zoom() const + { return textSizeMultiplier(); } public Q_SLOTS: void home(); -- cgit v0.12 From deffb8578757550e57ea3058e95a758155632226 Mon Sep 17 00:00:00 2001 From: kh Date: Fri, 24 Apr 2009 16:54:33 +0200 Subject: fixes empty tab titles after restart --- tools/assistant/tools/assistant/centralwidget.cpp | 23 +++++++++-------------- tools/assistant/tools/assistant/helpviewer.cpp | 1 + 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index aa8887c..0a94a3d 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -678,26 +678,21 @@ void CentralWidget::activateTab(bool onlyHelpViewer) void CentralWidget::setTabTitle(const QUrl& url) { - int tab = lastTabPage; - HelpViewer* viewer = currentHelpViewer(); - + Q_UNUSED(url) #if !defined(QT_NO_WEBKIT) - if (!viewer || viewer->source() != url) { - QTabBar *tabBar = qFindChild(tabWidget); - for (tab = 0; tab < tabBar->count(); ++tab) { - viewer = qobject_cast(tabWidget->widget(tab)); - if (viewer && viewer->source() == url) - break; - } + QTabBar *tabBar = qFindChild(tabWidget); + for (int tab = 0; tab < tabBar->count(); ++tab) { + HelpViewer* viewer = qobject_cast(tabWidget->widget(tab)); + if (viewer) + tabWidget->setTabText(tab, viewer->documentTitle().trimmed()); } #else - Q_UNUSED(url) -#endif - + HelpViewer* viewer = currentHelpViewer(); if (viewer) { - tabWidget->setTabText(tab, + tabWidget->setTabText(lastTabPage, quoteTabTitle(viewer->documentTitle().trimmed())); } +#endif } void CentralWidget::currentPageChanged(int index) diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index 5ce6e14..5726136 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -393,6 +393,7 @@ void HelpViewer::mousePressEvent(QMouseEvent *event) void HelpViewer::setLoadFinished(bool ok) { loadFinished = ok; + emit sourceChanged(url()); } #else // !defined(QT_NO_WEBKIT) -- cgit v0.12 From ed21b9dafea192ddd39f1d2a4abcb54962d6dfb8 Mon Sep 17 00:00:00 2001 From: Bjoern Erik Nilsen Date: Fri, 24 Apr 2009 17:34:28 +0200 Subject: Sometimes wrong clipping in QWidget::render() when passing a device or an untransformed painter When passing a painter to QWidget::render, we use the painter->paintEngine()->systemClip() as the "system viewport", i.e. all painting triggered by render() should be limited to this area. The only way to achieve this is by always ensuring the system clip is clipped to the same area (systemClip &= systemViewport). The problem however, was that we only did this for transformed painters. We must of course always do it when there's a systemViewport set, regardless of whether the painter is transformed or not. Auto test included. Task-number: 248852 Reviewed-by: Trond --- src/gui/kernel/qwidget.cpp | 11 +++-- src/gui/painting/qpaintengine.cpp | 4 +- src/gui/painting/qpaintengine_p.h | 12 +++-- tests/auto/qwidget/tst_qwidget.cpp | 98 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 071e1bd..e9fd28b 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -4709,10 +4709,13 @@ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset, if (redirected) { target = redirected; offset -= redirectionOffset; - if (!inRenderWithPainter) { // Clip handled by shared painter (in qpainter.cpp). - const QRegion redirectedSystemClip = redirected->paintEngine()->systemClip(); - if (!redirectedSystemClip.isEmpty()) - paintRegion &= redirectedSystemClip.translated(-offset); + } + + if (!inRenderWithPainter) { // Clip handled by shared painter (in qpainter.cpp). + if (QPaintEngine *targetEngine = target->paintEngine()) { + const QRegion targetSystemClip = targetEngine->systemClip(); + if (!targetSystemClip.isEmpty()) + paintRegion &= targetSystemClip.translated(-offset); } } diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index ad09060..7de1ec4 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -949,8 +949,8 @@ void QPaintEngine::setSystemClip(const QRegion ®ion) Q_D(QPaintEngine); d->systemClip = region; // Be backward compatible and only call d->systemStateChanged() - // if we currently have a system transform set. - if (d->hasSystemTransform) { + // if we currently have a system transform/viewport set. + if (d->hasSystemTransform || d->hasSystemViewport) { d->transformSystemClip(); d->systemStateChanged(); } diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h index eeba7ec..0b5e175 100644 --- a/src/gui/painting/qpaintengine_p.h +++ b/src/gui/painting/qpaintengine_p.h @@ -83,10 +83,12 @@ public: if (systemClip.isEmpty()) return; - if (systemTransform.type() <= QTransform::TxTranslate) - systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy())); - else - systemClip = systemTransform.map(systemClip); + if (hasSystemTransform) { + if (systemTransform.type() <= QTransform::TxTranslate) + systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy())); + else + systemClip = systemTransform.map(systemClip); + } // Make sure we're inside the viewport. if (hasSystemViewport) { @@ -101,7 +103,7 @@ public: inline void setSystemTransform(const QTransform &xform) { systemTransform = xform; - if ((hasSystemTransform = !xform.isIdentity())) + if ((hasSystemTransform = !xform.isIdentity()) || hasSystemViewport) transformSystemClip(); systemStateChanged(); } diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index a052034..767553a 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -283,6 +283,8 @@ private slots: void render_task217815(); void render_windowOpacity(); void render_systemClip(); + void render_systemClip2_data(); + void render_systemClip2(); void setContentsMargins(); @@ -6897,6 +6899,102 @@ void tst_QWidget::render_systemClip() #endif } +void tst_QWidget::render_systemClip2_data() +{ + QTest::addColumn("autoFillBackground"); + QTest::addColumn("usePaintEvent"); + QTest::addColumn("expectedColor"); + + QTest::newRow("Only auto-fill background") << true << false << QColor(Qt::blue); + QTest::newRow("Only draw in paintEvent") << false << true << QColor(Qt::green); + QTest::newRow("Auto-fill background and draw in paintEvent") << true << true << QColor(Qt::green); +} + +void tst_QWidget::render_systemClip2() +{ + QFETCH(bool, autoFillBackground); + QFETCH(bool, usePaintEvent); + QFETCH(QColor, expectedColor); + + Q_ASSERT_X(expectedColor != QColor(Qt::red), Q_FUNC_INFO, + "Qt::red is the reference color for the image, pick another color"); + + class MyWidget : public QWidget + { + public: + bool usePaintEvent; + void paintEvent(QPaintEvent *) + { + if (usePaintEvent) + QPainter(this).fillRect(rect(), Qt::green); + } + }; + + MyWidget widget; + widget.usePaintEvent = usePaintEvent; + widget.setPalette(Qt::blue); + // NB! widget.setAutoFillBackground(autoFillBackground) won't do the + // trick here since the widget is a top-level. The background is filled + // regardless, unless Qt::WA_OpaquePaintEvent or Qt::WA_NoSystemBackground + // is set. We therefore use the opaque attribute to turn off auto-fill. + if (!autoFillBackground) + widget.setAttribute(Qt::WA_OpaquePaintEvent); + widget.resize(100, 100); + + QImage image(widget.size(), QImage::Format_RGB32); + image.fill(QColor(Qt::red).rgb()); + + QPaintEngine *paintEngine = image.paintEngine(); + QVERIFY(paintEngine); + + QRegion systemClip(QRegion(50, 0, 50, 10)); + systemClip += QRegion(90, 10, 10, 40); + paintEngine->setSystemClip(systemClip); + + // Render entire widget directly onto device. + widget.render(&image); + +#ifndef RENDER_DEBUG + image.save("systemclip_with_device.png"); +#endif + // All pixels within the system clip should now be + // the expectedColor, and the rest should be red. + for (int i = 0; i < image.height(); ++i) { + for (int j = 0; j < image.width(); ++j) { + if (systemClip.contains(QPoint(j, i))) + QCOMPARE(image.pixel(j, i), expectedColor.rgb()); + else + QCOMPARE(image.pixel(j, i), QColor(Qt::red).rgb()); + } + } + + // Refill image with red. + image.fill(QColor(Qt::red).rgb()); + + // Do the same with an untransformed painter. + QPainter painter(&image); + //Make sure we're using the same paint engine and has the right clip set. + paintEngine->setSystemClip(systemClip); + QCOMPARE(painter.paintEngine(), paintEngine); + QCOMPARE(paintEngine->systemClip(), systemClip); + + widget.render(&painter); + +#ifndef RENDER_DEBUG + image.save("systemclip_with_untransformed_painter.png"); +#endif + // All pixels within the system clip should now be + // the expectedColor, and the rest should be red. + for (int i = 0; i < image.height(); ++i) { + for (int j = 0; j < image.width(); ++j) { + if (systemClip.contains(QPoint(j, i))) + QCOMPARE(image.pixel(j, i), expectedColor.rgb()); + else + QCOMPARE(image.pixel(j, i), QColor(Qt::red).rgb()); + } + } +} + void tst_QWidget::setContentsMargins() { QLabel label("why does it always rain on me?"); -- cgit v0.12 From be70a2de000e1bbbd5405247b475531695164a62 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 24 Apr 2009 18:09:57 +0200 Subject: Made urls more consistent and maintainable. http://qtsoftware.com/support-services/support/platform-support-policy still points to a dead link, though. --- dist/README | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/README b/dist/README index 38b3a1c..c9e7677 100644 --- a/dist/README +++ b/dist/README @@ -2,11 +2,11 @@ This is Qt version %VERSION%. Qt is a comprehensive cross-platform C++ application framework. Qt 4 introduces new features and many improvements over the 3.x series. See -http://doc.trolltech.com/latest/qt4-intro.html for details. +http://doc.qtsoftware.com/latest/qt4-intro.html for details. The Qt 4.x series is not binary compatible or source compatible with the 3.x series. For more information on porting from Qt 3 to Qt 4, see -http://doc.trolltech.com/latest/porting4.html. +http://doc.qtsoftware.com/latest/porting4.html . INSTALLING Qt @@ -37,7 +37,7 @@ The Qt reference documentation is available locally in Qt's doc/html directory. You can use Qt Assistant to view it; to launch Assistant, type 'assistant' on the command line or use the Start menu. On Mac OS X, you can find it in /Developer/Applications/Qt. The latest -documentation is available at http://doc.trolltech.com/. +documentation is available at http://doc.qtsoftware.com/ . SUPPORTED PLATFORMS @@ -90,10 +90,10 @@ For this release, the following platforms have been tested: wincewm60standard-msvc2008 For a complete list of supported platforms, see -http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/ +http://doc.qtsoftware.com/latest/supported-platforms.html For a description of Qt's platform support policy, see -http://www.qtsoftware.com/support-services/support/platform-support-policy +http://qtsoftware.com/support-services/support/platform-support-policy COMMERCIAL EDITIONS @@ -106,7 +106,7 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and Qt3Support modules. For a full listing of the contents of each module, please refer to -http://doc.trolltech.com/4.4/modules.html. +http://doc.qtsoftware.com/latest/modules.html HOW TO REPORT A BUG -- cgit v0.12 From 8b5a400581b9c037d12a9f49e075b187edcb0b00 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 24 Apr 2009 19:54:44 +0200 Subject: fixed minor issue with the piechart demo The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis --- examples/itemviews/chart/pieview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp index 6b62f25..48f4073 100644 --- a/examples/itemviews/chart/pieview.cpp +++ b/examples/itemviews/chart/pieview.cpp @@ -254,7 +254,7 @@ void PieView::mousePressEvent(QMouseEvent *event) QAbstractItemView::mousePressEvent(event); origin = event->pos(); if (!rubberBand) - rubberBand = new QRubberBand(QRubberBand::Rectangle, this); + rubberBand = new QRubberBand(QRubberBand::Rectangle, viewport()); rubberBand->setGeometry(QRect(origin, QSize())); rubberBand->show(); } -- cgit v0.12 From dae9a234412d09c1af67a34262637bdc6e8c0845 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 24 Apr 2009 19:54:44 +0200 Subject: fixed minor issue with the piechart demo The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis --- examples/itemviews/chart/pieview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp index 6b62f25..48f4073 100644 --- a/examples/itemviews/chart/pieview.cpp +++ b/examples/itemviews/chart/pieview.cpp @@ -254,7 +254,7 @@ void PieView::mousePressEvent(QMouseEvent *event) QAbstractItemView::mousePressEvent(event); origin = event->pos(); if (!rubberBand) - rubberBand = new QRubberBand(QRubberBand::Rectangle, this); + rubberBand = new QRubberBand(QRubberBand::Rectangle, viewport()); rubberBand->setGeometry(QRect(origin, QSize())); rubberBand->show(); } -- cgit v0.12 From 2f074e4241113ac7e75bd7647286077bd7e49f94 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 27 Apr 2009 16:00:59 +1000 Subject: Increment Qt version number in qdoc namespaces. As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me --- doc/src/known-issues.qdoc | 9 ++++----- tools/qdoc3/test/assistant.qdocconf | 2 +- tools/qdoc3/test/designer.qdocconf | 2 +- tools/qdoc3/test/linguist.qdocconf | 2 +- tools/qdoc3/test/qmake.qdocconf | 2 +- tools/qdoc3/test/qt-build-docs.qdocconf | 2 +- tools/qdoc3/test/qt.qdocconf | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/src/known-issues.qdoc b/doc/src/known-issues.qdoc index 60fd63d..91e122f 100644 --- a/doc/src/known-issues.qdoc +++ b/doc/src/known-issues.qdoc @@ -60,11 +60,10 @@ \section2 Intel Compiler Support - Although it is possible to build applications against Qt 4.5.0 using Intel - CC 10, these applications will crash when run. A fix for this issue is - scheduled for Qt 4.5.1. We recommend that developers who rely on this - compiler wait until the fix is applied before upgrading to the Qt 4.5.x - series of releases. + Although it is possible to build applications against Qt 4.5.x using Intel + CC 10, these applications will crash when run. We recommend that developers + who rely on this compiler wait until a fix is available before upgrading to + the Qt 4.5.x series of releases. \section2 X11 Hardware Support diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 67f1ecb..a3213c6 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.451 +qhp.Assistant.namespace = com.trolltech.assistant.452 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 3e916a2..63226f6 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.451 +qhp.Designer.namespace = com.trolltech.designer.452 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index adb8c20..8e33e4b 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.451 +qhp.Linguist.namespace = com.trolltech.linguist.452 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index aa7e1ad..4e735b0 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.451 +qhp.qmake.namespace = com.trolltech.qmake.452 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index a1baf2f..f7cd498 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -20,7 +20,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.451 +qhp.Qt.namespace = com.trolltech.qt.452 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 8859511..57eaf7a 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.451 +qhp.Qt.namespace = com.trolltech.qt.452 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -- cgit v0.12 From 4e356720440d6a99a9516d10e2705cd99f08fbdd Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 27 Apr 2009 16:37:53 +1000 Subject: Create the placeholder changes file for Qt 4.5.2. Reviewed-by: Trust Me --- dist/changes-4.5.2 | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 dist/changes-4.5.2 diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2 new file mode 100644 index 0000000..a772bf7 --- /dev/null +++ b/dist/changes-4.5.2 @@ -0,0 +1,123 @@ +Qt 4.5.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 4.5.0. For more details, +refer to the online documentation included in this distribution. The +documentation is also available online: + + http://doc.trolltech.com/4.5 + +The Qt version 4.5 series is binary compatible with the 4.4.x series. +Applications compiled for 4.4 will continue to run with 4.5. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Task Tracker: + + http://www.qtsoftware.com/developer/task-tracker + +Each of these identifiers can be entered in the task tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +- Documentation and Examples + +Third party components +---------------------- + + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Database Drivers * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Qt for Linux/X11 +---------------- + + +Qt for Windows +-------------- + + +Qt for Mac OS X +--------------- + + +Qt for Embedded Linux +--------------------- + + +Qt for Windows CE +----------------- + + +**************************************************************************** +* Compiler Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Tools * +**************************************************************************** + +- Build System + +- Assistant + + +- Designer + + +- Linguist + - Linguist GUI + + - lupdate + + - lrelease + + +- rcc + + +- moc + + +- uic + + +- uic3 + + +- qmake + + +- configure + + +- qtconfig + + +- qt3to4 + + +**************************************************************************** +* Plugins * +**************************************************************************** + + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + -- cgit v0.12 From 63a4d6652aa8d84282083e49217120c97bb0bfc8 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 27 Apr 2009 11:36:12 +0200 Subject: Document what QWidget::winId() returns on Mac OS X. There are different types depending on Carbon and Cocoa, and it is probably helpful to point that out. Task-number: 251001 Reviewed-by: Kavindra --- src/gui/kernel/qwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index e9fd28b..eb2e9f7 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2132,6 +2132,10 @@ QWidget *QWidget::find(WId id) If a widget is non-native (alien) and winId() is invoked on it, that widget will be provided a native handle. + On Mac OS X, the type returned depends on which framework Qt was linked + against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt + is using Cocoa, {WId} is a pointer to an NSView. + \note We recommend that you do not store this value as it is likely to change at run-time. -- cgit v0.12 From 728a7c2e1fc20c482b737a7070bd71afdf8e7d64 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 27 Apr 2009 14:17:39 +0200 Subject: Fixed to float support in QVariant also added autotests --- src/corelib/kernel/qvariant.cpp | 58 ++++++++++++++++++++---------------- tests/auto/qvariant/tst_qvariant.cpp | 50 +++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 25 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index ea66658..ff59540 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -325,6 +325,7 @@ static bool isNull(const QVariant::Private *d) case QVariant::ULongLong: case QVariant::Bool: case QVariant::Double: + case QMetaType::Float: break; } return d->is_null; @@ -416,6 +417,8 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) return a->data.b == b->data.b; case QVariant::Double: return a->data.d == b->data.d; + case QMetaType::Float: + return a->data.f == b->data.f; case QVariant::Date: return *v_cast(a) == *v_cast(b); case QVariant::Time: @@ -2554,57 +2557,62 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] = */ bool QVariant::canConvert(Type t) const { - if (d.type == uint(t)) + //we can treat floats as double + //the reason for not doing it the "proper" way is that QMetaTye Float's value is 135, + //which can't be handled by qCanConvertMatrix + const uint currentType = ((d.type == QMetaType::Float) ? QVariant::Double : d.type); + if (t == QMetaType::Float) t = QVariant::Double; + + if (currentType == uint(t)) return true; - if (d.type > QVariant::LastCoreType || t > QVariant::LastCoreType) { + if (currentType > QVariant::LastCoreType || t > QVariant::LastCoreType) { switch (uint(t)) { case QVariant::Int: - return d.type == QVariant::KeySequence - || d.type == QMetaType::ULong - || d.type == QMetaType::Long - || d.type == QMetaType::UShort - || d.type == QMetaType::UChar - || d.type == QMetaType::Char - || d.type == QMetaType::Short; + return currentType == QVariant::KeySequence + || currentType == QMetaType::ULong + || currentType == QMetaType::Long + || currentType == QMetaType::UShort + || currentType == QMetaType::UChar + || currentType == QMetaType::Char + || currentType == QMetaType::Short; case QVariant::Image: - return d.type == QVariant::Pixmap || d.type == QVariant::Bitmap; + return currentType == QVariant::Pixmap || currentType == QVariant::Bitmap; case QVariant::Pixmap: - return d.type == QVariant::Image || d.type == QVariant::Bitmap - || d.type == QVariant::Brush; + return currentType == QVariant::Image || currentType == QVariant::Bitmap + || currentType == QVariant::Brush; case QVariant::Bitmap: - return d.type == QVariant::Pixmap || d.type == QVariant::Image; + return currentType == QVariant::Pixmap || currentType == QVariant::Image; case QVariant::ByteArray: - return d.type == QVariant::Color; + return currentType == QVariant::Color; case QVariant::String: - return d.type == QVariant::KeySequence || d.type == QVariant::Font - || d.type == QVariant::Color; + return currentType == QVariant::KeySequence || currentType == QVariant::Font + || currentType == QVariant::Color; case QVariant::KeySequence: - return d.type == QVariant::String || d.type == QVariant::Int; + return currentType == QVariant::String || currentType == QVariant::Int; case QVariant::Font: - return d.type == QVariant::String; + return currentType == QVariant::String; case QVariant::Color: - return d.type == QVariant::String || d.type == QVariant::ByteArray - || d.type == QVariant::Brush; + return currentType == QVariant::String || currentType == QVariant::ByteArray + || currentType == QVariant::Brush; case QVariant::Brush: - return d.type == QVariant::Color || d.type == QVariant::Pixmap; + return currentType == QVariant::Color || currentType == QVariant::Pixmap; case QMetaType::Long: case QMetaType::Char: case QMetaType::UChar: case QMetaType::ULong: case QMetaType::Short: case QMetaType::UShort: - case QMetaType::Float: - return qCanConvertMatrix[QVariant::Int] & (1 << d.type) || d.type == QVariant::Int; + return qCanConvertMatrix[QVariant::Int] & (1 << currentType) || currentType == QVariant::Int; default: return false; } } - if(t == String && d.type == StringList) + if(t == String && currentType == StringList) return v_cast(&d)->count() == 1; else - return qCanConvertMatrix[t] & (1 << d.type); + return qCanConvertMatrix[t] & (1 << currentType); } /*! diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index d15f9c8..0ede920 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -440,6 +440,9 @@ void tst_QVariant::canConvert_data() var = QVariant((double)0.1); QTest::newRow("Double") << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + var = QVariant(0.1f); + QTest::newRow("Float") + << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = qVariantFromValue(QFont()); QTest::newRow("Font") << var << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; @@ -573,6 +576,7 @@ void tst_QVariant::canConvert() QCOMPARE(val.canConvert(QVariant::Date), DateCast); QCOMPARE(val.canConvert(QVariant::DateTime), DateTimeCast); QCOMPARE(val.canConvert(QVariant::Double), DoubleCast); + QCOMPARE(val.canConvert(QVariant::Type(QMetaType::Float)), DoubleCast); QCOMPARE(val.canConvert(QVariant::Font), FontCast); #ifdef QT3_SUPPORT QCOMPARE(val.canConvert(QVariant::IconSet), IconSetCast); @@ -615,6 +619,7 @@ void tst_QVariant::toInt_data() QTest::newRow( "invalid" ) << QVariant() << 0 << false; QTest::newRow( "int" ) << QVariant( 123 ) << 123 << true; QTest::newRow( "double" ) << QVariant( 3.1415927 ) << 3 << true; + QTest::newRow( "float" ) << QVariant( 3.1415927f ) << 3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << 123 << true; #ifdef QT3_SUPPORT QTest::newRow( "bool" ) << QVariant( true, 42 ) << 1 << true; @@ -627,6 +632,7 @@ void tst_QVariant::toInt_data() QTest::newRow( "ulonglong1" ) << QVariant( uintMax1 ) << 0 << true; QTest::newRow( "signedint" ) << QVariant( -123 ) << -123 << true; QTest::newRow( "signeddouble" ) << QVariant( -3.1415927 ) << -3 << true; + QTest::newRow( "signedfloat" ) << QVariant( -3.1415927f ) << -3 << true; QTest::newRow( "signedint-string" ) << QVariant( QString("-123") ) << -123 << true; QTest::newRow( "signedlonglong0" ) << QVariant( (qlonglong)-34 ) << -34 << true; QTest::newRow( "QChar" ) << QVariant(QChar('a')) << int('a') << true; @@ -666,6 +672,7 @@ void tst_QVariant::toUInt_data() QTest::newRow( "int" ) << QVariant( 123 ) << (uint)123 << true; QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (uint)3 << true; + QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (uint)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (uint)123 << true; #ifdef QT3_SUPPORT QTest::newRow( "bool" ) << QVariant( true, 42 ) << (uint)1 << true; @@ -679,6 +686,7 @@ void tst_QVariant::toUInt_data() QTest::newRow( "ulonglong1" ) << QVariant( uintMax1 ) << (uint)0 << true; QTest::newRow( "negativeint" ) << QVariant( -123 ) << (uint)-123 << true; QTest::newRow( "negativedouble" ) << QVariant( -3.1415927 ) << (uint)-3 << true; + QTest::newRow( "negativefloat" ) << QVariant( -3.1415927f ) << (uint)-3 << true; QTest::newRow( "negativeint-string" ) << QVariant( QString("-123") ) << (uint)0 << false; QTest::newRow( "negativelonglong0" ) << QVariant( (qlonglong)-34 ) << (uint)-34 << true; QTest::newRow( "QChar" ) << QVariant(QChar('a')) << uint('a') << true; @@ -860,7 +868,9 @@ void tst_QVariant::toBool_data() QTest::newRow( "uint0" ) << QVariant( 0u ) << false; QTest::newRow( "uint1" ) << QVariant( 123u ) << true; QTest::newRow( "double0" ) << QVariant( 0.0 ) << false; + QTest::newRow( "float0" ) << QVariant( 0.0f ) << false; QTest::newRow( "double1" ) << QVariant( 3.1415927 ) << true; + QTest::newRow( "float1" ) << QVariant( 3.1415927f ) << true; #ifdef QT3_SUPPORT QTest::newRow( "bool0" ) << QVariant( false, 42 ) << false; QTest::newRow( "bool1" ) << QVariant( true, 42 ) << true; @@ -1090,6 +1100,7 @@ void tst_QVariant::toLongLong_data() QTest::newRow( "int0" ) << QVariant( 123 ) << (qlonglong)123 << true; QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qlonglong)3 << true; + QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qlonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qlonglong)123 << true; #ifdef QT3_SUPPORT QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qlonglong)1 << true; @@ -1130,6 +1141,7 @@ void tst_QVariant::toULongLong_data() QTest::newRow( "int0" ) << QVariant( 123 ) << (qulonglong)123 << true; QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qulonglong)3 << true; + QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qulonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qulonglong)123 << true; #ifdef QT3_SUPPORT QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qulonglong)1 << true; @@ -1218,6 +1230,7 @@ void tst_QVariant::toByteArray_data() QTest::newRow( "int" ) << QVariant( -123 ) << QByteArray( "-123" ); QTest::newRow( "uint" ) << QVariant( (uint)123 ) << QByteArray( "123" ); QTest::newRow( "double" ) << QVariant( 123.456 ) << QByteArray( "123.456" ); + QTest::newRow( "float" ) << QVariant( 123.456f ) << QByteArray( "123.456" ); QTest::newRow( "longlong" ) << QVariant( (qlonglong)34 ) << QByteArray( "34" ); QTest::newRow( "ulonglong" ) << QVariant( (qulonglong)34 ) << QByteArray( "34" ); } @@ -1243,6 +1256,7 @@ void tst_QVariant::toString_data() QTest::newRow( "int" ) << QVariant( -123 ) << QString( "-123" ); QTest::newRow( "uint" ) << QVariant( (uint)123 ) << QString( "123" ); QTest::newRow( "double" ) << QVariant( 123.456 ) << QString( "123.456" ); + QTest::newRow( "float" ) << QVariant( 123.456f ) << QString( "123.456" ); #ifdef QT3_SUPPORT QTest::newRow( "bool" ) << QVariant( true, 0 ) << QString( "true" ); #else @@ -1450,6 +1464,7 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "datetime_invalid" ) << QVariant( QDateTime() ) << true; QTest::newRow( "datetime_valid" ) << QVariant( QDateTime( QDate( 2002, 07, 06 ), QTime( 14, 0, 0 ) ) ) << false; QTest::newRow( "double_valid" ) << QVariant( 123.456 ) << false; + QTest::newRow( "float_valid" ) << QVariant( 123.456f ) << false; QTest::newRow( "font_valid" ) << qVariantFromValue( QFont( "times", 12 ) ) << false; QTest::newRow( "pixmap_invalid" ) << qVariantFromValue( QPixmap() ) << true; QPixmap pixmap( 10, 10 ); @@ -1476,6 +1491,7 @@ void tst_QVariant::writeToReadFromDataStream_data() vMap.insert( "int", QVariant( 1 ) ); vMap.insert( "string", QVariant( QString("Two") ) ); vMap.insert( "double", QVariant( 3.45 ) ); + vMap.insert( "float", QVariant( 3.45f ) ); QTest::newRow( "map_valid" ) << QVariant( vMap ) << false; QTest::newRow( "palette_valid" ) << qVariantFromValue(QPalette(QColor("turquoise"))) << false; QTest::newRow( "pen_valid" ) << qVariantFromValue( QPen( Qt::red ) ) << false; @@ -1669,6 +1685,10 @@ void tst_QVariant::operator_eq_eq_data() QVariant mDoubleString(QByteArray("42.11")); QVariant mDoubleQString(QString("42.11")); + QVariant mFloat(42.11f); + QVariant mFloatString(QByteArray("42.11")); + QVariant mFloatQString(QString("42.11")); + QVariant mLongLong((qlonglong)-42); QVariant mLongLongString(QByteArray("-42")); QVariant mLongLongQString(QString("-42")); @@ -1686,6 +1706,7 @@ void tst_QVariant::operator_eq_eq_data() QVariant mBoolQString(QString("false")); QTest::newRow( "double_int" ) << QVariant(42.0) << QVariant(42) << true; + QTest::newRow( "float_int" ) << QVariant(42.f) << QVariant(42) << true; QTest::newRow( "mInt_mIntString" ) << mInt << mIntString << true; QTest::newRow( "mIntString_mInt" ) << mIntString << mInt << true; QTest::newRow( "mInt_mIntQString" ) << mInt << mIntQString << true; @@ -1701,6 +1722,11 @@ void tst_QVariant::operator_eq_eq_data() QTest::newRow( "mDouble_mDoubleQString" ) << mDouble << mDoubleQString << true; QTest::newRow( "mDoubleQString_mDouble" ) << mDoubleQString << mDouble << true; + QTest::newRow( "mFloat_mFloatString" ) << mFloat << mFloatString << true; + QTest::newRow( "mFloatString_mFloat" ) << mFloatString << mFloat << true; + QTest::newRow( "mFloat_mFloatQString" ) << mFloat << mFloatQString << true; + QTest::newRow( "mFloatQString_mFloat" ) << mFloatQString << mFloat << true; + QTest::newRow( "mLongLong_mLongLongString" ) << mLongLong << mLongLongString << true; QTest::newRow( "mLongLongString_mLongLong" ) << mLongLongString << mLongLong << true; QTest::newRow( "mLongLong_mLongLongQString" ) << mLongLong << mLongLongQString << true; @@ -1900,6 +1926,7 @@ void tst_QVariant::typeName_data() QTest::newRow("17") << int(QVariant::UInt) << QByteArray("uint"); QTest::newRow("18") << int(QVariant::Bool) << QByteArray("bool"); QTest::newRow("19") << int(QVariant::Double) << QByteArray("double"); + QTest::newRow("20") << int(QMetaType::Float) << QByteArray("float"); QTest::newRow("21") << int(QVariant::Polygon) << QByteArray("QPolygon"); QTest::newRow("22") << int(QVariant::Region) << QByteArray("QRegion"); QTest::newRow("23") << int(QVariant::Bitmap) << QByteArray("QBitmap"); @@ -2233,6 +2260,13 @@ void tst_QVariant::basicUserType() QCOMPARE(v.toDouble(), 4.4); { + float f = 4.5f; + v = QVariant(QMetaType::Float, &f); + } + QCOMPARE(v.userType(), int(QMetaType::Float)); + QCOMPARE(v.toDouble(), 4.5); + + { QByteArray ba("bar"); v = QVariant(QMetaType::QByteArray, &ba); } @@ -2246,6 +2280,7 @@ void tst_QVariant::data_() QVariant i = 1; QVariant d = 1.12; + QVariant f = 1.12f; QVariant ll = (qlonglong)2; QVariant ull = (qulonglong)3; QVariant s(QString("hallo")); @@ -2259,6 +2294,10 @@ void tst_QVariant::data_() QVERIFY(v.data()); QCOMPARE(*static_cast(v.data()), d.toDouble()); + v = f; + QVERIFY(v.data()); + QCOMPARE(*static_cast(v.data()), qVariantValue(v)); + v = ll; QVERIFY(v.data()); QCOMPARE(*static_cast(v.data()), ll.toLongLong()); @@ -2282,6 +2321,7 @@ void tst_QVariant::constData() int i = 1; double d = 1.12; + float f = 1.12f; qlonglong ll = 2; qulonglong ull = 3; QString s("hallo"); @@ -2295,6 +2335,10 @@ void tst_QVariant::constData() QVERIFY(v.constData()); QCOMPARE(*static_cast(v.constData()), d); + v = QVariant(f); + QVERIFY(v.constData()); + QCOMPARE(*static_cast(v.constData()), f); + v = QVariant(ll); QVERIFY(v.constData()); QCOMPARE(*static_cast(v.constData()), ll); @@ -2339,6 +2383,7 @@ void tst_QVariant::variant_to() qVariantSetValue(v4, foo); QCOMPARE(qvariant_cast(v1), 4.2); + QCOMPARE(qvariant_cast(v1), 4.2f); QCOMPARE(qvariant_cast(v2), 5); QCOMPARE(qvariant_cast(v3), sl); QCOMPARE(qvariant_cast(v3), QString::fromLatin1("blah")); @@ -2354,6 +2399,7 @@ void tst_QVariant::variant_to() QCOMPARE(qvariant_cast(n), 42); QCOMPARE(qvariant_cast(n), 42u); QCOMPARE(qvariant_cast(n), 42.0); + QCOMPARE(qvariant_cast(n), 42.f); QCOMPARE(qvariant_cast(n), short(42)); QCOMPARE(qvariant_cast(n), ushort(42)); @@ -2361,6 +2407,7 @@ void tst_QVariant::variant_to() QCOMPARE(qvariant_cast(n), 43); QCOMPARE(qvariant_cast(n), 43u); QCOMPARE(qvariant_cast(n), 43.0); + QCOMPARE(qvariant_cast(n), 43.f); QCOMPARE(qvariant_cast(n), 43l); n = QLatin1String("44"); @@ -2742,6 +2789,9 @@ void tst_QVariant::task172061_invalidDate() const variant = foo; QVERIFY(!variant.convert(QVariant::Double)); + + variant = foo; + QVERIFY(!variant.convert(QVariant::Type(QMetaType::Float))); } struct WontCompare -- cgit v0.12 From 96a27e24eec9356e45f1a6b6ff641a9afab24a39 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 27 Apr 2009 14:22:14 +0200 Subject: Make dark color schemes look better in property editor (especially schemes which have a grey color for text) Task: 252251 RevBy: Markus Goetz --- tools/designer/src/components/propertyeditor/propertyeditor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp index 63b57d8..806e1dd 100644 --- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp @@ -205,14 +205,15 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare colors.push_back(QColor(234, 191, 255)); colors.push_back(QColor(255, 191, 239)); m_colors.reserve(colors.count()); + const int darknessFactor = 250; for (int i = 0; i < colors.count(); i++) { QColor c = colors.at(i); - m_colors.push_back(qMakePair(c, c.darker(150))); + m_colors.push_back(qMakePair(c, c.darker(darknessFactor))); } QColor dynamicColor(191, 207, 255); QColor layoutColor(255, 191, 191); - m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(150)); - m_layoutColor = qMakePair(layoutColor, layoutColor.darker(150)); + m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(darknessFactor)); + m_layoutColor = qMakePair(layoutColor, layoutColor.darker(darknessFactor)); updateForegroundBrightness(); -- cgit v0.12 From c1ba5146a5ce2919df1529aa1202f6f3687071a0 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 27 Apr 2009 15:01:28 +0200 Subject: Ensure that QFontDialog::getFont() works on Mac OS X. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that running the font dialog modal means that the "fontChanged" action is not fired. Which means our font is never changed. Thankfully, since it's an app modal case, we can re-sync when the OK button is clicked. Task-number: 252000 Reviewed-by: Morten Sørvig --- src/gui/dialogs/qfontdialog_mac.mm | 67 +++++++++++++++----------------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 42be3be..50917a1 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -87,7 +87,6 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin NSButton *mOkButton; NSButton *mCancelButton; QFontDialogPrivate *mPriv; - NSFont *mCocoaFont; QFont *mQtFont; BOOL mPanelHackedWithButtons; CGFloat mDialogExtraWidth; @@ -119,6 +118,29 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)cleanUpAfterMyself; @end +static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) +{ + QFont newFont; + if (cocoaFont) { + int pSize = qRound([cocoaFont pointSize]); + QString family(QCFString::toQString(reinterpret_cast([cocoaFont familyName]))); + QString typeface(QCFString::toQString(reinterpret_cast([cocoaFont fontName]))); +// qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize; + int hyphenPos = typeface.indexOf(QLatin1Char('-')); + if (hyphenPos != -1) { + typeface.remove(0, hyphenPos + 1); + } else { + typeface = QLatin1String("Normal"); + } +// qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize; + newFont = QFontDatabase().font(family, typeface, pSize); + newFont.setUnderline(resolveFont.underline()); + newFont.setStrikeOut(resolveFont.strikeOut()); + + } + return newFont; +} + @implementation QCocoaFontPanelDelegate - (id)initWithFontPanel:(NSFontPanel *)panel stolenContentView:(NSView *)stolenContentView @@ -134,7 +156,6 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin mOkButton = okButton; mCancelButton = cancelButton; mPriv = priv; - mCocoaFont = 0; mPanelHackedWithButtons = (okButton != 0); mDialogExtraWidth = extraWidth; mDialogExtraHeight = extraHeight; @@ -155,42 +176,14 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)dealloc { - if (mCocoaFont) - [mCocoaFont release]; delete mQtFont; [super dealloc]; } - (void)changeFont:(id)sender { - Q_UNUSED(sender); - - QFont newFont; - - if (mCocoaFont) - [mCocoaFont autorelease]; NSFont *dummyFont = [NSFont userFontOfSize:12.0]; - mCocoaFont = [sender convertFont:dummyFont]; - if (mCocoaFont) { - [mCocoaFont retain]; - - int pSize = qRound([mCocoaFont pointSize]); - QString family(QCFString::toQString(reinterpret_cast([mCocoaFont familyName]))); - QString typeface(QCFString::toQString(reinterpret_cast([mCocoaFont fontName]))); -// qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize; - int hyphenPos = typeface.indexOf(QLatin1Char('-')); - if (hyphenPos != -1) { - typeface.remove(0, hyphenPos + 1); - } else { - typeface = QLatin1String("Normal"); - } -// qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize; - newFont = QFontDatabase().font(family, typeface, pSize); - newFont.setUnderline(mQtFont->underline()); - newFont.setStrikeOut(mQtFont->strikeOut()); - } - - [self setQtFont:newFont]; + [self setQtFont:qfontForCocoaFont([sender convertFont:dummyFont], *mQtFont)]; if (mPriv) mPriv->updateSampleFont(*mQtFont); } @@ -317,6 +310,9 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)onOkClicked { Q_ASSERT(mPanelHackedWithButtons); + NSFontManager *fontManager = [NSFontManager sharedFontManager]; + [self setQtFont:qfontForCocoaFont([fontManager convertFont:[fontManager selectedFont]], + *mQtFont)]; [[mStolenContentView window] close]; [self finishOffWithCode:NSOKButton]; } @@ -374,16 +370,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin mModalSession = 0; } - // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa -#if 1 - bool deleteDialog = mPriv->fontDialog()->testAttribute(Qt::WA_DeleteOnClose); - mPriv->fontDialog()->setAttribute(Qt::WA_DeleteOnClose, false); -#endif mPriv->done((code == NSOKButton) ? QDialog::Accepted : QDialog::Rejected); -#if 1 - if (deleteDialog) - delete mPriv->fontDialog(); -#endif } else { [NSApp stopModalWithCode:code]; } -- cgit v0.12 From 1c49081e9724db666070305bb57f829076a718fe Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Mon, 27 Apr 2009 14:29:13 +0200 Subject: Setting the print dialog to print pdf the QPrinter returns false on isValid() If the user passes QString() on printer name we can still be valid if the format is pdf/postscript. So test that. Reviewed-by: Trond Kjernaasen --- src/gui/painting/qprinter.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 4f3e71c..5161e32 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -834,11 +834,15 @@ void QPrinter::setPrinterName(const QString &name) #endif QList prnList = QPrinterInfo::availablePrinters(); - d->validPrinter = false; - for (int i = 0; i < prnList.size(); ++i) { - if (prnList[i].printerName() == name) { - d->validPrinter = true; - break; + if (name.isEmpty()) { + d->validPrinter = d->outputFormat == QPrinter::PdfFormat || d->outputFormat == QPrinter::PostScriptFormat; + } else { + d->validPrinter = false; + for (int i = 0; i < prnList.size(); ++i) { + if (prnList[i].printerName() == name) { + d->validPrinter = true; + break; + } } } -- cgit v0.12 From f328a68d898ebe74897132e3dae1ce75de496d3b Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Apr 2009 19:56:00 +0200 Subject: QSortFilterProxyModel: remove the mapping of the child that are filtered away when the filter change Task-Number: relates to 251296 Reviewed-by: Marius Bugge Monsen --- src/gui/itemviews/qsortfilterproxymodel.cpp | 51 +++++++++++++++------- .../tst_qsortfilterproxymodel.cpp | 10 +++++ 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 91431c4..fee19c9 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -56,6 +56,15 @@ QT_BEGIN_NAMESPACE typedef QList > QModelIndexPairList; +static inline QSet qVectorToSet(const QVector &vector) +{ + QSet set; + set.reserve(vector.size()); + for(int i=0; i < vector.size(); ++i) + set << vector.at(i); + return set; +} + class QSortFilterProxyModelLessThan { public: @@ -223,8 +232,8 @@ public: QModelIndexPairList store_persistent_indexes(); void update_persistent_indexes(const QModelIndexPairList &source_indexes); - void filter_changed(); - void handle_filter_changed( + void filter_changed(const QModelIndex &source_parent = QModelIndex()); + QSet handle_filter_changed( QVector &source_to_proxy, QVector &proxy_to_source, const QModelIndex &source_parent, Qt::Orientation orient); @@ -928,27 +937,39 @@ void QSortFilterProxyModelPrivate::update_persistent_indexes( q->changePersistentIndexList(from, to); } + /*! \internal Updates the proxy model (adds/removes rows) based on the new filter. */ -void QSortFilterProxyModelPrivate::filter_changed() +void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_parent) { - QMap::const_iterator it; - for (it = source_index_mapping.constBegin(); it != source_index_mapping.constEnd(); ++it) { - QModelIndex source_parent = it.key(); - Mapping *m = it.value(); - handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical); - handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal); + IndexMap::const_iterator it = source_index_mapping.constFind(source_parent); + if (it == source_index_mapping.constEnd()) + return; + Mapping *m = it.value(); + QSet rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical); + QSet columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal); + QVector::iterator it2 = m->mapped_children.end(); + while (it2 != m->mapped_children.begin()) { + --it2; + const QModelIndex source_child_index = *it2; + if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) { + it2 = m->mapped_children.erase(it2); + remove_from_mapping(source_child_index); + } else { + filter_changed(source_child_index); + } } } /*! \internal + returns the removed items indexes */ -void QSortFilterProxyModelPrivate::handle_filter_changed( +QSet QSortFilterProxyModelPrivate::handle_filter_changed( QVector &source_to_proxy, QVector &proxy_to_source, const QModelIndex &source_parent, Qt::Orientation orient) { @@ -985,6 +1006,7 @@ void QSortFilterProxyModelPrivate::handle_filter_changed( insert_source_items(source_to_proxy, proxy_to_source, source_items_insert, source_parent, orient); } + return qVectorToSet(source_items_remove); } void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &source_top_left, @@ -1035,15 +1057,14 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc if (!source_rows_remove.isEmpty()) { remove_source_items(m->proxy_rows, m->source_rows, source_rows_remove, source_parent, Qt::Vertical); - QSet source_rows_remove_set = source_rows_remove.toList().toSet(); - QVector::iterator it = m->mapped_children.begin(); - while (it != m->mapped_children.end()) { + QSet source_rows_remove_set = qVectorToSet(source_rows_remove); + QVector::iterator it = m->mapped_children.end(); + while (it != m->mapped_children.begin()) { + --it; const QModelIndex source_child_index = *it; if (source_rows_remove_set.contains(source_child_index.row())) { it = m->mapped_children.erase(it); remove_from_mapping(source_child_index); - } else { - ++it; } } } diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 18aa5fc..ea73a5e 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -2715,6 +2715,16 @@ void tst_QSortFilterProxyModel::task251296_hiddenChildren() QCOMPARE(proxy.rowCount(indexA) , 1); QModelIndex indexC = proxy.index(0, 0, indexA); QCOMPARE(proxy.data(indexC).toString(), QString::fromLatin1("C VISIBLE")); + + proxy.setFilterRegExp("C"); + QCOMPARE(proxy.rowCount(QModelIndex()), 0); + itemC->setText("invisible"); + itemA->setText("AC"); + + QCOMPARE(proxy.rowCount(QModelIndex()), 1); + indexA = proxy.index(0,0); + QCOMPARE(proxy.data(indexA).toString(), QString::fromLatin1("AC")); + QCOMPARE(proxy.rowCount(indexA) , 0); } -- cgit v0.12 From 68a498284e206e2bb000bc35331c966f3790f607 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 27 Apr 2009 15:40:53 +0200 Subject: Be able to set a border-image on plain QWidget we were not able to set border-image on plain QWidget, QDialog, QMainWindow, QFrame, QMenu, and more. And for some, not even border was working. PE_Widget used to only draw the background, now it draws both the whole rule (background + border) Since menu now have a PanelMenu, let's use that insead of PE_Widget + PE_FrameMenu. As for QFrame, we do not need to draw the border in CE_ShapedFrame, as PE_Widget does it. This patch mostly move code arounds. Reviewed-by: Jens Bache-Wiig --- src/gui/styles/qstylesheetstyle.cpp | 41 ++++++++++++------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 49ac57a..5756dba 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -2876,12 +2876,6 @@ void QStyleSheetStyle::polish(QWidget *w) QRenderRule rule = renderRule(w, PseudoElement_None, PseudoClass_Any); if (rule.hasDrawable() || rule.hasBox()) { if (w->metaObject() == &QWidget::staticMetaObject -#ifndef QT_NO_MENUBAR - || qobject_cast(w) -#endif -#ifndef QT_NO_MENU - || qobject_cast(w) -#endif #ifndef QT_NO_ITEMVIEWS || qobject_cast(w) #endif @@ -4164,9 +4158,8 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base); frmOpt.rect = rule.borderRect(frmOpt.rect); baseStyle()->drawControl(ce, &frmOpt, p, w); - } else { - rule.drawBorder(p, rule.borderRect(opt->rect)); } + // else, borders are already drawn in PE_Widget } return; @@ -4220,12 +4213,6 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op QRect rect = opt->rect; switch (pe) { - case PE_PanelStatusBar: - if (rule.hasDrawable()) { - rule.drawRule(p, opt->rect); - return; - } - break; case PE_FrameStatusBar: { QRenderRule subRule = renderRule(w->parentWidget(), opt, PseudoElement_Item); @@ -4337,36 +4324,34 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op return; case PE_Widget: - if (!rule.hasBackground()) { + if (!rule.hasDrawable()) { QWidget *container = containerWidget(w); if (autoFillDisabledWidgets->contains(container) - && (container == w || !renderRule(container, opt).hasBackground())) { + && (container == w || !renderRule(container, opt).hasDrawable())) { //we do not have a background, but we disabled the autofillbackground anyway. so fill the background now. // (this may happen if we have rules like :focus) p->fillRect(opt->rect, opt->palette.brush(w->backgroundRole())); } break; } - #ifndef QT_NO_SCROLLAREA if (const QAbstractScrollArea *sa = qobject_cast(w)) { const QAbstractScrollAreaPrivate *sap = sa->d_func(); rule.drawBackground(p, opt->rect, sap->contentsOffset()); - } else -#endif - { - rule.drawBackground(p, opt->rect); + if (rule.hasBorder()) + rule.drawBorder(p, rule.borderRect(opt->rect)); + break; } - - return; - - case PE_FrameMenu: +#endif + //fall tghought + case PE_PanelMenu: case PE_PanelMenuBar: - if (!rule.hasNativeBorder()) { - rule.drawBorder(p, rule.borderRect(opt->rect)); + case PE_PanelStatusBar: + if(rule.hasDrawable()) { + rule.drawRule(p, opt->rect); return; } - break; + break; case PE_IndicatorToolBarSeparator: case PE_IndicatorToolBarHandle: { -- cgit v0.12 From 3cdde3b112f0c69e497d72d195b9ccc44d0048ab Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 27 Apr 2009 15:50:52 +0200 Subject: Tests for the last stylesheet change. and add some missing images required for a previous test --- .../baseline/css_borderimage_allwidgets.ui | 210 +++++++++++++++++++++ .../baseline/images/splitter_horizontal.png | Bin 0 -> 199 bytes .../uiloader/baseline/images/splitter_vertical.png | Bin 0 -> 193 bytes 3 files changed, 210 insertions(+) create mode 100644 tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui create mode 100644 tests/auto/uiloader/baseline/images/splitter_horizontal.png create mode 100644 tests/auto/uiloader/baseline/images/splitter_vertical.png diff --git a/tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui b/tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui new file mode 100644 index 0000000..baba66b --- /dev/null +++ b/tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui @@ -0,0 +1,210 @@ + + + Form + + + + 0 + 0 + 553 + 368 + + + + Form + + + * { border-image: url("images/pushbutton.png") 6 6 6 6; border-width:6px; } + + + + + + + + + + + Each widget should have a background image. including the top level + + + true + + + + + + + PushButton + + + + + + + 24 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + PushButton + + + + + + + + + + RadioButton + + + + + + + true + + + + + 0 + 0 + 260 + 197 + + + + + + + Qt::Horizontal + + + + + + + + + + RadioButton + + + + + + + RadioButton + + + + + + + CheckBox + + + + + + + CheckBox + + + + + + + + + + + + + + GroupBox + + + + + + CheckBox + + + + + + + Line Edit + + + + + + + + New Item + + + + + New Item + + + + + New Item + + + + + New Item + + + + + New Item + + + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + diff --git a/tests/auto/uiloader/baseline/images/splitter_horizontal.png b/tests/auto/uiloader/baseline/images/splitter_horizontal.png new file mode 100644 index 0000000..66107cf Binary files /dev/null and b/tests/auto/uiloader/baseline/images/splitter_horizontal.png differ diff --git a/tests/auto/uiloader/baseline/images/splitter_vertical.png b/tests/auto/uiloader/baseline/images/splitter_vertical.png new file mode 100644 index 0000000..f907c0b Binary files /dev/null and b/tests/auto/uiloader/baseline/images/splitter_vertical.png differ -- cgit v0.12 From e7fdaf47dfdf5e2f6056aa5d5b4644e74a05492a Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Mon, 27 Apr 2009 16:11:21 +0200 Subject: Doc - cleaning up some documentation for QFileDialog and obsolete documentation. getOpenFileNames() and getExistingDirectory() mentioned that the dir parameter was ignored. This is no longer the case. This bit was reviewed by nrc, the other fixes were just cleanups. Task-number: 252223 Reviewed-by: nrc --- src/gui/dialogs/qfiledialog.cpp | 263 ++++++++++++++++++++-------------------- 1 file changed, 129 insertions(+), 134 deletions(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index d786f3e..073c25b 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1538,52 +1538,51 @@ extern QString qt_win_get_existing_directory(const QFileDialogArgs &args); #endif /*! - This is a convenience static function that returns an existing file - selected by the user. If the user presses Cancel, it returns a null - string. + This is a convenience static function that returns an existing file + selected by the user. If the user presses Cancel, it returns a null string. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8 - The function creates a modal file dialog with the given \a parent widget. - If the parent is not 0, the dialog will be shown centered over the - parent widget. + The function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. Only files - that match the given \a filter are shown. The filter selected is - set to \a selectedFilter. The parameters \a dir, \a - selectedFilter, and \a filter may be empty strings. If you want - multiple filters, separate them with ';;', for example: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. Only files that match the + given \a filter are shown. The filter selected is set to \a selectedFilter. + The parameters \a dir, \a selectedFilter, and \a filter may be empty + strings. If you want multiple filters, separate them with ';;', for + example: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified + then a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog will treat + symlinks as regular directories. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory() + \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory() */ QString QFileDialog::getOpenFileName(QWidget *parent, const QString &caption, @@ -1626,54 +1625,53 @@ QString QFileDialog::getOpenFileName(QWidget *parent, } /*! - This is a convenience static function that will return one or more - existing files selected by the user. + This is a convenience static function that will return one or more existing + files selected by the user. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9 - This function creates a modal file dialog with the given \a parent - widget. If the parent is not 0, the dialog will be shown centered - over the parent widget. + This function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. The filter - is set to \a filter so that only those files which match the filter - are shown. The filter selected is set to \a selectedFilter. The parameters - \a dir, \a selectedFilter and \a filter may be empty strings. If you - need multiple filters, separate them with ';;', for instance: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. The filter is set to + \a filter so that only those files which match the filter are shown. The + filter selected is set to \a selectedFilter. The parameters \a dir, + \a selectedFilter and \a filter may be empty strings. If you need multiple + filters, separate them with ';;', for instance: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified + then a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. On Mac OS X, the \a dir argument - is ignored, the native dialog always displays the last visited directory. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - Note that if you want to iterate over the list of files, you should - iterate over a copy. For example: + \note If you want to iterate over the list of files, you should iterate + over a copy. For example: \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getSaveFileName(), getExistingDirectory() + \sa getOpenFileName(), getSaveFileName(), getExistingDirectory() */ QStringList QFileDialog::getOpenFileNames(QWidget *parent, const QString &caption, @@ -1717,54 +1715,54 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, } /*! - This is a convenience static function that will return a file name - selected by the user. The file does not have to exist. + This is a convenience static function that will return a file name selected + by the user. The file does not have to exist. - It creates a modal file dialog with the given \a parent widget. If the - parent is not 0, the dialog will be shown centered over the parent - widget. + It creates a modal file dialog with the given \a parent widget. If + \a parent is not 0, the dialog will be shown centered over the parent + widget. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11 - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. Only files that - match the \a filter are shown. The filter selected is set to - \a selectedFilter. The parameters \a dir, \a selectedFilter, and - \a filter may be empty strings. Multiple filters are separated with ';;'. - For instance: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. Only files that match the + \a filter are shown. The filter selected is set to \a selectedFilter. The + parameters \a dir, \a selectedFilter, and \a filter may be empty strings. + Multiple filters are separated with ';;'. For instance: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - The default filter can be chosen by setting \a selectedFilter to the desired value. + The default filter can be chosen by setting \a selectedFilter to the + desired value. - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified, + a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. - On Mac OS X, the filter argument is ignored. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. On Mac OS X, with its native file + dialog, the filter argument is ignored. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks the file dialog will treat symlinks + as regular directories. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory() + \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory() */ QString QFileDialog::getSaveFileName(QWidget *parent, const QString &caption, @@ -1810,46 +1808,43 @@ QString QFileDialog::getSaveFileName(QWidget *parent, } /*! - This is a convenience static function that will return an existing - directory selected by the user. + This is a convenience static function that will return an existing + directory selected by the user. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12 - This function creates a modal file dialog with the given \a parent - widget. If the parent is not 0, the dialog will be shown centered over - the parent widget. + This function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The dialog's working directory is set to \a dir, and the caption is - set to \a caption. Either of these may be an empty string in which case - the current directory and a default caption will be used - respectively. + The dialog's working directory is set to \a dir, and the caption is set to + \a caption. Either of these may be an empty string in which case the + current directory and a default caption will be used respectively. - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. Note that \l{QFileDialog::}{ShowDirsOnly} - must be set to ensure a native file dialog. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must + be set. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. On Mac OS X, the \a dir argument - is ignored, the native dialog always displays the last visited directory. - On Windows CE, if the device has no native file dialog, a QFileDialog - will be used. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. On Windows CE, if the device has no native + file dialog, a QFileDialog will be used. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog will treat + symlinks as regular directories. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() + \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() */ QString QFileDialog::getExistingDirectory(QWidget *parent, const QString &caption, -- cgit v0.12 From ae949b9d21470a9b9bf200774c246a0b86a69ff6 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Mon, 27 Apr 2009 16:31:58 +0200 Subject: QPixmapCache:Remove the old pixmap if you insert one with the same key. If you insert a new pixmap in the cache with a key that was already in the cache then we remove the old pixmap and add the new one. This avoid to fill the memory with garbage even if the cache has a protection to avoid running out of memory. This was discovered with QraphicsView and its cache. We don't need to keep old cached pixmaps for an item. Task-number: KDE Reviewed-by: Trond --- src/gui/image/qpixmapcache.cpp | 5 +++++ tests/auto/qpixmapcache/tst_qpixmapcache.cpp | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index eedb6a3..458d6b9 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -187,6 +187,11 @@ bool QPMCache::insert(const QString& key, const QPixmap &pixmap, int cost) cacheKeys.insert(key, cacheKey); return true; } + qint64 oldCacheKey = cacheKeys.value(key, -1); + //If for the same key we add already a pixmap we should delete it + if (oldCacheKey != -1) + QCache::remove(oldCacheKey); + bool success = QCache::insert(cacheKey, new QDetachedPixmap(pixmap), cost); if (success) { cacheKeys.insert(key, cacheKey); diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp index c163b52..1f515ff 100644 --- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp @@ -166,6 +166,16 @@ void tst_QPixmapCache::insert() QVERIFY(estimatedNum - 1 <= num <= estimatedNum + 1); QPixmap p3; QPixmapCache::insert("null", p3); + + QPixmap c1(10, 10); + c1.fill(Qt::yellow); + QPixmapCache::insert("custom", c1); + QVERIFY(!c1.isDetached()); + QPixmap c2(10, 10); + c2.fill(Qt::red); + QPixmapCache::insert("custom", c2); + //We have deleted the old pixmap in the cache for the same key + QVERIFY(c1.isDetached()); } void tst_QPixmapCache::remove() -- cgit v0.12 From 73fefcfb67b2de42a0675eb88aaa5cb2751402e6 Mon Sep 17 00:00:00 2001 From: kh Date: Mon, 27 Apr 2009 17:30:20 +0200 Subject: fixes undefined behavior will closing all tabs Task-number: 249001, 236473 Reviewed-by: kh --- tools/assistant/tools/assistant/centralwidget.cpp | 241 ++++++++++++---------- tools/assistant/tools/assistant/centralwidget.h | 14 +- tools/assistant/tools/assistant/mainwindow.cpp | 10 +- tools/assistant/tools/assistant/mainwindow.h | 1 + tools/assistant/tools/assistant/searchwidget.cpp | 11 + tools/assistant/tools/assistant/searchwidget.h | 4 + 6 files changed, 165 insertions(+), 116 deletions(-) diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp index 0a94a3d..f953ab7 100644 --- a/tools/assistant/tools/assistant/centralwidget.cpp +++ b/tools/assistant/tools/assistant/centralwidget.cpp @@ -161,7 +161,7 @@ void FindWidget::updateButtons() QToolButton* FindWidget::setupToolButton(const QString &text, const QString &icon) { - QToolButton* toolButton = new QToolButton(this); + QToolButton *toolButton = new QToolButton(this); toolButton->setText(text); toolButton->setAutoRaise(true); @@ -262,13 +262,16 @@ CentralWidget::~CentralWidget() QString zoomCount; QString currentPages; QLatin1Char separator('|'); - for (int i = 1; i < tabWidget->count(); ++i) { + int i = m_searchWidget->isAttached() ? 1 : 0; + + for (; i < tabWidget->count(); ++i) { HelpViewer *viewer = qobject_cast(tabWidget->widget(i)); if (viewer && viewer->source().isValid()) { currentPages += viewer->source().toString() + separator; zoomCount += QString::number(viewer->zoom()) + separator; } } + engine.setCustomValue(QLatin1String("LastTabPage"), lastTabPage); engine.setCustomValue(QLatin1String("LastShownPages"), currentPages); #if !defined(QT_NO_WEBKIT) @@ -285,7 +288,7 @@ CentralWidget *CentralWidget::instance() void CentralWidget::newTab() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); #if !defined(QT_NO_WEBKIT) if (viewer && viewer->hasLoadFinished()) #else @@ -296,7 +299,7 @@ void CentralWidget::newTab() void CentralWidget::zoomIn() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->zoomIn(); @@ -306,7 +309,7 @@ void CentralWidget::zoomIn() void CentralWidget::zoomOut() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->zoomOut(); @@ -329,7 +332,7 @@ void CentralWidget::nextPage() void CentralWidget::resetZoom() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->resetZoom(); @@ -353,7 +356,7 @@ void CentralWidget::findPrevious() void CentralWidget::closeTab() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (!viewer|| tabWidget->count() == 1) return; @@ -363,8 +366,8 @@ void CentralWidget::closeTab() void CentralWidget::setSource(const QUrl &url) { - HelpViewer* viewer = currentHelpViewer(); - HelpViewer* lastViewer = qobject_cast(tabWidget->widget(lastTabPage)); + HelpViewer *viewer = currentHelpViewer(); + HelpViewer *lastViewer = qobject_cast(tabWidget->widget(lastTabPage)); if (!viewer && !lastViewer) { viewer = new HelpViewer(helpEngine, this); @@ -418,13 +421,13 @@ void CentralWidget::setLastShownPages() bool CentralWidget::hasSelection() const { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); return viewer ? viewer->hasSelection() : false; } QUrl CentralWidget::currentSource() const { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); if (viewer) return viewer->source(); @@ -433,7 +436,7 @@ QUrl CentralWidget::currentSource() const QString CentralWidget::currentTitle() const { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); if (viewer) return viewer->documentTitle(); @@ -442,7 +445,7 @@ QString CentralWidget::currentTitle() const void CentralWidget::copySelection() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->copy(); } @@ -465,7 +468,7 @@ void CentralWidget::initPrinter() void CentralWidget::print() { #ifndef QT_NO_PRINTER - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (!viewer) return; @@ -522,14 +525,14 @@ bool CentralWidget::isHomeAvailable() const void CentralWidget::home() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->home(); } bool CentralWidget::isForwardAvailable() const { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); if (viewer) return viewer->isForwardAvailable(); @@ -538,14 +541,14 @@ bool CentralWidget::isForwardAvailable() const void CentralWidget::forward() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->forward(); } bool CentralWidget::isBackwardAvailable() const { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); if (viewer) return viewer->isBackwardAvailable(); @@ -554,7 +557,7 @@ bool CentralWidget::isBackwardAvailable() const void CentralWidget::backward() { - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) viewer->backward(); } @@ -572,7 +575,7 @@ void CentralWidget::setGlobalActions(const QList &actions) void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom) { - HelpViewer* viewer; + HelpViewer *viewer; #if defined(QT_NO_WEBKIT) viewer = currentHelpViewer(); @@ -595,20 +598,20 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom) } #if !defined(QT_NO_WEBKIT) - QWebSettings* settings = QWebSettings::globalSettings(); + QWebSettings *settings = QWebSettings::globalSettings(); if (!userFont) { int fontSize = settings->fontSize(QWebSettings::DefaultFontSize); QString fontFamily = settings->fontFamily(QWebSettings::StandardFont); font = QFont(fontFamily, fontSize); } - QWebView* view = qobject_cast (viewer); + QWebView *view = qobject_cast (viewer); if (view) { settings = view->settings(); settings->setFontFamily(QWebSettings::StandardFont, font.family()); settings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize()); } else if (viewer) { - viewer->setFont(font); + viewer->setFont(font); } viewer->setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom); #else @@ -622,7 +625,7 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom) HelpViewer *CentralWidget::newEmptyTab() { - HelpViewer* viewer = new HelpViewer(helpEngine, this); + HelpViewer *viewer = new HelpViewer(helpEngine, this); viewer->installEventFilter(this); viewer->setFocus(Qt::OtherFocusReason); #if defined(QT_NO_WEBKIT) @@ -641,7 +644,7 @@ void CentralWidget::findCurrentText(const QString &text) void CentralWidget::connectSignals() { - const HelpViewer* viewer = currentHelpViewer(); + const HelpViewer *viewer = currentHelpViewer(); if (viewer) { connect(viewer, SIGNAL(copyAvailable(bool)), this, SIGNAL(copyAvailable(bool))); @@ -676,18 +679,18 @@ void CentralWidget::activateTab(bool onlyHelpViewer) } } -void CentralWidget::setTabTitle(const QUrl& url) +void CentralWidget::setTabTitle(const QUrl &url) { Q_UNUSED(url) #if !defined(QT_NO_WEBKIT) QTabBar *tabBar = qFindChild(tabWidget); for (int tab = 0; tab < tabBar->count(); ++tab) { - HelpViewer* viewer = qobject_cast(tabWidget->widget(tab)); + HelpViewer *viewer = qobject_cast(tabWidget->widget(tab)); if (viewer) tabWidget->setTabText(tab, viewer->documentTitle().trimmed()); } #else - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); if (viewer) { tabWidget->setTabText(lastTabPage, quoteTabTitle(viewer->documentTitle().trimmed())); @@ -698,61 +701,50 @@ void CentralWidget::setTabTitle(const QUrl& url) void CentralWidget::currentPageChanged(int index) { const HelpViewer *viewer = currentHelpViewer(); - - if (viewer || tabWidget->count() == 1) + if (viewer) lastTabPage = index; - bool enabled = false; - if (viewer) { - enabled = true; - if (!m_searchWidget) - enabled = tabWidget->count() > 1; - } + QWidget *widget = tabWidget->cornerWidget(Qt::TopRightCorner); + widget->setEnabled(viewer && enableTabCloseAction()); - QWidget *widget = tabWidget->cornerWidget(Qt::TopLeftCorner); - widget->setEnabled(m_searchWidget ? enabled : true); + widget = tabWidget->cornerWidget(Qt::TopLeftCorner); + widget->setEnabled(viewer ? true : false); - widget = tabWidget->cornerWidget(Qt::TopRightCorner); - widget->setEnabled(enabled); - - emit currentViewerChanged(); + emit currentViewerChanged(); } void CentralWidget::showTabBarContextMenu(const QPoint &point) { - HelpViewer* viewer = helpViewerFromTabPosition(tabWidget, point); + HelpViewer *viewer = helpViewerFromTabPosition(tabWidget, point); if (!viewer) return; QTabBar *tabBar = qFindChild(tabWidget); QMenu menu(QLatin1String(""), tabBar); - QAction *new_page = menu.addAction(tr("Add New Page")); - QAction *close_page = menu.addAction(tr("Close This Page")); - QAction *close_pages = menu.addAction(tr("Close Other Pages")); - menu.addSeparator(); - QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page...")); + QAction *newPage = menu.addAction(tr("Add New Page")); - if (tabBar->count() == 1) { - close_page->setEnabled(false); - close_pages->setEnabled(false); - } else if (m_searchWidget && tabBar->count() == 2) { - close_pages->setEnabled(false); - } + bool enableAction = enableTabCloseAction(); + QAction *closePage = menu.addAction(tr("Close This Page")); + closePage->setEnabled(enableAction); - QAction *picked_action = menu.exec(tabBar->mapToGlobal(point)); - if (!picked_action) - return; + QAction *closePages = menu.addAction(tr("Close Other Pages")); + closePages->setEnabled(enableAction); - if (picked_action == new_page) + menu.addSeparator(); + + QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page...")); + + QAction *pickedAction = menu.exec(tabBar->mapToGlobal(point)); + if (pickedAction == newPage) setSourceInNewTab(viewer->source()); - if (picked_action == close_page) { + if (pickedAction == closePage) { tabWidget->removeTab(tabWidget->indexOf(viewer)); QTimer::singleShot(0, viewer, SLOT(deleteLater())); } - if (picked_action == close_pages) { + if (pickedAction == closePages) { int currentPage = tabWidget->indexOf(viewer); for (int i = tabBar->count() -1; i >= 0; --i) { viewer = qobject_cast(tabWidget->widget(i)); @@ -766,58 +758,68 @@ void CentralWidget::showTabBarContextMenu(const QPoint &point) } } - if (picked_action == newBookmark) + if (pickedAction == newBookmark) emit addNewBookmark(viewer->documentTitle(), viewer->source().toString()); } bool CentralWidget::eventFilter(QObject *object, QEvent *e) { - if (currentHelpViewer() == object && e->type() == QEvent::KeyPress){ + if (e->type() == QEvent::KeyPress) { QKeyEvent *ke = static_cast(e); - if (ke->key() == Qt::Key_Backspace) { - HelpViewer *viewer = currentHelpViewer(); + switch (ke->key()) { + default: { + return QWidget::eventFilter(object, e); + } break; + + case Qt::Key_Escape: { + if (findWidget->editFind == object) { + findBar->hide(); + if (HelpViewer *viewer = currentHelpViewer()) + viewer->setFocus(); + } + } break; + + case Qt::Key_Backspace: { + HelpViewer *viewer = currentHelpViewer(); + if (viewer == object) { #if defined(QT_NO_WEBKIT) - if (viewer && viewer->isBackwardAvailable()) { + if (viewer->isBackwardAvailable()) { #else - if (viewer && viewer->isBackwardAvailable() && !viewer->hasFocus()) { + if (viewer->isBackwardAvailable() && !viewer->hasFocus()) { #endif - viewer->backward(); - return true; - } + viewer->backward(); + return true; + } + } + } break; } } - QTabBar *tabBar = qobject_cast(object); - bool mousRel = e->type() == QEvent::MouseButtonRelease; - bool dblClick = e->type() == QEvent::MouseButtonDblClick; - - if (tabBar && (mousRel || dblClick)) { - QMouseEvent *mouseEvent = static_cast(e); - HelpViewer *viewer = helpViewerFromTabPosition(tabWidget, mouseEvent->pos()); - if (!m_searchWidget && tabWidget->count() <= 1) - return QWidget::eventFilter(object, e); - - if (viewer && (mouseEvent->button() == Qt::MidButton || dblClick)) { - tabWidget->removeTab(tabWidget->indexOf(viewer)); - QTimer::singleShot(0, viewer, SLOT(deleteLater())); - currentPageChanged(tabWidget->currentIndex()); - return true; - } - } else if (object == findWidget->editFind && e->type() == QEvent::KeyPress) { - QKeyEvent *ke = static_cast(e); - if (ke->key() == Qt::Key_Escape) { - findBar->hide(); - HelpViewer *hv = currentHelpViewer(); - if (hv) - hv->setFocus(); + if (QTabBar *tabBar = qobject_cast(object)) { + const bool dblClick = e->type() == QEvent::MouseButtonDblClick; + if ((e->type() == QEvent::MouseButtonRelease) || dblClick) { + QMouseEvent *mouseEvent = static_cast(e); + HelpViewer *viewer = helpViewerFromTabPosition(tabWidget, + mouseEvent->pos()); + if (viewer) { + if ((mouseEvent->button() == Qt::MidButton) || dblClick) { + if (availableHelpViewer() > 1) { + tabWidget->removeTab(tabWidget->indexOf(viewer)); + QTimer::singleShot(0, viewer, SLOT(deleteLater())); + currentPageChanged(tabWidget->currentIndex()); + return true; + } + } + } } } + return QWidget::eventFilter(object, e); } void CentralWidget::keyPressEvent(QKeyEvent *e) { - QString text = e->text(); + const QString &text = e->text(); if (text.startsWith(QLatin1Char('/'))) { if (!findBar->isVisible()) { findBar->show(); @@ -837,7 +839,7 @@ void CentralWidget::find(QString ttf, bool forward, bool backward) QTextDocument *doc = 0; QTextBrowser *browser = 0; - HelpViewer* viewer = currentHelpViewer(); + HelpViewer *viewer = currentHelpViewer(); QPalette p = findWidget->editFind->palette(); p.setColor(QPalette::Active, QPalette::Base, Qt::white); @@ -876,7 +878,7 @@ void CentralWidget::find(QString ttf, bool forward, bool backward) } if (tabWidget->currentWidget() == m_searchWidget) { - QTextBrowser* browser = qFindChild(m_searchWidget); + QTextBrowser *browser = qFindChild(m_searchWidget); if (browser) { doc = browser->document(); cursor = browser->textCursor(); @@ -933,15 +935,6 @@ void CentralWidget::find(QString ttf, bool forward, bool backward) findWidget->editFind->setPalette(p); } -void CentralWidget::activateSearch() -{ - if (tabWidget->widget(0) != m_searchWidget) - createSearchWidget(helpEngine->searchEngine()); - - tabWidget->setCurrentWidget(m_searchWidget); - m_searchWidget->setFocus(); -} - void CentralWidget::updateBrowserFont() { QFont font = qApp->font(); @@ -952,7 +945,7 @@ void CentralWidget::updateBrowserFont() } #if !defined(QT_NO_WEBKIT) - QWebSettings* settings = QWebSettings::globalSettings(); + QWebSettings *settings = QWebSettings::globalSettings(); if (!userFont) { int fontSize = settings->fontSize(QWebSettings::DefaultFontSize); QString fontFamily = settings->fontFamily(QWebSettings::StandardFont); @@ -960,11 +953,11 @@ void CentralWidget::updateBrowserFont() } #endif - QWidget* widget = 0; + QWidget *widget = 0; for (int i = 0; i < tabWidget->count(); ++i) { widget = tabWidget->widget(i); #if !defined(QT_NO_WEBKIT) - QWebView* view = qobject_cast (widget); + QWebView *view = qobject_cast (widget); if (view) { settings = view->settings(); settings->setFontFamily(QWebSettings::StandardFont, font.family()); @@ -991,11 +984,41 @@ void CentralWidget::createSearchWidget(QHelpSearchEngine *searchEngine) SLOT(setSourceFromSearchInNewTab(QUrl))); } tabWidget->insertTab(0, m_searchWidget, tr("Search")); + m_searchWidget->setAttached(true); +} + +void CentralWidget::activateSearchWidget() +{ + if (!m_searchWidget->isAttached()) + createSearchWidget(helpEngine->searchEngine()); + + tabWidget->setCurrentWidget(m_searchWidget); + m_searchWidget->setFocus(); } void CentralWidget::removeSearchWidget() { - tabWidget->removeTab(0); + if (m_searchWidget && m_searchWidget->isAttached()) { + tabWidget->removeTab(0); + m_searchWidget->setAttached(false); + } +} + +int CentralWidget::availableHelpViewer() const +{ + int count = tabWidget->count(); + if (m_searchWidget && m_searchWidget->isAttached()) + count--; + return count; +} + +bool CentralWidget::enableTabCloseAction() const +{ + int minTabCount = 1; + if (m_searchWidget && m_searchWidget->isAttached()) + minTabCount = 2; + + return (tabWidget->count() > minTabCount); } QString CentralWidget::quoteTabTitle(const QString &title) const @@ -1026,7 +1049,7 @@ CentralWidget::highlightSearchTerms() if (!viewer) return; - QHelpSearchEngine* searchEngine = helpEngine->searchEngine(); + QHelpSearchEngine *searchEngine = helpEngine->searchEngine(); QList queryList = searchEngine->query(); QStringList terms; diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h index a34ba65..2c28091 100644 --- a/tools/assistant/tools/assistant/centralwidget.h +++ b/tools/assistant/tools/assistant/centralwidget.h @@ -116,10 +116,14 @@ public: void setGlobalActions(const QList &actions); HelpViewer *currentHelpViewer() const; void activateTab(bool onlyHelpViewer = false); - void activateSearch(); + void createSearchWidget(QHelpSearchEngine *searchEngine); + void activateSearchWidget(); void removeSearchWidget(); + int availableHelpViewer() const; + bool enableTabCloseAction() const; + void closeTabAt(int index); QMap currentSourceFileList() const; @@ -170,7 +174,7 @@ private slots: void setSourceFromSearchInNewTab(const QUrl &url); private: - void connectSignals(); + void connectSignals(); bool eventFilter(QObject *object, QEvent *e); void find(QString ttf, bool forward, bool backward); void initPrinter(); @@ -183,13 +187,13 @@ private: QList globalActionList; QWidget *findBar; - QTabWidget* tabWidget; + QTabWidget *tabWidget; FindWidget *findWidget; QHelpEngine *helpEngine; QPrinter *printer; bool usesDefaultCollection; - - SearchWidget* m_searchWidget; + + SearchWidget *m_searchWidget; }; QT_END_NAMESPACE diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index 6e22413..426a828 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -535,6 +535,8 @@ void MainWindow::setupActions() SLOT(copyAvailable(bool))); connect(m_centralWidget, SIGNAL(currentViewerChanged()), this, SLOT(updateNavigationItems())); + connect(m_centralWidget, SIGNAL(currentViewerChanged()), this, + SLOT(updateTabCloseAction())); connect(m_centralWidget, SIGNAL(forwardAvailable(bool)), this, SLOT(updateNavigationItems())); connect(m_centralWidget, SIGNAL(backwardAvailable(bool)), this, @@ -697,10 +699,14 @@ void MainWindow::updateNavigationItems() m_printAction->setEnabled(hasCurrentViewer); m_nextAction->setEnabled(m_centralWidget->isForwardAvailable()); m_backAction->setEnabled(m_centralWidget->isBackwardAvailable()); - m_closeTabAction->setEnabled(hasCurrentViewer); m_newTabAction->setEnabled(hasCurrentViewer); } +void MainWindow::updateTabCloseAction() +{ + m_closeTabAction->setEnabled(m_centralWidget->enableTabCloseAction()); +} + void MainWindow::showTopicChooser(const QMap &links, const QString &keyword) { @@ -871,7 +877,7 @@ void MainWindow::activateCurrentCentralWidgetTab() void MainWindow::showSearch() { - m_centralWidget->activateSearch(); + m_centralWidget->activateSearchWidget(); } void MainWindow::hideSearch() diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h index 1bd8005..7d08a74 100644 --- a/tools/assistant/tools/assistant/mainwindow.h +++ b/tools/assistant/tools/assistant/mainwindow.h @@ -104,6 +104,7 @@ private slots: void showAboutDialog(); void copyAvailable(bool yes); void updateNavigationItems(); + void updateTabCloseAction(); void showNewAddress(const QUrl &url); void addNewBookmark(const QString &title, const QString &url); void showTopicChooser(const QMap &links, const QString &keyword); diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp index 677e18e..c40a9c4 100644 --- a/tools/assistant/tools/assistant/searchwidget.cpp +++ b/tools/assistant/tools/assistant/searchwidget.cpp @@ -62,6 +62,7 @@ QT_BEGIN_NAMESPACE SearchWidget::SearchWidget(QHelpSearchEngine *engine, QWidget *parent) : QWidget(parent) , zoomCount(0) + , attached(false) , searchEngine(engine) { QVBoxLayout *vLayout = new QVBoxLayout(this); @@ -122,6 +123,16 @@ void SearchWidget::resetZoom() } } +bool SearchWidget::isAttached() const +{ + return attached; +} + +void SearchWidget::setAttached(bool state) +{ + attached = state; +} + void SearchWidget::search() const { QList query = searchEngine->queryWidget(